diff --git a/source/adios2/ADIOS.h b/source/adios2/ADIOS.h
index 8a72294b444cc0109d235a4da523b2e59b28b1aa..baf5183c570fc1487e21aa95fd9d6df212b461fe 100644
--- a/source/adios2/ADIOS.h
+++ b/source/adios2/ADIOS.h
@@ -7,8 +7,8 @@
  *      Author: wfg
  */
 
-#ifndef ADIOS_H_
-#define ADIOS_H_
+#ifndef ADIOS2_ADIOS_H_
+#define ADIOS2_ADIOS_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <complex>
@@ -361,4 +361,4 @@ extern template unsigned int ADIOS::GetVariableIndex<void>(const std::string &);
 // Include the inline implementations for the public interface
 #include "adios2/ADIOS.inl"
 
-#endif /* ADIOS_H_ */
+#endif /* ADIOS2_ADIOS_H_ */
diff --git a/source/adios2/ADIOS.inl b/source/adios2/ADIOS.inl
index 1efaa8380b55342433a2f8973191afd26d96e996..6be677d6284227512be935e4d043c87d89112817 100644
--- a/source/adios2/ADIOS.inl
+++ b/source/adios2/ADIOS.inl
@@ -6,9 +6,9 @@
  *   This contains the template implementations for the ADIOS class
  */
 
-#ifndef ADIOS_INL_
-#define ADIOS_INL_
-#ifndef ADIOS_H_
+#ifndef ADIOS2_ADIOS_INL_
+#define ADIOS2_ADIOS_INL_
+#ifndef ADIOS2_ADIOS_H_
 #error "Inline file should only be included from it's header, never on it's own"
 #endif
 
@@ -32,4 +32,4 @@ VariableCompound &ADIOS::DefineVariableCompound(const std::string &name,
 
 } // end namespace adios
 
-#endif /* ADIOS_INL_ */
+#endif /* ADIOS2_ADIOS_INL_ */
diff --git a/source/adios2/ADIOS.tcc b/source/adios2/ADIOS.tcc
index b75b163dd6f27751897d1de820103201b73614fb..81af327ac2fc770191c4d1aeab692439b0f550d4 100644
--- a/source/adios2/ADIOS.tcc
+++ b/source/adios2/ADIOS.tcc
@@ -6,8 +6,8 @@
  *   This contains the template specializatios for the ADIOS class
  */
 
-#ifndef ADIOS_TCC_
-#define ADIOS_TCC_
+#ifndef ADIOS2_ADIOS_TCC_
+#define ADIOS2_ADIOS_TCC_
 
 #include "adios2/ADIOS.h"
 #include "adios2/ADIOSMacros.h"
@@ -155,4 +155,4 @@ Variable<T> &ADIOS::GetVariable(const std::string &name)
 
 } // end namespace adios
 
-#endif // ADIOS_TCC_
+#endif // ADIOS2_ADIOS_TCC_
diff --git a/source/adios2/ADIOSMacros.h b/source/adios2/ADIOSMacros.h
index 06dd9cd3b4167a21a2b0f73de1a61bebe45ab5ed..0a15f131de7c3c715807482830179a9692eac3ed 100644
--- a/source/adios2/ADIOSMacros.h
+++ b/source/adios2/ADIOSMacros.h
@@ -5,8 +5,8 @@
  * ADIOSMacros.h
  *   This contains a set of helper macros used internally
  */
-#ifndef ADIOSMACROS_H
-#define ADIOSMACROS_H
+#ifndef ADIOS2_ADIOSMACROS_H
+#define ADIOS2_ADIOSMACROS_H
 
 // The ADIOS_FOREACH_TYPE_1ARG macro assumes the given argument is a macro which
 // takes a single argument that is a type and then inserts the given MACRO for
@@ -59,4 +59,4 @@
     MACRO(double)                                                              \
     MACRO(long double)
 
-#endif // ADIOSMACROS_H
+#endif /* ADIOS2_ADIOSMACROS_H */
diff --git a/source/adios2/ADIOSTypes.h b/source/adios2/ADIOSTypes.h
index 1412bdfce52102dcafea981260860e71efd24031..a5ea21b9e95f429b1ec273d247995de93c0a2de0 100644
--- a/source/adios2/ADIOSTypes.h
+++ b/source/adios2/ADIOSTypes.h
@@ -8,8 +8,8 @@
  *      Author: pnb
  */
 
-#ifndef ADIOS_TYPES_H_
-#define ADIOS_TYPES_H_
+#ifndef ADIOS2_ADIOSTYPES_H_
+#define ADIOS2_ADIOSTYPES_H_
 
 #include <complex>
 #include <cstddef>
@@ -139,4 +139,4 @@ struct TypeInfo<T, typename std::enable_if<std::is_same<
 
 } // end namespace adios
 
-#endif /* ADIOS_TYPES_H_ */
+#endif /* ADIOS2_ADIOSTYPES_H_ */
diff --git a/source/adios2/ADIOS_MPI.h b/source/adios2/ADIOS_MPI.h
index d06557fd0cf90d635181c653c8b9d9ac66fb23b9..5a1a585db1818ff4a2059bb5edb99dbf6e8b52df 100644
--- a/source/adios2/ADIOS_MPI.h
+++ b/source/adios2/ADIOS_MPI.h
@@ -3,8 +3,8 @@
  * accompanying file Copyright.txt for details.
  */
 
