Unify (and fix) include guards

2015-10-15 13:09:21 +02:00 · 2015-10-15 13:09:21 +02:00 · 821550e62f
commit 821550e62f
parent 9a27cea138
33 changed files with 74 additions and 60 deletions
--- a/implementations/caching/CachedBlock.h
+++ b/implementations/caching/CachedBlock.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_ENCRYPTEDBLOCK_H_
-#define BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_ENCRYPTEDBLOCK_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHEDBLOCK_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHEDBLOCK_H_

 #include "../../interface/Block.h"

--- a/implementations/caching/CachingBlockStore.h
+++ b/implementations/caching/CachingBlockStore.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHINGBLOCKSTORE_H_
-#define BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHINGBLOCKSTORE_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHINGBLOCKSTORE_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHINGBLOCKSTORE_H_

 #include "cache/Cache.h"
 #include "../../interface/BlockStore.h"
--- a/implementations/caching/NewBlock.h
+++ b/implementations/caching/NewBlock.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_IMPLEMENTATIONS_CACHING_NEWBLOCK_H_
-#define BLOCKSTORE_IMPLEMENTATIONS_CACHING_NEWBLOCK_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_NEWBLOCK_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_NEWBLOCK_H_

 #include "../../interface/BlockStore.h"
 #include <messmer/cpp-utils/data/Data.h>
--- a/implementations/caching/cache/Cache.h
+++ b/implementations/caching/cache/Cache.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHE_H_
-#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHE_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHE_CACHE_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHE_CACHE_H_

 #include "CacheEntry.h"
 #include "QueueMap.h"
--- a/implementations/caching/cache/CacheEntry.h
+++ b/implementations/caching/cache/CacheEntry.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHEENTRY_H_
-#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHEENTRY_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHE_CACHEENTRY_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHE_CACHEENTRY_H_

 #include <ctime>
 #include <memory>
--- a/implementations/caching/cache/PeriodicTask.h
+++ b/implementations/caching/cache/PeriodicTask.h
@ -1,5 +1,6 @@
-#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_PERIODICTASK_H_
-#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_PERIODICTASK_H_
+#pragma once
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHE_PERIODICTASK_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHE_PERIODICTASK_H_

 #include <functional>
 #include <boost/thread.hpp>
--- a/implementations/caching/cache/QueueMap.h
+++ b/implementations/caching/cache/QueueMap.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING2_MAP_H_
-#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING2_MAP_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHE_QUEUEMAP_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHE_QUEUEMAP_H_

 #include <memory>
 #include <unordered_map>
--- a/implementations/encrypted/EncryptedBlock.h
+++ b/implementations/encrypted/EncryptedBlock.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_ENCRYPTEDBLOCK_H_
-#define BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_ENCRYPTEDBLOCK_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_ENCRYPTEDBLOCK_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_ENCRYPTEDBLOCK_H_

 #include "../../interface/Block.h"
 #include <messmer/cpp-utils/data/Data.h>
--- a/implementations/encrypted/EncryptedBlockStore.h
+++ b/implementations/encrypted/EncryptedBlockStore.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_ENCRYPTEDBLOCKSTORE_H_
-#define BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_ENCRYPTEDBLOCKSTORE_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_ENCRYPTEDBLOCKSTORE_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_ENCRYPTEDBLOCKSTORE_H_

 #include "../../interface/BlockStore.h"
 #include <messmer/cpp-utils/macros.h>
--- a/implementations/encrypted/ciphers/CFB_Cipher.h
+++ b/implementations/encrypted/ciphers/CFB_Cipher.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_CIPHERS_AES256_CFB_H_
-#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_CIPHERS_AES256_CFB_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_CIPHERS_CFB_CIPHER_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_CIPHERS_CFB_CIPHER_H_

 #include <messmer/cpp-utils/data/FixedSizeData.h>
 #include <messmer/cpp-utils/data/Data.h>
