diff --git a/include/ndn-cpp/common.hpp b/include/ndn-cpp/common.hpp
index a0a4b09..5ba6875 100644
--- a/include/ndn-cpp/common.hpp
+++ b/include/ndn-cpp/common.hpp
@@ -28,11 +28,17 @@
 // cd <NDN-CPP ROOT>/include
 // mv boost ndnboost
 // cd ndnboost
+// # Replace when including files.
 // (unset LANG; find . -type f -exec sed -i '' 's/\<boost\//\<ndnboost\//g' {} +)
 // (unset LANG; find . -type f -exec sed -i '' 's/\"boost\//\"ndnboost\//g' {} +)
-// (unset LANG; find . -type f -exec sed -i '' 's/\ boost\//\ ndnboost\//g' {} +)
+// (unset LANG; find . -type f -exec sed -i '' 's/ boost\// ndnboost\//g' {} +)
 // (unset LANG; find . -type f -exec sed -i '' 's/(boost\//(ndnboost\//g' {} +)
+// # Replace macro definitions.
 // (unset LANG; find . -type f -exec sed -i '' 's/BOOST_/NDNBOOST_/g' {} +)
+// # Replace header include guards which don't start with BOOST_ .  This may result in some with NDNBOOST twice, but that is OK.
+// (unset LANG; find . -type f -exec sed -i '' 's/_DWA/_NDNBOOST_DWA/g' {} +)
+// (unset LANG; find . -type f -exec sed -i '' 's/ UUID_/ NDNBOOST_UUID_/g' {} +)
+// (unset LANG; find . -type f -exec sed -i '' 's/ FILE_boost/ FILE_ndnboost/g' {} +)
 #include <ndnboost/shared_ptr.hpp>
 #include <ndnboost/make_shared.hpp>
 namespace ndn { namespace ptr_lib = ndnboost; }
diff --git a/include/ndnboost/concept/assert.hpp b/include/ndnboost/concept/assert.hpp
index 5db4cce..094781e 100644
--- a/include/ndnboost/concept/assert.hpp
+++ b/include/ndnboost/concept/assert.hpp
@@ -1,8 +1,8 @@
 // Copyright David Abrahams 2006. 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 NDNBOOST_CONCEPT_ASSERT_DWA2006430_HPP
-# define NDNBOOST_CONCEPT_ASSERT_DWA2006430_HPP
+#ifndef NDNBOOST_CONCEPT_ASSERT_NDNBOOST_DWA2006430_HPP
+# define NDNBOOST_CONCEPT_ASSERT_NDNBOOST_DWA2006430_HPP
 
 # include <ndnboost/config.hpp>
 # include <ndnboost/detail/workaround.hpp>
@@ -43,4 +43,4 @@
 # define NDNBOOST_CONCEPT_ASSERT(ModelInParens) \
     NDNBOOST_CONCEPT_ASSERT_FN(void(*)ModelInParens)
 
-#endif // NDNBOOST_CONCEPT_ASSERT_DWA2006430_HPP
+#endif // NDNBOOST_CONCEPT_ASSERT_NDNBOOST_DWA2006430_HPP
diff --git a/include/ndnboost/concept/detail/backward_compatibility.hpp b/include/ndnboost/concept/detail/backward_compatibility.hpp
index 536d011..7a79b95 100644
--- a/include/ndnboost/concept/detail/backward_compatibility.hpp
+++ b/include/ndnboost/concept/detail/backward_compatibility.hpp
@@ -1,8 +1,8 @@
 // Copyright David Abrahams 2009. 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 NDNBOOST_CONCEPT_BACKWARD_COMPATIBILITY_DWA200968_HPP