-#ifndef ADIOS_MPI_H_
-#define ADIOS_MPI_H_
+#ifndef ADIOS2_ADIOS_MPI_H_
+#define ADIOS2_ADIOS_MPI_H_
 
 #include "adios2/ADIOSConfig.h"
 
@@ -14,4 +14,4 @@
 #include "adios2/mpidummy.h"
 #endif
 
-#endif /* ADIOS_MPI_H_ */
+#endif /* ADIOS2_ADIOS_MPI_H_ */
diff --git a/source/adios2/capsule/heap/STLVector.h b/source/adios2/capsule/heap/STLVector.h
index 20b70de676ab63b7374e626a5b8b31b70a478cf2..aaa7bd095cedb6d252c7d7ec1d7c28787613a0dd 100644
--- a/source/adios2/capsule/heap/STLVector.h
+++ b/source/adios2/capsule/heap/STLVector.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef STLVECTOR_H_
-#define STLVECTOR_H_
+#ifndef ADIOS2_CAPSULE_HEAP_STLVECTOR_H_
+#define ADIOS2_CAPSULE_HEAP_STLVECTOR_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <vector>
@@ -60,4 +60,4 @@ public:
 } // end namespace capsule
 } // end namespace
 
-#endif /* STLVECTOR_H_ */
+#endif /* ADIOS2_CAPSULE_HEAP_STLVECTOR_H_ */
diff --git a/source/adios2/capsule/shmem/ShmSystemV.h b/source/adios2/capsule/shmem/ShmSystemV.h
index 2b58ea5f5ca1c4e4dc968e09c57bf4824668ce3d..68631624b214716fac3e54a272835c5917fab43b 100644
--- a/source/adios2/capsule/shmem/ShmSystemV.h
+++ b/source/adios2/capsule/shmem/ShmSystemV.h
@@ -1,6 +1,10 @@
+/*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ */
 
-#ifndef SHMSYSTEMV_H_
-#define SHMSYSTEMV_H_
+#ifndef ADIOS2_CAPSULE_SHMEM_SHMSYSTEMV_H_
+#define ADIOS2_CAPSULE_SHMEM_SHMSYSTEMV_H_
 
 #include <sys/ipc.h>
 #include <sys/types.h>
@@ -61,4 +65,4 @@ private:
 
 } // end namespace adios
 
-#endif /* SHMSYSTEMV_H_ */
+#endif /* ADIOS2_CAPSULE_SHMEM_SHMSYSTEMV_H_ */
diff --git a/source/adios2/core/Attribute.h b/source/adios2/core/Attribute.h
index d732a26d6509f39fbe301014a4fd718217cac1a7..146e72486ae4da7275af68b45f2a447a01c8558d 100644
--- a/source/adios2/core/Attribute.h
+++ b/source/adios2/core/Attribute.h
@@ -8,12 +8,10 @@
  *      Author: wfg
  */
 
-#ifndef ATTRIBUTE_H_
-#define ATTRIBUTE_H_
+#ifndef ADIOS2_CORE_ATTRIBUTE_H_
+#define ADIOS2_CORE_ATTRIBUTE_H_
 
-/// \cond EXCLUDE_FROM_DOXYGEN
 #include <string>
-/// \endcond
 
 #include "adios2/ADIOSConfig.h"
 
@@ -31,4 +29,4 @@ struct Attribute
 
 } // end namespace
 
-#endif /* ATTRIBUTE_H_ */
+#endif /* ADIOS2_CORE_ATTRIBUTE_H_ */
diff --git a/source/adios2/core/Capsule.h b/source/adios2/core/Capsule.h
index 7d1b8cd3e0aa176fa5ff41a66dc64f8a1557fbe9..c3e3cdcebef36517998014186d664affea40342f 100644
--- a/source/adios2/core/Capsule.h
+++ b/source/adios2/core/Capsule.h
@@ -8,8 +8,8 @@
  *      Author: wfgtemplates and pointers
  */
 
-#ifndef CAPSULE_H_
-#define CAPSULE_H_
+#ifndef ADIOS2_CORE_CAPSULE_H_
+#define ADIOS2_CORE_CAPSULE_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <string>
@@ -67,4 +67,4 @@ protected:
 
 } // end namespace
 
-#endif /* CAPSULE_H_ */
+#endif /* ADIOS2_CORE_CAPSULE_H_ */
diff --git a/source/adios2/core/Engine.h b/source/adios2/core/Engine.h
index 783c8939c7aee5bacc26cbcc6ae75c157acebdf4..cea4802d4a9caf53a85fb1a24496eeb757a118b4 100644
--- a/source/adios2/core/Engine.h
+++ b/source/adios2/core/Engine.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef ENGINE_H_
-#define ENGINE_H_
+#ifndef ADIOS2_CORE_ENGINE_H_
+#define ADIOS2_CORE_ENGINE_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <complex>    //std::complex
@@ -539,4 +539,4 @@ protected:
 
 } // end namespace
 