--- a/implementations/inmemory/InMemoryBlock.h
+++ b/implementations/inmemory/InMemoryBlock.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCK_H_
-#define BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCK_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCK_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCK_H_

 #include "../../interface/Block.h"
 #include <messmer/cpp-utils/data/Data.h>
--- a/implementations/inmemory/InMemoryBlockStore.h
+++ b/implementations/inmemory/InMemoryBlockStore.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCKSTORE_H_
-#define BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCKSTORE_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCKSTORE_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCKSTORE_H_

 #include "../../interface/helpers/BlockStoreWithRandomKeys.h"
 #include <messmer/cpp-utils/macros.h>
--- a/implementations/ondisk/OnDiskBlock.h
+++ b/implementations/ondisk/OnDiskBlock.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_IMPLEMENTATIONS_ONDISK_ONDISKBLOCK_H_
-#define BLOCKSTORE_IMPLEMENTATIONS_ONDISK_ONDISKBLOCK_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_ONDISK_ONDISKBLOCK_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_ONDISK_ONDISKBLOCK_H_

 #include <boost/filesystem/path.hpp>
 #include "../../interface/Block.h"
--- a/implementations/ondisk/OnDiskBlockStore.h
+++ b/implementations/ondisk/OnDiskBlockStore.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_IMPLEMENTATIONS_ONDISK_ONDISKBLOCKSTORE_H_
-#define BLOCKSTORE_IMPLEMENTATIONS_ONDISK_ONDISKBLOCKSTORE_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_ONDISK_ONDISKBLOCKSTORE_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_ONDISK_ONDISKBLOCKSTORE_H_

 #include <boost/filesystem.hpp>
 #include "../../interface/helpers/BlockStoreWithRandomKeys.h"
--- a/implementations/parallelaccess/BlockRef.h
+++ b/implementations/parallelaccess/BlockRef.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHEDBLOCKREF_H_
-#define BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHEDBLOCKREF_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_PARALLELACCESS_BLOCKREF_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_PARALLELACCESS_BLOCKREF_H_

 #include <messmer/parallelaccessstore/ParallelAccessStore.h>
 #include "../../interface/Block.h"
--- a/implementations/parallelaccess/ParallelAccessBlockStore.h
+++ b/implementations/parallelaccess/ParallelAccessBlockStore.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHINGBLOCKSTORE_H_
-#define BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHINGBLOCKSTORE_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_PARALLELACCESS_PARALLELACCESSBLOCKSTORE_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_PARALLELACCESS_PARALLELACCESSBLOCKSTORE_H_

 #include <messmer/parallelaccessstore/ParallelAccessStore.h>
 #include "BlockRef.h"
--- a/implementations/parallelaccess/ParallelAccessBlockStoreAdapter.h
+++ b/implementations/parallelaccess/ParallelAccessBlockStoreAdapter.h
@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_PARALLELACCESS_PARALLELACCESSBLOCKSTOREADAPTER_H_
 #define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_PARALLELACCESS_PARALLELACCESSBLOCKSTOREADAPTER_H_

--- a/implementations/testfake/FakeBlock.h
+++ b/implementations/testfake/FakeBlock.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCK_H_
-#define BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCK_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_TESTFAKE_FAKEBLOCK_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_TESTFAKE_FAKEBLOCK_H_

 #include "../../interface/Block.h"
 #include <messmer/cpp-utils/data/Data.h>
--- a/implementations/testfake/FakeBlockStore.h
+++ b/implementations/testfake/FakeBlockStore.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCKSTORE_H_
-#define BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCKSTORE_H_
+#ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_TESTFAKE_FAKEBLOCKSTORE_H_
+#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_TESTFAKE_FAKEBLOCKSTORE_H_

 #include "../../interface/helpers/BlockStoreWithRandomKeys.h"
 #include <messmer/cpp-utils/data/Data.h>
--- a/interface/Block.h
+++ b/interface/Block.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_INTERFACE_BLOCK_H_
-#define BLOCKSTORE_INTERFACE_BLOCK_H_
+#ifndef MESSMER_BLOCKSTORE_INTERFACE_BLOCK_H_
+#define MESSMER_BLOCKSTORE_INTERFACE_BLOCK_H_

 #include "../utils/Key.h"
 #include <cstring>
