diff --git a/include/podio/detail/AssociationCollectionData.h b/include/podio/detail/AssociationCollectionData.h
index 90fa035c3..ba520d5c3 100644
--- a/include/podio/detail/AssociationCollectionData.h
+++ b/include/podio/detail/AssociationCollectionData.h
@@ -1,5 +1,5 @@
-#ifndef PODIO_ASSOCIATIONCOLLECTIONDATA_H
-#define PODIO_ASSOCIATIONCOLLECTIONDATA_H
+#ifndef PODIO_DETAIL_ASSOCIATIONCOLLECTIONDATA_H
+#define PODIO_DETAIL_ASSOCIATIONCOLLECTIONDATA_H
 
 #include "podio/detail/AssociationFwd.h"
 #include "podio/detail/AssociationObj.h"
@@ -199,4 +199,4 @@ class AssociationCollectionData {
 
 } // namespace podio
 
-#endif // PODIO_ASSOCIATIONCOLLECTIONDATA_H
+#endif // PODIO_DETAIL_ASSOCIATIONCOLLECTIONDATA_H
diff --git a/include/podio/detail/AssociationFwd.h b/include/podio/detail/AssociationFwd.h
index 2d69a4b17..20d5c9d30 100644
--- a/include/podio/detail/AssociationFwd.h
+++ b/include/podio/detail/AssociationFwd.h
@@ -1,5 +1,5 @@
-#ifndef PODIO_ASSOCIATIONFWD_H
-#define PODIO_ASSOCIATIONFWD_H
+#ifndef PODIO_DETAIL_ASSOCIATIONFWD_H
+#define PODIO_DETAIL_ASSOCIATIONFWD_H
 
 #include <algorithm>
 #include <deque>
@@ -80,4 +80,4 @@ using AssociationMutableCollectionIterator = AssociationCollectionIteratorT<From
 
 } // namespace podio
 
-#endif // PODIO_ASSOCIATIONFWD_H
+#endif // PODIO_DETAIL_ASSOCIATIONFWD_H
diff --git a/include/podio/detail/AssociationObj.h b/include/podio/detail/AssociationObj.h
index 45d6267e2..000d2aa35 100644
--- a/include/podio/detail/AssociationObj.h
+++ b/include/podio/detail/AssociationObj.h
@@ -1,5 +1,5 @@
-#ifndef PODIO_ASSOCIATIONOBJ_H
-#define PODIO_ASSOCIATIONOBJ_H
+#ifndef PODIO_DETAIL_ASSOCIATIONOBJ_H
+#define PODIO_DETAIL_ASSOCIATIONOBJ_H
 
 #include "podio/detail/AssociationFwd.h"
 
@@ -58,4 +58,4 @@ class AssociationObj : public podio::ObjBase {
 
 } // namespace podio
 
-#endif // PODIO_ASSOCIATIONOBJ_H
+#endif // PODIO_DETAIL_ASSOCIATIONOBJ_H
diff --git a/include/podio/detail/AssociationSIOBlock.h b/include/podio/detail/AssociationSIOBlock.h
index 9ddb586c1..587bb965c 100644
--- a/include/podio/detail/AssociationSIOBlock.h
+++ b/include/podio/detail/AssociationSIOBlock.h
@@ -1,5 +1,5 @@
-#ifndef PODIO_ASSOCIATIONSIOBLOCK_H
-#define PODIO_ASSOCIATIONSIOBLOCK_H
+#ifndef PODIO_DETAIL_ASSOCIATIONSIOBLOCK_H
+#define PODIO_DETAIL_ASSOCIATIONSIOBLOCK_H
 
 #include "podio/detail/AssociationFwd.h"
 
@@ -90,4 +90,4 @@ class AssociationSIOBlock : public podio::SIOBlock {
 
 } // namespace podio
 
-#endif // PODIO_ASSOCIATIONSIOBLOCK_H
+#endif // PODIO_DETAIL_ASSOCIATIONSIOBLOCK_H