-#endif /* ENGINE_H_ */
+#endif /* ADIOS2_CORE_ENGINE_H_ */
diff --git a/source/adios2/core/IOChrono.h b/source/adios2/core/IOChrono.h
index 7f1ac8e561dea54c6fa9970b3cac462c868fafee..2f17b497fccf281fcd53e2aa7f8fa49b43c02aa4 100644
--- a/source/adios2/core/IOChrono.h
+++ b/source/adios2/core/IOChrono.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef IOCHRONO_H_
-#define IOCHRONO_H_
+#ifndef ADIOS2_CORE_IOCHRONO_H_
+#define ADIOS2_CORE_IOCHRONO_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <vector>
@@ -41,4 +41,4 @@ struct IOChrono
 } // end namespace profiling
 } // end namespace adios
 
-#endif /* IOCHRONO_H_ */
+#endif /* ADIOS2_CORE_IOCHRONO_H_ */
diff --git a/source/adios2/core/Method.h b/source/adios2/core/Method.h
index 676f857e596de476d34391d1f2187c18db17eb77..26ab2ffe0c62efc7cd1cadb1953797eba75123f5 100644
--- a/source/adios2/core/Method.h
+++ b/source/adios2/core/Method.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef METHOD_H_
-#define METHOD_H_
+#ifndef ADIOS2_CORE_METHOD_H_
+#define ADIOS2_CORE_METHOD_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <map>
@@ -149,4 +149,4 @@ private:
 
 } // end namespace adios
 
-#endif /* METHOD_H_ */
+#endif /* ADIOS2_CORE_METHOD_H_ */
diff --git a/source/adios2/core/Support.h b/source/adios2/core/Support.h
index bdb494e90854be018720eb1f4c6efecebaa3089a..c836724b168a73c51063cd5177d90b4a943a2495 100644
--- a/source/adios2/core/Support.h
+++ b/source/adios2/core/Support.h
@@ -2,14 +2,14 @@
  * Distributed under the OSI-approved Apache License, Version 2.0.  See
  * accompanying file Copyright.txt for details.
  *
- * SSupport.h
+ * Support.h
  *
  *  Created on: Oct 10, 2016
  *      Author: wfg
  */
 
-#ifndef SUPPORT_H_
-#define SUPPORT_H_
+#ifndef ADIOS2_CORE_SUPPORT_H_
+#define ADIOS2_CORE_SUPPORT_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <map>
@@ -60,4 +60,4 @@ struct Support
 
 } // end namespace adios
 
-#endif /* SUPPORT_H_ */
+#endif /* ADIOS2_CORE_SUPPORT_H_ */
diff --git a/source/adios2/core/Timer.h b/source/adios2/core/Timer.h
index 90656079db2ea9826cd4ab71a49e52df36bb0368..59796aedcb3744babcbd0fdb738d56ca29b0c47f 100644
--- a/source/adios2/core/Timer.h
+++ b/source/adios2/core/Timer.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef TIMER_H_
-#define TIMER_H_
+#ifndef ADIOS2_CORE_TIMER_H_
+#define ADIOS2_CORE_TIMER_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <chrono>
@@ -63,4 +63,4 @@ private:
 } // end namespace profiling
 } // end namespace adios
 
-#endif /* TIMER_H_ */
+#endif /* ADIOS2_CORE_TIMER_H_ */
diff --git a/source/adios2/core/Transform.h b/source/adios2/core/Transform.h
index ffb00d1422d451b9a209e2dd84884420758d1534..8073ba4002e4b0412b20b0092b9b4d98adb65bbe 100644
--- a/source/adios2/core/Transform.h
+++ b/source/adios2/core/Transform.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef TRANSFORM_H_
-#define TRANSFORM_H_
+#ifndef ADIOS2_CORE_TRANSFORM_H_
+#define ADIOS2_CORE_TRANSFORM_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <string>
@@ -47,4 +47,4 @@ public:
 };
 
 } // end namespace adios
-#endif /* TRANSFORM_H_ */
+#endif /* ADIOS2_CORE_TRANSFORM_H_ */
diff --git a/source/adios2/core/Transport.h b/source/adios2/core/Transport.h
index 03c8d62a47f3b85d65f5892defe7ecd62fcea1f2..83f5339f86fd24ff6244824d9c9e88c11e8235ec 100644
--- a/source/adios2/core/Transport.h
+++ b/source/adios2/core/Transport.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef TRANSPORT_H_
-#define TRANSPORT_H_
+#ifndef ADIOS2_CORE_TRANSPORT_H_
+#define ADIOS2_CORE_TRANSPORT_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <string>
@@ -91,4 +91,4 @@ protected:
 
 } // end namespace adios
 
-#endif /* TRANSPORT_H_ */
+#endif /* ADIOS2_CORE_TRANSPORT_H_ */
diff --git a/source/adios2/core/Variable.h b/source/adios2/core/Variable.h
index 4839297bf6111cc030e3dec3391c3f46f1337597..5b0fdbb5b81b94743e2860d7c15efb68fbfa3841 100644
--- a/source/adios2/core/Variable.h
+++ b/source/adios2/core/Variable.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef VARIABLE_H_
-#define VARIABLE_H_
+#ifndef ADIOS2_CORE_VARIABLE_H_
+#define ADIOS2_CORE_VARIABLE_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <map>
@@ -119,4 +119,4 @@ public:
 
 } // end namespace
 
