ndnboost:  Also replace header include guards which don't start with BOOST_ .
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