-# define NDNBOOST_CONCEPT_BACKWARD_COMPATIBILITY_DWA200968_HPP
+#ifndef NDNBOOST_CONCEPT_BACKWARD_COMPATIBILITY_NDNBOOST_DWA200968_HPP
+# define NDNBOOST_CONCEPT_BACKWARD_COMPATIBILITY_NDNBOOST_DWA200968_HPP
 
 namespace ndnboost
 {
@@ -13,4 +13,4 @@
 # endif 
 } // namespace ndnboost::concept
 
-#endif // NDNBOOST_CONCEPT_BACKWARD_COMPATIBILITY_DWA200968_HPP
+#endif // NDNBOOST_CONCEPT_BACKWARD_COMPATIBILITY_NDNBOOST_DWA200968_HPP
diff --git a/include/ndnboost/concept/detail/borland.hpp b/include/ndnboost/concept/detail/borland.hpp
index 8518175..0ec29d9 100644
--- a/include/ndnboost/concept/detail/borland.hpp
+++ b/include/ndnboost/concept/detail/borland.hpp
@@ -1,8 +1,8 @@
 // Copyright David Abrahams 2006. 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 NDNBOOST_CONCEPT_DETAIL_BORLAND_DWA2006429_HPP
-# define NDNBOOST_CONCEPT_DETAIL_BORLAND_DWA2006429_HPP
+#ifndef NDNBOOST_CONCEPT_DETAIL_BORLAND_NDNBOOST_DWA2006429_HPP
+# define NDNBOOST_CONCEPT_DETAIL_BORLAND_NDNBOOST_DWA2006429_HPP
 
 # include <ndnboost/preprocessor/cat.hpp>
 # include <ndnboost/concept/detail/backward_compatibility.hpp>
@@ -27,4 +27,4 @@
 
 }} // namespace ndnboost::concept
 
-#endif // NDNBOOST_CONCEPT_DETAIL_BORLAND_DWA2006429_HPP
+#endif // NDNBOOST_CONCEPT_DETAIL_BORLAND_NDNBOOST_DWA2006429_HPP
diff --git a/include/ndnboost/concept/detail/concept_def.hpp b/include/ndnboost/concept/detail/concept_def.hpp
index 196162e..ab8102a 100644
--- a/include/ndnboost/concept/detail/concept_def.hpp
+++ b/include/ndnboost/concept/detail/concept_def.hpp
@@ -1,13 +1,13 @@
 // Copyright David Abrahams 2006. 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 NDNBOOST_CONCEPT_DETAIL_CONCEPT_DEF_DWA200651_HPP
-# define NDNBOOST_CONCEPT_DETAIL_CONCEPT_DEF_DWA200651_HPP
+#ifndef NDNBOOST_CONCEPT_DETAIL_CONCEPT_DEF_NDNBOOST_DWA200651_HPP
+# define NDNBOOST_CONCEPT_DETAIL_CONCEPT_DEF_NDNBOOST_DWA200651_HPP
 # include <ndnboost/preprocessor/seq/for_each_i.hpp>
 # include <ndnboost/preprocessor/seq/enum.hpp>
 # include <ndnboost/preprocessor/comma_if.hpp>
 # include <ndnboost/preprocessor/cat.hpp>
-#endif // NDNBOOST_CONCEPT_DETAIL_CONCEPT_DEF_DWA200651_HPP
+#endif // NDNBOOST_CONCEPT_DETAIL_CONCEPT_DEF_NDNBOOST_DWA200651_HPP
 
 // NDNBOOST_concept(SomeName, (p1)(p2)...(pN))
 //
diff --git a/include/ndnboost/concept/detail/general.hpp b/include/ndnboost/concept/detail/general.hpp
index fcf579b..bba4c49 100644
--- a/include/ndnboost/concept/detail/general.hpp
+++ b/include/ndnboost/concept/detail/general.hpp
@@ -1,8 +1,8 @@
 // Copyright David Abrahams 2006. 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 NDNBOOST_CONCEPT_DETAIL_GENERAL_DWA2006429_HPP