-#endif /* VARIABLE_H_ */
+#endif /* ADIOS2_CORE_VARIABLE_H_ */
diff --git a/source/adios2/core/VariableBase.h b/source/adios2/core/VariableBase.h
index eba00014831ee38eeae66ec1231b7a4c59106385..aef3af0d3ab2b96817ec18b91b417a82155865f7 100644
--- a/source/adios2/core/VariableBase.h
+++ b/source/adios2/core/VariableBase.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef VARIABLEBASE_H_
-#define VARIABLEBASE_H_
+#ifndef ADIOS2_CORE_VARIABLEBASE_H_
+#define ADIOS2_CORE_VARIABLEBASE_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <exception>
@@ -137,4 +137,4 @@ public:
 
 } // end namespace
 
-#endif /* VARIABLEBASE_H_ */
+#endif /* ADIOS2_CORE_VARIABLEBASE_H_ */
diff --git a/source/adios2/core/VariableCompound.h b/source/adios2/core/VariableCompound.h
index d40c8ae217e8ff6a2cdeba86fc648fa5a803c6e9..4a64cbd45213458f2a38adc8cf27d4affd2cfb6c 100644
--- a/source/adios2/core/VariableCompound.h
+++ b/source/adios2/core/VariableCompound.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef VARIABLECOMPOUND_H_
-#define VARIABLECOMPOUND_H_
+#ifndef ADIOS2_CORE_VARIABLECOMPOUND_H_
+#define ADIOS2_CORE_VARIABLECOMPOUND_H_
 
 #include "adios2/ADIOSConfig.h"
 #include "adios2/core/VariableBase.h"
@@ -62,4 +62,4 @@ private:
 
 } // end namespace
 
-#endif /* VARIABLECOMPOUND_H_ */
+#endif /* ADIOS2_CORE_VARIABLECOMPOUND_H_ */
diff --git a/source/adios2/core/adiosFunctions.h b/source/adios2/core/adiosFunctions.h
index 1c267000e85555e9c35286cce751116e4f033b11..07f05fae2b3bec413f680f18ba5c339e2b071545 100644
--- a/source/adios2/core/adiosFunctions.h
+++ b/source/adios2/core/adiosFunctions.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef ADIOSFUNCTIONS_H_
-#define ADIOSFUNCTIONS_H_
+#ifndef ADIOS2_CORE_ADIOSFUNCTIONS_H_
+#define ADIOS2_CORE_ADIOSFUNCTIONS_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <cstring> //std::size_t
@@ -231,4 +231,4 @@ bool IsLittleEndian() noexcept;
 
 } // end namespace
 
-#endif /* ADIOSFUNCTIONS_H_ */
+#endif /* ADIOS2_CORE_ADIOSFUNCTIONS_H_ */
diff --git a/source/adios2/core/adiosTemplates.h b/source/adios2/core/adiosTemplates.h
index 570e31f48fa4d1ce58d7cafeae2a02efd2db6c95..702a5c1450a4a85d752c52f81acd7fa4578c21af 100644
--- a/source/adios2/core/adiosTemplates.h
+++ b/source/adios2/core/adiosTemplates.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef ADIOSTEMPLATES_H_
-#define ADIOSTEMPLATES_H_
+#ifndef ADIOS2_CORE_ADIOSTEMPLATES_H_
+#define ADIOS2_CORE_ADIOSTEMPLATES_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <cmath> //std::sqrt
@@ -324,4 +324,4 @@ void PrintValues(const std::string name, const char *buffer,
 
 } // end namespace
 
-#endif /* ADIOSTEMPLATES_H_ */
+#endif /* ADIOS2_CORE_ADIOSTEMPLATES_H_ */
diff --git a/source/adios2/core/capsuleTemplates.h b/source/adios2/core/capsuleTemplates.h
index 7fe230bca9f6bdf7cf26ee9c56986c0140dc6a24..76c022f2775a7421a6926697a7ed9a7a1a0770a9 100644
--- a/source/adios2/core/capsuleTemplates.h
+++ b/source/adios2/core/capsuleTemplates.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef CAPSULETEMPLATES_H_
-#define CAPSULETEMPLATES_H_
+#ifndef ADIOS2_CORE_CAPSULETEMPLATES_H_
+#define ADIOS2_CORE_CAPSULETEMPLATES_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <cstring> //std::memcpy
@@ -111,4 +111,4 @@ namespace adios
 
 } // end namespace
 
-#endif /* CAPSULETEMPLATES_H_ */
+#endif /* ADIOS2_CORE_CAPSULETEMPLATES_H_ */
diff --git a/source/adios2/engine/adios1/ADIOS1Reader.h b/source/adios2/engine/adios1/ADIOS1Reader.h
index f85025f1f70549602eac28ac217ebb78c94ec3be..32f94c1f4608e9b67add7763b032d9db6dc451a4 100644
--- a/source/adios2/engine/adios1/ADIOS1Reader.h
+++ b/source/adios2/engine/adios1/ADIOS1Reader.h
@@ -10,8 +10,8 @@
  *      Author: pnb
  */
 
-#ifndef ADIOS1READER_H_
-#define ADIOS1READER_H_
+#ifndef ADIOS2_ENGINE_ADIOS1_ADIOS1READER_H_
+#define ADIOS2_ENGINE_ADIOS1_ADIOS1READER_H_
 
 #include <iostream> //this must go away
 
