diff --git a/implementations/onblocks/BlobOnBlocks.h b/implementations/onblocks/BlobOnBlocks.h
index 0d3b9622..9956b92b 100644
--- a/implementations/onblocks/BlobOnBlocks.h
+++ b/implementations/onblocks/BlobOnBlocks.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_BLOBONBLOCKS_H_
-#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_BLOBONBLOCKS_H_
+#ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_BLOBONBLOCKS_H_
+#define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_BLOBONBLOCKS_H_
 
 #include "../../interface/Blob.h"
 
diff --git a/implementations/onblocks/BlobStoreOnBlocks.h b/implementations/onblocks/BlobStoreOnBlocks.h
index 62f1fc4d..ec9f2012 100644
--- a/implementations/onblocks/BlobStoreOnBlocks.h
+++ b/implementations/onblocks/BlobStoreOnBlocks.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOBSTORE_IMPLEMENTATIONS_BLOCKED_BLOBSTOREONBLOCKS_H_
-#define BLOBSTORE_IMPLEMENTATIONS_BLOCKED_BLOBSTOREONBLOCKS_H_
+#ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_BLOCKED_BLOBSTOREONBLOCKS_H_
+#define MESSMER_BLOBSTORE_IMPLEMENTATIONS_BLOCKED_BLOBSTOREONBLOCKS_H_
 
 #include "../../interface/BlobStore.h"
 #include "messmer/blockstore/interface/BlockStore.h"
diff --git a/implementations/onblocks/datanodestore/DataInnerNode.h b/implementations/onblocks/datanodestore/DataInnerNode.h
index 31019748..8755fce6 100644
--- a/implementations/onblocks/datanodestore/DataInnerNode.h
+++ b/implementations/onblocks/datanodestore/DataInnerNode.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATAINNERNODE_H_
-#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATAINNERNODE_H_
+#ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATAINNERNODE_H_
+#define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATAINNERNODE_H_
 
 #include "DataNode.h"
 #include "DataInnerNode_ChildEntry.h"
diff --git a/implementations/onblocks/datanodestore/DataLeafNode.h b/implementations/onblocks/datanodestore/DataLeafNode.h
index 25e68059..71596711 100644
--- a/implementations/onblocks/datanodestore/DataLeafNode.h
+++ b/implementations/onblocks/datanodestore/DataLeafNode.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATALEAFNODE_H_
-#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATALEAFNODE_H_
+#ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATALEAFNODE_H_
+#define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATALEAFNODE_H_
 
 #include "DataNode.h"
 
diff --git a/implementations/onblocks/datanodestore/DataNode.h b/implementations/onblocks/datanodestore/DataNode.h
index 17bbad62..960f54a5 100644
--- a/implementations/onblocks/datanodestore/DataNode.h
+++ b/implementations/onblocks/datanodestore/DataNode.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODE_H_
-#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODE_H_
+#ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODE_H_
+#define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODE_H_
 
 #include "DataNodeView.h"
 #include <messmer/cpp-utils/data/Data.h>
diff --git a/implementations/onblocks/datanodestore/DataNodeStore.h b/implementations/onblocks/datanodestore/DataNodeStore.h
index 5cfd38d7..c8017b8f 100644
--- a/implementations/onblocks/datanodestore/DataNodeStore.h
+++ b/implementations/onblocks/datanodestore/DataNodeStore.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODESTORE_H_
-#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODESTORE_H_
+#ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODESTORE_H_
+#define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODESTORE_H_
 
 #include <memory>
 #include "messmer/cpp-utils/macros.h"
diff --git a/implementations/onblocks/datanodestore/DataNodeView.h b/implementations/onblocks/datanodestore/DataNodeView.h
index 5e342fba..c92aa661 100644
--- a/implementations/onblocks/datanodestore/DataNodeView.h
+++ b/implementations/onblocks/datanodestore/DataNodeView.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODEVIEW_H_
-#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODEVIEW_H_
+#ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODEVIEW_H_
+#define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODEVIEW_H_
 
 #include "messmer/blockstore/interface/Block.h"
 #include "../BlobStoreOnBlocks.h"
diff --git a/implementations/onblocks/datatreestore/DataTree.h b/implementations/onblocks/datatreestore/DataTree.h
index d1b780ec..e1e73caf 100644
--- a/implementations/onblocks/datatreestore/DataTree.h
+++ b/implementations/onblocks/datatreestore/DataTree.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREE_H_
-#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREE_H_
+#ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREE_H_
+#define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREE_H_
 
 #include <memory>
 #include <messmer/cpp-utils/macros.h>
diff --git a/implementations/onblocks/datatreestore/DataTreeStore.h b/implementations/onblocks/datatreestore/DataTreeStore.h
index 39cd5211..97ed0fc5 100644
--- a/implementations/onblocks/datatreestore/DataTreeStore.h
+++ b/implementations/onblocks/datatreestore/DataTreeStore.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_DATATREESTORE_H_
-#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_DATATREESTORE_H_
+#ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_DATATREESTORE_H_
+#define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_DATATREESTORE_H_
 
 #include <memory>
 #include <messmer/cpp-utils/macros.h>