-# define NDNBOOST_CONCEPT_DETAIL_GENERAL_DWA2006429_HPP
+#ifndef NDNBOOST_CONCEPT_DETAIL_GENERAL_NDNBOOST_DWA2006429_HPP
+# define NDNBOOST_CONCEPT_DETAIL_GENERAL_NDNBOOST_DWA2006429_HPP
 
 # include <ndnboost/preprocessor/cat.hpp>
 # include <ndnboost/concept/detail/backward_compatibility.hpp>
@@ -72,4 +72,4 @@
 
 }}
 
-#endif // NDNBOOST_CONCEPT_DETAIL_GENERAL_DWA2006429_HPP
+#endif // NDNBOOST_CONCEPT_DETAIL_GENERAL_NDNBOOST_DWA2006429_HPP
diff --git a/include/ndnboost/concept/detail/has_constraints.hpp b/include/ndnboost/concept/detail/has_constraints.hpp
index 289df91..0fc96d5 100644
--- a/include/ndnboost/concept/detail/has_constraints.hpp
+++ b/include/ndnboost/concept/detail/has_constraints.hpp
@@ -1,8 +1,8 @@
 // Copyright David Abrahams 2006. 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 NDNBOOST_CONCEPT_DETAIL_HAS_CONSTRAINTS_DWA2006429_HPP
-# define NDNBOOST_CONCEPT_DETAIL_HAS_CONSTRAINTS_DWA2006429_HPP
+#ifndef NDNBOOST_CONCEPT_DETAIL_HAS_CONSTRAINTS_NDNBOOST_DWA2006429_HPP
+# define NDNBOOST_CONCEPT_DETAIL_HAS_CONSTRAINTS_NDNBOOST_DWA2006429_HPP
 
 # include <ndnboost/mpl/bool.hpp>
 # include <ndnboost/detail/workaround.hpp>
@@ -47,4 +47,4 @@
 
 }} // namespace ndnboost::concepts::detail
 
-#endif // NDNBOOST_CONCEPT_DETAIL_HAS_CONSTRAINTS_DWA2006429_HPP
+#endif // NDNBOOST_CONCEPT_DETAIL_HAS_CONSTRAINTS_NDNBOOST_DWA2006429_HPP
diff --git a/include/ndnboost/concept/detail/msvc.hpp b/include/ndnboost/concept/detail/msvc.hpp
index 183dda4..8002ff8 100644
--- a/include/ndnboost/concept/detail/msvc.hpp
+++ b/include/ndnboost/concept/detail/msvc.hpp
@@ -1,8 +1,8 @@
 // Copyright David Abrahams 2006. 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 NDNBOOST_CONCEPT_CHECK_MSVC_DWA2006429_HPP
-# define NDNBOOST_CONCEPT_CHECK_MSVC_DWA2006429_HPP
+#ifndef NDNBOOST_CONCEPT_CHECK_MSVC_NDNBOOST_DWA2006429_HPP
+# define NDNBOOST_CONCEPT_CHECK_MSVC_NDNBOOST_DWA2006429_HPP
 
 # include <ndnboost/preprocessor/cat.hpp>
 # include <ndnboost/concept/detail/backward_compatibility.hpp>
@@ -111,4 +111,4 @@
 # endif
 }}
 
-#endif // NDNBOOST_CONCEPT_CHECK_MSVC_DWA2006429_HPP
+#endif // NDNBOOST_CONCEPT_CHECK_MSVC_NDNBOOST_DWA2006429_HPP
diff --git a/include/ndnboost/concept/usage.hpp b/include/ndnboost/concept/usage.hpp
index dfedbc0..02e4976 100644
--- a/include/ndnboost/concept/usage.hpp
+++ b/include/ndnboost/concept/usage.hpp
@@ -1,8 +1,8 @@
 // Copyright David Abrahams 2006. 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 NDNBOOST_CONCEPT_USAGE_DWA2006919_HPP