@@ -115,4 +115,4 @@ private:
 
 } // end namespace adios
 
-#endif /* ADIOS1READER_H_ */
+#endif /* ADIOS2_ENGINE_ADIOS1_ADIOS1READER_H_ */
diff --git a/source/adios2/engine/adios1/ADIOS1Writer.h b/source/adios2/engine/adios1/ADIOS1Writer.h
index 3e0d6b68ea5277d650b092470db95bc0a42086d9..c02de6a815a93980e8c807d220d67b8df882ea61 100644
--- a/source/adios2/engine/adios1/ADIOS1Writer.h
+++ b/source/adios2/engine/adios1/ADIOS1Writer.h
@@ -10,8 +10,8 @@
  *      Author: pnb
  */
 
-#ifndef ADIOS1WRITER_H_
-#define ADIOS1WRITER_H_
+#ifndef ADIOS2_ENGINE_ADIOS1_ADIOS1WRITER_H_
+#define ADIOS2_ENGINE_ADIOS1_ADIOS1WRITER_H_
 
 #include <adios.h>
 
@@ -129,4 +129,4 @@ private:
 
 } // end namespace adios
 
-#endif /* ADIOS1WRITER_H_ */
+#endif /* ADIOS2_ENGINE_ADIOS1_ADIOS1WRITER_H_ */
diff --git a/source/adios2/engine/bp/BPFileReader.h b/source/adios2/engine/bp/BPFileReader.h
index 3f09cb36cae8d28c3efad67610da00c815c6e4f3..cba6a54ea7724d530cef9a22ab351b13351a36b7 100644
--- a/source/adios2/engine/bp/BPFileReader.h
+++ b/source/adios2/engine/bp/BPFileReader.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef BPFILEREADER_H_
-#define BPFILEREADER_H_
+#ifndef ADIOS2_ENGINE_BP_BPFILEREADER_H_
+#define ADIOS2_ENGINE_BP_BPFILEREADER_H_
 
 #include <iostream> //this must go away
 
@@ -144,4 +144,4 @@ private:
 
 } // end namespace adios
 
-#endif /* BPFILEREADER_H_ */
+#endif /* ADIOS2_ENGINE_BP_BPFILEREADER_H_ */
diff --git a/source/adios2/engine/bp/BPFileWriter.h b/source/adios2/engine/bp/BPFileWriter.h
index 5c0551b9644afc08af40e25ea47dc6b14501f547..f6754ed382681feb4441ef9a9a58bbc247545945 100644
--- a/source/adios2/engine/bp/BPFileWriter.h
+++ b/source/adios2/engine/bp/BPFileWriter.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef BPFILEWRITER_H_
-#define BPFILEWRITER_H_
+#ifndef ADIOS2_ENGINE_BP_BPFILEWRITER_H_
+#define ADIOS2_ENGINE_BP_BPFILEWRITER_H_
 
 #include "adios2/ADIOSConfig.h"
 #include "adios2/capsule/heap/STLVector.h"
@@ -185,4 +185,4 @@ private:
 
 } // end namespace adios
 
-#endif /* BPFILEWRITER_H_ */
+#endif /* ADIOS2_ENGINE_BP_BPFILEWRITER_H_ */
diff --git a/source/adios2/engine/dataman/DataManReader.h b/source/adios2/engine/dataman/DataManReader.h
index cc367825a199ca28b01450b8a030dbd73a5efec1..003fad9776b587b96bfcb0b7a60247f4549509ba 100644
--- a/source/adios2/engine/dataman/DataManReader.h
+++ b/source/adios2/engine/dataman/DataManReader.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef DATAMANREADER_H_
-#define DATAMANREADER_H_
+#ifndef ADIOS2_ENGINE_DATAMAN_DATAMANREADER_H_
+#define ADIOS2_ENGINE_DATAMAN_DATAMANREADER_H_
 
 #include <iostream> //std::cout << Needs to go
 
@@ -141,4 +141,4 @@ private:
 
 } // end namespace
 
-#endif /* DATAMANREADER_H_ */
+#endif /* ADIOS2_ENGINE_DATAMAN_DATAMANREADER_H_ */
diff --git a/source/adios2/engine/dataman/DataManWriter.h b/source/adios2/engine/dataman/DataManWriter.h
index 95cfefb3ef76eefa4bef6cb93013c9b7a466c99f..0edaeb2e1a067d95caba640c3ec30328d2343cff 100644
--- a/source/adios2/engine/dataman/DataManWriter.h
+++ b/source/adios2/engine/dataman/DataManWriter.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef DATAMANWRITER_H_
-#define DATAMANWRITER_H_
+#ifndef ADIOS2_ENGINE_DATAMAN_DATAMAN_WRITER_H_
+#define ADIOS2_ENGINE_DATAMAN_DATAMAN_WRITER_H_
 
 #include <iostream> //std::cout must be removed, only used for hello example
 #include <unistd.h> //sleep must be removed
@@ -181,4 +181,4 @@ private:
 
 } // end namespace adios
 