--- a/interface/BlockStore.h
+++ b/interface/BlockStore.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_BLOCKSTORE_BLOCKSTORE_H_
-#define FSPP_BLOCKSTORE_BLOCKSTORE_H_
+#ifndef MESSMER_BLOCKSTORE_INTERFACE_BLOCKSTORE_H_
+#define MESSMER_BLOCKSTORE_INTERFACE_BLOCKSTORE_H_

 #include "Block.h"
 #include <string>
--- a/interface/helpers/BlockStoreWithRandomKeys.h
+++ b/interface/helpers/BlockStoreWithRandomKeys.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_BLOCKSTORE_BLOCKSTOREWITHRANDOMKEYS_H_
-#define FSPP_BLOCKSTORE_BLOCKSTOREWITHRANDOMKEYS_H_
+#ifndef MESSMER_BLOCKSTORE_INTERFACE_HELPERS_BLOCKSTOREWITHRANDOMKEYS_H_
+#define MESSMER_BLOCKSTORE_INTERFACE_HELPERS_BLOCKSTOREWITHRANDOMKEYS_H_

 #include "../BlockStore.h"
 #include "../Block.h"
--- a/test/implementations/caching/cache/testutils/CacheTest.h
+++ b/test/implementations/caching/cache/testutils/CacheTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKS_MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_QUEUEMAPTEST_H_
-#define BLOCKS_MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_QUEUEMAPTEST_H_
+#ifndef MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_QUEUEMAPTEST_H_
+#define MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_QUEUEMAPTEST_H_

 #include <google/gtest/gtest.h>
 #include "../../../../../implementations/caching/cache/Cache.h"
--- a/test/implementations/caching/cache/testutils/MinimalKeyType.h
+++ b/test/implementations/caching/cache/testutils/MinimalKeyType.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKS_MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_MINIMALKEYTYPE_H_
-#define BLOCKS_MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_MINIMALKEYTYPE_H_
+#ifndef MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_MINIMALKEYTYPE_H_
+#define MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_MINIMALKEYTYPE_H_

 #include <unordered_map>

--- a/test/implementations/caching/cache/testutils/MinimalValueType.h
+++ b/test/implementations/caching/cache/testutils/MinimalValueType.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKS_MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_MINIMALVALUETYPE_H_
-#define BLOCKS_MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_MINIMALVALUETYPE_H_
+#ifndef MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_MINIMALVALUETYPE_H_
+#define MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_MINIMALVALUETYPE_H_

 #include <messmer/cpp-utils/macros.h>
 #include <cassert>
--- a/test/implementations/caching/cache/testutils/QueueMapTest.h
+++ b/test/implementations/caching/cache/testutils/QueueMapTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKS_MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_QUEUEMAPTEST_H_
-#define BLOCKS_MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_QUEUEMAPTEST_H_
+#ifndef MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_QUEUEMAPTEST_H_
+#define MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_QUEUEMAPTEST_H_

 #include <google/gtest/gtest.h>
 #include <messmer/cpp-utils/pointer/unique_ref.h>
--- a/test/testutils/BlockStoreTest.h
+++ b/test/testutils/BlockStoreTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_BLOCKSTORE_IMPLEMENTATIONS_TESTUTILS_BLOCKSTORETEST_H_
-#define TEST_BLOCKSTORE_IMPLEMENTATIONS_TESTUTILS_BLOCKSTORETEST_H_
+#ifndef MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_TESTUTILS_BLOCKSTORETEST_H_
+#define MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_TESTUTILS_BLOCKSTORETEST_H_

 #include "google/gtest/gtest.h"