-# define NDNBOOST_CONCEPT_USAGE_DWA2006919_HPP
+#ifndef NDNBOOST_CONCEPT_USAGE_NDNBOOST_DWA2006919_HPP
+# define NDNBOOST_CONCEPT_USAGE_NDNBOOST_DWA2006919_HPP
 
 # include <ndnboost/concept/assert.hpp>
 # include <ndnboost/detail/workaround.hpp>
@@ -41,4 +41,4 @@
 
 }} // namespace ndnboost::concepts
 
-#endif // NDNBOOST_CONCEPT_USAGE_DWA2006919_HPP
+#endif // NDNBOOST_CONCEPT_USAGE_NDNBOOST_DWA2006919_HPP
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
diff --git a/include/ndnboost/exception/current_exception_cast.hpp b/include/ndnboost/exception/current_exception_cast.hpp
index 2dc62ea..9a724c1 100644
--- a/include/ndnboost/exception/current_exception_cast.hpp
+++ b/include/ndnboost/exception/current_exception_cast.hpp
@@ -3,8 +3,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 UUID_7E83C166200811DE885E826156D89593
-#define UUID_7E83C166200811DE885E826156D89593
+#ifndef NDNBOOST_UUID_7E83C166200811DE885E826156D89593
+#define NDNBOOST_UUID_7E83C166200811DE885E826156D89593
 #if (__GNUC__*100+__GNUC_MINOR__>301) && !defined(NDNBOOST_EXCEPTION_ENABLE_WARNINGS)
 #pragma GCC system_header
 #endif
diff --git a/include/ndnboost/exception/detail/attribute_noreturn.hpp b/include/ndnboost/exception/detail/attribute_noreturn.hpp
index abf526f..437b81c 100644
--- a/include/ndnboost/exception/detail/attribute_noreturn.hpp
+++ b/include/ndnboost/exception/detail/attribute_noreturn.hpp
@@ -3,8 +3,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 UUID_61531AB0680611DEADD5846855D89593
-#define UUID_61531AB0680611DEADD5846855D89593
+#ifndef NDNBOOST_UUID_61531AB0680611DEADD5846855D89593
+#define NDNBOOST_UUID_61531AB0680611DEADD5846855D89593
 
 #if defined(_MSC_VER)
 #define NDNBOOST_ATTRIBUTE_NORETURN __declspec(noreturn)
diff --git a/include/ndnboost/exception/detail/error_info_impl.hpp b/include/ndnboost/exception/detail/error_info_impl.hpp
index 3127f2a..f547380 100644
--- a/include/ndnboost/exception/detail/error_info_impl.hpp
+++ b/include/ndnboost/exception/detail/error_info_impl.hpp
@@ -3,8 +3,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 UUID_CE6983AC753411DDA764247956D89593
-#define UUID_CE6983AC753411DDA764247956D89593
+#ifndef NDNBOOST_UUID_CE6983AC753411DDA764247956D89593
+#define NDNBOOST_UUID_CE6983AC753411DDA764247956D89593
 #if (__GNUC__*100+__GNUC_MINOR__>301) && !defined(NDNBOOST_EXCEPTION_ENABLE_WARNINGS)
 #pragma GCC system_header
 #endif
diff --git a/include/ndnboost/exception/detail/type_info.hpp b/include/ndnboost/exception/detail/type_info.hpp
index 4c9eb47..2fcae2f 100644
--- a/include/ndnboost/exception/detail/type_info.hpp
+++ b/include/ndnboost/exception/detail/type_info.hpp
@@ -3,8 +3,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 UUID_C3E1741C754311DDB2834CCA55D89593
-#define UUID_C3E1741C754311DDB2834CCA55D89593
+#ifndef NDNBOOST_UUID_C3E1741C754311DDB2834CCA55D89593
+#define NDNBOOST_UUID_C3E1741C754311DDB2834CCA55D89593
 #if (__GNUC__*100+__GNUC_MINOR__>301) && !defined(NDNBOOST_EXCEPTION_ENABLE_WARNINGS)
 #pragma GCC system_header
 #endif