-#endif /* DATAMANWRITER_H_ */
+#endif /* ADIOS2_ENGINE_DATAMAN_DATAMAN_WRITER_H_ */
diff --git a/source/adios2/engine/hdf5/HDF5ReaderP.h b/source/adios2/engine/hdf5/HDF5ReaderP.h
index ec5d910ebf453c4f4f9eb6d5faf55248759feef6..42e4dab6be48f5fdda07b7fcd5aac35bb135e63e 100644
--- a/source/adios2/engine/hdf5/HDF5ReaderP.h
+++ b/source/adios2/engine/hdf5/HDF5ReaderP.h
@@ -8,7 +8,7 @@
  *      Author: Junmin
  */
 
-#ifndef HDF5_READER_P_H
-#define HDF5_READER_P_H
+#ifndef ADIOS2_ENGINE_HDF5_HDF5READERP_H_
+#define ADIOS2_ENGINE_HDF5_HDF5READERP_H_
 
-#endif
+#endif /* ADIOS2_ENGINE_HDF5_HDF5READERP_H_ */
diff --git a/source/adios2/engine/hdf5/HDF5WriterP.h b/source/adios2/engine/hdf5/HDF5WriterP.h
index d581ace0827fede64041b9693578eb5346602b45..33807473988c9d91aa0e42bfa9feded67d3f1dfd 100644
--- a/source/adios2/engine/hdf5/HDF5WriterP.h
+++ b/source/adios2/engine/hdf5/HDF5WriterP.h
@@ -9,8 +9,8 @@
  *      Author: Junmin
  */
 
-#ifndef HDF5_WRITER_P_H_
-#define HDF5_WRITER_P_H_
+#ifndef ADIOS2_ENGINE_HDF5_HDF5WRITERP_H__
+#define ADIOS2_ENGINE_HDF5_HDF5WRITERP_H__
 
 #include "adios2/ADIOSConfig.h"
 #include "adios2/ADIOS_MPI.h"
@@ -108,4 +108,4 @@ private:
 
 } // end namespace adios
 
-#endif /* HDF5_WRITER_P_H_ */
+#endif /* ADIOS2_ENGINE_HDF5_HDF5WRITERP_H__ */
diff --git a/source/adios2/transform/BZip2.h b/source/adios2/transform/BZip2.h
index 3fc726ba3d6b4885a864985ab6417bdd8811bde3..bf16fa75750c6e102ca920df3056352b9323273d 100644
--- a/source/adios2/transform/BZip2.h
+++ b/source/adios2/transform/BZip2.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef BZIP2_H_
-#define BZIP2_H_
+#ifndef ADIOS2_TRANSFORM_BZIP2_H_
+#define ADIOS2_TRANSFORM_BZIP2_H_
 
 #include "adios2/ADIOSConfig.h"
 #include "adios2/core/Transform.h"
@@ -42,4 +42,4 @@ public:
 } // end namespace transform
 } // end namespace adios
 
-#endif /* BZIP2_H_ */
+#endif /* ADIOS2_TRANSFORM_BZIP2_H_ */
diff --git a/source/adios2/transport/file/FStream.h b/source/adios2/transport/file/FStream.h
index 23816ec320d8c2cf7b2816ee24d6e8029cc9a57b..a0436d788f0dde895d0ad44f08057b0b5d2f9d52 100644
--- a/source/adios2/transport/file/FStream.h
+++ b/source/adios2/transport/file/FStream.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef FSTREAM_H_
-#define FSTREAM_H_
+#ifndef ADIOS2_TRANSPORT_FILE_FSTREAM_H_
+#define ADIOS2_TRANSPORT_FILE_FSTREAM_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <fstream>
@@ -51,4 +51,4 @@ private:
 } // end namespace transport
 } // end namespace adios
 
-#endif /* FSTREAM_H_ */
+#endif /* ADIOS2_TRANSPORT_FILE_FSTREAM_H_ */
diff --git a/source/adios2/transport/file/FileDescriptor.h b/source/adios2/transport/file/FileDescriptor.h
index 1668aa07b3823e079da1c12a6e6678001e2203d4..7b87d13c3c959ffa9feb908e416a89c06aa901fc 100644
--- a/source/adios2/transport/file/FileDescriptor.h
+++ b/source/adios2/transport/file/FileDescriptor.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef FILEDESCRIPTOR_H_
-#define FILEDESCRIPTOR_H_
+#ifndef ADIOS2_TRANSPORT_FILE_FILEDESCRIPTOR_H_
+#define ADIOS2_TRANSPORT_FILE_FILEDESCRIPTOR_H_
 
 #include "adios2/ADIOSConfig.h"
 #include "adios2/core/Transport.h"
@@ -42,4 +42,4 @@ private:
 
 } // end namespace transport
 } // end namespace
-#endif /* FILEDESCRIPTOR_H_ */
+#endif /* ADIOS2_TRANSPORT_FILE_FILEDESCRIPTOR_H_ */
diff --git a/source/adios2/transport/file/FilePointer.h b/source/adios2/transport/file/FilePointer.h
index 26ea22e24f42c334ea96ee53a48c46ea02542423..8761127044dc8114bf2fa93d4080226127f41ff7 100644
--- a/source/adios2/transport/file/FilePointer.h
+++ b/source/adios2/transport/file/FilePointer.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef FILEPOINTER_H_
-#define FILEPOINTER_H_
+#ifndef ADIOS2_TRANSPORT_FILE_FILEPOINTER_H_
+#define ADIOS2_TRANSPORT_FILE_FILEPOINTER_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <stdio.h> // FILE*
@@ -52,4 +52,4 @@ private:
 } // end namespace transport
 } // end namespace
 