--- a/test/testutils/BlockStoreTest_Data.h
+++ b/test/testutils/BlockStoreTest_Data.h
@ -1,3 +1,7 @@
+#pragma once
+#ifndef MESSMER_BLOCKSTORE_TEST_TESTUTILS_BLOCKSTORETEST_DATA_H_
+#define MESSMER_BLOCKSTORE_TEST_TESTUTILS_BLOCKSTORETEST_DATA_H_
+
 // This file is meant to be included by BlockStoreTest.h only

 struct DataRange {
@ -96,3 +100,5 @@ constexpr std::initializer_list<DataRange> DATA_RANGES = {
 TYPED_TEST_P_FOR_ALL_DATA_RANGES(WriteAndReadImmediately);
 TYPED_TEST_P_FOR_ALL_DATA_RANGES(WriteAndReadAfterLoading);
 TYPED_TEST_P_FOR_ALL_DATA_RANGES(OverwriteAndRead);
+
+#endif
--- a/test/testutils/BlockStoreTest_Size.h
+++ b/test/testutils/BlockStoreTest_Size.h
@ -1,3 +1,7 @@
+#pragma once
+#ifndef MESSMER_BLOCKSTORE_TEST_TESTUTILS_BLOCKSTORETEST_SIZE_H_
+#define MESSMER_BLOCKSTORE_TEST_TESTUTILS_BLOCKSTORETEST_SIZE_H_
+
 // This file is meant to be included by BlockStoreTest.h only

 #include <messmer/cpp-utils/data/Data.h>
@ -156,3 +160,5 @@ TYPED_TEST_P_FOR_ALL_SIZES(AfterLoad_FlushingDoesntChangeBlock);
 TYPED_TEST_P_FOR_ALL_SIZES(AfterCreate_FlushesWhenDestructed);
 TYPED_TEST_P_FOR_ALL_SIZES(AfterLoad_FlushesWhenDestructed);
 TYPED_TEST_P_FOR_ALL_SIZES(LoadNonExistingBlock);
+
+#endif
--- a/test/testutils/BlockStoreWithRandomKeysTest.h
+++ b/test/testutils/BlockStoreWithRandomKeysTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_BLOCKSTORE_IMPLEMENTATIONS_TESTUTILS_BLOCKSTOREWITHRANDOMKEYSTEST_H_
-#define TEST_BLOCKSTORE_IMPLEMENTATIONS_TESTUTILS_BLOCKSTOREWITHRANDOMKEYSTEST_H_
+#ifndef MESSMER_BLOCKSTORE_TEST_TESTUTILS_BLOCKSTOREWITHRANDOMKEYSTEST_H_
+#define MESSMER_BLOCKSTORE_TEST_TESTUTILS_BLOCKSTOREWITHRANDOMKEYSTEST_H_

 #include <google/gtest/gtest.h>

--- a/utils/BlockStoreUtils.h
+++ b/utils/BlockStoreUtils.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_UTILS_BLOCKSTOREUTILS_H_
-#define BLOCKSTORE_UTILS_BLOCKSTOREUTILS_H_
+#ifndef MESSMER_BLOCKSTORE_UTILS_BLOCKSTOREUTILS_H_
+#define MESSMER_BLOCKSTORE_UTILS_BLOCKSTOREUTILS_H_

 #include <messmer/cpp-utils/pointer/unique_ref.h>

--- a/utils/FileDoesntExistException.h
+++ b/utils/FileDoesntExistException.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_UTILS_FILEDOESNTEXISTEXCEPTION_H_
-#define BLOCKSTORE_UTILS_FILEDOESNTEXISTEXCEPTION_H_
+#ifndef MESSMER_BLOCKSTORE_UTILS_FILEDOESNTEXISTEXCEPTION_H_
+#define MESSMER_BLOCKSTORE_UTILS_FILEDOESNTEXISTEXCEPTION_H_

 #include <boost/filesystem/path.hpp>

--- a/utils/Key.h
+++ b/utils/Key.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKSTORE_UTILS_KEY_H_
-#define BLOCKSTORE_UTILS_KEY_H_
+#ifndef MESSMER_BLOCKSTORE_UTILS_KEY_H_
+#define MESSMER_BLOCKSTORE_UTILS_KEY_H_

 #include <string>
 #include <messmer/cpp-utils/data/FixedSizeData.h>