diff --git a/include/ndnboost/exception/exception.hpp b/include/ndnboost/exception/exception.hpp
index cb1a8cb..9a9747b 100644
--- a/include/ndnboost/exception/exception.hpp
+++ b/include/ndnboost/exception/exception.hpp
@@ -3,8 +3,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 UUID_274DA366004E11DCB1DDFE2E56D89593
-#define UUID_274DA366004E11DCB1DDFE2E56D89593
+#ifndef NDNBOOST_UUID_274DA366004E11DCB1DDFE2E56D89593
+#define NDNBOOST_UUID_274DA366004E11DCB1DDFE2E56D89593
 #if (__GNUC__*100+__GNUC_MINOR__>301) && !defined(NDNBOOST_EXCEPTION_ENABLE_WARNINGS)
 #pragma GCC system_header
 #endif
diff --git a/include/ndnboost/exception/get_error_info.hpp b/include/ndnboost/exception/get_error_info.hpp
index 14f6c56..cb34154 100644
--- a/include/ndnboost/exception/get_error_info.hpp
+++ b/include/ndnboost/exception/get_error_info.hpp
@@ -3,8 +3,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 UUID_1A590226753311DD9E4CCF6156D89593
-#define UUID_1A590226753311DD9E4CCF6156D89593
+#ifndef NDNBOOST_UUID_1A590226753311DD9E4CCF6156D89593
+#define NDNBOOST_UUID_1A590226753311DD9E4CCF6156D89593
 #if (__GNUC__*100+__GNUC_MINOR__>301) && !defined(NDNBOOST_EXCEPTION_ENABLE_WARNINGS)
 #pragma GCC system_header
 #endif
diff --git a/include/ndnboost/get_pointer.hpp b/include/ndnboost/get_pointer.hpp
index f20867b..34443c3 100644
--- a/include/ndnboost/get_pointer.hpp
+++ b/include/ndnboost/get_pointer.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 GET_POINTER_DWA20021219_HPP
-#define GET_POINTER_DWA20021219_HPP
+#ifndef GET_POINTER_NDNBOOST_DWA20021219_HPP
+#define GET_POINTER_NDNBOOST_DWA20021219_HPP
 
 #include <ndnboost/config.hpp>
 
@@ -45,4 +45,4 @@
 
 } // namespace ndnboost
 
-#endif // GET_POINTER_DWA20021219_HPP
+#endif // GET_POINTER_NDNBOOST_DWA20021219_HPP
diff --git a/include/ndnboost/indirect_reference.hpp b/include/ndnboost/indirect_reference.hpp
index fdd5e72..c68b2f8 100644
--- a/include/ndnboost/indirect_reference.hpp
+++ b/include/ndnboost/indirect_reference.hpp
@@ -1,5 +1,5 @@
-#ifndef INDIRECT_REFERENCE_DWA200415_HPP
-# define INDIRECT_REFERENCE_DWA200415_HPP
+#ifndef INDIRECT_REFERENCE_NDNBOOST_DWA200415_HPP
+# define INDIRECT_REFERENCE_NDNBOOST_DWA200415_HPP
 
 //
 // Copyright David Abrahams 2004. Use, modification and distribution is
@@ -40,4 +40,4 @@
   
 } // namespace ndnboost
 
-#endif // INDIRECT_REFERENCE_DWA200415_HPP
+#endif // INDIRECT_REFERENCE_NDNBOOST_DWA200415_HPP
diff --git a/include/ndnboost/iterator/detail/facade_iterator_category.hpp b/include/ndnboost/iterator/detail/facade_iterator_category.hpp
index c658c9f..4148793 100644
--- a/include/ndnboost/iterator/detail/facade_iterator_category.hpp
+++ b/include/ndnboost/iterator/detail/facade_iterator_category.hpp
@@ -1,8 +1,8 @@
 // Copyright David Abrahams 2003. 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 FACADE_ITERATOR_CATEGORY_DWA20031118_HPP