-#endif /* FILEPOINTER_H_ */
+#endif /* ADIOS2_TRANSPORT_FILE_FILEPOINTER_H_ */
diff --git a/source/adios2/transport/file/MPI_File.h b/source/adios2/transport/file/MPI_File.h
index 8380736e598519e60808971894c88b0f8c7f8aaa..d1098669b5bc6269414b80f8ec6968dda4b9d043 100644
--- a/source/adios2/transport/file/MPI_File.h
+++ b/source/adios2/transport/file/MPI_File.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef MPI_FILE_H_
-#define MPI_FILE_H_
+#ifndef ADIOS2_TRANSPORT_FILE_MPI_FILE_H_
+#define ADIOS2_TRANSPORT_FILE_MPI_FILE_H_
 
 #include "adios2/ADIOSConfig.h"
 #include "adios2/ADIOS_MPI.h"
@@ -47,4 +47,4 @@ private:
 } // end namespace transport
 } // end namespace
 
-#endif /* MPI_FILE_H_ */
+#endif /* ADIOS2_TRANSPORT_FILE_MPI_FILE_H_ */
diff --git a/source/adios2/transport/wan/MdtmMan.h b/source/adios2/transport/wan/MdtmMan.h
index 3b0a0c4face3e6ab8086e8d26cad2d8e6c9f26d5..887ffae35d4e8936a89f8d9dada6e49152bc44a5 100644
--- a/source/adios2/transport/wan/MdtmMan.h
+++ b/source/adios2/transport/wan/MdtmMan.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef MDTMMAN_H_
-#define MDTMMAN_H_
+#ifndef ADIOS2_TRANSPORT_WAN_MDTMMAN_H_
+#define ADIOS2_TRANSPORT_WAN_MDTMMAN_H_
 
 #include <json.hpp>
 
@@ -137,4 +137,4 @@ private:
 } // end namespace transport
 } // end namespace
 
-#endif /* MDTMMAN_H_ */
+#endif /* ADIOS2_TRANSPORT_WAN_MDTMMAN_H_ */
diff --git a/source/adios2/utilities/format/bp1/BP1.h b/source/adios2/utilities/format/bp1/BP1.h
index dc070be1f9c9f966cb12de3f1a5fff82e51a821d..bc9ffb84acc7d8e098b7b9f6a65d5a3ed1fd59bd 100644
--- a/source/adios2/utilities/format/bp1/BP1.h
+++ b/source/adios2/utilities/format/bp1/BP1.h
@@ -8,12 +8,12 @@
  *      Author: wfg
  */
 
-#ifndef BP1_H_
-#define BP1_H_
+#ifndef ADIOS2_UTILITIES_FORMAT_BP1_BP1_H_
+#define ADIOS2_UTILITIES_FORMAT_BP1_BP1_H_
 
 #include "adios2/ADIOSConfig.h"
 #include "adios2/utilities/format/bp1/BP1Aggregator.h"
 #include "adios2/utilities/format/bp1/BP1Structs.h"
 #include "adios2/utilities/format/bp1/BP1Writer.h"
 
-#endif /* BP1_H_ */
+#endif /* ADIOS2_UTILITIES_FORMAT_BP1_BP1_H_ */
diff --git a/source/adios2/utilities/format/bp1/BP1Aggregator.h b/source/adios2/utilities/format/bp1/BP1Aggregator.h
index e68fad5b65ecbd9b9e9fc6c5698ae7f3030f4337..f1fc6c61fe986b5864f107c7814b281f5dde691b 100644
--- a/source/adios2/utilities/format/bp1/BP1Aggregator.h
+++ b/source/adios2/utilities/format/bp1/BP1Aggregator.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef BP1AGGREGATOR_H_
-#define BP1AGGREGATOR_H_
+#ifndef ADIOS2_UTILITIES_FORMAT_BP1_BP1AGGREGATOR_H_
+#define ADIOS2_UTILITIES_FORMAT_BP1_BP1AGGREGATOR_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <string>
@@ -57,4 +57,4 @@ private:
 } // end namespace format
 } // end namespace adios
 
-#endif /* BP1AGGREGATOR_H_ */
+#endif /* ADIOS2_UTILITIES_FORMAT_BP1_BP1AGGREGATOR_H_ */
diff --git a/source/adios2/utilities/format/bp1/BP1Base.h b/source/adios2/utilities/format/bp1/BP1Base.h
index a4defb631c724feff5d2ede4d6ad6f9750a65be5..f9ce6493881909421cfca6ef094d9ba3e11b1f7d 100644
--- a/source/adios2/utilities/format/bp1/BP1Base.h
+++ b/source/adios2/utilities/format/bp1/BP1Base.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef BP1BASE_H_
-#define BP1BASE_H_
+#ifndef ADIOS2_UTILITIES_FORMAT_BP1_BP1BASE_H_
+#define ADIOS2_UTILITIES_FORMAT_BP1_BP1BASE_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <cstdint> //std::uintX_t
@@ -277,4 +277,4 @@ inline std::int8_t BP1Base::GetDataType<long double>() const noexcept
 } // end namespace format
 } // end namespace adios
 