diff --git a/implementations/onblocks/parallelaccessdatatreestore/ParallelAccessDataTreeStore.h b/implementations/onblocks/parallelaccessdatatreestore/ParallelAccessDataTreeStore.h
index 80614118..0a39c51b 100644
--- a/implementations/onblocks/parallelaccessdatatreestore/ParallelAccessDataTreeStore.h
+++ b/implementations/onblocks/parallelaccessdatatreestore/ParallelAccessDataTreeStore.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_PARALLELACCESSDATATREESTORE_PARALLELACCESSDATATREESTORE_H_
-#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_PARALLELACCESSDATATREESTORE_PARALLELACCESSDATATREESTORE_H_
+#ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_PARALLELACCESSDATATREESTORE_PARALLELACCESSDATATREESTORE_H_
+#define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_PARALLELACCESSDATATREESTORE_PARALLELACCESSDATATREESTORE_H_
 
 #include <memory>
 #include <messmer/cpp-utils/macros.h>
diff --git a/implementations/onblocks/parallelaccessdatatreestore/ParallelAccessDataTreeStoreAdapter.h b/implementations/onblocks/parallelaccessdatatreestore/ParallelAccessDataTreeStoreAdapter.h
index 8130dbe3..5c76ff99 100644
--- a/implementations/onblocks/parallelaccessdatatreestore/ParallelAccessDataTreeStoreAdapter.h
+++ b/implementations/onblocks/parallelaccessdatatreestore/ParallelAccessDataTreeStoreAdapter.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_PARALLELACCESSDATATREESTORE_PARALLELACCESSDATATREESTOREADAPTER_H_
 #define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_PARALLELACCESSDATATREESTORE_PARALLELACCESSDATATREESTOREADAPTER_H_
 
diff --git a/interface/Blob.h b/interface/Blob.h
index 1b75fcb1..fcc96da5 100644
--- a/interface/Blob.h
+++ b/interface/Blob.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOBSTORE_INTERFACE_BLOB_H_
-#define BLOBSTORE_INTERFACE_BLOB_H_
+#ifndef MESSMER_BLOBSTORE_INTERFACE_BLOB_H_
+#define MESSMER_BLOBSTORE_INTERFACE_BLOB_H_
 
 #include <cstring>
 #include <cstdint>
diff --git a/interface/BlobStore.h b/interface/BlobStore.h
index 71509aaf..9bada9ab 100644
--- a/interface/BlobStore.h
+++ b/interface/BlobStore.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_BLOBSTORE_BLOBSTORE_H_
-#define FSPP_BLOBSTORE_BLOBSTORE_H_
+#ifndef MESSMER_BLOBSTORE_INTERFACE_BLOBSTORE_H_
+#define MESSMER_BLOBSTORE_INTERFACE_BLOBSTORE_H_
 
 #include "Blob.h"
 #include <string>
diff --git a/test/implementations/onblocks/datatreestore/testutils/DataTreeTest.h b/test/implementations/onblocks/datatreestore/testutils/DataTreeTest.h
index 9b0002a1..a693637e 100644
--- a/test/implementations/onblocks/datatreestore/testutils/DataTreeTest.h
+++ b/test/implementations/onblocks/datatreestore/testutils/DataTreeTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_DATATREETEST_H_
-#define TEST_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_DATATREETEST_H_
+#ifndef MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_DATATREETEST_H_
+#define MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_DATATREETEST_H_
 
 #include "google/gtest/gtest.h"
 
diff --git a/test/implementations/onblocks/datatreestore/testutils/LeafDataFixture.h b/test/implementations/onblocks/datatreestore/testutils/LeafDataFixture.h
index 25d1b2b3..fc2952d2 100644
--- a/test/implementations/onblocks/datatreestore/testutils/LeafDataFixture.h
+++ b/test/implementations/onblocks/datatreestore/testutils/LeafDataFixture.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKS_MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_GROWING_TESTUTILS_LEAFDATAFIXTURE_H_
-#define BLOCKS_MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_GROWING_TESTUTILS_LEAFDATAFIXTURE_H_
+#ifndef MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_GROWING_TESTUTILS_LEAFDATAFIXTURE_H_
+#define MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_GROWING_TESTUTILS_LEAFDATAFIXTURE_H_
 
 #include <google/gtest/gtest.h>
 
diff --git a/test/implementations/onblocks/datatreestore/testutils/TwoLevelDataFixture.h b/test/implementations/onblocks/datatreestore/testutils/TwoLevelDataFixture.h
index 887cfabb..d28fa306 100644
--- a/test/implementations/onblocks/datatreestore/testutils/TwoLevelDataFixture.h
+++ b/test/implementations/onblocks/datatreestore/testutils/TwoLevelDataFixture.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKS_MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_GROWING_TESTUTILS_TWOLEVELDATAFIXTURE_H_
-#define BLOCKS_MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_GROWING_TESTUTILS_TWOLEVELDATAFIXTURE_H_
+#ifndef MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_GROWING_TESTUTILS_TWOLEVELDATAFIXTURE_H_
+#define MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_GROWING_TESTUTILS_TWOLEVELDATAFIXTURE_H_
 
 #include <messmer/cpp-utils/macros.h>
 #include <messmer/cpp-utils/pointer/cast.h>
diff --git a/test/implementations/onblocks/testutils/BlobStoreTest.h b/test/implementations/onblocks/testutils/BlobStoreTest.h
index 2b2bb2c8..3442a22a 100644
--- a/test/implementations/onblocks/testutils/BlobStoreTest.h
+++ b/test/implementations/onblocks/testutils/BlobStoreTest.h
@@ -1,3 +1,7 @@
+#pragma once
+#ifndef MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_TESTUTILS_BLOBSTORETEST_H_
+#define MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_TESTUTILS_BLOBSTORETEST_H_
+
 #include <google/gtest/gtest.h>
 
 #include "../../../../interface/BlobStore.h"
@@ -21,3 +25,5 @@ public:
     //ref is moved into here and then destructed
   }
 };
+
+#endif