-# define FACADE_ITERATOR_CATEGORY_DWA20031118_HPP
+#ifndef FACADE_ITERATOR_CATEGORY_NDNBOOST_DWA20031118_HPP
+# define FACADE_ITERATOR_CATEGORY_NDNBOOST_DWA20031118_HPP
 
 # include <ndnboost/iterator/iterator_categories.hpp>
 
@@ -197,4 +197,4 @@
 
 # include <ndnboost/iterator/detail/config_undef.hpp>
 
-#endif // FACADE_ITERATOR_CATEGORY_DWA20031118_HPP
+#endif // FACADE_ITERATOR_CATEGORY_NDNBOOST_DWA20031118_HPP
diff --git a/include/ndnboost/iterator/iterator_traits.hpp b/include/ndnboost/iterator/iterator_traits.hpp
index 39735b3..4d8fb61 100644
--- a/include/ndnboost/iterator/iterator_traits.hpp
+++ b/include/ndnboost/iterator/iterator_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 ITERATOR_TRAITS_DWA200347_HPP
-# define ITERATOR_TRAITS_DWA200347_HPP
+#ifndef ITERATOR_TRAITS_NDNBOOST_DWA200347_HPP
+# define ITERATOR_TRAITS_NDNBOOST_DWA200347_HPP
 
 # include <ndnboost/detail/iterator.hpp>
 # include <ndnboost/detail/workaround.hpp>
@@ -89,4 +89,4 @@
 
 } // namespace ndnboost::iterator
 
-#endif // ITERATOR_TRAITS_DWA200347_HPP
+#endif // ITERATOR_TRAITS_NDNBOOST_DWA200347_HPP
diff --git a/include/ndnboost/pointee.hpp b/include/ndnboost/pointee.hpp
index dd0a3b6..c8c927d 100644
--- a/include/ndnboost/pointee.hpp
+++ b/include/ndnboost/pointee.hpp
@@ -1,5 +1,5 @@
-#ifndef POINTEE_DWA200415_HPP
-# define POINTEE_DWA200415_HPP
+#ifndef POINTEE_NDNBOOST_DWA200415_HPP
+# define POINTEE_NDNBOOST_DWA200415_HPP
 
 //
 // Copyright David Abrahams 2004. Use, modification and distribution is
@@ -71,4 +71,4 @@
   
 } // namespace ndnboost
 
-#endif // POINTEE_DWA200415_HPP
+#endif // POINTEE_NDNBOOST_DWA200415_HPP
diff --git a/include/ndnboost/throw_exception.hpp b/include/ndnboost/throw_exception.hpp
index 9ee3ca5..475a9f2 100644
--- a/include/ndnboost/throw_exception.hpp
+++ b/include/ndnboost/throw_exception.hpp
@@ -1,5 +1,5 @@
-#ifndef UUID_AA15E74A856F11E08B8D93F24824019B
-#define UUID_AA15E74A856F11E08B8D93F24824019B
+#ifndef NDNBOOST_UUID_AA15E74A856F11E08B8D93F24824019B
+#define NDNBOOST_UUID_AA15E74A856F11E08B8D93F24824019B
 #if defined(__GNUC__) && !defined(NDNBOOST_EXCEPTION_ENABLE_WARNINGS)
 #pragma GCC system_header
 #endif