-#endif /* BP1BASE_H_ */
+#endif /* ADIOS2_UTILITIES_FORMAT_BP1_BP1BASE_H_ */
diff --git a/source/adios2/utilities/format/bp1/BP1Structs.h b/source/adios2/utilities/format/bp1/BP1Structs.h
index e385b3a25ac5e489a212a51182d6ea9c475cca7b..60a79a04adefac460ef621e3e83111ff4cf41bf1 100644
--- a/source/adios2/utilities/format/bp1/BP1Structs.h
+++ b/source/adios2/utilities/format/bp1/BP1Structs.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef BP1STRUCTS_H_
-#define BP1STRUCTS_H_
+#ifndef ADIOS2_UTILITIES_FORMAT_BP1_BP1STRUCTS_H_
+#define ADIOS2_UTILITIES_FORMAT_BP1_BP1STRUCTS_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <cstdint>
@@ -85,4 +85,4 @@ struct BP1MetadataSet
 } // end namespace format
 } // end namespace adios
 
-#endif /* BP1STRUCTS_H_ */
+#endif /* ADIOS2_UTILITIES_FORMAT_BP1_BP1STRUCTS_H_ */
diff --git a/source/adios2/utilities/format/bp1/BP1Writer.h b/source/adios2/utilities/format/bp1/BP1Writer.h
index eaa81659ed2815baf8995e4d7802dff8324e4100..ba898ea1e118e0d428227bbed2c074e05fb61641 100644
--- a/source/adios2/utilities/format/bp1/BP1Writer.h
+++ b/source/adios2/utilities/format/bp1/BP1Writer.h
@@ -8,8 +8,8 @@
  *      Author: wfg
  */
 
-#ifndef BP1WRITER_H_
-#define BP1WRITER_H_
+#ifndef ADIOS2_UTILITIES_FORMAT_BP1_BP1WRITER_H_
+#define ADIOS2_UTILITIES_FORMAT_BP1_BP1WRITER_H_
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <algorithm> //std::count, std::copy, std::for_each
@@ -264,4 +264,4 @@ ADIOS_FOREACH_TYPE_1ARG(declare_template_instantiation)
 } // end namespace format
 } // end namespace adios
 
-#endif /* BP1WRITER_H_ */
+#endif /* ADIOS2_UTILITIES_FORMAT_BP1_BP1WRITER_H_ */
diff --git a/source/adios2/utilities/format/bp1/BP1Writer.tcc b/source/adios2/utilities/format/bp1/BP1Writer.tcc
index bab7bb9c8c3da815a152ed3745972c7d7be7b6dc..1e5f0fb4fb914256dc61b28e6ecea6bd2d720470 100644
--- a/source/adios2/utilities/format/bp1/BP1Writer.tcc
+++ b/source/adios2/utilities/format/bp1/BP1Writer.tcc
@@ -7,8 +7,8 @@
  *  Created on: Apr 11, 2017
  *      Author: wfg
  */
-#ifndef BP1WRITER_TCC_
-#define BP1WRITER_TCC_
+#ifndef ADIOS2_UTILITIES_FORMAT_BP1_BP1WRITER_TCC_
+#define ADIOS2_UTILITIES_FORMAT_BP1_BP1WRITER_TCC_
 
 #include "BP1Writer.h"
 
@@ -303,4 +303,4 @@ void BP1Writer::WriteVariableCharacteristics(
 } // end namespace format
 } // end namespace adios
 
-#endif // BP1WRITER_TCC_
+#endif // ADIOS2_UTILITIES_FORMAT_BP1_BP1WRITER_TCC_
diff --git a/source/dataman/DataMan.h b/source/dataman/DataMan.h
index 82bfa9c88a420263edf9b366321416716f7c9962..709f5e7f1ef2cea4e710d9507e10d4901051f725 100644
--- a/source/dataman/DataMan.h
+++ b/source/dataman/DataMan.h
@@ -8,8 +8,8 @@
  *      Author: Jason Wang
  */
 
-#ifndef DATAMANAGER_H_
-#define DATAMANAGER_H_
+#ifndef DATAMAN_H_
+#define DATAMAN_H_
 
 #include "DataManBase.h"
 
@@ -42,4 +42,4 @@ private:
     std::vector<int> m_priority;
 };
 
-#endif
+#endif /* DATAMAN_H_ */
diff --git a/source/dataman/DataManBase.h b/source/dataman/DataManBase.h
index f7e9c3d88194d4f8fff366735fc18195a37f4119..9b8b116b6b431c659e1b1508bcb4231518e4606b 100644
--- a/source/dataman/DataManBase.h
+++ b/source/dataman/DataManBase.h
@@ -8,8 +8,8 @@
  *      Author: Jason Wang
  */
 
-#ifndef DATAMAN_H_
-#define DATAMAN_H_
+#ifndef DATAMANBASE_H_
+#define DATAMANBASE_H_
 
 #include <cstdint>
 
@@ -271,4 +271,4 @@ private:
     bool m_profiling_enabled = false;
 };
 
-#endif
+#endif /* DATAMANBASE_H_ */