diff --git a/include/ndnboost/detail/binary_search.hpp b/include/ndnboost/detail/binary_search.hpp
index da27f39..e663267 100644
--- a/include/ndnboost/detail/binary_search.hpp
+++ b/include/ndnboost/detail/binary_search.hpp
@@ -25,8 +25,8 @@
 // representations about the suitability of this software for any
 // purpose.  It is provided "as is" without express or implied warranty.
 // 
-#ifndef BINARY_SEARCH_DWA_122600_H_
-# define BINARY_SEARCH_DWA_122600_H_
+#ifndef BINARY_SEARCH_NDNBOOST_DWA_122600_H_
+# define BINARY_SEARCH_NDNBOOST_DWA_122600_H_
 
 # include <ndnboost/detail/iterator.hpp>
 # include <utility>
@@ -213,4 +213,4 @@
 
 }} // namespace ndnboost::detail
 
-#endif // BINARY_SEARCH_DWA_122600_H_
+#endif // BINARY_SEARCH_NDNBOOST_DWA_122600_H_
diff --git a/include/ndnboost/detail/indirect_traits.hpp b/include/ndnboost/detail/indirect_traits.hpp
index 95d95df..8cd9158 100644
--- a/include/ndnboost/detail/indirect_traits.hpp
+++ b/include/ndnboost/detail/indirect_traits.hpp
@@ -2,8 +2,8 @@
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
-#ifndef INDIRECT_TRAITS_DWA2002131_HPP
-# define INDIRECT_TRAITS_DWA2002131_HPP
+#ifndef INDIRECT_TRAITS_NDNBOOST_DWA2002131_HPP
+# define INDIRECT_TRAITS_NDNBOOST_DWA2002131_HPP
 # include <ndnboost/type_traits/is_function.hpp>
 # include <ndnboost/type_traits/is_reference.hpp>
 # include <ndnboost/type_traits/is_pointer.hpp>
@@ -484,4 +484,4 @@
 
 }} // namespace ndnboost::python::detail
 
-#endif // INDIRECT_TRAITS_DWA2002131_HPP
+#endif // INDIRECT_TRAITS_NDNBOOST_DWA2002131_HPP
diff --git a/include/ndnboost/detail/is_incrementable.hpp b/include/ndnboost/detail/is_incrementable.hpp
index 0471db9..a9ff9ca 100644
--- a/include/ndnboost/detail/is_incrementable.hpp
+++ b/include/ndnboost/detail/is_incrementable.hpp
@@ -1,8 +1,8 @@
 // Copyright David Abrahams 2004. Use, modification and distribution is
 // subject to the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef IS_INCREMENTABLE_DWA200415_HPP
-# define IS_INCREMENTABLE_DWA200415_HPP
+#ifndef IS_INCREMENTABLE_NDNBOOST_DWA200415_HPP
+# define IS_INCREMENTABLE_NDNBOOST_DWA200415_HPP
 
 # include <ndnboost/type_traits/detail/template_arity_spec.hpp>
 # include <ndnboost/type_traits/remove_cv.hpp>
@@ -131,4 +131,4 @@
 
 # include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
-#endif // IS_INCREMENTABLE_DWA200415_HPP
+#endif // IS_INCREMENTABLE_NDNBOOST_DWA200415_HPP
diff --git a/include/ndnboost/detail/iterator.hpp b/include/ndnboost/detail/iterator.hpp
index c2bb102..388a89b 100644
--- a/include/ndnboost/detail/iterator.hpp
+++ b/include/ndnboost/detail/iterator.hpp
@@ -47,8 +47,8 @@
 // 06 Feb 2001 - Removed useless #includes of standard library headers
 //               (David Abrahams)
 
-#ifndef ITERATOR_DWA122600_HPP_
-# define ITERATOR_DWA122600_HPP_
+#ifndef ITERATOR_NDNBOOST_DWA122600_HPP_
+# define ITERATOR_NDNBOOST_DWA122600_HPP_
 
 # include <ndnboost/config.hpp>
 # include <iterator>
@@ -491,4 +491,4 @@
 # undef NDNBOOST_BAD_CONTAINER_ITERATOR_CATEGORY_TYPEDEF
 # undef NDNBOOST_BAD_OUTPUT_ITERATOR_SPECIALIZATION
 
-#endif // ITERATOR_DWA122600_HPP_
+#endif // ITERATOR_NDNBOOST_DWA122600_HPP_
diff --git a/include/ndnboost/detail/workaround.hpp b/include/ndnboost/detail/workaround.hpp
index 7e4ace0..8f6a917 100644
--- a/include/ndnboost/detail/workaround.hpp
+++ b/include/ndnboost/detail/workaround.hpp
@@ -2,8 +2,8 @@
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
-#ifndef WORKAROUND_DWA2002126_HPP
-# define WORKAROUND_DWA2002126_HPP
+#ifndef WORKAROUND_NDNBOOST_DWA2002126_HPP
+# define WORKAROUND_NDNBOOST_DWA2002126_HPP
 
 // Compiler/library version workaround macro
 //
@@ -264,4 +264,4 @@
 
 # endif 
 
-#endif // WORKAROUND_DWA2002126_HPP
+#endif // WORKAROUND_NDNBOOST_DWA2002126_HPP