diff --git a/include/ndnboost/type.hpp b/include/ndnboost/type.hpp
index 92e4192..89b35f9 100644
--- a/include/ndnboost/type.hpp
+++ b/include/ndnboost/type.hpp
@@ -3,8 +3,8 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef NDNBOOST_TYPE_DWA20010120_HPP
-# define NDNBOOST_TYPE_DWA20010120_HPP
+#ifndef NDNBOOST_TYPE_NDNBOOST_DWA20010120_HPP
+# define NDNBOOST_TYPE_NDNBOOST_DWA20010120_HPP
 
 namespace ndnboost {
 
@@ -15,4 +15,4 @@
 
 }
 
-#endif // NDNBOOST_TYPE_DWA20010120_HPP
+#endif // NDNBOOST_TYPE_NDNBOOST_DWA20010120_HPP
diff --git a/include/ndnboost/type_traits/floating_point_promotion.hpp b/include/ndnboost/type_traits/floating_point_promotion.hpp
index 3db875d..b774da1 100644
--- a/include/ndnboost/type_traits/floating_point_promotion.hpp
+++ b/include/ndnboost/type_traits/floating_point_promotion.hpp
@@ -3,8 +3,8 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef FILE_boost_type_traits_floating_point_promotion_hpp_INCLUDED
-#define FILE_boost_type_traits_floating_point_promotion_hpp_INCLUDED
+#ifndef FILE_ndnboost_type_traits_floating_point_promotion_hpp_INCLUDED
+#define FILE_ndnboost_type_traits_floating_point_promotion_hpp_INCLUDED
 
 #include <ndnboost/config.hpp>
 
@@ -87,5 +87,5 @@
 
 #include <ndnboost/type_traits/detail/type_trait_undef.hpp>
 
-#endif // #ifndef FILE_boost_type_traits_floating_point_promotion_hpp_INCLUDED
+#endif // #ifndef FILE_ndnboost_type_traits_floating_point_promotion_hpp_INCLUDED
 
diff --git a/include/ndnboost/type_traits/integral_promotion.hpp b/include/ndnboost/type_traits/integral_promotion.hpp
index 48cfffe..0871147 100644
--- a/include/ndnboost/type_traits/integral_promotion.hpp
+++ b/include/ndnboost/type_traits/integral_promotion.hpp
@@ -3,8 +3,8 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef FILE_boost_type_traits_integral_promotion_hpp_INCLUDED
-#define FILE_boost_type_traits_integral_promotion_hpp_INCLUDED
+#ifndef FILE_ndnboost_type_traits_integral_promotion_hpp_INCLUDED
+#define FILE_ndnboost_type_traits_integral_promotion_hpp_INCLUDED
 
 #include <ndnboost/config.hpp>
 
@@ -191,5 +191,5 @@
 
 #include <ndnboost/type_traits/detail/type_trait_undef.hpp>
 
-#endif // #ifndef FILE_boost_type_traits_integral_promotion_hpp_INCLUDED
+#endif // #ifndef FILE_ndnboost_type_traits_integral_promotion_hpp_INCLUDED
 
diff --git a/include/ndnboost/type_traits/promote.hpp b/include/ndnboost/type_traits/promote.hpp
index 54d491f..5eeba4d 100644
--- a/include/ndnboost/type_traits/promote.hpp
+++ b/include/ndnboost/type_traits/promote.hpp
@@ -3,8 +3,8 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef FILE_boost_type_traits_promote_hpp_INCLUDED
-#define FILE_boost_type_traits_promote_hpp_INCLUDED
+#ifndef FILE_ndnboost_type_traits_promote_hpp_INCLUDED
+#define FILE_ndnboost_type_traits_promote_hpp_INCLUDED
 
 #include <ndnboost/config.hpp>
 #include <ndnboost/type_traits/integral_promotion.hpp>
@@ -36,5 +36,5 @@
 
 #include <ndnboost/type_traits/detail/type_trait_undef.hpp>
 
-#endif // #ifndef FILE_boost_type_traits_promote_hpp_INCLUDED
+#endif // #ifndef FILE_ndnboost_type_traits_promote_hpp_INCLUDED