diff --git a/boost/LICENSE_1_0.txt b/boost/LICENSE_1_0.txt
deleted file mode 100644
index 36b7cd9..0000000
--- a/boost/LICENSE_1_0.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/boost/config/select_compiler_config.hpp b/boost/config/select_compiler_config.hpp
deleted file mode 100644
index 0d47b25..0000000
--- a/boost/config/select_compiler_config.hpp
+++ /dev/null
@@ -1,112 +0,0 @@
-//  Boost compiler configuration selection header file
-
-//  (C) Copyright John Maddock 2001 - 2003. 
-//  (C) Copyright Martin Wille 2003.
-//  (C) Copyright Guillaume Melquiond 2003.
-//
-//  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)
-
-//  See http://www.boost.org/ for most recent version.
-
-// locate which compiler we are using and define
-// BOOST_COMPILER_CONFIG as needed: 
-
-#if defined(__GCCXML__)
-// GCC-XML emulates other compilers, it has to appear first here!
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/gcc_xml.hpp"
-
-#elif defined(_CRAYC)
-// EDG based Cray compiler:
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/cray.hpp"
-
-#elif defined __CUDACC__
-//  NVIDIA CUDA C++ compiler for GPU
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/nvcc.hpp"
-
-#elif defined __COMO__
-//  Comeau C++
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/comeau.hpp"
-
-#elif defined(__PATHSCALE__) && (__PATHCC__ >= 4)
-// PathScale EKOPath compiler (has to come before clang and gcc)
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/pathscale.hpp"
-
-#elif defined __clang__
-//  Clang C++ emulates GCC, so it has to appear early.
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/clang.hpp"
-
-#elif defined __DMC__
-//  Digital Mars C++
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/digitalmars.hpp"
-
-#elif defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)
-//  Intel
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/intel.hpp"
-
-# elif defined __GNUC__
-//  GNU C++:
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/gcc.hpp"
-
-#elif defined __KCC
-//  Kai C++
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/kai.hpp"
-
-#elif defined __sgi
-//  SGI MIPSpro C++
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/sgi_mipspro.hpp"
-
-#elif defined __DECCXX
-//  Compaq Tru64 Unix cxx
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/compaq_cxx.hpp"
-
-#elif defined __ghs
-//  Greenhills C++
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/greenhills.hpp"
-
-#elif defined __CODEGEARC__
-//  CodeGear - must be checked for before Borland
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/codegear.hpp"
-
-#elif defined __BORLANDC__
-//  Borland
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/borland.hpp"
-
-#elif defined  __MWERKS__
-//  Metrowerks CodeWarrior
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/metrowerks.hpp"
-
-#elif defined  __SUNPRO_CC
-//  Sun Workshop Compiler C++
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/sunpro_cc.hpp"
-
-#elif defined __HP_aCC
-//  HP aCC
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/hp_acc.hpp"
-
-#elif defined(__MRC__) || defined(__SC__)
-//  MPW MrCpp or SCpp
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/mpw.hpp"
-
-#elif defined(__IBMCPP__)
-//  IBM Visual Age
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/vacpp.hpp"
-
-#elif defined(__PGI)
-//  Portland Group Inc.
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/pgi.hpp"
-
-#elif defined _MSC_VER
-//  Microsoft Visual C++
-//
-//  Must remain the last #elif since some other vendors (Metrowerks, for
-//  example) also #define _MSC_VER
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/visualc.hpp"
-
-#elif defined (BOOST_ASSERT_CONFIG)
-// this must come last - generate an error if we don't
-// recognise the compiler:
-#  error "Unknown compiler - please configure (http://www.boost.org/libs/config/config.htm#configuring) and report the results to the main boost mailing list (http://www.boost.org/more/mailing_lists.htm#main)"
-
-#endif
diff --git a/boost/smart_ptr/detail/sp_counted_base.hpp b/boost/smart_ptr/detail/sp_counted_base.hpp
deleted file mode 100644
index 9ced2b9..0000000
--- a/boost/smart_ptr/detail/sp_counted_base.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_HPP_INCLUDED
-#define BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_HPP_INCLUDED
-
-// MS compatible compilers support #pragma once
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-//
-//  detail/sp_counted_base.hpp
-//
-//  Copyright 2005, 2006 Peter Dimov
-//
-// 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)
-//
-
-#include <boost/config.hpp>
-#include <boost/smart_ptr/detail/sp_has_sync.hpp>
-
-#if defined( BOOST_SP_DISABLE_THREADS )
-# include <boost/smart_ptr/detail/sp_counted_base_nt.hpp>
-
-#elif defined( BOOST_SP_USE_SPINLOCK )
-# include <boost/smart_ptr/detail/sp_counted_base_spin.hpp>
-
-#elif defined( BOOST_SP_USE_PTHREADS )
-# include <boost/smart_ptr/detail/sp_counted_base_pt.hpp>
-
-#elif defined( BOOST_DISABLE_THREADS ) && !defined( BOOST_SP_ENABLE_THREADS ) && !defined( BOOST_DISABLE_WIN32 )
-# include <boost/smart_ptr/detail/sp_counted_base_nt.hpp>
-
-#elif defined( __SNC__ )
-# include <boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp>
-
-#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) && !defined(__PATHSCALE__)
-# include <boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp>
-
-#elif defined(__HP_aCC) && defined(__ia64)
-# include <boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp>
-
-#elif defined( __GNUC__ ) && defined( __ia64__ ) && !defined( __INTEL_COMPILER ) && !defined(__PATHSCALE__)
-# include <boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp>
-
-#elif defined( __IBMCPP__ ) && defined( __powerpc )
-# include <boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp>
-
-#elif defined( __MWERKS__ ) && defined( __POWERPC__ )
-# include <boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp>
-
-#elif defined( __GNUC__ ) && ( defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc ) ) && !defined(__PATHSCALE__) && !defined( _AIX )
-# include <boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp>
-
-#elif defined( __GNUC__ ) && ( defined( __mips__ ) || defined( _mips ) ) && !defined(__PATHSCALE__)
-# include <boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp>
-
-#elif defined( BOOST_SP_HAS_SYNC )
-# include <boost/smart_ptr/detail/sp_counted_base_sync.hpp>
-
-#elif defined(__GNUC__) && ( defined( __sparcv9 ) || ( defined( __sparcv8 ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 ) ) )
-# include <boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp>
-
-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined(__CYGWIN__)
-# include <boost/smart_ptr/detail/sp_counted_base_w32.hpp>
-
-#elif defined( _AIX )
-# include <boost/smart_ptr/detail/sp_counted_base_aix.hpp>
-
-#elif !defined( BOOST_HAS_THREADS )
-# include <boost/smart_ptr/detail/sp_counted_base_nt.hpp>
-
-#else
-# include <boost/smart_ptr/detail/sp_counted_base_spin.hpp>
-
-#endif
-
-#endif  // #ifndef BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_HPP_INCLUDED
diff --git a/ndn-cpp/common.hpp b/ndn-cpp/common.hpp
index b0f3fbf..18c8069 100644
--- a/ndn-cpp/common.hpp
+++ b/ndn-cpp/common.hpp
@@ -20,11 +20,10 @@
 namespace ndn { namespace ptr_lib = boost; }
 #else
 // Use the boost header files in this distribution that were extracted with:
-// bcp --namespace=ndnboost shared_ptr make_shared ~/bcp_temp
-// Since HAVE_BOOST_SHARED_PTR failed, assume that there is no boost subdirectory on the INCLUDE path, so that
-//   <boost> is the boost subdirectory in this distribution.
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+// cd <INCLUDE DIRECTORY WITH boost SUBDIRECTORY>; bcp --namespace=ndnboost shared_ptr make_shared <NDN-CPP ROOT>
+// Also needed to rename all '<boost/' to '<ndnboost/', and all '"boost/' to '"ndnboost/', and the boost subdirectory to ndnboost.
+#include <ndnboost/shared_ptr.hpp>
+#include <ndnboost/make_shared.hpp>
 namespace ndn { namespace ptr_lib = ndnboost; }
 #endif
 
diff --git a/boost/assert.hpp b/ndnboost/assert.hpp
similarity index 96%
rename from boost/assert.hpp
rename to ndnboost/assert.hpp
index dc70e91..73f3df2 100644
--- a/boost/assert.hpp
+++ b/ndnboost/assert.hpp
@@ -34,7 +34,7 @@
 
 #elif defined(BOOST_ENABLE_ASSERT_HANDLER)
 
-#include <boost/current_function.hpp>
+#include <ndnboost/current_function.hpp>
 
 namespace ndnboost
 {
@@ -63,7 +63,7 @@
 
 #elif defined(BOOST_ENABLE_ASSERT_HANDLER)
 
-  #include <boost/current_function.hpp>
+  #include <ndnboost/current_function.hpp>
 
   namespace ndnboost
   {
@@ -80,7 +80,7 @@
     #define BOOST_ASSERT_HPP
     #include <cstdlib>
     #include <iostream>
-    #include <boost/current_function.hpp>
+    #include <ndnboost/current_function.hpp>
 
     //  IDE's like Visual Studio perform better if output goes to std::cout or
     //  some other stream, so allow user to configure output stream:
diff --git a/boost/checked_delete.hpp b/ndnboost/checked_delete.hpp
similarity index 100%
rename from boost/checked_delete.hpp
rename to ndnboost/checked_delete.hpp
diff --git a/boost/config.hpp b/ndnboost/config.hpp
similarity index 87%
rename from boost/config.hpp
rename to ndnboost/config.hpp
index f37585e..eeaf79f 100644
--- a/boost/config.hpp
+++ b/ndnboost/config.hpp
@@ -19,7 +19,7 @@
 
 // if we don't have a user config, then use the default location:
 #if !defined(BOOST_USER_CONFIG) && !defined(BOOST_NO_USER_CONFIG)
-#  define BOOST_USER_CONFIG <boost/config/user.hpp>
+#  define BOOST_USER_CONFIG <ndnboost/config/user.hpp>
 #endif
 // include it first:
 #ifdef BOOST_USER_CONFIG
@@ -28,7 +28,7 @@
 
 // if we don't have a compiler config set, try and find one:
 #if !defined(BOOST_COMPILER_CONFIG) && !defined(BOOST_NO_COMPILER_CONFIG) && !defined(BOOST_NO_CONFIG)
-#  include <boost/config/select_compiler_config.hpp>
+#  include <ndnboost/config/select_compiler_config.hpp>
 #endif
 // if we have a compiler config, include it now:
 #ifdef BOOST_COMPILER_CONFIG
@@ -37,7 +37,7 @@
 
 // if we don't have a std library config set, try and find one:
 #if !defined(BOOST_STDLIB_CONFIG) && !defined(BOOST_NO_STDLIB_CONFIG) && !defined(BOOST_NO_CONFIG) && defined(__cplusplus)
-#  include <boost/config/select_stdlib_config.hpp>
+#  include <ndnboost/config/select_stdlib_config.hpp>
 #endif
 // if we have a std library config, include it now:
 #ifdef BOOST_STDLIB_CONFIG
@@ -46,7 +46,7 @@
 
 // if we don't have a platform config set, try and find one:
 #if !defined(BOOST_PLATFORM_CONFIG) && !defined(BOOST_NO_PLATFORM_CONFIG) && !defined(BOOST_NO_CONFIG)
-#  include <boost/config/select_platform_config.hpp>
+#  include <ndnboost/config/select_platform_config.hpp>
 #endif
 // if we have a platform config, include it now:
 #ifdef BOOST_PLATFORM_CONFIG
@@ -54,7 +54,7 @@
 #endif
 
 // get config suffix code:
-#include <boost/config/suffix.hpp>
+#include <ndnboost/config/suffix.hpp>
 
 #endif  // BOOST_CONFIG_HPP
 
diff --git a/boost/config/abi/borland_prefix.hpp b/ndnboost/config/abi/borland_prefix.hpp
similarity index 100%
rename from boost/config/abi/borland_prefix.hpp
rename to ndnboost/config/abi/borland_prefix.hpp
diff --git a/boost/config/abi/borland_suffix.hpp b/ndnboost/config/abi/borland_suffix.hpp
similarity index 100%
rename from boost/config/abi/borland_suffix.hpp
rename to ndnboost/config/abi/borland_suffix.hpp
diff --git a/boost/config/abi/msvc_prefix.hpp b/ndnboost/config/abi/msvc_prefix.hpp
similarity index 100%
rename from boost/config/abi/msvc_prefix.hpp
rename to ndnboost/config/abi/msvc_prefix.hpp
diff --git a/boost/config/abi/msvc_suffix.hpp b/ndnboost/config/abi/msvc_suffix.hpp
similarity index 100%
rename from boost/config/abi/msvc_suffix.hpp
rename to ndnboost/config/abi/msvc_suffix.hpp
diff --git a/boost/config/abi_prefix.hpp b/ndnboost/config/abi_prefix.hpp
similarity index 95%
rename from boost/config/abi_prefix.hpp
rename to ndnboost/config/abi_prefix.hpp
index 3b13474..277cd60 100644
--- a/boost/config/abi_prefix.hpp
+++ b/ndnboost/config/abi_prefix.hpp
@@ -12,7 +12,7 @@
 # error double inclusion of header boost/config/abi_prefix.hpp is an error
 #endif
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 // this must occur after all other includes and before any code appears:
 #ifdef BOOST_HAS_ABI_HEADERS
diff --git a/boost/config/abi_suffix.hpp b/ndnboost/config/abi_suffix.hpp
similarity index 95%
rename from boost/config/abi_suffix.hpp
rename to ndnboost/config/abi_suffix.hpp
index 9391616..c1287cb 100644
--- a/boost/config/abi_suffix.hpp
+++ b/ndnboost/config/abi_suffix.hpp
@@ -7,7 +7,7 @@
 // http://www.boost.org/LICENSE_1_0.txt).
 
 // This header should be #included AFTER code that was preceded by a #include
-// <boost/config/abi_prefix.hpp>.
+// <ndnboost/config/abi_prefix.hpp>.
 
 #ifndef BOOST_CONFIG_ABI_PREFIX_HPP
 # error Header boost/config/abi_suffix.hpp must only be used after boost/config/abi_prefix.hpp
diff --git a/boost/config/auto_link.hpp b/ndnboost/config/auto_link.hpp
similarity index 98%
rename from boost/config/auto_link.hpp
rename to ndnboost/config/auto_link.hpp
index e36d06a..002bfb9 100644
--- a/boost/config/auto_link.hpp
+++ b/ndnboost/config/auto_link.hpp
@@ -6,7 +6,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         auto_link.hpp
-  *   VERSION      see <boost/version.hpp>
+  *   VERSION      see <ndnboost/version.hpp>
   *   DESCRIPTION: Automatic library inclusion for Borland/Microsoft compilers.
   */
 
@@ -76,7 +76,7 @@
 
 #ifdef __cplusplus
 #  ifndef BOOST_CONFIG_HPP
-#     include <boost/config.hpp>
+#     include <ndnboost/config.hpp>
 #  endif
 #elif defined(_MSC_VER) && !defined(__MWERKS__) && !defined(__EDG_VERSION__)
 //
@@ -95,7 +95,7 @@
     || (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200))
 
 #ifndef BOOST_VERSION_HPP
-#  include <boost/version.hpp>
+#  include <ndnboost/version.hpp>
 #endif
 
 #ifndef BOOST_LIB_NAME
diff --git a/boost/config/compiler/borland.hpp b/ndnboost/config/compiler/borland.hpp
similarity index 98%
rename from boost/config/compiler/borland.hpp
rename to ndnboost/config/compiler/borland.hpp
index cffa8ea..bcb6156 100644
--- a/boost/config/compiler/borland.hpp
+++ b/ndnboost/config/compiler/borland.hpp
@@ -250,10 +250,10 @@
 //
 #if __BORLANDC__ != 0x600 // not implemented for version 6 compiler yet
 #ifndef BOOST_ABI_PREFIX
-#  define BOOST_ABI_PREFIX "boost/config/abi/borland_prefix.hpp"
+#  define BOOST_ABI_PREFIX "ndnboost/config/abi/borland_prefix.hpp"
 #endif
 #ifndef BOOST_ABI_SUFFIX
-#  define BOOST_ABI_SUFFIX "boost/config/abi/borland_suffix.hpp"
+#  define BOOST_ABI_SUFFIX "ndnboost/config/abi/borland_suffix.hpp"
 #endif
 #endif
 //
diff --git a/boost/config/compiler/clang.hpp b/ndnboost/config/compiler/clang.hpp
similarity index 100%
rename from boost/config/compiler/clang.hpp
rename to ndnboost/config/compiler/clang.hpp
diff --git a/boost/config/compiler/codegear.hpp b/ndnboost/config/compiler/codegear.hpp
similarity index 97%
rename from boost/config/compiler/codegear.hpp
rename to ndnboost/config/compiler/codegear.hpp
index 1a6df33..90790de 100644
--- a/boost/config/compiler/codegear.hpp
+++ b/ndnboost/config/compiler/codegear.hpp
@@ -157,10 +157,10 @@
 // ABI fixing headers:
 //
 #ifndef BOOST_ABI_PREFIX
-#  define BOOST_ABI_PREFIX "boost/config/abi/borland_prefix.hpp"
+#  define BOOST_ABI_PREFIX "ndnboost/config/abi/borland_prefix.hpp"
 #endif
 #ifndef BOOST_ABI_SUFFIX
-#  define BOOST_ABI_SUFFIX "boost/config/abi/borland_suffix.hpp"
+#  define BOOST_ABI_SUFFIX "ndnboost/config/abi/borland_suffix.hpp"
 #endif
 //
 // Disable Win32 support in ANSI mode:
diff --git a/boost/config/compiler/comeau.hpp b/ndnboost/config/compiler/comeau.hpp
similarity index 96%
rename from boost/config/compiler/comeau.hpp
rename to ndnboost/config/compiler/comeau.hpp
index 278222d..09f608c 100644
--- a/boost/config/compiler/comeau.hpp
+++ b/ndnboost/config/compiler/comeau.hpp
@@ -12,7 +12,7 @@
 
 //  Comeau C++ compiler setup:
 
-#include "boost/config/compiler/common_edg.hpp"
+#include "ndnboost/config/compiler/common_edg.hpp"
 
 #if (__COMO_VERSION__ <= 4245)
 
diff --git a/boost/config/compiler/common_edg.hpp b/ndnboost/config/compiler/common_edg.hpp
similarity index 100%
rename from boost/config/compiler/common_edg.hpp
rename to ndnboost/config/compiler/common_edg.hpp
diff --git a/boost/config/compiler/compaq_cxx.hpp b/ndnboost/config/compiler/compaq_cxx.hpp
similarity index 89%
rename from boost/config/compiler/compaq_cxx.hpp
rename to ndnboost/config/compiler/compaq_cxx.hpp
index b44486c..e0d5fe6 100644
--- a/boost/config/compiler/compaq_cxx.hpp
+++ b/ndnboost/config/compiler/compaq_cxx.hpp
@@ -9,7 +9,7 @@
 
 #define BOOST_COMPILER "HP Tru64 C++ " BOOST_STRINGIZE(__DECCXX_VER)
 
-#include "boost/config/compiler/common_edg.hpp"
+#include "ndnboost/config/compiler/common_edg.hpp"
 
 //
 // versions check:
diff --git a/boost/config/compiler/cray.hpp b/ndnboost/config/compiler/cray.hpp
similarity index 97%
rename from boost/config/compiler/cray.hpp
rename to ndnboost/config/compiler/cray.hpp
index 5463ea0..cabb98a 100644
--- a/boost/config/compiler/cray.hpp
+++ b/ndnboost/config/compiler/cray.hpp
@@ -20,7 +20,7 @@
 #  error "Unsupported Cray compiler, please try running the configure script."
 #endif
 
-#include "boost/config/compiler/common_edg.hpp"
+#include "ndnboost/config/compiler/common_edg.hpp"
 
 //
 // Cray peculiarities, probably version 7 specific:
diff --git a/boost/config/compiler/digitalmars.hpp b/ndnboost/config/compiler/digitalmars.hpp
similarity index 100%
rename from boost/config/compiler/digitalmars.hpp
rename to ndnboost/config/compiler/digitalmars.hpp
diff --git a/boost/config/compiler/gcc.hpp b/ndnboost/config/compiler/gcc.hpp
similarity index 100%
rename from boost/config/compiler/gcc.hpp
rename to ndnboost/config/compiler/gcc.hpp
diff --git a/boost/config/compiler/gcc_xml.hpp b/ndnboost/config/compiler/gcc_xml.hpp
similarity index 100%
rename from boost/config/compiler/gcc_xml.hpp
rename to ndnboost/config/compiler/gcc_xml.hpp
diff --git a/boost/config/compiler/greenhills.hpp b/ndnboost/config/compiler/greenhills.hpp
similarity index 93%
rename from boost/config/compiler/greenhills.hpp
rename to ndnboost/config/compiler/greenhills.hpp
index 038b6b2..8d2da94 100644
--- a/boost/config/compiler/greenhills.hpp
+++ b/ndnboost/config/compiler/greenhills.hpp
@@ -9,7 +9,7 @@
 
 #define BOOST_COMPILER "Greenhills C++ version " BOOST_STRINGIZE(__ghs)
 
-#include "boost/config/compiler/common_edg.hpp"
+#include "ndnboost/config/compiler/common_edg.hpp"
 
 //
 // versions check:
diff --git a/boost/config/compiler/hp_acc.hpp b/ndnboost/config/compiler/hp_acc.hpp
similarity index 98%
rename from boost/config/compiler/hp_acc.hpp
rename to ndnboost/config/compiler/hp_acc.hpp
index 4f5f81b..bad1a45 100644
--- a/boost/config/compiler/hp_acc.hpp
+++ b/ndnboost/config/compiler/hp_acc.hpp
@@ -13,7 +13,7 @@
 //  HP aCC C++ compiler setup:
 
 #if defined(__EDG__)
-#include "boost/config/compiler/common_edg.hpp"
+#include "ndnboost/config/compiler/common_edg.hpp"
 #endif
 
 #if (__HP_aCC <= 33100)
diff --git a/boost/config/compiler/intel.hpp b/ndnboost/config/compiler/intel.hpp
similarity index 99%
rename from boost/config/compiler/intel.hpp
rename to ndnboost/config/compiler/intel.hpp
index 8c746c1..e79e3cf 100644
--- a/boost/config/compiler/intel.hpp
+++ b/ndnboost/config/compiler/intel.hpp
@@ -14,7 +14,7 @@
 
 //  Intel compiler setup:
 
-#include "boost/config/compiler/common_edg.hpp"
+#include "ndnboost/config/compiler/common_edg.hpp"
 
 #if defined(__INTEL_COMPILER)
 #  define BOOST_INTEL_CXX_VERSION __INTEL_COMPILER
diff --git a/boost/config/compiler/kai.hpp b/ndnboost/config/compiler/kai.hpp
similarity index 94%
rename from boost/config/compiler/kai.hpp
rename to ndnboost/config/compiler/kai.hpp
index 2337e6a..c839638 100644
--- a/boost/config/compiler/kai.hpp
+++ b/ndnboost/config/compiler/kai.hpp
@@ -9,7 +9,7 @@
 
 //  Kai C++ compiler setup:
 
-#include "boost/config/compiler/common_edg.hpp"
+#include "ndnboost/config/compiler/common_edg.hpp"
 
 #   if (__KCC_VERSION <= 4001) || !defined(BOOST_STRICT_CONFIG)
       // at least on Sun, the contents of <cwchar> is not in namespace std
diff --git a/boost/config/compiler/metrowerks.hpp b/ndnboost/config/compiler/metrowerks.hpp
similarity index 100%
rename from boost/config/compiler/metrowerks.hpp
rename to ndnboost/config/compiler/metrowerks.hpp
diff --git a/boost/config/compiler/mpw.hpp b/ndnboost/config/compiler/mpw.hpp
similarity index 100%
rename from boost/config/compiler/mpw.hpp
rename to ndnboost/config/compiler/mpw.hpp
diff --git a/boost/config/compiler/nvcc.hpp b/ndnboost/config/compiler/nvcc.hpp
similarity index 88%
rename from boost/config/compiler/nvcc.hpp
rename to ndnboost/config/compiler/nvcc.hpp
index 03203fb..5b9bb39 100644
--- a/boost/config/compiler/nvcc.hpp
+++ b/ndnboost/config/compiler/nvcc.hpp
@@ -19,10 +19,10 @@
 // NVCC Basically behaves like some flavor of MSVC6 + some specific quirks
 #ifdef __GNUC__
 
-#include <boost/config/compiler/gcc.hpp>
+#include <ndnboost/config/compiler/gcc.hpp>
 
 #elif defined(_MSC_VER)
 
-#include <boost/config/compiler/visualc.hpp>
+#include <ndnboost/config/compiler/visualc.hpp>
 
 #endif
diff --git a/boost/config/compiler/pathscale.hpp b/ndnboost/config/compiler/pathscale.hpp
similarity index 100%
rename from boost/config/compiler/pathscale.hpp
rename to ndnboost/config/compiler/pathscale.hpp
diff --git a/boost/config/compiler/pgi.hpp b/ndnboost/config/compiler/pgi.hpp
similarity index 100%
rename from boost/config/compiler/pgi.hpp
rename to ndnboost/config/compiler/pgi.hpp
diff --git a/boost/config/compiler/sgi_mipspro.hpp b/ndnboost/config/compiler/sgi_mipspro.hpp
similarity index 93%
rename from boost/config/compiler/sgi_mipspro.hpp
rename to ndnboost/config/compiler/sgi_mipspro.hpp
index 9068831..048ea44 100644
--- a/boost/config/compiler/sgi_mipspro.hpp
+++ b/ndnboost/config/compiler/sgi_mipspro.hpp
@@ -9,7 +9,7 @@
 
 #define BOOST_COMPILER "SGI Irix compiler version " BOOST_STRINGIZE(_COMPILER_VERSION)
 
-#include "boost/config/compiler/common_edg.hpp"
+#include "ndnboost/config/compiler/common_edg.hpp"
 
 //
 // Threading support:
diff --git a/boost/config/compiler/sunpro_cc.hpp b/ndnboost/config/compiler/sunpro_cc.hpp
similarity index 100%
rename from boost/config/compiler/sunpro_cc.hpp
rename to ndnboost/config/compiler/sunpro_cc.hpp
diff --git a/boost/config/compiler/vacpp.hpp b/ndnboost/config/compiler/vacpp.hpp
similarity index 100%
rename from boost/config/compiler/vacpp.hpp
rename to ndnboost/config/compiler/vacpp.hpp
diff --git a/boost/config/compiler/visualc.hpp b/ndnboost/config/compiler/visualc.hpp
similarity index 98%
rename from boost/config/compiler/visualc.hpp
rename to ndnboost/config/compiler/visualc.hpp
index aa4584d..22c5708 100644
--- a/boost/config/compiler/visualc.hpp
+++ b/ndnboost/config/compiler/visualc.hpp
@@ -243,10 +243,10 @@
 // prefix and suffix headers:
 //
 #ifndef BOOST_ABI_PREFIX
-#  define BOOST_ABI_PREFIX "boost/config/abi/msvc_prefix.hpp"
+#  define BOOST_ABI_PREFIX "ndnboost/config/abi/msvc_prefix.hpp"
 #endif
 #ifndef BOOST_ABI_SUFFIX
-#  define BOOST_ABI_SUFFIX "boost/config/abi/msvc_suffix.hpp"
+#  define BOOST_ABI_SUFFIX "ndnboost/config/abi/msvc_suffix.hpp"
 #endif
 
 #ifndef BOOST_COMPILER
diff --git a/boost/config/no_tr1/cmath.hpp b/ndnboost/config/no_tr1/cmath.hpp
similarity index 100%
rename from boost/config/no_tr1/cmath.hpp
rename to ndnboost/config/no_tr1/cmath.hpp
diff --git a/boost/config/no_tr1/complex.hpp b/ndnboost/config/no_tr1/complex.hpp
similarity index 100%
rename from boost/config/no_tr1/complex.hpp
rename to ndnboost/config/no_tr1/complex.hpp
diff --git a/boost/config/no_tr1/functional.hpp b/ndnboost/config/no_tr1/functional.hpp
similarity index 100%
rename from boost/config/no_tr1/functional.hpp
rename to ndnboost/config/no_tr1/functional.hpp
diff --git a/boost/config/no_tr1/memory.hpp b/ndnboost/config/no_tr1/memory.hpp
similarity index 100%
rename from boost/config/no_tr1/memory.hpp
rename to ndnboost/config/no_tr1/memory.hpp
diff --git a/boost/config/no_tr1/utility.hpp b/ndnboost/config/no_tr1/utility.hpp
similarity index 100%
rename from boost/config/no_tr1/utility.hpp
rename to ndnboost/config/no_tr1/utility.hpp
diff --git a/boost/config/platform/aix.hpp b/ndnboost/config/platform/aix.hpp
similarity index 86%
rename from boost/config/platform/aix.hpp
rename to ndnboost/config/platform/aix.hpp
index 894ef42..43521cf 100644
--- a/boost/config/platform/aix.hpp
+++ b/ndnboost/config/platform/aix.hpp
@@ -14,7 +14,7 @@
 #define BOOST_HAS_NANOSLEEP
 #define BOOST_HAS_CLOCK_GETTIME
 
-// This needs support in "boost/cstdint.hpp" exactly like FreeBSD.
+// This needs support in "ndnboost/cstdint.hpp" exactly like FreeBSD.
 // This platform has header named <inttypes.h> which includes all
 // the things needed.
 #define BOOST_HAS_STDINT_H
@@ -26,7 +26,7 @@
 //#define BOOST_HAS_PTHREAD_YIELD
 
 // boilerplate code:
-#include <boost/config/posix_features.hpp>
+#include <ndnboost/config/posix_features.hpp>
 
 
 
diff --git a/boost/config/platform/amigaos.hpp b/ndnboost/config/platform/amigaos.hpp
similarity index 100%
rename from boost/config/platform/amigaos.hpp
rename to ndnboost/config/platform/amigaos.hpp
diff --git a/boost/config/platform/beos.hpp b/ndnboost/config/platform/beos.hpp
similarity index 92%
rename from boost/config/platform/beos.hpp
rename to ndnboost/config/platform/beos.hpp
index 48c3d8d..5a5fcdc 100644
--- a/boost/config/platform/beos.hpp
+++ b/ndnboost/config/platform/beos.hpp
@@ -20,7 +20,7 @@
 #endif
 
 // boilerplate code:
-#include <boost/config/posix_features.hpp>
+#include <ndnboost/config/posix_features.hpp>
  
 
 
diff --git a/boost/config/platform/bsd.hpp b/ndnboost/config/platform/bsd.hpp
similarity index 97%
rename from boost/config/platform/bsd.hpp
rename to ndnboost/config/platform/bsd.hpp
index a014297..0510d28 100644
--- a/boost/config/platform/bsd.hpp
+++ b/ndnboost/config/platform/bsd.hpp
@@ -77,7 +77,7 @@
 
 // boilerplate code:
 #define BOOST_HAS_UNISTD_H
-#include <boost/config/posix_features.hpp>
+#include <ndnboost/config/posix_features.hpp>
 
 
 
diff --git a/boost/config/platform/cray.hpp b/ndnboost/config/platform/cray.hpp
similarity index 89%
rename from boost/config/platform/cray.hpp
rename to ndnboost/config/platform/cray.hpp
index 5c476e4..b25003d 100644
--- a/boost/config/platform/cray.hpp
+++ b/ndnboost/config/platform/cray.hpp
@@ -12,7 +12,7 @@
 
 // boilerplate code:
 #define BOOST_HAS_UNISTD_H
-#include <boost/config/posix_features.hpp>
+#include <ndnboost/config/posix_features.hpp>
 
 
 
diff --git a/boost/config/platform/cygwin.hpp b/ndnboost/config/platform/cygwin.hpp
similarity index 96%
rename from boost/config/platform/cygwin.hpp
rename to ndnboost/config/platform/cygwin.hpp
index b7ef572..96eda3b 100644
--- a/boost/config/platform/cygwin.hpp
+++ b/ndnboost/config/platform/cygwin.hpp
@@ -43,7 +43,7 @@
 #define BOOST_NO_FENV_H
 
 // boilerplate code:
-#include <boost/config/posix_features.hpp>
+#include <ndnboost/config/posix_features.hpp>
 
 //
 // Cygwin lies about XSI conformance, there is no nl_types.h:
diff --git a/boost/config/platform/hpux.hpp b/ndnboost/config/platform/hpux.hpp
similarity index 97%
rename from boost/config/platform/hpux.hpp
rename to ndnboost/config/platform/hpux.hpp
index 19ce68e..3c717c3 100644
--- a/boost/config/platform/hpux.hpp
+++ b/ndnboost/config/platform/hpux.hpp
@@ -43,7 +43,7 @@
 
 // boilerplate code:
 #define BOOST_HAS_UNISTD_H
-#include <boost/config/posix_features.hpp>
+#include <ndnboost/config/posix_features.hpp>
 
 // the following are always available:
 #ifndef BOOST_HAS_GETTIMEOFDAY
diff --git a/boost/config/platform/irix.hpp b/ndnboost/config/platform/irix.hpp
similarity index 93%
rename from boost/config/platform/irix.hpp
rename to ndnboost/config/platform/irix.hpp
index aeae49c..8064127 100644
--- a/boost/config/platform/irix.hpp
+++ b/ndnboost/config/platform/irix.hpp
@@ -25,7 +25,7 @@
 
 // boilerplate code:
 #define BOOST_HAS_UNISTD_H
-#include <boost/config/posix_features.hpp>
+#include <ndnboost/config/posix_features.hpp>
 
 
 
diff --git a/boost/config/platform/linux.hpp b/ndnboost/config/platform/linux.hpp
similarity index 97%
rename from boost/config/platform/linux.hpp
rename to ndnboost/config/platform/linux.hpp
index a02aff7..b5769ad 100644
--- a/boost/config/platform/linux.hpp
+++ b/ndnboost/config/platform/linux.hpp
@@ -71,7 +71,7 @@
 
 // boilerplate code:
 #define BOOST_HAS_UNISTD_H
-#include <boost/config/posix_features.hpp>
+#include <ndnboost/config/posix_features.hpp>
 #define BOOST_HAS_PTHREAD_YIELD
 
 #ifndef __GNUC__
diff --git a/boost/config/platform/macos.hpp b/ndnboost/config/platform/macos.hpp
similarity index 97%
rename from boost/config/platform/macos.hpp
rename to ndnboost/config/platform/macos.hpp
index 6d876b1..f755410 100644
--- a/boost/config/platform/macos.hpp
+++ b/ndnboost/config/platform/macos.hpp
@@ -25,7 +25,7 @@
 // to replace the platform-native BSD one. G++ users
 // should also always be able to do this on MaxOS X.
 //
-#  include <boost/config/posix_features.hpp>
+#  include <ndnboost/config/posix_features.hpp>
 #  ifndef BOOST_HAS_STDINT_H
 #     define BOOST_HAS_STDINT_H
 #  endif
diff --git a/boost/config/platform/qnxnto.hpp b/ndnboost/config/platform/qnxnto.hpp
similarity index 93%
rename from boost/config/platform/qnxnto.hpp
rename to ndnboost/config/platform/qnxnto.hpp
index b1377c8..c8b59be 100644
--- a/boost/config/platform/qnxnto.hpp
+++ b/ndnboost/config/platform/qnxnto.hpp
@@ -10,7 +10,7 @@
 #define BOOST_PLATFORM "QNX"
 
 #define BOOST_HAS_UNISTD_H
-#include <boost/config/posix_features.hpp>
+#include <ndnboost/config/posix_features.hpp>
 
 // QNX claims XOpen version 5 compatibility, but doesn't have an nl_types.h
 // or log1p and expm1:
diff --git a/boost/config/platform/solaris.hpp b/ndnboost/config/platform/solaris.hpp
similarity index 93%
rename from boost/config/platform/solaris.hpp
rename to ndnboost/config/platform/solaris.hpp
index 9f92566..2de1151 100644
--- a/boost/config/platform/solaris.hpp
+++ b/ndnboost/config/platform/solaris.hpp
@@ -14,7 +14,7 @@
 
 // boilerplate code:
 #define BOOST_HAS_UNISTD_H
-#include <boost/config/posix_features.hpp>
+#include <ndnboost/config/posix_features.hpp>
 
 //
 // pthreads don't actually work with gcc unless _PTHREADS is defined:
diff --git a/boost/config/platform/symbian.hpp b/ndnboost/config/platform/symbian.hpp
similarity index 97%
rename from boost/config/platform/symbian.hpp
rename to ndnboost/config/platform/symbian.hpp
index e02a778..3ccdb4b 100644
--- a/boost/config/platform/symbian.hpp
+++ b/ndnboost/config/platform/symbian.hpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #endif// boilerplate code:
 #  define BOOST_HAS_UNISTD_H
-#  include <boost/config/posix_features.hpp>
+#  include <ndnboost/config/posix_features.hpp>
 // S60 SDK defines _POSIX_VERSION as POSIX.1
 #  ifndef BOOST_HAS_STDINT_H
 #    define BOOST_HAS_STDINT_H
diff --git a/boost/config/platform/vms.hpp b/ndnboost/config/platform/vms.hpp
similarity index 100%
rename from boost/config/platform/vms.hpp
rename to ndnboost/config/platform/vms.hpp
diff --git a/boost/config/platform/vxworks.hpp b/ndnboost/config/platform/vxworks.hpp
similarity index 94%
rename from boost/config/platform/vxworks.hpp
rename to ndnboost/config/platform/vxworks.hpp
index 6ec5171..92aeade 100644
--- a/boost/config/platform/vxworks.hpp
+++ b/ndnboost/config/platform/vxworks.hpp
@@ -27,5 +27,5 @@
 #define BOOST_ASIO_DISABLE_SERIAL_PORT
 
 // boilerplate code:
-#include <boost/config/posix_features.hpp>
+#include <ndnboost/config/posix_features.hpp>
  
diff --git a/boost/config/platform/win32.hpp b/ndnboost/config/platform/win32.hpp
similarity index 100%
rename from boost/config/platform/win32.hpp
rename to ndnboost/config/platform/win32.hpp
diff --git a/boost/config/posix_features.hpp b/ndnboost/config/posix_features.hpp
similarity index 100%
rename from boost/config/posix_features.hpp
rename to ndnboost/config/posix_features.hpp
diff --git a/boost/config/requires_threads.hpp b/ndnboost/config/requires_threads.hpp
similarity index 98%
rename from boost/config/requires_threads.hpp
rename to ndnboost/config/requires_threads.hpp
index cfaff23..be04a8e 100644
--- a/boost/config/requires_threads.hpp
+++ b/ndnboost/config/requires_threads.hpp
@@ -8,7 +8,7 @@
 #define BOOST_CONFIG_REQUIRES_THREADS_HPP
 
 #ifndef BOOST_CONFIG_HPP
-#  include <boost/config.hpp>
+#  include <ndnboost/config.hpp>
 #endif
 
 #if defined(BOOST_DISABLE_THREADS)
diff --git a/ndnboost/config/select_compiler_config.hpp b/ndnboost/config/select_compiler_config.hpp
new file mode 100644
index 0000000..ea47d40
--- /dev/null
+++ b/ndnboost/config/select_compiler_config.hpp
@@ -0,0 +1,112 @@
+//  Boost compiler configuration selection header file
+
+//  (C) Copyright John Maddock 2001 - 2003. 
+//  (C) Copyright Martin Wille 2003.
+//  (C) Copyright Guillaume Melquiond 2003.
+//
+//  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)
+
+//  See http://www.boost.org/ for most recent version.
+
+// locate which compiler we are using and define
+// BOOST_COMPILER_CONFIG as needed: 
+
+#if defined(__GCCXML__)
+// GCC-XML emulates other compilers, it has to appear first here!
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/gcc_xml.hpp"
+
+#elif defined(_CRAYC)
+// EDG based Cray compiler:
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/cray.hpp"
+
+#elif defined __CUDACC__
+//  NVIDIA CUDA C++ compiler for GPU
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/nvcc.hpp"
+
+#elif defined __COMO__
+//  Comeau C++
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/comeau.hpp"
+
+#elif defined(__PATHSCALE__) && (__PATHCC__ >= 4)
+// PathScale EKOPath compiler (has to come before clang and gcc)
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/pathscale.hpp"
+
+#elif defined __clang__
+//  Clang C++ emulates GCC, so it has to appear early.
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/clang.hpp"
+
+#elif defined __DMC__
+//  Digital Mars C++
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/digitalmars.hpp"
+
+#elif defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)
+//  Intel
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/intel.hpp"
+
+# elif defined __GNUC__
+//  GNU C++:
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/gcc.hpp"
+
+#elif defined __KCC
+//  Kai C++
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/kai.hpp"
+
+#elif defined __sgi
+//  SGI MIPSpro C++
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/sgi_mipspro.hpp"
+
+#elif defined __DECCXX
+//  Compaq Tru64 Unix cxx
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/compaq_cxx.hpp"
+
+#elif defined __ghs
+//  Greenhills C++
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/greenhills.hpp"
+
+#elif defined __CODEGEARC__
+//  CodeGear - must be checked for before Borland
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/codegear.hpp"
+
+#elif defined __BORLANDC__
+//  Borland
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/borland.hpp"
+
+#elif defined  __MWERKS__
+//  Metrowerks CodeWarrior
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/metrowerks.hpp"
+
+#elif defined  __SUNPRO_CC
+//  Sun Workshop Compiler C++
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/sunpro_cc.hpp"
+
+#elif defined __HP_aCC
+//  HP aCC
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/hp_acc.hpp"
+
+#elif defined(__MRC__) || defined(__SC__)
+//  MPW MrCpp or SCpp
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/mpw.hpp"
+
+#elif defined(__IBMCPP__)
+//  IBM Visual Age
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/vacpp.hpp"
+
+#elif defined(__PGI)
+//  Portland Group Inc.
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/pgi.hpp"
+
+#elif defined _MSC_VER
+//  Microsoft Visual C++
+//
+//  Must remain the last #elif since some other vendors (Metrowerks, for
+//  example) also #define _MSC_VER
+#   define BOOST_COMPILER_CONFIG "ndnboost/config/compiler/visualc.hpp"
+
+#elif defined (BOOST_ASSERT_CONFIG)
+// this must come last - generate an error if we don't
+// recognise the compiler:
+#  error "Unknown compiler - please configure (http://www.boost.org/libs/config/config.htm#configuring) and report the results to the main boost mailing list (http://www.boost.org/more/mailing_lists.htm#main)"
+
+#endif
diff --git a/boost/config/select_platform_config.hpp b/ndnboost/config/select_platform_config.hpp
similarity index 65%
rename from boost/config/select_platform_config.hpp
rename to ndnboost/config/select_platform_config.hpp
index 2af61d2..59d56f3 100644
--- a/boost/config/select_platform_config.hpp
+++ b/ndnboost/config/select_platform_config.hpp
@@ -15,67 +15,67 @@
 
 #if (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) && !defined(_CRAYC)
 // linux, also other platforms (Hurd etc) that use GLIBC, should these really have their own config headers though?
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/linux.hpp"
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/linux.hpp"
 
 #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 // BSD:
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/bsd.hpp"
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/bsd.hpp"
 
 #elif defined(sun) || defined(__sun)
 // solaris:
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/solaris.hpp"
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/solaris.hpp"
 
 #elif defined(__sgi)
 // SGI Irix:
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/irix.hpp"
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/irix.hpp"
 
 #elif defined(__hpux)
 // hp unix:
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/hpux.hpp"
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/hpux.hpp"
 
 #elif defined(__CYGWIN__)
 // cygwin is not win32:
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/cygwin.hpp"
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/cygwin.hpp"
 
 #elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
 // win32:
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/win32.hpp"
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/win32.hpp"
 
 #elif defined(__BEOS__)
 // BeOS
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/beos.hpp"
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/beos.hpp"
 
 #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
 // MacOS
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/macos.hpp"
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/macos.hpp"
 
 #elif defined(__IBMCPP__) || defined(_AIX)
 // IBM
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/aix.hpp"
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/aix.hpp"
 
 #elif defined(__amigaos__)
 // AmigaOS
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/amigaos.hpp"
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/amigaos.hpp"
 
 #elif defined(__QNXNTO__)
 // QNX:
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/qnxnto.hpp"
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/qnxnto.hpp"
 
 #elif defined(__VXWORKS__)
 // vxWorks:
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/vxworks.hpp"
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/vxworks.hpp"
 
 #elif defined(__SYMBIAN32__) 
 // Symbian: 
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/symbian.hpp" 
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/symbian.hpp" 
 
 #elif defined(_CRAYC)
 // Cray:
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/cray.hpp" 
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/cray.hpp" 
 
 #elif defined(__VMS) 
 // VMS:
-#  define BOOST_PLATFORM_CONFIG "boost/config/platform/vms.hpp" 
+#  define BOOST_PLATFORM_CONFIG "ndnboost/config/platform/vms.hpp" 
 #else
 
 #  if defined(unix) \
@@ -89,7 +89,7 @@
 #     define BOOST_HAS_UNISTD_H
 #  endif
 
-#  include <boost/config/posix_features.hpp>
+#  include <ndnboost/config/posix_features.hpp>
 
 #  endif
 
diff --git a/boost/config/select_stdlib_config.hpp b/ndnboost/config/select_stdlib_config.hpp
similarity index 76%
rename from boost/config/select_stdlib_config.hpp
rename to ndnboost/config/select_stdlib_config.hpp
index 96ede00..f0167a3 100644
--- a/boost/config/select_stdlib_config.hpp
+++ b/ndnboost/config/select_stdlib_config.hpp
@@ -24,7 +24,7 @@
 // STLPort library; this _must_ come first, otherwise since
 // STLport typically sits on top of some other library, we
 // can end up detecting that first rather than STLport:
-#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/stlport.hpp"
+#  define BOOST_STDLIB_CONFIG "ndnboost/config/stdlib/stlport.hpp"
 
 #else
 
@@ -34,43 +34,43 @@
 // we get those definitions)
 // (again do not rely on this header being included since users can short-circuit this 
 //  header if they know whose std lib they are using.)
-#include <boost/config/no_tr1/utility.hpp>
+#include <ndnboost/config/no_tr1/utility.hpp>
 
 #if defined(__LIBCOMO__)
 // Comeau STL:
-#define BOOST_STDLIB_CONFIG "boost/config/stdlib/libcomo.hpp"
+#define BOOST_STDLIB_CONFIG "ndnboost/config/stdlib/libcomo.hpp"
 
 #elif defined(__STD_RWCOMPILER_H__) || defined(_RWSTD_VER)
 // Rogue Wave library:
-#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/roguewave.hpp"
+#  define BOOST_STDLIB_CONFIG "ndnboost/config/stdlib/roguewave.hpp"
 
 #elif defined(_LIBCPP_VERSION)
 // libc++
-#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/libcpp.hpp"
+#  define BOOST_STDLIB_CONFIG "ndnboost/config/stdlib/libcpp.hpp"
 
 #elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
 // GNU libstdc++ 3
-#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/libstdcpp3.hpp"
+#  define BOOST_STDLIB_CONFIG "ndnboost/config/stdlib/libstdcpp3.hpp"
 
 #elif defined(__STL_CONFIG_H)
 // generic SGI STL
-#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/sgi.hpp"
+#  define BOOST_STDLIB_CONFIG "ndnboost/config/stdlib/sgi.hpp"
 
 #elif defined(__MSL_CPP__)
 // MSL standard lib:
-#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/msl.hpp"
+#  define BOOST_STDLIB_CONFIG "ndnboost/config/stdlib/msl.hpp"
 
 #elif defined(__IBMCPP__)
 // take the default VACPP std lib
-#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/vacpp.hpp"
+#  define BOOST_STDLIB_CONFIG "ndnboost/config/stdlib/vacpp.hpp"
 
 #elif defined(MSIPL_COMPILE_H)
 // Modena C++ standard library
-#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/modena.hpp"
+#  define BOOST_STDLIB_CONFIG "ndnboost/config/stdlib/modena.hpp"
 
 #elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
 // Dinkumware Library (this has to appear after any possible replacement libraries):
-#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/dinkumware.hpp"
+#  define BOOST_STDLIB_CONFIG "ndnboost/config/stdlib/dinkumware.hpp"
 
 #elif defined (BOOST_ASSERT_CONFIG)
 // this must come last - generate an error if we don't
diff --git a/boost/config/stdlib/dinkumware.hpp b/ndnboost/config/stdlib/dinkumware.hpp
similarity index 98%
rename from boost/config/stdlib/dinkumware.hpp
rename to ndnboost/config/stdlib/dinkumware.hpp
index 3058851..8ee6bcf 100644
--- a/boost/config/stdlib/dinkumware.hpp
+++ b/ndnboost/config/stdlib/dinkumware.hpp
@@ -12,7 +12,7 @@
 //  Dinkumware standard library config:
 
 #if !defined(_YVALS) && !defined(_CPPLIB_VER)
-#include <boost/config/no_tr1/utility.hpp>
+#include <ndnboost/config/no_tr1/utility.hpp>
 #if !defined(_YVALS) && !defined(_CPPLIB_VER)
 #error This is not the Dinkumware lib!
 #endif
diff --git a/boost/config/stdlib/libcomo.hpp b/ndnboost/config/stdlib/libcomo.hpp
similarity index 97%
rename from boost/config/stdlib/libcomo.hpp
rename to ndnboost/config/stdlib/libcomo.hpp
index 29490f1..c3fe9f0 100644
--- a/boost/config/stdlib/libcomo.hpp
+++ b/ndnboost/config/stdlib/libcomo.hpp
@@ -10,7 +10,7 @@
 //  Comeau STL:
 
 #if !defined(__LIBCOMO__)
-#  include <boost/config/no_tr1/utility.hpp>
+#  include <ndnboost/config/no_tr1/utility.hpp>
 #  if !defined(__LIBCOMO__)
 #      error "This is not the Comeau STL!"
 #  endif
diff --git a/boost/config/stdlib/libcpp.hpp b/ndnboost/config/stdlib/libcpp.hpp
similarity index 100%
rename from boost/config/stdlib/libcpp.hpp
rename to ndnboost/config/stdlib/libcpp.hpp
diff --git a/boost/config/stdlib/libstdcpp3.hpp b/ndnboost/config/stdlib/libstdcpp3.hpp
similarity index 100%
rename from boost/config/stdlib/libstdcpp3.hpp
rename to ndnboost/config/stdlib/libstdcpp3.hpp
diff --git a/boost/config/stdlib/modena.hpp b/ndnboost/config/stdlib/modena.hpp
similarity index 96%
rename from boost/config/stdlib/modena.hpp
rename to ndnboost/config/stdlib/modena.hpp
index b483b6e..ec29e89 100644
--- a/boost/config/stdlib/modena.hpp
+++ b/ndnboost/config/stdlib/modena.hpp
@@ -8,7 +8,7 @@
 //  Modena C++ standard library (comes with KAI C++)
 
 #if !defined(MSIPL_COMPILE_H)
-#  include <boost/config/no_tr1/utility.hpp>
+#  include <ndnboost/config/no_tr1/utility.hpp>
 #  if !defined(__MSIPL_COMPILE_H)
 #      error "This is not the Modena C++ library!"
 #  endif
diff --git a/boost/config/stdlib/msl.hpp b/ndnboost/config/stdlib/msl.hpp
similarity index 95%
rename from boost/config/stdlib/msl.hpp
rename to ndnboost/config/stdlib/msl.hpp
index 4f9a2da..444d620 100644
--- a/boost/config/stdlib/msl.hpp
+++ b/ndnboost/config/stdlib/msl.hpp
@@ -9,7 +9,7 @@
 //  Metrowerks standard library:
 
 #ifndef __MSL_CPP__
-#  include <boost/config/no_tr1/utility.hpp>
+#  include <ndnboost/config/no_tr1/utility.hpp>
 #  ifndef __MSL_CPP__
 #     error This is not the MSL standard library!
 #  endif
@@ -34,7 +34,7 @@
 #    define BOOST_HAS_UNISTD_H
 #  endif
    // boilerplate code:
-#  include <boost/config/posix_features.hpp>
+#  include <ndnboost/config/posix_features.hpp>
 #endif
 
 #if defined(_MWMT) || _MSL_THREADSAFE
diff --git a/boost/config/stdlib/roguewave.hpp b/ndnboost/config/stdlib/roguewave.hpp
similarity index 98%
rename from boost/config/stdlib/roguewave.hpp
rename to ndnboost/config/stdlib/roguewave.hpp
index cb80f57..0571076 100644
--- a/boost/config/stdlib/roguewave.hpp
+++ b/ndnboost/config/stdlib/roguewave.hpp
@@ -13,7 +13,7 @@
 #define BOOST_RW_STDLIB 1 
 
 #if !defined(__STD_RWCOMPILER_H__) && !defined(_RWSTD_VER)
-#  include <boost/config/no_tr1/utility.hpp>
+#  include <ndnboost/config/no_tr1/utility.hpp>
 #  if !defined(__STD_RWCOMPILER_H__) && !defined(_RWSTD_VER)
 #     error This is not the Rogue Wave standard library
 #  endif
diff --git a/boost/config/stdlib/sgi.hpp b/ndnboost/config/stdlib/sgi.hpp
similarity index 97%
rename from boost/config/stdlib/sgi.hpp
rename to ndnboost/config/stdlib/sgi.hpp
index ae9b6ad..8ac5d03 100644
--- a/boost/config/stdlib/sgi.hpp
+++ b/ndnboost/config/stdlib/sgi.hpp
@@ -10,7 +10,7 @@
 //  generic SGI STL:
 
 #if !defined(__STL_CONFIG_H)
-#  include <boost/config/no_tr1/utility.hpp>
+#  include <ndnboost/config/no_tr1/utility.hpp>
 #  if !defined(__STL_CONFIG_H)
 #      error "This is not the SGI STL!"
 #  endif
@@ -95,7 +95,7 @@
 #  include <string>
 #  if defined(__BASTRING__)
 #     define BOOST_NO_LIMITS
-// Note: <boost/limits.hpp> will provide compile-time constants
+// Note: <ndnboost/limits.hpp> will provide compile-time constants
 #     undef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
 #     define BOOST_NO_STD_WSTRING
 #  endif
diff --git a/boost/config/stdlib/stlport.hpp b/ndnboost/config/stdlib/stlport.hpp
similarity index 100%
rename from boost/config/stdlib/stlport.hpp
rename to ndnboost/config/stdlib/stlport.hpp
diff --git a/boost/config/stdlib/vacpp.hpp b/ndnboost/config/stdlib/vacpp.hpp
similarity index 100%
rename from boost/config/stdlib/vacpp.hpp
rename to ndnboost/config/stdlib/vacpp.hpp
diff --git a/boost/config/suffix.hpp b/ndnboost/config/suffix.hpp
similarity index 99%
rename from boost/config/suffix.hpp
rename to ndnboost/config/suffix.hpp
index da0eba1..fc1eeeb 100644
--- a/boost/config/suffix.hpp
+++ b/ndnboost/config/suffix.hpp
@@ -546,8 +546,8 @@
 
 #if defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) && defined(__cplusplus)
 
-#  include "boost/type.hpp"
-#  include "boost/non_type.hpp"
+#  include "ndnboost/type.hpp"
+#  include "ndnboost/non_type.hpp"
 
 #  define BOOST_EXPLICIT_TEMPLATE_TYPE(t)              ndnboost::type<t>* = 0
 #  define BOOST_EXPLICIT_TEMPLATE_TYPE_SPEC(t)         ndnboost::type<t>*
diff --git a/boost/config/user.hpp b/ndnboost/config/user.hpp
similarity index 100%
rename from boost/config/user.hpp
rename to ndnboost/config/user.hpp
diff --git a/boost/config/warning_disable.hpp b/ndnboost/config/warning_disable.hpp
similarity index 100%
rename from boost/config/warning_disable.hpp
rename to ndnboost/config/warning_disable.hpp
diff --git a/boost/current_function.hpp b/ndnboost/current_function.hpp
similarity index 100%
rename from boost/current_function.hpp
rename to ndnboost/current_function.hpp
diff --git a/boost/detail/interlocked.hpp b/ndnboost/detail/interlocked.hpp
similarity index 99%
rename from boost/detail/interlocked.hpp
rename to ndnboost/detail/interlocked.hpp
index 52fef8f..4ad8271 100644
--- a/boost/detail/interlocked.hpp
+++ b/ndnboost/detail/interlocked.hpp
@@ -17,7 +17,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 #if defined( BOOST_USE_WINDOWS_H )
 
diff --git a/boost/detail/sp_typeinfo.hpp b/ndnboost/detail/sp_typeinfo.hpp
similarity index 96%
rename from boost/detail/sp_typeinfo.hpp
rename to ndnboost/detail/sp_typeinfo.hpp
index fcae26e..2239709 100644
--- a/boost/detail/sp_typeinfo.hpp
+++ b/ndnboost/detail/sp_typeinfo.hpp
@@ -15,11 +15,11 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 #if defined( BOOST_NO_TYPEID )
 
-#include <boost/current_function.hpp>
+#include <ndnboost/current_function.hpp>
 #include <functional>
 
 namespace ndnboost
diff --git a/boost/detail/workaround.hpp b/ndnboost/detail/workaround.hpp
similarity index 99%
rename from boost/detail/workaround.hpp
rename to ndnboost/detail/workaround.hpp
index 40b3423..6568e47 100644
--- a/boost/detail/workaround.hpp
+++ b/ndnboost/detail/workaround.hpp
@@ -38,7 +38,7 @@
 
 # ifndef BOOST_STRICT_CONFIG
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 #ifndef __BORLANDC__
 #define __BORLANDC___WORKAROUND_GUARD 1
diff --git a/boost/exception/detail/attribute_noreturn.hpp b/ndnboost/exception/detail/attribute_noreturn.hpp
similarity index 100%
rename from boost/exception/detail/attribute_noreturn.hpp
rename to ndnboost/exception/detail/attribute_noreturn.hpp
diff --git a/boost/exception/exception.hpp b/ndnboost/exception/exception.hpp
similarity index 100%
rename from boost/exception/exception.hpp
rename to ndnboost/exception/exception.hpp
diff --git a/boost/make_shared.hpp b/ndnboost/make_shared.hpp
similarity index 90%
rename from boost/make_shared.hpp
rename to ndnboost/make_shared.hpp
index c04938f..8a2b188 100644
--- a/boost/make_shared.hpp
+++ b/ndnboost/make_shared.hpp
@@ -12,6 +12,6 @@
 //  See http://www.boost.org/libs/smart_ptr/make_shared.html
 //  for documentation.
 
-#include <boost/smart_ptr/make_shared.hpp>
+#include <ndnboost/smart_ptr/make_shared.hpp>
 
 #endif // #ifndef BOOST_MAKE_SHARED_HPP_INCLUDED
diff --git a/boost/memory_order.hpp b/ndnboost/memory_order.hpp
similarity index 100%
rename from boost/memory_order.hpp
rename to ndnboost/memory_order.hpp
diff --git a/boost/mpl/aux_/adl_barrier.hpp b/ndnboost/mpl/aux_/adl_barrier.hpp
similarity index 91%
rename from boost/mpl/aux_/adl_barrier.hpp
rename to ndnboost/mpl/aux_/adl_barrier.hpp
index 23d2092..cb25ebc 100644
--- a/boost/mpl/aux_/adl_barrier.hpp
+++ b/ndnboost/mpl/aux_/adl_barrier.hpp
@@ -14,9 +14,9 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/adl.hpp>
-#include <boost/mpl/aux_/config/gcc.hpp>
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/aux_/config/adl.hpp>
+#include <ndnboost/mpl/aux_/config/gcc.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
 #if !defined(BOOST_MPL_CFG_NO_ADL_BARRIER_NAMESPACE)
 
diff --git a/boost/mpl/aux_/arity.hpp b/ndnboost/mpl/aux_/arity.hpp
similarity index 87%
rename from boost/mpl/aux_/arity.hpp
rename to ndnboost/mpl/aux_/arity.hpp
index 32104ed..68c708e 100644
--- a/boost/mpl/aux_/arity.hpp
+++ b/ndnboost/mpl/aux_/arity.hpp
@@ -14,12 +14,12 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/dtp.hpp>
+#include <ndnboost/mpl/aux_/config/dtp.hpp>
 
 #if defined(BOOST_MPL_CFG_BROKEN_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES)
 
-#   include <boost/mpl/aux_/nttp_decl.hpp>
-#   include <boost/mpl/aux_/config/static_constant.hpp>
+#   include <ndnboost/mpl/aux_/nttp_decl.hpp>
+#   include <ndnboost/mpl/aux_/config/static_constant.hpp>
 
 namespace ndnboost { namespace mpl { namespace aux {
 
diff --git a/boost/mpl/aux_/config/adl.hpp b/ndnboost/mpl/aux_/config/adl.hpp
similarity index 87%
rename from boost/mpl/aux_/config/adl.hpp
rename to ndnboost/mpl/aux_/config/adl.hpp
index d6ead71..5257305 100644
--- a/boost/mpl/aux_/config/adl.hpp
+++ b/ndnboost/mpl/aux_/config/adl.hpp
@@ -14,10 +14,10 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/msvc.hpp>
-#include <boost/mpl/aux_/config/intel.hpp>
-#include <boost/mpl/aux_/config/gcc.hpp>
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/aux_/config/msvc.hpp>
+#include <ndnboost/mpl/aux_/config/intel.hpp>
+#include <ndnboost/mpl/aux_/config/gcc.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
 // agurt, 25/apr/04: technically, the ADL workaround is only needed for GCC,
 // but putting everything expect public, user-specializable metafunctions into
diff --git a/boost/mpl/aux_/config/arrays.hpp b/ndnboost/mpl/aux_/config/arrays.hpp
similarity index 89%
rename from boost/mpl/aux_/config/arrays.hpp
rename to ndnboost/mpl/aux_/config/arrays.hpp
index d801cf7..673631d 100644
--- a/boost/mpl/aux_/config/arrays.hpp
+++ b/ndnboost/mpl/aux_/config/arrays.hpp
@@ -14,8 +14,8 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/msvc.hpp>
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/aux_/config/msvc.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
 #if    !defined(BOOST_MPL_CFG_NO_DEPENDENT_ARRAY_TYPES) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
diff --git a/boost/mpl/aux_/config/ctps.hpp b/ndnboost/mpl/aux_/config/ctps.hpp
similarity index 82%
rename from boost/mpl/aux_/config/ctps.hpp
rename to ndnboost/mpl/aux_/config/ctps.hpp
index 9a4aaf7..908a311 100644
--- a/boost/mpl/aux_/config/ctps.hpp
+++ b/ndnboost/mpl/aux_/config/ctps.hpp
@@ -14,8 +14,8 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/workaround.hpp>
-#include <boost/config.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/config.hpp>
 
 #if    !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
@@ -25,6 +25,6 @@
 
 #endif
 
-// BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION is defined in <boost/config.hpp>
+// BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION is defined in <ndnboost/config.hpp>
 
 #endif // BOOST_MPL_AUX_CONFIG_CTPS_HPP_INCLUDED
diff --git a/boost/mpl/aux_/config/dtp.hpp b/ndnboost/mpl/aux_/config/dtp.hpp
similarity index 96%
rename from boost/mpl/aux_/config/dtp.hpp
rename to ndnboost/mpl/aux_/config/dtp.hpp
index e53929b..4796289 100644
--- a/boost/mpl/aux_/config/dtp.hpp
+++ b/ndnboost/mpl/aux_/config/dtp.hpp
@@ -14,7 +14,7 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
 // MWCW 7.x-8.0 "losts" default template parameters of nested class 
 // templates when their owner classes are passed as arguments to other 
diff --git a/boost/mpl/aux_/config/eti.hpp b/ndnboost/mpl/aux_/config/eti.hpp
similarity index 92%
rename from boost/mpl/aux_/config/eti.hpp
rename to ndnboost/mpl/aux_/config/eti.hpp
index c3fd1c6..9f2f29c 100644
--- a/boost/mpl/aux_/config/eti.hpp
+++ b/ndnboost/mpl/aux_/config/eti.hpp
@@ -14,8 +14,8 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/msvc.hpp>
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/aux_/config/msvc.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
 // flags for MSVC 6.5's so-called "early template instantiation bug"
 #if    !defined(BOOST_MPL_CFG_MSVC_60_ETI_BUG) \
diff --git a/boost/mpl/aux_/config/gcc.hpp b/ndnboost/mpl/aux_/config/gcc.hpp
similarity index 100%
rename from boost/mpl/aux_/config/gcc.hpp
rename to ndnboost/mpl/aux_/config/gcc.hpp
diff --git a/boost/mpl/aux_/config/integral.hpp b/ndnboost/mpl/aux_/config/integral.hpp
similarity index 91%
rename from boost/mpl/aux_/config/integral.hpp
rename to ndnboost/mpl/aux_/config/integral.hpp
index 6a89160..a8cbd7d 100644
--- a/boost/mpl/aux_/config/integral.hpp
+++ b/ndnboost/mpl/aux_/config/integral.hpp
@@ -14,8 +14,8 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/msvc.hpp>
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/aux_/config/msvc.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
 #if    !defined(BOOST_MPL_CFG_BCC_INTEGRAL_CONSTANTS) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
diff --git a/boost/mpl/aux_/config/intel.hpp b/ndnboost/mpl/aux_/config/intel.hpp
similarity index 94%
rename from boost/mpl/aux_/config/intel.hpp
rename to ndnboost/mpl/aux_/config/intel.hpp
index 141a952..e14dc9e 100644
--- a/boost/mpl/aux_/config/intel.hpp
+++ b/ndnboost/mpl/aux_/config/intel.hpp
@@ -16,6 +16,6 @@
 
 
 // BOOST_INTEL_CXX_VERSION is defined here:
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 #endif // BOOST_MPL_AUX_CONFIG_INTEL_HPP_INCLUDED
diff --git a/boost/mpl/aux_/config/lambda.hpp b/ndnboost/mpl/aux_/config/lambda.hpp
similarity index 91%
rename from boost/mpl/aux_/config/lambda.hpp
rename to ndnboost/mpl/aux_/config/lambda.hpp
index 7be16bf..808385a 100644
--- a/boost/mpl/aux_/config/lambda.hpp
+++ b/ndnboost/mpl/aux_/config/lambda.hpp
@@ -14,8 +14,8 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/ttp.hpp>
-#include <boost/mpl/aux_/config/ctps.hpp>
+#include <ndnboost/mpl/aux_/config/ttp.hpp>
+#include <ndnboost/mpl/aux_/config/ctps.hpp>
 
 // agurt, 15/jan/02: full-fledged implementation requires both 
 // template template parameters _and_ partial specialization
diff --git a/boost/mpl/aux_/config/msvc.hpp b/ndnboost/mpl/aux_/config/msvc.hpp
similarity index 94%
rename from boost/mpl/aux_/config/msvc.hpp
rename to ndnboost/mpl/aux_/config/msvc.hpp
index fe89cda..32a69ec 100644
--- a/boost/mpl/aux_/config/msvc.hpp
+++ b/ndnboost/mpl/aux_/config/msvc.hpp
@@ -16,6 +16,6 @@
 
 
 // BOOST_MSVC is defined here:
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 #endif // BOOST_MPL_AUX_CONFIG_MSVC_HPP_INCLUDED
diff --git a/boost/mpl/aux_/config/nttp.hpp b/ndnboost/mpl/aux_/config/nttp.hpp
similarity index 91%
rename from boost/mpl/aux_/config/nttp.hpp
rename to ndnboost/mpl/aux_/config/nttp.hpp
index 7be8f13..6c17d43 100644
--- a/boost/mpl/aux_/config/nttp.hpp
+++ b/ndnboost/mpl/aux_/config/nttp.hpp
@@ -14,8 +14,8 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/msvc.hpp>
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/aux_/config/msvc.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
 // MSVC 6.5 ICE-s on the code as simple as this (see "aux_/nttp_decl.hpp"
 // for a workaround):
diff --git a/boost/mpl/aux_/config/overload_resolution.hpp b/ndnboost/mpl/aux_/config/overload_resolution.hpp
similarity index 94%
rename from boost/mpl/aux_/config/overload_resolution.hpp
rename to ndnboost/mpl/aux_/config/overload_resolution.hpp
index 9de579f..a3a7932 100644
--- a/boost/mpl/aux_/config/overload_resolution.hpp
+++ b/ndnboost/mpl/aux_/config/overload_resolution.hpp
@@ -14,7 +14,7 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
 #if    !defined(BOOST_MPL_CFG_BROKEN_OVERLOAD_RESOLUTION) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
diff --git a/boost/mpl/aux_/config/preprocessor.hpp b/ndnboost/mpl/aux_/config/preprocessor.hpp
similarity index 95%
rename from boost/mpl/aux_/config/preprocessor.hpp
rename to ndnboost/mpl/aux_/config/preprocessor.hpp
index 39190c4..342088e 100644
--- a/boost/mpl/aux_/config/preprocessor.hpp
+++ b/ndnboost/mpl/aux_/config/preprocessor.hpp
@@ -14,7 +14,7 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
 #if !defined(BOOST_MPL_CFG_BROKEN_PP_MACRO_EXPANSION) \
     && (   BOOST_WORKAROUND(__MWERKS__, <= 0x3003) \
diff --git a/boost/mpl/aux_/config/static_constant.hpp b/ndnboost/mpl/aux_/config/static_constant.hpp
similarity index 95%
rename from boost/mpl/aux_/config/static_constant.hpp
rename to ndnboost/mpl/aux_/config/static_constant.hpp
index 02cf9c4..749397e 100644
--- a/boost/mpl/aux_/config/static_constant.hpp
+++ b/ndnboost/mpl/aux_/config/static_constant.hpp
@@ -16,7 +16,7 @@
 
 #if !defined(BOOST_MPL_PREPROCESSING_MODE)
 // BOOST_STATIC_CONSTANT is defined here:
-#   include <boost/config.hpp>
+#   include <ndnboost/config.hpp>
 #else
 // undef the macro for the preprocessing mode
 #   undef BOOST_STATIC_CONSTANT
diff --git a/boost/mpl/aux_/config/ttp.hpp b/ndnboost/mpl/aux_/config/ttp.hpp
similarity index 88%
rename from boost/mpl/aux_/config/ttp.hpp
rename to ndnboost/mpl/aux_/config/ttp.hpp
index 879ec1d..485c82f 100644
--- a/boost/mpl/aux_/config/ttp.hpp
+++ b/ndnboost/mpl/aux_/config/ttp.hpp
@@ -14,9 +14,9 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/msvc.hpp>
-#include <boost/mpl/aux_/config/gcc.hpp>
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/aux_/config/msvc.hpp>
+#include <ndnboost/mpl/aux_/config/gcc.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
 #if !defined(BOOST_MPL_CFG_NO_TEMPLATE_TEMPLATE_PARAMETERS) \
     && ( defined(BOOST_NO_TEMPLATE_TEMPLATES) \
diff --git a/boost/mpl/aux_/config/workaround.hpp b/ndnboost/mpl/aux_/config/workaround.hpp
similarity index 92%
rename from boost/mpl/aux_/config/workaround.hpp
rename to ndnboost/mpl/aux_/config/workaround.hpp
index 8ec172f..3e2da98 100644
--- a/boost/mpl/aux_/config/workaround.hpp
+++ b/ndnboost/mpl/aux_/config/workaround.hpp
@@ -14,6 +14,6 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/detail/workaround.hpp>
+#include <ndnboost/detail/workaround.hpp>
 
 #endif // BOOST_MPL_AUX_CONFIG_WORKAROUND_HPP_INCLUDED
diff --git a/boost/mpl/aux_/integral_wrapper.hpp b/ndnboost/mpl/aux_/integral_wrapper.hpp
similarity index 92%
rename from boost/mpl/aux_/integral_wrapper.hpp
rename to ndnboost/mpl/aux_/integral_wrapper.hpp
index d36e7cb..3ff7d82 100644
--- a/boost/mpl/aux_/integral_wrapper.hpp
+++ b/ndnboost/mpl/aux_/integral_wrapper.hpp
@@ -13,13 +13,13 @@
 
 // NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION!
 
-#include <boost/mpl/integral_c_tag.hpp>
-#include <boost/mpl/aux_/static_cast.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
-#include <boost/mpl/aux_/config/static_constant.hpp>
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/integral_c_tag.hpp>
+#include <ndnboost/mpl/aux_/static_cast.hpp>
+#include <ndnboost/mpl/aux_/nttp_decl.hpp>
+#include <ndnboost/mpl/aux_/config/static_constant.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
-#include <boost/preprocessor/cat.hpp>
+#include <ndnboost/preprocessor/cat.hpp>
 
 #if !defined(AUX_WRAPPER_NAME)
 #   define AUX_WRAPPER_NAME BOOST_PP_CAT(AUX_WRAPPER_VALUE_TYPE,_)
diff --git a/boost/mpl/aux_/lambda_arity_param.hpp b/ndnboost/mpl/aux_/lambda_arity_param.hpp
similarity index 94%
rename from boost/mpl/aux_/lambda_arity_param.hpp
rename to ndnboost/mpl/aux_/lambda_arity_param.hpp
index 5418f2c..b4d0e44 100644
--- a/boost/mpl/aux_/lambda_arity_param.hpp
+++ b/ndnboost/mpl/aux_/lambda_arity_param.hpp
@@ -14,7 +14,7 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/ttp.hpp>
+#include <ndnboost/mpl/aux_/config/ttp.hpp>
 
 #if !defined(BOOST_MPL_CFG_EXTENDED_TEMPLATE_PARAMETERS_MATCHING)
 #   define BOOST_MPL_AUX_LAMBDA_ARITY_PARAM(param)    
diff --git a/boost/mpl/aux_/lambda_support.hpp b/ndnboost/mpl/aux_/lambda_support.hpp
similarity index 89%
rename from boost/mpl/aux_/lambda_support.hpp
rename to ndnboost/mpl/aux_/lambda_support.hpp
index e732873..955b155 100644
--- a/boost/mpl/aux_/lambda_support.hpp
+++ b/ndnboost/mpl/aux_/lambda_support.hpp
@@ -14,7 +14,7 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/lambda.hpp>
+#include <ndnboost/mpl/aux_/config/lambda.hpp>
 
 #if !defined(BOOST_MPL_CFG_NO_FULL_LAMBDA_SUPPORT)
 
@@ -23,18 +23,18 @@
 
 #else
 
-#   include <boost/mpl/int_fwd.hpp>
-#   include <boost/mpl/aux_/yes_no.hpp>
-#   include <boost/mpl/aux_/na_fwd.hpp>
-#   include <boost/mpl/aux_/preprocessor/params.hpp>
-#   include <boost/mpl/aux_/preprocessor/enum.hpp>
-#   include <boost/mpl/aux_/config/msvc.hpp>
-#   include <boost/mpl/aux_/config/workaround.hpp>
+#   include <ndnboost/mpl/int_fwd.hpp>
+#   include <ndnboost/mpl/aux_/yes_no.hpp>
+#   include <ndnboost/mpl/aux_/na_fwd.hpp>
+#   include <ndnboost/mpl/aux_/preprocessor/params.hpp>
+#   include <ndnboost/mpl/aux_/preprocessor/enum.hpp>
+#   include <ndnboost/mpl/aux_/config/msvc.hpp>
+#   include <ndnboost/mpl/aux_/config/workaround.hpp>
 
-#   include <boost/preprocessor/tuple/to_list.hpp>
-#   include <boost/preprocessor/list/for_each_i.hpp>
-#   include <boost/preprocessor/inc.hpp>
-#   include <boost/preprocessor/cat.hpp>
+#   include <ndnboost/preprocessor/tuple/to_list.hpp>
+#   include <ndnboost/preprocessor/list/for_each_i.hpp>
+#   include <ndnboost/preprocessor/inc.hpp>
+#   include <ndnboost/preprocessor/cat.hpp>
 
 #   define BOOST_MPL_AUX_LAMBDA_SUPPORT_ARG_TYPEDEF_FUNC(R,typedef_,i,param) \
     typedef_ param BOOST_PP_CAT(arg,BOOST_PP_INC(i)); \
diff --git a/boost/mpl/aux_/na.hpp b/ndnboost/mpl/aux_/na.hpp
similarity index 90%
rename from boost/mpl/aux_/na.hpp
rename to ndnboost/mpl/aux_/na.hpp
index d519a49..2ab6449 100644
--- a/boost/mpl/aux_/na.hpp
+++ b/ndnboost/mpl/aux_/na.hpp
@@ -14,10 +14,10 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/bool.hpp>
-#include <boost/mpl/aux_/na_fwd.hpp>
-#include <boost/mpl/aux_/config/msvc.hpp>
-#include <boost/mpl/aux_/config/ctps.hpp>
+#include <ndnboost/mpl/bool.hpp>
+#include <ndnboost/mpl/aux_/na_fwd.hpp>
+#include <ndnboost/mpl/aux_/config/msvc.hpp>
+#include <ndnboost/mpl/aux_/config/ctps.hpp>
 
 namespace ndnboost { namespace mpl {
 
diff --git a/boost/mpl/aux_/na_fwd.hpp b/ndnboost/mpl/aux_/na_fwd.hpp
similarity index 93%
rename from boost/mpl/aux_/na_fwd.hpp
rename to ndnboost/mpl/aux_/na_fwd.hpp
index 2409fc8..7ad343b 100644
--- a/boost/mpl/aux_/na_fwd.hpp
+++ b/ndnboost/mpl/aux_/na_fwd.hpp
@@ -14,7 +14,7 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/adl_barrier.hpp>
+#include <ndnboost/mpl/aux_/adl_barrier.hpp>
 
 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
 
diff --git a/boost/mpl/aux_/na_spec.hpp b/ndnboost/mpl/aux_/na_spec.hpp
similarity index 83%
rename from boost/mpl/aux_/na_spec.hpp
rename to ndnboost/mpl/aux_/na_spec.hpp
index 6cd7721..04e2328 100644
--- a/boost/mpl/aux_/na_spec.hpp
+++ b/ndnboost/mpl/aux_/na_spec.hpp
@@ -15,24 +15,24 @@
 // $Revision: 49267 $
 
 #if !defined(BOOST_MPL_PREPROCESSING_MODE)
-#   include <boost/mpl/lambda_fwd.hpp>
-#   include <boost/mpl/int.hpp>
-#   include <boost/mpl/bool.hpp>
-#   include <boost/mpl/aux_/na.hpp>
-#   include <boost/mpl/aux_/arity.hpp>
-#   include <boost/mpl/aux_/template_arity_fwd.hpp>
+#   include <ndnboost/mpl/lambda_fwd.hpp>
+#   include <ndnboost/mpl/int.hpp>
+#   include <ndnboost/mpl/bool.hpp>
+#   include <ndnboost/mpl/aux_/na.hpp>
+#   include <ndnboost/mpl/aux_/arity.hpp>
+#   include <ndnboost/mpl/aux_/template_arity_fwd.hpp>
 #endif
 
-#include <boost/mpl/aux_/preprocessor/params.hpp>
-#include <boost/mpl/aux_/preprocessor/enum.hpp>
-#include <boost/mpl/aux_/preprocessor/def_params_tail.hpp>
-#include <boost/mpl/aux_/lambda_arity_param.hpp>
-#include <boost/mpl/aux_/config/dtp.hpp>
-#include <boost/mpl/aux_/config/eti.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
-#include <boost/mpl/aux_/config/ttp.hpp>
-#include <boost/mpl/aux_/config/lambda.hpp>
-#include <boost/mpl/aux_/config/overload_resolution.hpp>
+#include <ndnboost/mpl/aux_/preprocessor/params.hpp>
+#include <ndnboost/mpl/aux_/preprocessor/enum.hpp>
+#include <ndnboost/mpl/aux_/preprocessor/def_params_tail.hpp>
+#include <ndnboost/mpl/aux_/lambda_arity_param.hpp>
+#include <ndnboost/mpl/aux_/config/dtp.hpp>
+#include <ndnboost/mpl/aux_/config/eti.hpp>
+#include <ndnboost/mpl/aux_/nttp_decl.hpp>
+#include <ndnboost/mpl/aux_/config/ttp.hpp>
+#include <ndnboost/mpl/aux_/config/lambda.hpp>
+#include <ndnboost/mpl/aux_/config/overload_resolution.hpp>
 
 
 #define BOOST_MPL_AUX_NA_PARAMS(i) \
diff --git a/boost/mpl/aux_/nttp_decl.hpp b/ndnboost/mpl/aux_/nttp_decl.hpp
similarity index 90%
rename from boost/mpl/aux_/nttp_decl.hpp
rename to ndnboost/mpl/aux_/nttp_decl.hpp
index 65e2929..ebfe6a1 100644
--- a/boost/mpl/aux_/nttp_decl.hpp
+++ b/ndnboost/mpl/aux_/nttp_decl.hpp
@@ -14,7 +14,7 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/nttp.hpp>
+#include <ndnboost/mpl/aux_/config/nttp.hpp>
 
 #if defined(BOOST_MPL_CFG_NTTP_BUG)
 
@@ -23,7 +23,7 @@
 typedef unsigned    _mpl_nttp_unsigned;
 typedef long        _mpl_nttp_long;
 
-#   include <boost/preprocessor/cat.hpp>
+#   include <ndnboost/preprocessor/cat.hpp>
 #   define BOOST_MPL_AUX_NTTP_DECL(T, x) BOOST_PP_CAT(_mpl_nttp_,T) x /**/
 
 #else
diff --git a/boost/mpl/aux_/preprocessor/def_params_tail.hpp b/ndnboost/mpl/aux_/preprocessor/def_params_tail.hpp
similarity index 84%
rename from boost/mpl/aux_/preprocessor/def_params_tail.hpp
rename to ndnboost/mpl/aux_/preprocessor/def_params_tail.hpp
index c51636e..dcb31f0 100644
--- a/boost/mpl/aux_/preprocessor/def_params_tail.hpp
+++ b/ndnboost/mpl/aux_/preprocessor/def_params_tail.hpp
@@ -14,14 +14,14 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/limits/arity.hpp>
-#include <boost/mpl/aux_/config/dtp.hpp>
-#include <boost/mpl/aux_/config/preprocessor.hpp>
+#include <ndnboost/mpl/limits/arity.hpp>
+#include <ndnboost/mpl/aux_/config/dtp.hpp>
+#include <ndnboost/mpl/aux_/config/preprocessor.hpp>
 
-#include <boost/preprocessor/comma_if.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/identity.hpp>
-#include <boost/preprocessor/empty.hpp>
+#include <ndnboost/preprocessor/comma_if.hpp>
+#include <ndnboost/preprocessor/logical/and.hpp>
+#include <ndnboost/preprocessor/identity.hpp>
+#include <ndnboost/preprocessor/empty.hpp>
 
 // BOOST_MPL_PP_DEF_PARAMS_TAIL(1,T,value): , T1 = value, .., Tn = value
 // BOOST_MPL_PP_DEF_PARAMS_TAIL(2,T,value): , T2 = value, .., Tn = value
@@ -29,8 +29,8 @@
 
 #if !defined(BOOST_MPL_CFG_NO_OWN_PP_PRIMITIVES)
 
-#   include <boost/mpl/aux_/preprocessor/filter_params.hpp>
-#   include <boost/mpl/aux_/preprocessor/sub.hpp>
+#   include <ndnboost/mpl/aux_/preprocessor/filter_params.hpp>
+#   include <ndnboost/mpl/aux_/preprocessor/sub.hpp>
 
 #   define BOOST_MPL_PP_DEF_PARAMS_TAIL_IMPL(i, param, value_func) \
     BOOST_MPL_PP_DEF_PARAMS_TAIL_DELAY_1( \
@@ -63,12 +63,12 @@
 
 #else
 
-#   include <boost/preprocessor/arithmetic/add.hpp>
-#   include <boost/preprocessor/arithmetic/sub.hpp>
-#   include <boost/preprocessor/inc.hpp>
-#   include <boost/preprocessor/tuple/elem.hpp>
-#   include <boost/preprocessor/repeat.hpp>
-#   include <boost/preprocessor/cat.hpp>
+#   include <ndnboost/preprocessor/arithmetic/add.hpp>
+#   include <ndnboost/preprocessor/arithmetic/sub.hpp>
+#   include <ndnboost/preprocessor/inc.hpp>
+#   include <ndnboost/preprocessor/tuple/elem.hpp>
+#   include <ndnboost/preprocessor/repeat.hpp>
+#   include <ndnboost/preprocessor/cat.hpp>
 
 #   define BOOST_MPL_PP_AUX_TAIL_PARAM_FUNC(unused, i, op) \
     , BOOST_PP_CAT( \
diff --git a/boost/mpl/aux_/preprocessor/enum.hpp b/ndnboost/mpl/aux_/preprocessor/enum.hpp
similarity index 88%
rename from boost/mpl/aux_/preprocessor/enum.hpp
rename to ndnboost/mpl/aux_/preprocessor/enum.hpp
index 11541a0..a1660b9 100644
--- a/boost/mpl/aux_/preprocessor/enum.hpp
+++ b/ndnboost/mpl/aux_/preprocessor/enum.hpp
@@ -14,7 +14,7 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/preprocessor.hpp>
+#include <ndnboost/mpl/aux_/config/preprocessor.hpp>
 
 // BOOST_MPL_PP_ENUM(0,int): <nothing>
 // BOOST_MPL_PP_ENUM(1,int): int
@@ -23,7 +23,7 @@
 
 #if !defined(BOOST_MPL_CFG_NO_OWN_PP_PRIMITIVES)
 
-#   include <boost/preprocessor/cat.hpp>
+#   include <ndnboost/preprocessor/cat.hpp>
 
 #   define BOOST_MPL_PP_ENUM(n, param) \
     BOOST_PP_CAT(BOOST_MPL_PP_ENUM_,n)(param) \
@@ -42,8 +42,8 @@
 
 #else
 
-#   include <boost/preprocessor/comma_if.hpp>
-#   include <boost/preprocessor/repeat.hpp>
+#   include <ndnboost/preprocessor/comma_if.hpp>
+#   include <ndnboost/preprocessor/repeat.hpp>
 
 #   define BOOST_MPL_PP_AUX_ENUM_FUNC(unused, i, param) \
     BOOST_PP_COMMA_IF(i) param \
diff --git a/boost/mpl/aux_/preprocessor/filter_params.hpp b/ndnboost/mpl/aux_/preprocessor/filter_params.hpp
similarity index 100%
rename from boost/mpl/aux_/preprocessor/filter_params.hpp
rename to ndnboost/mpl/aux_/preprocessor/filter_params.hpp
diff --git a/boost/mpl/aux_/preprocessor/params.hpp b/ndnboost/mpl/aux_/preprocessor/params.hpp
similarity index 86%
rename from boost/mpl/aux_/preprocessor/params.hpp
rename to ndnboost/mpl/aux_/preprocessor/params.hpp
index ac861ec..3ea43f1 100644
--- a/boost/mpl/aux_/preprocessor/params.hpp
+++ b/ndnboost/mpl/aux_/preprocessor/params.hpp
@@ -14,7 +14,7 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/preprocessor.hpp>
+#include <ndnboost/mpl/aux_/config/preprocessor.hpp>
 
 // BOOST_MPL_PP_PARAMS(0,T): <nothing>
 // BOOST_MPL_PP_PARAMS(1,T): T1
@@ -23,7 +23,7 @@
 
 #if !defined(BOOST_MPL_CFG_NO_OWN_PP_PRIMITIVES)
 
-#   include <boost/preprocessor/cat.hpp>
+#   include <ndnboost/preprocessor/cat.hpp>
 
 #   define BOOST_MPL_PP_PARAMS(n,p) \
     BOOST_PP_CAT(BOOST_MPL_PP_PARAMS_,n)(p) \
@@ -42,10 +42,10 @@
 
 #else
 
-#   include <boost/preprocessor/comma_if.hpp>
-#   include <boost/preprocessor/repeat.hpp>
-#   include <boost/preprocessor/inc.hpp>
-#   include <boost/preprocessor/cat.hpp>
+#   include <ndnboost/preprocessor/comma_if.hpp>
+#   include <ndnboost/preprocessor/repeat.hpp>
+#   include <ndnboost/preprocessor/inc.hpp>
+#   include <ndnboost/preprocessor/cat.hpp>
 
 #   define BOOST_MPL_PP_AUX_PARAM_FUNC(unused, i, param) \
     BOOST_PP_COMMA_IF(i) \
diff --git a/boost/mpl/aux_/preprocessor/sub.hpp b/ndnboost/mpl/aux_/preprocessor/sub.hpp
similarity index 89%
rename from boost/mpl/aux_/preprocessor/sub.hpp
rename to ndnboost/mpl/aux_/preprocessor/sub.hpp
index 7f5e291..f4ba5d0 100644
--- a/boost/mpl/aux_/preprocessor/sub.hpp
+++ b/ndnboost/mpl/aux_/preprocessor/sub.hpp
@@ -14,14 +14,14 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/preprocessor.hpp>
+#include <ndnboost/mpl/aux_/config/preprocessor.hpp>
 
 #if !defined(BOOST_MPL_CFG_NO_OWN_PP_PRIMITIVES)
 
-#   include <boost/mpl/aux_/preprocessor/tuple.hpp>
+#   include <ndnboost/mpl/aux_/preprocessor/tuple.hpp>
 
 #if defined(BOOST_MPL_CFG_BROKEN_PP_MACRO_EXPANSION)
-#   include <boost/preprocessor/cat.hpp>
+#   include <ndnboost/preprocessor/cat.hpp>
 
 #   define BOOST_MPL_PP_SUB(i,j) \
     BOOST_MPL_PP_SUB_DELAY(i,j) \
@@ -54,7 +54,7 @@
 
 #else
 
-#   include <boost/preprocessor/arithmetic/sub.hpp>
+#   include <ndnboost/preprocessor/arithmetic/sub.hpp>
 
 #   define BOOST_MPL_PP_SUB(i,j) \
     BOOST_PP_SUB(i,j) \
diff --git a/boost/mpl/aux_/preprocessor/tuple.hpp b/ndnboost/mpl/aux_/preprocessor/tuple.hpp
similarity index 100%
rename from boost/mpl/aux_/preprocessor/tuple.hpp
rename to ndnboost/mpl/aux_/preprocessor/tuple.hpp
diff --git a/boost/mpl/aux_/static_cast.hpp b/ndnboost/mpl/aux_/static_cast.hpp
similarity index 93%
rename from boost/mpl/aux_/static_cast.hpp
rename to ndnboost/mpl/aux_/static_cast.hpp
index 8c12128..aebd267 100644
--- a/boost/mpl/aux_/static_cast.hpp
+++ b/ndnboost/mpl/aux_/static_cast.hpp
@@ -14,7 +14,7 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \
  || BOOST_WORKAROUND(__GNUC__, < 3) \
diff --git a/boost/mpl/aux_/template_arity_fwd.hpp b/ndnboost/mpl/aux_/template_arity_fwd.hpp
similarity index 100%
rename from boost/mpl/aux_/template_arity_fwd.hpp
rename to ndnboost/mpl/aux_/template_arity_fwd.hpp
diff --git a/boost/mpl/aux_/value_wknd.hpp b/ndnboost/mpl/aux_/value_wknd.hpp
similarity index 89%
rename from boost/mpl/aux_/value_wknd.hpp
rename to ndnboost/mpl/aux_/value_wknd.hpp
index 51727be..a68fcca 100644
--- a/boost/mpl/aux_/value_wknd.hpp
+++ b/ndnboost/mpl/aux_/value_wknd.hpp
@@ -14,15 +14,15 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/static_cast.hpp>
-#include <boost/mpl/aux_/config/integral.hpp>
-#include <boost/mpl/aux_/config/eti.hpp>
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/aux_/static_cast.hpp>
+#include <ndnboost/mpl/aux_/config/integral.hpp>
+#include <ndnboost/mpl/aux_/config/eti.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
 #if defined(BOOST_MPL_CFG_BCC_INTEGRAL_CONSTANTS) \
     || defined(BOOST_MPL_CFG_MSVC_60_ETI_BUG)
 
-#   include <boost/mpl/int.hpp>
+#   include <ndnboost/mpl/int.hpp>
 
 namespace ndnboost { namespace mpl { namespace aux {
 template< typename C_ > struct value_wknd
diff --git a/boost/mpl/aux_/yes_no.hpp b/ndnboost/mpl/aux_/yes_no.hpp
similarity index 85%
rename from boost/mpl/aux_/yes_no.hpp
rename to ndnboost/mpl/aux_/yes_no.hpp
index 00d4345..f26d2df 100644
--- a/boost/mpl/aux_/yes_no.hpp
+++ b/ndnboost/mpl/aux_/yes_no.hpp
@@ -14,10 +14,10 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/nttp_decl.hpp>
-#include <boost/mpl/aux_/config/arrays.hpp>
-#include <boost/mpl/aux_/config/msvc.hpp>
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/aux_/nttp_decl.hpp>
+#include <ndnboost/mpl/aux_/config/arrays.hpp>
+#include <ndnboost/mpl/aux_/config/msvc.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
 
 namespace ndnboost { namespace mpl { namespace aux {
diff --git a/boost/mpl/bool.hpp b/ndnboost/mpl/bool.hpp
similarity index 86%
rename from boost/mpl/bool.hpp
rename to ndnboost/mpl/bool.hpp
index cabf22f..670bb32 100644
--- a/boost/mpl/bool.hpp
+++ b/ndnboost/mpl/bool.hpp
@@ -14,9 +14,9 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/bool_fwd.hpp>
-#include <boost/mpl/integral_c_tag.hpp>
-#include <boost/mpl/aux_/config/static_constant.hpp>
+#include <ndnboost/mpl/bool_fwd.hpp>
+#include <ndnboost/mpl/integral_c_tag.hpp>
+#include <ndnboost/mpl/aux_/config/static_constant.hpp>
 
 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
 
diff --git a/boost/mpl/bool_fwd.hpp b/ndnboost/mpl/bool_fwd.hpp
similarity index 94%
rename from boost/mpl/bool_fwd.hpp
rename to ndnboost/mpl/bool_fwd.hpp
index e71ab9c..f00b798 100644
--- a/boost/mpl/bool_fwd.hpp
+++ b/ndnboost/mpl/bool_fwd.hpp
@@ -14,7 +14,7 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/adl_barrier.hpp>
+#include <ndnboost/mpl/aux_/adl_barrier.hpp>
 
 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
 
diff --git a/boost/mpl/if.hpp b/ndnboost/mpl/if.hpp
similarity index 89%
rename from boost/mpl/if.hpp
rename to ndnboost/mpl/if.hpp
index c533e96..a19b4a9 100644
--- a/boost/mpl/if.hpp
+++ b/ndnboost/mpl/if.hpp
@@ -14,13 +14,13 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/value_wknd.hpp>
-#include <boost/mpl/aux_/static_cast.hpp>
-#include <boost/mpl/aux_/na_spec.hpp>
-#include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/mpl/aux_/config/integral.hpp>
-#include <boost/mpl/aux_/config/ctps.hpp>
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/aux_/value_wknd.hpp>
+#include <ndnboost/mpl/aux_/static_cast.hpp>
+#include <ndnboost/mpl/aux_/na_spec.hpp>
+#include <ndnboost/mpl/aux_/lambda_support.hpp>
+#include <ndnboost/mpl/aux_/config/integral.hpp>
+#include <ndnboost/mpl/aux_/config/ctps.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
 namespace ndnboost { namespace mpl {
 
diff --git a/boost/mpl/int.hpp b/ndnboost/mpl/int.hpp
similarity index 86%
rename from boost/mpl/int.hpp
rename to ndnboost/mpl/int.hpp
index 14db548..510ee6e 100644
--- a/boost/mpl/int.hpp
+++ b/ndnboost/mpl/int.hpp
@@ -14,9 +14,9 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/int_fwd.hpp>
+#include <ndnboost/mpl/int_fwd.hpp>
 
 #define AUX_WRAPPER_VALUE_TYPE int
-#include <boost/mpl/aux_/integral_wrapper.hpp>
+#include <ndnboost/mpl/aux_/integral_wrapper.hpp>
 
 #endif // BOOST_MPL_INT_HPP_INCLUDED
diff --git a/boost/mpl/int_fwd.hpp b/ndnboost/mpl/int_fwd.hpp
similarity index 88%
rename from boost/mpl/int_fwd.hpp
rename to ndnboost/mpl/int_fwd.hpp
index 87b043c..f7b42e2 100644
--- a/boost/mpl/int_fwd.hpp
+++ b/ndnboost/mpl/int_fwd.hpp
@@ -14,8 +14,8 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/adl_barrier.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
+#include <ndnboost/mpl/aux_/adl_barrier.hpp>
+#include <ndnboost/mpl/aux_/nttp_decl.hpp>
 
 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
 
diff --git a/boost/mpl/integral_c.hpp b/ndnboost/mpl/integral_c.hpp
similarity index 84%
rename from boost/mpl/integral_c.hpp
rename to ndnboost/mpl/integral_c.hpp
index e270dc5..166fedd 100644
--- a/boost/mpl/integral_c.hpp
+++ b/ndnboost/mpl/integral_c.hpp
@@ -14,10 +14,10 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/integral_c_fwd.hpp>
-#include <boost/mpl/aux_/config/ctps.hpp>
-#include <boost/mpl/aux_/config/static_constant.hpp>
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/integral_c_fwd.hpp>
+#include <ndnboost/mpl/aux_/config/ctps.hpp>
+#include <ndnboost/mpl/aux_/config/static_constant.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
 
 #if BOOST_WORKAROUND(__HP_aCC, <= 53800)
 // the type of non-type template arguments may not depend on template arguments
@@ -29,7 +29,7 @@
 #define AUX_WRAPPER_NAME integral_c
 #define AUX_WRAPPER_VALUE_TYPE T
 #define AUX_WRAPPER_INST(value) AUX_WRAPPER_NAME< T, value >
-#include <boost/mpl/aux_/integral_wrapper.hpp>
+#include <ndnboost/mpl/aux_/integral_wrapper.hpp>
 
 
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
diff --git a/boost/mpl/integral_c_fwd.hpp b/ndnboost/mpl/integral_c_fwd.hpp
similarity index 90%
rename from boost/mpl/integral_c_fwd.hpp
rename to ndnboost/mpl/integral_c_fwd.hpp
index 7fcbfd5..91d4b6b 100644
--- a/boost/mpl/integral_c_fwd.hpp
+++ b/ndnboost/mpl/integral_c_fwd.hpp
@@ -14,8 +14,8 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/config/workaround.hpp>
-#include <boost/mpl/aux_/adl_barrier.hpp>
+#include <ndnboost/mpl/aux_/config/workaround.hpp>
+#include <ndnboost/mpl/aux_/adl_barrier.hpp>
 
 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
 
diff --git a/boost/mpl/integral_c_tag.hpp b/ndnboost/mpl/integral_c_tag.hpp
similarity index 87%
rename from boost/mpl/integral_c_tag.hpp
rename to ndnboost/mpl/integral_c_tag.hpp
index 27da563..54c83ac 100644
--- a/boost/mpl/integral_c_tag.hpp
+++ b/ndnboost/mpl/integral_c_tag.hpp
@@ -15,8 +15,8 @@
 // $Revision: 49267 $
 
 
-#include <boost/mpl/aux_/adl_barrier.hpp>
-#include <boost/mpl/aux_/config/static_constant.hpp>
+#include <ndnboost/mpl/aux_/adl_barrier.hpp>
+#include <ndnboost/mpl/aux_/config/static_constant.hpp>
 
 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
 struct integral_c_tag { BOOST_STATIC_CONSTANT(int, value = 0); };
diff --git a/boost/mpl/lambda_fwd.hpp b/ndnboost/mpl/lambda_fwd.hpp
similarity index 77%
rename from boost/mpl/lambda_fwd.hpp
rename to ndnboost/mpl/lambda_fwd.hpp
index 74817c2..c7f3ec6 100644
--- a/boost/mpl/lambda_fwd.hpp
+++ b/ndnboost/mpl/lambda_fwd.hpp
@@ -14,15 +14,15 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/void_fwd.hpp>
-#include <boost/mpl/aux_/na.hpp>
-#include <boost/mpl/aux_/config/lambda.hpp>
+#include <ndnboost/mpl/void_fwd.hpp>
+#include <ndnboost/mpl/aux_/na.hpp>
+#include <ndnboost/mpl/aux_/config/lambda.hpp>
 
 #if !defined(BOOST_MPL_CFG_NO_FULL_LAMBDA_SUPPORT)
 
-#   include <boost/mpl/int.hpp>
-#   include <boost/mpl/aux_/lambda_arity_param.hpp>
-#   include <boost/mpl/aux_/template_arity_fwd.hpp>
+#   include <ndnboost/mpl/int.hpp>
+#   include <ndnboost/mpl/aux_/lambda_arity_param.hpp>
+#   include <ndnboost/mpl/aux_/template_arity_fwd.hpp>
 
 namespace ndnboost { namespace mpl {
 
@@ -39,7 +39,7 @@
 
 #else // BOOST_MPL_CFG_NO_FULL_LAMBDA_SUPPORT
 
-#   include <boost/mpl/bool.hpp>
+#   include <ndnboost/mpl/bool.hpp>
 
 namespace ndnboost { namespace mpl {
 
diff --git a/boost/mpl/limits/arity.hpp b/ndnboost/mpl/limits/arity.hpp
similarity index 100%
rename from boost/mpl/limits/arity.hpp
rename to ndnboost/mpl/limits/arity.hpp
diff --git a/boost/mpl/size_t.hpp b/ndnboost/mpl/size_t.hpp
similarity index 87%
rename from boost/mpl/size_t.hpp
rename to ndnboost/mpl/size_t.hpp
index 54a05c6..182f128 100644
--- a/boost/mpl/size_t.hpp
+++ b/ndnboost/mpl/size_t.hpp
@@ -14,12 +14,12 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/size_t_fwd.hpp>
+#include <ndnboost/mpl/size_t_fwd.hpp>
 
 #define AUX_WRAPPER_VALUE_TYPE std::size_t
 #define AUX_WRAPPER_NAME size_t
 #define AUX_WRAPPER_PARAMS(N) std::size_t N
 
-#include <boost/mpl/aux_/integral_wrapper.hpp>
+#include <ndnboost/mpl/aux_/integral_wrapper.hpp>
 
 #endif // BOOST_MPL_SIZE_T_HPP_INCLUDED
diff --git a/boost/mpl/size_t_fwd.hpp b/ndnboost/mpl/size_t_fwd.hpp
similarity index 85%
rename from boost/mpl/size_t_fwd.hpp
rename to ndnboost/mpl/size_t_fwd.hpp
index 396a521..f6d8aaa 100644
--- a/boost/mpl/size_t_fwd.hpp
+++ b/ndnboost/mpl/size_t_fwd.hpp
@@ -14,8 +14,8 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/adl_barrier.hpp>
-#include <boost/config.hpp> // make sure 'size_t' is placed into 'std'
+#include <ndnboost/mpl/aux_/adl_barrier.hpp>
+#include <ndnboost/config.hpp> // make sure 'size_t' is placed into 'std'
 #include <cstddef>
 
 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
diff --git a/boost/mpl/void_fwd.hpp b/ndnboost/mpl/void_fwd.hpp
similarity index 93%
rename from boost/mpl/void_fwd.hpp
rename to ndnboost/mpl/void_fwd.hpp
index 9643dec..bb493d7 100644
--- a/boost/mpl/void_fwd.hpp
+++ b/ndnboost/mpl/void_fwd.hpp
@@ -14,7 +14,7 @@
 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $
 // $Revision: 49267 $
 
-#include <boost/mpl/aux_/adl_barrier.hpp>
+#include <ndnboost/mpl/aux_/adl_barrier.hpp>
 
 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
 
diff --git a/boost/non_type.hpp b/ndnboost/non_type.hpp
similarity index 100%
rename from boost/non_type.hpp
rename to ndnboost/non_type.hpp
diff --git a/boost/preprocessor/arithmetic/add.hpp b/ndnboost/preprocessor/arithmetic/add.hpp
similarity index 86%
rename from boost/preprocessor/arithmetic/add.hpp
rename to ndnboost/preprocessor/arithmetic/add.hpp
index 5a29f55..c88e661 100644
--- a/boost/preprocessor/arithmetic/add.hpp
+++ b/ndnboost/preprocessor/arithmetic/add.hpp
@@ -14,11 +14,11 @@
 # ifndef BOOST_PREPROCESSOR_ARITHMETIC_ADD_HPP
 # define BOOST_PREPROCESSOR_ARITHMETIC_ADD_HPP
 #
-# include <boost/preprocessor/arithmetic/dec.hpp>
-# include <boost/preprocessor/arithmetic/inc.hpp>
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/control/while.hpp>
-# include <boost/preprocessor/tuple/elem.hpp>
+# include <ndnboost/preprocessor/arithmetic/dec.hpp>
+# include <ndnboost/preprocessor/arithmetic/inc.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/control/while.hpp>
+# include <ndnboost/preprocessor/tuple/elem.hpp>
 #
 # /* BOOST_PP_ADD */
 #
diff --git a/boost/preprocessor/arithmetic/dec.hpp b/ndnboost/preprocessor/arithmetic/dec.hpp
similarity index 99%
rename from boost/preprocessor/arithmetic/dec.hpp
rename to ndnboost/preprocessor/arithmetic/dec.hpp
index 0503359..6913d88 100644
--- a/boost/preprocessor/arithmetic/dec.hpp
+++ b/ndnboost/preprocessor/arithmetic/dec.hpp
@@ -14,7 +14,7 @@
 # ifndef BOOST_PREPROCESSOR_ARITHMETIC_DEC_HPP
 # define BOOST_PREPROCESSOR_ARITHMETIC_DEC_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
 #
 # /* BOOST_PP_DEC */
 #
diff --git a/boost/preprocessor/arithmetic/inc.hpp b/ndnboost/preprocessor/arithmetic/inc.hpp
similarity index 99%
rename from boost/preprocessor/arithmetic/inc.hpp
rename to ndnboost/preprocessor/arithmetic/inc.hpp
index 1597ab8..c26e86f 100644
--- a/boost/preprocessor/arithmetic/inc.hpp
+++ b/ndnboost/preprocessor/arithmetic/inc.hpp
@@ -14,7 +14,7 @@
 # ifndef BOOST_PREPROCESSOR_ARITHMETIC_INC_HPP
 # define BOOST_PREPROCESSOR_ARITHMETIC_INC_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
 #
 # /* BOOST_PP_INC */
 #
diff --git a/boost/preprocessor/arithmetic/sub.hpp b/ndnboost/preprocessor/arithmetic/sub.hpp
similarity index 88%
rename from boost/preprocessor/arithmetic/sub.hpp
rename to ndnboost/preprocessor/arithmetic/sub.hpp
index 5262cda..3384f15 100644
--- a/boost/preprocessor/arithmetic/sub.hpp
+++ b/ndnboost/preprocessor/arithmetic/sub.hpp
@@ -14,10 +14,10 @@
 # ifndef BOOST_PREPROCESSOR_ARITHMETIC_SUB_HPP
 # define BOOST_PREPROCESSOR_ARITHMETIC_SUB_HPP
 #
-# include <boost/preprocessor/arithmetic/dec.hpp>
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/control/while.hpp>
-# include <boost/preprocessor/tuple/elem.hpp>
+# include <ndnboost/preprocessor/arithmetic/dec.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/control/while.hpp>
+# include <ndnboost/preprocessor/tuple/elem.hpp>
 #
 # /* BOOST_PP_SUB */
 #
diff --git a/boost/preprocessor/array/data.hpp b/ndnboost/preprocessor/array/data.hpp
similarity index 91%
rename from boost/preprocessor/array/data.hpp
rename to ndnboost/preprocessor/array/data.hpp
index 10c926a..6a0bae4 100644
--- a/boost/preprocessor/array/data.hpp
+++ b/ndnboost/preprocessor/array/data.hpp
@@ -12,8 +12,8 @@
 # ifndef BOOST_PREPROCESSOR_ARRAY_DATA_HPP
 # define BOOST_PREPROCESSOR_ARRAY_DATA_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/tuple/elem.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/tuple/elem.hpp>
 #
 # /* BOOST_PP_ARRAY_DATA */
 #
diff --git a/boost/preprocessor/array/elem.hpp b/ndnboost/preprocessor/array/elem.hpp
similarity index 84%
rename from boost/preprocessor/array/elem.hpp
rename to ndnboost/preprocessor/array/elem.hpp
index 105ba24..22596e2 100644
--- a/boost/preprocessor/array/elem.hpp
+++ b/ndnboost/preprocessor/array/elem.hpp
@@ -12,10 +12,10 @@
 # ifndef BOOST_PREPROCESSOR_ARRAY_ELEM_HPP
 # define BOOST_PREPROCESSOR_ARRAY_ELEM_HPP
 #
-# include <boost/preprocessor/array/data.hpp>
-# include <boost/preprocessor/array/size.hpp>
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/tuple/elem.hpp>
+# include <ndnboost/preprocessor/array/data.hpp>
+# include <ndnboost/preprocessor/array/size.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/tuple/elem.hpp>
 #
 # /* BOOST_PP_ARRAY_ELEM */
 #
diff --git a/boost/preprocessor/array/size.hpp b/ndnboost/preprocessor/array/size.hpp
similarity index 91%
rename from boost/preprocessor/array/size.hpp
rename to ndnboost/preprocessor/array/size.hpp
index 3f370ee..a4a28de 100644
--- a/boost/preprocessor/array/size.hpp
+++ b/ndnboost/preprocessor/array/size.hpp
@@ -12,8 +12,8 @@
 # ifndef BOOST_PREPROCESSOR_ARRAY_SIZE_HPP
 # define BOOST_PREPROCESSOR_ARRAY_SIZE_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/tuple/elem.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/tuple/elem.hpp>
 #
 # /* BOOST_PP_ARRAY_SIZE */
 #
diff --git a/boost/preprocessor/cat.hpp b/ndnboost/preprocessor/cat.hpp
similarity index 94%
rename from boost/preprocessor/cat.hpp
rename to ndnboost/preprocessor/cat.hpp
index 5e52850..6dbc6c2 100644
--- a/boost/preprocessor/cat.hpp
+++ b/ndnboost/preprocessor/cat.hpp
@@ -14,7 +14,7 @@
 # ifndef BOOST_PREPROCESSOR_CAT_HPP
 # define BOOST_PREPROCESSOR_CAT_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
 #
 # /* BOOST_PP_CAT */
 #
diff --git a/boost/preprocessor/comma_if.hpp b/ndnboost/preprocessor/comma_if.hpp
similarity index 91%
rename from boost/preprocessor/comma_if.hpp
rename to ndnboost/preprocessor/comma_if.hpp
index 9ceb079..78e47a4 100644
--- a/boost/preprocessor/comma_if.hpp
+++ b/ndnboost/preprocessor/comma_if.hpp
@@ -12,6 +12,6 @@
 # ifndef BOOST_PREPROCESSOR_COMMA_IF_HPP
 # define BOOST_PREPROCESSOR_COMMA_IF_HPP
 #
-# include <boost/preprocessor/punctuation/comma_if.hpp>
+# include <ndnboost/preprocessor/punctuation/comma_if.hpp>
 #
 # endif
diff --git a/boost/preprocessor/config/config.hpp b/ndnboost/preprocessor/config/config.hpp
similarity index 100%
rename from boost/preprocessor/config/config.hpp
rename to ndnboost/preprocessor/config/config.hpp
diff --git a/boost/preprocessor/control/detail/dmc/while.hpp b/ndnboost/preprocessor/control/detail/dmc/while.hpp
similarity index 99%
rename from boost/preprocessor/control/detail/dmc/while.hpp
rename to ndnboost/preprocessor/control/detail/dmc/while.hpp
index 95c3135..b2e2e9f 100644
--- a/boost/preprocessor/control/detail/dmc/while.hpp
+++ b/ndnboost/preprocessor/control/detail/dmc/while.hpp
@@ -14,9 +14,9 @@
 # ifndef BOOST_PREPROCESSOR_CONTROL_DETAIL_WHILE_HPP
 # define BOOST_PREPROCESSOR_CONTROL_DETAIL_WHILE_HPP
 #
-# include <boost/preprocessor/control/iif.hpp>
-# include <boost/preprocessor/logical/bool.hpp>
-# include <boost/preprocessor/tuple/eat.hpp>
+# include <ndnboost/preprocessor/control/iif.hpp>
+# include <ndnboost/preprocessor/logical/bool.hpp>
+# include <ndnboost/preprocessor/tuple/eat.hpp>
 #
 # define BOOST_PP_WHILE_1(p, o, s) BOOST_PP_WHILE_1_C(BOOST_PP_BOOL(p##(2, s)), p, o, s)
 # define BOOST_PP_WHILE_2(p, o, s) BOOST_PP_WHILE_2_C(BOOST_PP_BOOL(p##(3, s)), p, o, s)
diff --git a/boost/preprocessor/control/detail/edg/while.hpp b/ndnboost/preprocessor/control/detail/edg/while.hpp
similarity index 99%
rename from boost/preprocessor/control/detail/edg/while.hpp
rename to ndnboost/preprocessor/control/detail/edg/while.hpp
index ce28eb2..ec10544 100644
--- a/boost/preprocessor/control/detail/edg/while.hpp
+++ b/ndnboost/preprocessor/control/detail/edg/while.hpp
@@ -14,8 +14,8 @@
 # ifndef BOOST_PREPROCESSOR_CONTROL_DETAIL_EDG_WHILE_HPP
 # define BOOST_PREPROCESSOR_CONTROL_DETAIL_EDG_WHILE_HPP
 #
-# include <boost/preprocessor/control/if.hpp>
-# include <boost/preprocessor/tuple/eat.hpp>
+# include <ndnboost/preprocessor/control/if.hpp>
+# include <ndnboost/preprocessor/tuple/eat.hpp>
 #
 # define BOOST_PP_WHILE_1(p, o, s) BOOST_PP_WHILE_1_I(p, o, s)
 # define BOOST_PP_WHILE_2(p, o, s) BOOST_PP_WHILE_2_I(p, o, s)
diff --git a/boost/preprocessor/control/detail/msvc/while.hpp b/ndnboost/preprocessor/control/detail/msvc/while.hpp
similarity index 99%
rename from boost/preprocessor/control/detail/msvc/while.hpp
rename to ndnboost/preprocessor/control/detail/msvc/while.hpp
index e543e41..bd2d461 100644
--- a/boost/preprocessor/control/detail/msvc/while.hpp
+++ b/ndnboost/preprocessor/control/detail/msvc/while.hpp
@@ -14,8 +14,8 @@
 # ifndef BOOST_PREPROCESSOR_CONTROL_DETAIL_MSVC_WHILE_HPP
 # define BOOST_PREPROCESSOR_CONTROL_DETAIL_MSVC_WHILE_HPP
 #
-# include <boost/preprocessor/control/if.hpp>
-# include <boost/preprocessor/tuple/eat.hpp>
+# include <ndnboost/preprocessor/control/if.hpp>
+# include <ndnboost/preprocessor/tuple/eat.hpp>
 #
 # define BOOST_PP_WHILE_1(p, o, s) BOOST_PP_IF(p(2, s), BOOST_PP_WHILE_2, s BOOST_PP_TUPLE_EAT_3)(p, o, o(2, s))
 # define BOOST_PP_WHILE_2(p, o, s) BOOST_PP_IF(p(3, s), BOOST_PP_WHILE_3, s BOOST_PP_TUPLE_EAT_3)(p, o, o(3, s))
diff --git a/boost/preprocessor/control/detail/while.hpp b/ndnboost/preprocessor/control/detail/while.hpp
similarity index 99%
rename from boost/preprocessor/control/detail/while.hpp
rename to ndnboost/preprocessor/control/detail/while.hpp
index 7315e1d..bc81737 100644
--- a/boost/preprocessor/control/detail/while.hpp
+++ b/ndnboost/preprocessor/control/detail/while.hpp
@@ -14,9 +14,9 @@
 # ifndef BOOST_PREPROCESSOR_CONTROL_DETAIL_WHILE_HPP
 # define BOOST_PREPROCESSOR_CONTROL_DETAIL_WHILE_HPP
 #
-# include <boost/preprocessor/control/iif.hpp>
-# include <boost/preprocessor/logical/bool.hpp>
-# include <boost/preprocessor/tuple/eat.hpp>
+# include <ndnboost/preprocessor/control/iif.hpp>
+# include <ndnboost/preprocessor/logical/bool.hpp>
+# include <ndnboost/preprocessor/tuple/eat.hpp>
 #
 # define BOOST_PP_WHILE_1(p, o, s) BOOST_PP_WHILE_1_C(BOOST_PP_BOOL(p(2, s)), p, o, s)
 # define BOOST_PP_WHILE_2(p, o, s) BOOST_PP_WHILE_2_C(BOOST_PP_BOOL(p(3, s)), p, o, s)
diff --git a/boost/preprocessor/control/expr_iif.hpp b/ndnboost/preprocessor/control/expr_iif.hpp
similarity index 95%
rename from boost/preprocessor/control/expr_iif.hpp
rename to ndnboost/preprocessor/control/expr_iif.hpp
index 58f45a4..acd4c15 100644
--- a/boost/preprocessor/control/expr_iif.hpp
+++ b/ndnboost/preprocessor/control/expr_iif.hpp
@@ -12,7 +12,7 @@
 # ifndef BOOST_PREPROCESSOR_CONTROL_EXPR_IIF_HPP
 # define BOOST_PREPROCESSOR_CONTROL_EXPR_IIF_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
 #
 # /* BOOST_PP_EXPR_IIF */
 #
diff --git a/boost/preprocessor/control/if.hpp b/ndnboost/preprocessor/control/if.hpp
similarity index 83%
rename from boost/preprocessor/control/if.hpp
rename to ndnboost/preprocessor/control/if.hpp
index 52cfc3d..92ea96d 100644
--- a/boost/preprocessor/control/if.hpp
+++ b/ndnboost/preprocessor/control/if.hpp
@@ -14,9 +14,9 @@
 # ifndef BOOST_PREPROCESSOR_CONTROL_IF_HPP
 # define BOOST_PREPROCESSOR_CONTROL_IF_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/control/iif.hpp>
-# include <boost/preprocessor/logical/bool.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/control/iif.hpp>
+# include <ndnboost/preprocessor/logical/bool.hpp>
 #
 # /* BOOST_PP_IF */
 #
diff --git a/boost/preprocessor/control/iif.hpp b/ndnboost/preprocessor/control/iif.hpp
similarity index 95%
rename from boost/preprocessor/control/iif.hpp
rename to ndnboost/preprocessor/control/iif.hpp
index fd07817..b5e33cf 100644
--- a/boost/preprocessor/control/iif.hpp
+++ b/ndnboost/preprocessor/control/iif.hpp
@@ -12,7 +12,7 @@
 # ifndef BOOST_PREPROCESSOR_CONTROL_IIF_HPP
 # define BOOST_PREPROCESSOR_CONTROL_IIF_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
 #
 # if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MWCC()
 #    define BOOST_PP_IIF(bit, t, f) BOOST_PP_IIF_I(bit, t, f)
diff --git a/boost/preprocessor/control/while.hpp b/ndnboost/preprocessor/control/while.hpp
similarity index 96%
rename from boost/preprocessor/control/while.hpp
rename to ndnboost/preprocessor/control/while.hpp
index e8a65ff..20dd37f 100644
--- a/boost/preprocessor/control/while.hpp
+++ b/ndnboost/preprocessor/control/while.hpp
@@ -14,13 +14,13 @@
 # ifndef BOOST_PREPROCESSOR_CONTROL_WHILE_HPP
 # define BOOST_PREPROCESSOR_CONTROL_WHILE_HPP
 #
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/debug/error.hpp>
-# include <boost/preprocessor/detail/auto_rec.hpp>
-# include <boost/preprocessor/list/fold_left.hpp>
-# include <boost/preprocessor/list/fold_right.hpp>
-# include <boost/preprocessor/logical/bitand.hpp>
+# include <ndnboost/preprocessor/cat.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/debug/error.hpp>
+# include <ndnboost/preprocessor/detail/auto_rec.hpp>
+# include <ndnboost/preprocessor/list/fold_left.hpp>
+# include <ndnboost/preprocessor/list/fold_right.hpp>
+# include <ndnboost/preprocessor/logical/bitand.hpp>
 #
 # /* BOOST_PP_WHILE */
 #
@@ -39,13 +39,13 @@
 # define BOOST_PP_WHILE_F(d, _) 0
 #
 # if BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_EDG()
-#    include <boost/preprocessor/control/detail/edg/while.hpp>
+#    include <ndnboost/preprocessor/control/detail/edg/while.hpp>
 # elif BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MSVC()
-#    include <boost/preprocessor/control/detail/msvc/while.hpp>
+#    include <ndnboost/preprocessor/control/detail/msvc/while.hpp>
 # elif BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_DMC()
-#    include <boost/preprocessor/control/detail/dmc/while.hpp>
+#    include <ndnboost/preprocessor/control/detail/dmc/while.hpp>
 # else
-#    include <boost/preprocessor/control/detail/while.hpp>
+#    include <ndnboost/preprocessor/control/detail/while.hpp>
 # endif
 #
 # define BOOST_PP_WHILE_257(p, o, s) BOOST_PP_ERROR(0x0001)
diff --git a/boost/preprocessor/debug/error.hpp b/ndnboost/preprocessor/debug/error.hpp
similarity index 93%
rename from boost/preprocessor/debug/error.hpp
rename to ndnboost/preprocessor/debug/error.hpp
index c8ae5e7..5adb571 100644
--- a/boost/preprocessor/debug/error.hpp
+++ b/ndnboost/preprocessor/debug/error.hpp
@@ -12,8 +12,8 @@
 # ifndef BOOST_PREPROCESSOR_DEBUG_ERROR_HPP
 # define BOOST_PREPROCESSOR_DEBUG_ERROR_HPP
 #
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/cat.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
 #
 # /* BOOST_PP_ERROR */
 #
diff --git a/boost/preprocessor/detail/auto_rec.hpp b/ndnboost/preprocessor/detail/auto_rec.hpp
similarity index 99%
rename from boost/preprocessor/detail/auto_rec.hpp
rename to ndnboost/preprocessor/detail/auto_rec.hpp
index 39de1d0..8167a15 100644
--- a/boost/preprocessor/detail/auto_rec.hpp
+++ b/ndnboost/preprocessor/detail/auto_rec.hpp
@@ -9,16 +9,16 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
 #
 # if BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_DMC()
-#     include <boost/preprocessor/detail/dmc/auto_rec.hpp>
+#     include <ndnboost/preprocessor/detail/dmc/auto_rec.hpp>
 # else
 #
 # ifndef BOOST_PREPROCESSOR_DETAIL_AUTO_REC_HPP
 # define BOOST_PREPROCESSOR_DETAIL_AUTO_REC_HPP
 #
-# include <boost/preprocessor/control/iif.hpp>
+# include <ndnboost/preprocessor/control/iif.hpp>
 #
 # /* BOOST_PP_AUTO_REC */
 #
diff --git a/boost/preprocessor/detail/check.hpp b/ndnboost/preprocessor/detail/check.hpp
similarity index 95%
rename from boost/preprocessor/detail/check.hpp
rename to ndnboost/preprocessor/detail/check.hpp
index 63f8ff9..3a908d4 100644
--- a/boost/preprocessor/detail/check.hpp
+++ b/ndnboost/preprocessor/detail/check.hpp
@@ -12,8 +12,8 @@
 # ifndef BOOST_PREPROCESSOR_DETAIL_CHECK_HPP
 # define BOOST_PREPROCESSOR_DETAIL_CHECK_HPP
 #
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/cat.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
 #
 # /* BOOST_PP_CHECK */
 #
diff --git a/boost/preprocessor/detail/dmc/auto_rec.hpp b/ndnboost/preprocessor/detail/dmc/auto_rec.hpp
similarity index 99%
rename from boost/preprocessor/detail/dmc/auto_rec.hpp
rename to ndnboost/preprocessor/detail/dmc/auto_rec.hpp
index 37fbe04..9e40364 100644
--- a/boost/preprocessor/detail/dmc/auto_rec.hpp
+++ b/ndnboost/preprocessor/detail/dmc/auto_rec.hpp
@@ -12,7 +12,7 @@
 # ifndef BOOST_PREPROCESSOR_DETAIL_AUTO_REC_HPP
 # define BOOST_PREPROCESSOR_DETAIL_AUTO_REC_HPP
 #
-# include <boost/preprocessor/control/iif.hpp>
+# include <ndnboost/preprocessor/control/iif.hpp>
 #
 # /* BOOST_PP_AUTO_REC */
 #
diff --git a/boost/preprocessor/detail/is_binary.hpp b/ndnboost/preprocessor/detail/is_binary.hpp
similarity index 91%
rename from boost/preprocessor/detail/is_binary.hpp
rename to ndnboost/preprocessor/detail/is_binary.hpp
index 3428833..ed35dc8 100644
--- a/boost/preprocessor/detail/is_binary.hpp
+++ b/ndnboost/preprocessor/detail/is_binary.hpp
@@ -12,8 +12,8 @@
 # ifndef BOOST_PREPROCESSOR_DETAIL_IS_BINARY_HPP
 # define BOOST_PREPROCESSOR_DETAIL_IS_BINARY_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/detail/check.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/detail/check.hpp>
 #
 # /* BOOST_PP_IS_BINARY */
 #
diff --git a/boost/preprocessor/empty.hpp b/ndnboost/preprocessor/empty.hpp
similarity index 92%
rename from boost/preprocessor/empty.hpp
rename to ndnboost/preprocessor/empty.hpp
index 116ef74..4c81065 100644
--- a/boost/preprocessor/empty.hpp
+++ b/ndnboost/preprocessor/empty.hpp
@@ -12,6 +12,6 @@
 # ifndef BOOST_PREPROCESSOR_EMPTY_HPP
 # define BOOST_PREPROCESSOR_EMPTY_HPP
 #
-# include <boost/preprocessor/facilities/empty.hpp>
+# include <ndnboost/preprocessor/facilities/empty.hpp>
 #
 # endif
diff --git a/boost/preprocessor/enum_params.hpp b/ndnboost/preprocessor/enum_params.hpp
similarity index 91%
rename from boost/preprocessor/enum_params.hpp
rename to ndnboost/preprocessor/enum_params.hpp
index 414f8aa..b2752ce 100644
--- a/boost/preprocessor/enum_params.hpp
+++ b/ndnboost/preprocessor/enum_params.hpp
@@ -12,6 +12,6 @@
 # ifndef BOOST_PREPROCESSOR_ENUM_PARAMS_HPP
 # define BOOST_PREPROCESSOR_ENUM_PARAMS_HPP
 #
-# include <boost/preprocessor/repetition/enum_params.hpp>
+# include <ndnboost/preprocessor/repetition/enum_params.hpp>
 #
 # endif
diff --git a/boost/preprocessor/facilities/empty.hpp b/ndnboost/preprocessor/facilities/empty.hpp
similarity index 100%
rename from boost/preprocessor/facilities/empty.hpp
rename to ndnboost/preprocessor/facilities/empty.hpp
diff --git a/boost/preprocessor/facilities/identity.hpp b/ndnboost/preprocessor/facilities/identity.hpp
similarity index 90%
rename from boost/preprocessor/facilities/identity.hpp
rename to ndnboost/preprocessor/facilities/identity.hpp
index 13ec4ca..4f48d28 100644
--- a/boost/preprocessor/facilities/identity.hpp
+++ b/ndnboost/preprocessor/facilities/identity.hpp
@@ -14,7 +14,7 @@
 # ifndef BOOST_PREPROCESSOR_FACILITIES_IDENTITY_HPP
 # define BOOST_PREPROCESSOR_FACILITIES_IDENTITY_HPP
 #
-# include <boost/preprocessor/facilities/empty.hpp>
+# include <ndnboost/preprocessor/facilities/empty.hpp>
 #
 # /* BOOST_PP_IDENTITY */
 #
diff --git a/boost/preprocessor/facilities/overload.hpp b/ndnboost/preprocessor/facilities/overload.hpp
similarity index 91%
rename from boost/preprocessor/facilities/overload.hpp
rename to ndnboost/preprocessor/facilities/overload.hpp
index 1576316..2d26d6b 100644
--- a/boost/preprocessor/facilities/overload.hpp
+++ b/ndnboost/preprocessor/facilities/overload.hpp
@@ -13,8 +13,8 @@
 # ifndef BOOST_PREPROCESSOR_FACILITIES_OVERLOAD_HPP
 # define BOOST_PREPROCESSOR_FACILITIES_OVERLOAD_HPP
 #
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/variadic/size.hpp>
+# include <ndnboost/preprocessor/cat.hpp>
+# include <ndnboost/preprocessor/variadic/size.hpp>
 #
 # /* BOOST_PP_OVERLOAD */
 #
diff --git a/boost/preprocessor/identity.hpp b/ndnboost/preprocessor/identity.hpp
similarity index 92%
rename from boost/preprocessor/identity.hpp
rename to ndnboost/preprocessor/identity.hpp
index 847dd13..3101d21 100644
--- a/boost/preprocessor/identity.hpp
+++ b/ndnboost/preprocessor/identity.hpp
@@ -12,6 +12,6 @@
 # ifndef BOOST_PREPROCESSOR_IDENTITY_HPP
 # define BOOST_PREPROCESSOR_IDENTITY_HPP
 #
-# include <boost/preprocessor/facilities/identity.hpp>
+# include <ndnboost/preprocessor/facilities/identity.hpp>
 #
 # endif
diff --git a/boost/preprocessor/inc.hpp b/ndnboost/preprocessor/inc.hpp
similarity index 92%
rename from boost/preprocessor/inc.hpp
rename to ndnboost/preprocessor/inc.hpp
index b98d3a6..143930d 100644
--- a/boost/preprocessor/inc.hpp
+++ b/ndnboost/preprocessor/inc.hpp
@@ -12,6 +12,6 @@
 # ifndef BOOST_PREPROCESSOR_INC_HPP
 # define BOOST_PREPROCESSOR_INC_HPP
 #
-# include <boost/preprocessor/arithmetic/inc.hpp>
+# include <ndnboost/preprocessor/arithmetic/inc.hpp>
 #
 # endif
diff --git a/boost/preprocessor/iterate.hpp b/ndnboost/preprocessor/iterate.hpp
similarity index 92%
rename from boost/preprocessor/iterate.hpp
rename to ndnboost/preprocessor/iterate.hpp
index e720ec8..0d2d058 100644
--- a/boost/preprocessor/iterate.hpp
+++ b/ndnboost/preprocessor/iterate.hpp
@@ -12,6 +12,6 @@
 # ifndef BOOST_PREPROCESSOR_ITERATE_HPP
 # define BOOST_PREPROCESSOR_ITERATE_HPP
 #
-# include <boost/preprocessor/iteration/iterate.hpp>
+# include <ndnboost/preprocessor/iteration/iterate.hpp>
 #
 # endif
diff --git a/boost/preprocessor/iteration/detail/bounds/lower1.hpp b/ndnboost/preprocessor/iteration/detail/bounds/lower1.hpp
similarity index 98%
rename from boost/preprocessor/iteration/detail/bounds/lower1.hpp
rename to ndnboost/preprocessor/iteration/detail/bounds/lower1.hpp
index 6694d0b..576e070 100644
--- a/boost/preprocessor/iteration/detail/bounds/lower1.hpp
+++ b/ndnboost/preprocessor/iteration/detail/bounds/lower1.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_ITERATION_START_1
 #
diff --git a/boost/preprocessor/iteration/detail/bounds/lower2.hpp b/ndnboost/preprocessor/iteration/detail/bounds/lower2.hpp
similarity index 98%
rename from boost/preprocessor/iteration/detail/bounds/lower2.hpp
rename to ndnboost/preprocessor/iteration/detail/bounds/lower2.hpp
index ece21fc..50c430c 100644
--- a/boost/preprocessor/iteration/detail/bounds/lower2.hpp
+++ b/ndnboost/preprocessor/iteration/detail/bounds/lower2.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_ITERATION_START_2
 #
diff --git a/boost/preprocessor/iteration/detail/bounds/lower3.hpp b/ndnboost/preprocessor/iteration/detail/bounds/lower3.hpp
similarity index 98%
rename from boost/preprocessor/iteration/detail/bounds/lower3.hpp
rename to ndnboost/preprocessor/iteration/detail/bounds/lower3.hpp
index 8429eac..f90cd0e 100644
--- a/boost/preprocessor/iteration/detail/bounds/lower3.hpp
+++ b/ndnboost/preprocessor/iteration/detail/bounds/lower3.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_ITERATION_START_3
 #
diff --git a/boost/preprocessor/iteration/detail/bounds/lower4.hpp b/ndnboost/preprocessor/iteration/detail/bounds/lower4.hpp
similarity index 98%
rename from boost/preprocessor/iteration/detail/bounds/lower4.hpp
rename to ndnboost/preprocessor/iteration/detail/bounds/lower4.hpp
index ba0832f..4617e5c 100644
--- a/boost/preprocessor/iteration/detail/bounds/lower4.hpp
+++ b/ndnboost/preprocessor/iteration/detail/bounds/lower4.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_ITERATION_START_4
 #
diff --git a/boost/preprocessor/iteration/detail/bounds/lower5.hpp b/ndnboost/preprocessor/iteration/detail/bounds/lower5.hpp
similarity index 98%
rename from boost/preprocessor/iteration/detail/bounds/lower5.hpp
rename to ndnboost/preprocessor/iteration/detail/bounds/lower5.hpp
index f4888c7..b7ae8d6 100644
--- a/boost/preprocessor/iteration/detail/bounds/lower5.hpp
+++ b/ndnboost/preprocessor/iteration/detail/bounds/lower5.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_ITERATION_START_5
 #
diff --git a/boost/preprocessor/iteration/detail/bounds/upper1.hpp b/ndnboost/preprocessor/iteration/detail/bounds/upper1.hpp
similarity index 98%
rename from boost/preprocessor/iteration/detail/bounds/upper1.hpp
rename to ndnboost/preprocessor/iteration/detail/bounds/upper1.hpp
index 50d0fcf..f7b1a0f 100644
--- a/boost/preprocessor/iteration/detail/bounds/upper1.hpp
+++ b/ndnboost/preprocessor/iteration/detail/bounds/upper1.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_ITERATION_FINISH_1
 #
diff --git a/boost/preprocessor/iteration/detail/bounds/upper2.hpp b/ndnboost/preprocessor/iteration/detail/bounds/upper2.hpp
similarity index 98%
rename from boost/preprocessor/iteration/detail/bounds/upper2.hpp
rename to ndnboost/preprocessor/iteration/detail/bounds/upper2.hpp
index faef6f4..7960ef9 100644
--- a/boost/preprocessor/iteration/detail/bounds/upper2.hpp
+++ b/ndnboost/preprocessor/iteration/detail/bounds/upper2.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_ITERATION_FINISH_2
 #
diff --git a/boost/preprocessor/iteration/detail/bounds/upper3.hpp b/ndnboost/preprocessor/iteration/detail/bounds/upper3.hpp
similarity index 98%
rename from boost/preprocessor/iteration/detail/bounds/upper3.hpp
rename to ndnboost/preprocessor/iteration/detail/bounds/upper3.hpp
index 38d9ade..fa4aaef 100644
--- a/boost/preprocessor/iteration/detail/bounds/upper3.hpp
+++ b/ndnboost/preprocessor/iteration/detail/bounds/upper3.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_ITERATION_FINISH_3
 #
diff --git a/boost/preprocessor/iteration/detail/bounds/upper4.hpp b/ndnboost/preprocessor/iteration/detail/bounds/upper4.hpp
similarity index 98%
rename from boost/preprocessor/iteration/detail/bounds/upper4.hpp
rename to ndnboost/preprocessor/iteration/detail/bounds/upper4.hpp
index 7f771c2..820031e 100644
--- a/boost/preprocessor/iteration/detail/bounds/upper4.hpp
+++ b/ndnboost/preprocessor/iteration/detail/bounds/upper4.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_ITERATION_FINISH_4
 #
diff --git a/boost/preprocessor/iteration/detail/bounds/upper5.hpp b/ndnboost/preprocessor/iteration/detail/bounds/upper5.hpp
similarity index 98%
rename from boost/preprocessor/iteration/detail/bounds/upper5.hpp
rename to ndnboost/preprocessor/iteration/detail/bounds/upper5.hpp
index 9f27d58..6cd5e2a 100644
--- a/boost/preprocessor/iteration/detail/bounds/upper5.hpp
+++ b/ndnboost/preprocessor/iteration/detail/bounds/upper5.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_ITERATION_FINISH_5
 #
diff --git a/boost/preprocessor/iteration/detail/finish.hpp b/ndnboost/preprocessor/iteration/detail/finish.hpp
similarity index 98%
rename from boost/preprocessor/iteration/detail/finish.hpp
rename to ndnboost/preprocessor/iteration/detail/finish.hpp
index 0236944..bcd6ca9 100644
--- a/boost/preprocessor/iteration/detail/finish.hpp
+++ b/ndnboost/preprocessor/iteration/detail/finish.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_LOCAL_FE
 #
diff --git a/boost/preprocessor/iteration/detail/iter/forward1.hpp b/ndnboost/preprocessor/iteration/detail/iter/forward1.hpp
similarity index 99%
rename from boost/preprocessor/iteration/detail/iter/forward1.hpp
rename to ndnboost/preprocessor/iteration/detail/iter/forward1.hpp
index 3c6a458..542e1c3 100644
--- a/boost/preprocessor/iteration/detail/iter/forward1.hpp
+++ b/ndnboost/preprocessor/iteration/detail/iter/forward1.hpp
@@ -14,16 +14,16 @@
 #        error BOOST_PP_ERROR:  depth #1 filename is not defined
 #    endif
 #    define BOOST_PP_VALUE BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_ITERATION_LIMITS)
-#    include <boost/preprocessor/iteration/detail/bounds/lower1.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/lower1.hpp>
 #    define BOOST_PP_VALUE BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_ITERATION_LIMITS)
-#    include <boost/preprocessor/iteration/detail/bounds/upper1.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/upper1.hpp>
 #    define BOOST_PP_ITERATION_FLAGS_1() 0
 #    undef BOOST_PP_ITERATION_LIMITS
 # elif defined(BOOST_PP_ITERATION_PARAMS_1)
 #    define BOOST_PP_VALUE BOOST_PP_ARRAY_ELEM(0, BOOST_PP_ITERATION_PARAMS_1)
-#    include <boost/preprocessor/iteration/detail/bounds/lower1.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/lower1.hpp>
 #    define BOOST_PP_VALUE BOOST_PP_ARRAY_ELEM(1, BOOST_PP_ITERATION_PARAMS_1)
-#    include <boost/preprocessor/iteration/detail/bounds/upper1.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/upper1.hpp>
 #    define BOOST_PP_FILENAME_1 BOOST_PP_ARRAY_ELEM(2, BOOST_PP_ITERATION_PARAMS_1)
 #    if BOOST_PP_ARRAY_SIZE(BOOST_PP_ITERATION_PARAMS_1) >= 4
 #        define BOOST_PP_ITERATION_FLAGS_1() BOOST_PP_ARRAY_ELEM(3, BOOST_PP_ITERATION_PARAMS_1)
@@ -40,7 +40,7 @@
 # define BOOST_PP_IS_ITERATING 1
 #
 # if (BOOST_PP_ITERATION_START_1) > (BOOST_PP_ITERATION_FINISH_1)
-#    include <boost/preprocessor/iteration/detail/iter/reverse1.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/iter/reverse1.hpp>
 # else
 #    if BOOST_PP_ITERATION_START_1 <= 0 && BOOST_PP_ITERATION_FINISH_1 >= 0
 #        define BOOST_PP_ITERATION_1 0
diff --git a/boost/preprocessor/iteration/detail/iter/forward2.hpp b/ndnboost/preprocessor/iteration/detail/iter/forward2.hpp
similarity index 99%
rename from boost/preprocessor/iteration/detail/iter/forward2.hpp
rename to ndnboost/preprocessor/iteration/detail/iter/forward2.hpp
index e61a329..25ad55c 100644
--- a/boost/preprocessor/iteration/detail/iter/forward2.hpp
+++ b/ndnboost/preprocessor/iteration/detail/iter/forward2.hpp
@@ -14,16 +14,16 @@
 #        error BOOST_PP_ERROR:  depth #2 filename is not defined
 #    endif
 #    define BOOST_PP_VALUE BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_ITERATION_LIMITS)
-#    include <boost/preprocessor/iteration/detail/bounds/lower2.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/lower2.hpp>
 #    define BOOST_PP_VALUE BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_ITERATION_LIMITS)
-#    include <boost/preprocessor/iteration/detail/bounds/upper2.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/upper2.hpp>
 #    define BOOST_PP_ITERATION_FLAGS_2() 0
 #    undef BOOST_PP_ITERATION_LIMITS
 # elif defined(BOOST_PP_ITERATION_PARAMS_2)
 #    define BOOST_PP_VALUE BOOST_PP_ARRAY_ELEM(0, BOOST_PP_ITERATION_PARAMS_2)
-#    include <boost/preprocessor/iteration/detail/bounds/lower2.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/lower2.hpp>
 #    define BOOST_PP_VALUE BOOST_PP_ARRAY_ELEM(1, BOOST_PP_ITERATION_PARAMS_2)
-#    include <boost/preprocessor/iteration/detail/bounds/upper2.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/upper2.hpp>
 #    define BOOST_PP_FILENAME_2 BOOST_PP_ARRAY_ELEM(2, BOOST_PP_ITERATION_PARAMS_2)
 #    if BOOST_PP_ARRAY_SIZE(BOOST_PP_ITERATION_PARAMS_2) >= 4
 #        define BOOST_PP_ITERATION_FLAGS_2() BOOST_PP_ARRAY_ELEM(3, BOOST_PP_ITERATION_PARAMS_2)
@@ -38,7 +38,7 @@
 # define BOOST_PP_ITERATION_DEPTH() 2
 #
 # if (BOOST_PP_ITERATION_START_2) > (BOOST_PP_ITERATION_FINISH_2)
-#    include <boost/preprocessor/iteration/detail/iter/reverse2.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/iter/reverse2.hpp>
 # else
 #    if BOOST_PP_ITERATION_START_2 <= 0 && BOOST_PP_ITERATION_FINISH_2 >= 0
 #        define BOOST_PP_ITERATION_2 0
diff --git a/boost/preprocessor/iteration/detail/iter/forward3.hpp b/ndnboost/preprocessor/iteration/detail/iter/forward3.hpp
similarity index 99%
rename from boost/preprocessor/iteration/detail/iter/forward3.hpp
rename to ndnboost/preprocessor/iteration/detail/iter/forward3.hpp
index e68966f..f650c18 100644
--- a/boost/preprocessor/iteration/detail/iter/forward3.hpp
+++ b/ndnboost/preprocessor/iteration/detail/iter/forward3.hpp
@@ -14,16 +14,16 @@
 #        error BOOST_PP_ERROR:  depth #3 filename is not defined
 #    endif
 #    define BOOST_PP_VALUE BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_ITERATION_LIMITS)
-#    include <boost/preprocessor/iteration/detail/bounds/lower3.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/lower3.hpp>
 #    define BOOST_PP_VALUE BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_ITERATION_LIMITS)
-#    include <boost/preprocessor/iteration/detail/bounds/upper3.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/upper3.hpp>
 #    define BOOST_PP_ITERATION_FLAGS_3() 0
 #    undef BOOST_PP_ITERATION_LIMITS
 # elif defined(BOOST_PP_ITERATION_PARAMS_3)
 #    define BOOST_PP_VALUE BOOST_PP_ARRAY_ELEM(0, BOOST_PP_ITERATION_PARAMS_3)
-#    include <boost/preprocessor/iteration/detail/bounds/lower3.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/lower3.hpp>
 #    define BOOST_PP_VALUE BOOST_PP_ARRAY_ELEM(1, BOOST_PP_ITERATION_PARAMS_3)
-#    include <boost/preprocessor/iteration/detail/bounds/upper3.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/upper3.hpp>
 #    define BOOST_PP_FILENAME_3 BOOST_PP_ARRAY_ELEM(2, BOOST_PP_ITERATION_PARAMS_3)
 #    if BOOST_PP_ARRAY_SIZE(BOOST_PP_ITERATION_PARAMS_3) >= 4
 #        define BOOST_PP_ITERATION_FLAGS_3() BOOST_PP_ARRAY_ELEM(3, BOOST_PP_ITERATION_PARAMS_3)
@@ -38,7 +38,7 @@
 # define BOOST_PP_ITERATION_DEPTH() 3
 #
 # if (BOOST_PP_ITERATION_START_3) > (BOOST_PP_ITERATION_FINISH_3)
-#    include <boost/preprocessor/iteration/detail/iter/reverse3.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/iter/reverse3.hpp>
 # else
 #    if BOOST_PP_ITERATION_START_3 <= 0 && BOOST_PP_ITERATION_FINISH_3 >= 0
 #        define BOOST_PP_ITERATION_3 0
diff --git a/boost/preprocessor/iteration/detail/iter/forward4.hpp b/ndnboost/preprocessor/iteration/detail/iter/forward4.hpp
similarity index 99%
rename from boost/preprocessor/iteration/detail/iter/forward4.hpp
rename to ndnboost/preprocessor/iteration/detail/iter/forward4.hpp
index 1b4f588..3ddfbf5 100644
--- a/boost/preprocessor/iteration/detail/iter/forward4.hpp
+++ b/ndnboost/preprocessor/iteration/detail/iter/forward4.hpp
@@ -14,16 +14,16 @@
 #        error BOOST_PP_ERROR:  depth #4 filename is not defined
 #    endif
 #    define BOOST_PP_VALUE BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_ITERATION_LIMITS)
-#    include <boost/preprocessor/iteration/detail/bounds/lower4.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/lower4.hpp>
 #    define BOOST_PP_VALUE BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_ITERATION_LIMITS)
-#    include <boost/preprocessor/iteration/detail/bounds/upper4.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/upper4.hpp>
 #    define BOOST_PP_ITERATION_FLAGS_4() 0
 #    undef BOOST_PP_ITERATION_LIMITS
 # elif defined(BOOST_PP_ITERATION_PARAMS_4)
 #    define BOOST_PP_VALUE BOOST_PP_ARRAY_ELEM(0, BOOST_PP_ITERATION_PARAMS_4)
-#    include <boost/preprocessor/iteration/detail/bounds/lower4.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/lower4.hpp>
 #    define BOOST_PP_VALUE BOOST_PP_ARRAY_ELEM(1, BOOST_PP_ITERATION_PARAMS_4)
-#    include <boost/preprocessor/iteration/detail/bounds/upper4.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/upper4.hpp>
 #    define BOOST_PP_FILENAME_4 BOOST_PP_ARRAY_ELEM(2, BOOST_PP_ITERATION_PARAMS_4)
 #    if BOOST_PP_ARRAY_SIZE(BOOST_PP_ITERATION_PARAMS_4) >= 4
 #        define BOOST_PP_ITERATION_FLAGS_4() BOOST_PP_ARRAY_ELEM(3, BOOST_PP_ITERATION_PARAMS_4)
@@ -38,7 +38,7 @@
 # define BOOST_PP_ITERATION_DEPTH() 4
 #
 # if (BOOST_PP_ITERATION_START_4) > (BOOST_PP_ITERATION_FINISH_4)
-#    include <boost/preprocessor/iteration/detail/iter/reverse4.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/iter/reverse4.hpp>
 # else
 #    if BOOST_PP_ITERATION_START_4 <= 0 && BOOST_PP_ITERATION_FINISH_4 >= 0
 #        define BOOST_PP_ITERATION_4 0
diff --git a/boost/preprocessor/iteration/detail/iter/forward5.hpp b/ndnboost/preprocessor/iteration/detail/iter/forward5.hpp
similarity index 99%
rename from boost/preprocessor/iteration/detail/iter/forward5.hpp
rename to ndnboost/preprocessor/iteration/detail/iter/forward5.hpp
index 7617607..acefeea 100644
--- a/boost/preprocessor/iteration/detail/iter/forward5.hpp
+++ b/ndnboost/preprocessor/iteration/detail/iter/forward5.hpp
@@ -14,16 +14,16 @@
 #        error BOOST_PP_ERROR:  depth #5 filename is not defined
 #    endif
 #    define BOOST_PP_VALUE BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_ITERATION_LIMITS)
-#    include <boost/preprocessor/iteration/detail/bounds/lower5.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/lower5.hpp>
 #    define BOOST_PP_VALUE BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_ITERATION_LIMITS)
-#    include <boost/preprocessor/iteration/detail/bounds/upper5.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/upper5.hpp>
 #    define BOOST_PP_ITERATION_FLAGS_5() 0
 #    undef BOOST_PP_ITERATION_LIMITS
 # elif defined(BOOST_PP_ITERATION_PARAMS_5)
 #    define BOOST_PP_VALUE BOOST_PP_ARRAY_ELEM(0, BOOST_PP_ITERATION_PARAMS_5)
-#    include <boost/preprocessor/iteration/detail/bounds/lower5.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/lower5.hpp>
 #    define BOOST_PP_VALUE BOOST_PP_ARRAY_ELEM(1, BOOST_PP_ITERATION_PARAMS_5)
-#    include <boost/preprocessor/iteration/detail/bounds/upper5.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/bounds/upper5.hpp>
 #    define BOOST_PP_FILENAME_5 BOOST_PP_ARRAY_ELEM(2, BOOST_PP_ITERATION_PARAMS_5)
 #    if BOOST_PP_ARRAY_SIZE(BOOST_PP_ITERATION_PARAMS_5) >= 4
 #        define BOOST_PP_ITERATION_FLAGS_5() BOOST_PP_ARRAY_ELEM(3, BOOST_PP_ITERATION_PARAMS_5)
@@ -38,7 +38,7 @@
 # define BOOST_PP_ITERATION_DEPTH() 5
 #
 # if (BOOST_PP_ITERATION_START_5) > (BOOST_PP_ITERATION_FINISH_5)
-#    include <boost/preprocessor/iteration/detail/iter/reverse5.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/iter/reverse5.hpp>
 # else
 #    if BOOST_PP_ITERATION_START_5 <= 0 && BOOST_PP_ITERATION_FINISH_5 >= 0
 #        define BOOST_PP_ITERATION_5 0
diff --git a/boost/preprocessor/iteration/detail/iter/reverse1.hpp b/ndnboost/preprocessor/iteration/detail/iter/reverse1.hpp
similarity index 100%
rename from boost/preprocessor/iteration/detail/iter/reverse1.hpp
rename to ndnboost/preprocessor/iteration/detail/iter/reverse1.hpp
diff --git a/boost/preprocessor/iteration/detail/iter/reverse2.hpp b/ndnboost/preprocessor/iteration/detail/iter/reverse2.hpp
similarity index 100%
rename from boost/preprocessor/iteration/detail/iter/reverse2.hpp
rename to ndnboost/preprocessor/iteration/detail/iter/reverse2.hpp
diff --git a/boost/preprocessor/iteration/detail/iter/reverse3.hpp b/ndnboost/preprocessor/iteration/detail/iter/reverse3.hpp
similarity index 100%
rename from boost/preprocessor/iteration/detail/iter/reverse3.hpp
rename to ndnboost/preprocessor/iteration/detail/iter/reverse3.hpp
diff --git a/boost/preprocessor/iteration/detail/iter/reverse4.hpp b/ndnboost/preprocessor/iteration/detail/iter/reverse4.hpp
similarity index 100%
rename from boost/preprocessor/iteration/detail/iter/reverse4.hpp
rename to ndnboost/preprocessor/iteration/detail/iter/reverse4.hpp
diff --git a/boost/preprocessor/iteration/detail/iter/reverse5.hpp b/ndnboost/preprocessor/iteration/detail/iter/reverse5.hpp
similarity index 100%
rename from boost/preprocessor/iteration/detail/iter/reverse5.hpp
rename to ndnboost/preprocessor/iteration/detail/iter/reverse5.hpp
diff --git a/boost/preprocessor/iteration/detail/local.hpp b/ndnboost/preprocessor/iteration/detail/local.hpp
similarity index 98%
rename from boost/preprocessor/iteration/detail/local.hpp
rename to ndnboost/preprocessor/iteration/detail/local.hpp
index ccddd5e..1c79f47 100644
--- a/boost/preprocessor/iteration/detail/local.hpp
+++ b/ndnboost/preprocessor/iteration/detail/local.hpp
@@ -19,16 +19,16 @@
 #        define BOOST_PP_LOCAL_F BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_LOCAL_LIMITS)
 #    else
 #        define BOOST_PP_VALUE BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_LOCAL_LIMITS)
-#        include <boost/preprocessor/iteration/detail/start.hpp>
+#        include <ndnboost/preprocessor/iteration/detail/start.hpp>
 #        define BOOST_PP_VALUE BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_LOCAL_LIMITS)
-#        include <boost/preprocessor/iteration/detail/finish.hpp>
+#        include <ndnboost/preprocessor/iteration/detail/finish.hpp>
 #        define BOOST_PP_LOCAL_S BOOST_PP_LOCAL_SE()
 #        define BOOST_PP_LOCAL_F BOOST_PP_LOCAL_FE()
 #    endif
 # endif
 #
 # if (BOOST_PP_LOCAL_S) > (BOOST_PP_LOCAL_F)
-#    include <boost/preprocessor/iteration/detail/rlocal.hpp>
+#    include <ndnboost/preprocessor/iteration/detail/rlocal.hpp>
 # else
 #    if BOOST_PP_LOCAL_C(0)
         BOOST_PP_LOCAL_MACRO(0)
diff --git a/boost/preprocessor/iteration/detail/rlocal.hpp b/ndnboost/preprocessor/iteration/detail/rlocal.hpp
similarity index 100%
rename from boost/preprocessor/iteration/detail/rlocal.hpp
rename to ndnboost/preprocessor/iteration/detail/rlocal.hpp
diff --git a/boost/preprocessor/iteration/detail/self.hpp b/ndnboost/preprocessor/iteration/detail/self.hpp
similarity index 100%
rename from boost/preprocessor/iteration/detail/self.hpp
rename to ndnboost/preprocessor/iteration/detail/self.hpp
diff --git a/boost/preprocessor/iteration/detail/start.hpp b/ndnboost/preprocessor/iteration/detail/start.hpp
similarity index 98%
rename from boost/preprocessor/iteration/detail/start.hpp
rename to ndnboost/preprocessor/iteration/detail/start.hpp
index cbf0381..31f9cf9 100644
--- a/boost/preprocessor/iteration/detail/start.hpp
+++ b/ndnboost/preprocessor/iteration/detail/start.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_LOCAL_SE
 #
diff --git a/boost/preprocessor/iteration/iterate.hpp b/ndnboost/preprocessor/iteration/iterate.hpp
similarity index 79%
rename from boost/preprocessor/iteration/iterate.hpp
rename to ndnboost/preprocessor/iteration/iterate.hpp
index 8f861e7..8a11939 100644
--- a/boost/preprocessor/iteration/iterate.hpp
+++ b/ndnboost/preprocessor/iteration/iterate.hpp
@@ -12,13 +12,13 @@
 # ifndef BOOST_PREPROCESSOR_ITERATION_ITERATE_HPP
 # define BOOST_PREPROCESSOR_ITERATION_ITERATE_HPP
 #
-# include <boost/preprocessor/arithmetic/dec.hpp>
-# include <boost/preprocessor/arithmetic/inc.hpp>
-# include <boost/preprocessor/array/elem.hpp>
-# include <boost/preprocessor/array/size.hpp>
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/slot/slot.hpp>
-# include <boost/preprocessor/tuple/elem.hpp>
+# include <ndnboost/preprocessor/arithmetic/dec.hpp>
+# include <ndnboost/preprocessor/arithmetic/inc.hpp>
+# include <ndnboost/preprocessor/array/elem.hpp>
+# include <ndnboost/preprocessor/array/size.hpp>
+# include <ndnboost/preprocessor/cat.hpp>
+# include <ndnboost/preprocessor/slot/slot.hpp>
+# include <ndnboost/preprocessor/tuple/elem.hpp>
 #
 # /* BOOST_PP_ITERATION_DEPTH */
 #
@@ -73,10 +73,10 @@
 #
 # define BOOST_PP_ITERATE() BOOST_PP_CAT(BOOST_PP_ITERATE_, BOOST_PP_INC(BOOST_PP_ITERATION_DEPTH()))
 #
-# define BOOST_PP_ITERATE_1 <boost/preprocessor/iteration/detail/iter/forward1.hpp>
-# define BOOST_PP_ITERATE_2 <boost/preprocessor/iteration/detail/iter/forward2.hpp>
-# define BOOST_PP_ITERATE_3 <boost/preprocessor/iteration/detail/iter/forward3.hpp>
-# define BOOST_PP_ITERATE_4 <boost/preprocessor/iteration/detail/iter/forward4.hpp>
-# define BOOST_PP_ITERATE_5 <boost/preprocessor/iteration/detail/iter/forward5.hpp>
+# define BOOST_PP_ITERATE_1 <ndnboost/preprocessor/iteration/detail/iter/forward1.hpp>
+# define BOOST_PP_ITERATE_2 <ndnboost/preprocessor/iteration/detail/iter/forward2.hpp>
+# define BOOST_PP_ITERATE_3 <ndnboost/preprocessor/iteration/detail/iter/forward3.hpp>
+# define BOOST_PP_ITERATE_4 <ndnboost/preprocessor/iteration/detail/iter/forward4.hpp>
+# define BOOST_PP_ITERATE_5 <ndnboost/preprocessor/iteration/detail/iter/forward5.hpp>
 #
 # endif
diff --git a/boost/preprocessor/iteration/local.hpp b/ndnboost/preprocessor/iteration/local.hpp
similarity index 79%
rename from boost/preprocessor/iteration/local.hpp
rename to ndnboost/preprocessor/iteration/local.hpp
index 289fb1a..76992b7 100644
--- a/boost/preprocessor/iteration/local.hpp
+++ b/ndnboost/preprocessor/iteration/local.hpp
@@ -12,13 +12,13 @@
 # ifndef BOOST_PREPROCESSOR_ITERATION_LOCAL_HPP
 # define BOOST_PREPROCESSOR_ITERATION_LOCAL_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/slot/slot.hpp>
-# include <boost/preprocessor/tuple/elem.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/slot/slot.hpp>
+# include <ndnboost/preprocessor/tuple/elem.hpp>
 #
 # /* BOOST_PP_LOCAL_ITERATE */
 #
-# define BOOST_PP_LOCAL_ITERATE() <boost/preprocessor/iteration/detail/local.hpp>
+# define BOOST_PP_LOCAL_ITERATE() <ndnboost/preprocessor/iteration/detail/local.hpp>
 #
 # define BOOST_PP_LOCAL_C(n) (BOOST_PP_LOCAL_S) <= n && (BOOST_PP_LOCAL_F) >= n
 # define BOOST_PP_LOCAL_R(n) (BOOST_PP_LOCAL_F) <= n && (BOOST_PP_LOCAL_S) >= n
diff --git a/boost/preprocessor/iteration/self.hpp b/ndnboost/preprocessor/iteration/self.hpp
similarity index 89%
rename from boost/preprocessor/iteration/self.hpp
rename to ndnboost/preprocessor/iteration/self.hpp
index 6e0464c..f8c8528 100644
--- a/boost/preprocessor/iteration/self.hpp
+++ b/ndnboost/preprocessor/iteration/self.hpp
@@ -14,6 +14,6 @@
 #
 # /* BOOST_PP_INCLUDE_SELF */
 #
-# define BOOST_PP_INCLUDE_SELF() <boost/preprocessor/iteration/detail/self.hpp>
+# define BOOST_PP_INCLUDE_SELF() <ndnboost/preprocessor/iteration/detail/self.hpp>
 #
 # endif
diff --git a/boost/preprocessor/list/adt.hpp b/ndnboost/preprocessor/list/adt.hpp
similarity index 90%
rename from boost/preprocessor/list/adt.hpp
rename to ndnboost/preprocessor/list/adt.hpp
index b4f12ba..a4e3785 100644
--- a/boost/preprocessor/list/adt.hpp
+++ b/ndnboost/preprocessor/list/adt.hpp
@@ -14,10 +14,10 @@
 # ifndef BOOST_PREPROCESSOR_LIST_ADT_HPP
 # define BOOST_PREPROCESSOR_LIST_ADT_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/detail/is_binary.hpp>
-# include <boost/preprocessor/logical/compl.hpp>
-# include <boost/preprocessor/tuple/eat.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/detail/is_binary.hpp>
+# include <ndnboost/preprocessor/logical/compl.hpp>
+# include <ndnboost/preprocessor/tuple/eat.hpp>
 #
 # /* BOOST_PP_LIST_CONS */
 #
diff --git a/boost/preprocessor/list/append.hpp b/ndnboost/preprocessor/list/append.hpp
similarity index 92%
rename from boost/preprocessor/list/append.hpp
rename to ndnboost/preprocessor/list/append.hpp
index 26e9d74..0f7cb4d 100644
--- a/boost/preprocessor/list/append.hpp
+++ b/ndnboost/preprocessor/list/append.hpp
@@ -14,8 +14,8 @@
 # ifndef BOOST_PREPROCESSOR_LIST_APPEND_HPP
 # define BOOST_PREPROCESSOR_LIST_APPEND_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/list/fold_right.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/list/fold_right.hpp>
 #
 # /* BOOST_PP_LIST_APPEND */
 #
diff --git a/boost/preprocessor/list/detail/dmc/fold_left.hpp b/ndnboost/preprocessor/list/detail/dmc/fold_left.hpp
similarity index 99%
rename from boost/preprocessor/list/detail/dmc/fold_left.hpp
rename to ndnboost/preprocessor/list/detail/dmc/fold_left.hpp
index 844ac5b..073cc13 100644
--- a/boost/preprocessor/list/detail/dmc/fold_left.hpp
+++ b/ndnboost/preprocessor/list/detail/dmc/fold_left.hpp
@@ -14,10 +14,10 @@
 # ifndef BOOST_PREPROCESSOR_LIST_DETAIL_FOLD_LEFT_HPP
 # define BOOST_PREPROCESSOR_LIST_DETAIL_FOLD_LEFT_HPP
 #
-# include <boost/preprocessor/control/expr_iif.hpp>
-# include <boost/preprocessor/control/iif.hpp>
-# include <boost/preprocessor/list/adt.hpp>
-# include <boost/preprocessor/tuple/elem.hpp>
+# include <ndnboost/preprocessor/control/expr_iif.hpp>
+# include <ndnboost/preprocessor/control/iif.hpp>
+# include <ndnboost/preprocessor/list/adt.hpp>
+# include <ndnboost/preprocessor/tuple/elem.hpp>
 #
 # define BOOST_PP_LIST_FOLD_LEFT_1(o, s, l) BOOST_PP_IIF(BOOST_PP_LIST_IS_CONS(l), BOOST_PP_LIST_FOLD_LEFT_2, BOOST_PP_TUPLE_ELEM_3_1)(o, BOOST_PP_IIF(BOOST_PP_LIST_IS_CONS(l), o, BOOST_PP_TUPLE_ELEM_3_1)(2, s, BOOST_PP_LIST_FIRST(l)), BOOST_PP_LIST_REST(l))
 # define BOOST_PP_LIST_FOLD_LEFT_2(o, s, l) BOOST_PP_IIF(BOOST_PP_LIST_IS_CONS(l), BOOST_PP_LIST_FOLD_LEFT_3, BOOST_PP_TUPLE_ELEM_3_1)(o, BOOST_PP_IIF(BOOST_PP_LIST_IS_CONS(l), o, BOOST_PP_TUPLE_ELEM_3_1)(3, s, BOOST_PP_LIST_FIRST(l)), BOOST_PP_LIST_REST(l))
diff --git a/boost/preprocessor/list/detail/edg/fold_left.hpp b/ndnboost/preprocessor/list/detail/edg/fold_left.hpp
similarity index 99%
rename from boost/preprocessor/list/detail/edg/fold_left.hpp
rename to ndnboost/preprocessor/list/detail/edg/fold_left.hpp
index ae9524f..87550f0 100644
--- a/boost/preprocessor/list/detail/edg/fold_left.hpp
+++ b/ndnboost/preprocessor/list/detail/edg/fold_left.hpp
@@ -14,10 +14,10 @@
 # ifndef BOOST_PREPROCESSOR_LIST_DETAIL_EDG_FOLD_LEFT_HPP
 # define BOOST_PREPROCESSOR_LIST_DETAIL_EDG_FOLD_LEFT_HPP
 #
-# include <boost/preprocessor/control/expr_iif.hpp>
-# include <boost/preprocessor/control/iif.hpp>
-# include <boost/preprocessor/list/adt.hpp>
-# include <boost/preprocessor/tuple/eat.hpp>
+# include <ndnboost/preprocessor/control/expr_iif.hpp>
+# include <ndnboost/preprocessor/control/iif.hpp>
+# include <ndnboost/preprocessor/list/adt.hpp>
+# include <ndnboost/preprocessor/tuple/eat.hpp>
 #
 # define BOOST_PP_LIST_FOLD_LEFT_1(o, s, l) BOOST_PP_LIST_FOLD_LEFT_1_D(o, s, l)
 # define BOOST_PP_LIST_FOLD_LEFT_2(o, s, l) BOOST_PP_LIST_FOLD_LEFT_2_D(o, s, l)
diff --git a/boost/preprocessor/list/detail/edg/fold_right.hpp b/ndnboost/preprocessor/list/detail/edg/fold_right.hpp
similarity index 99%
rename from boost/preprocessor/list/detail/edg/fold_right.hpp
rename to ndnboost/preprocessor/list/detail/edg/fold_right.hpp
index d372d2e..037f551 100644
--- a/boost/preprocessor/list/detail/edg/fold_right.hpp
+++ b/ndnboost/preprocessor/list/detail/edg/fold_right.hpp
@@ -14,9 +14,9 @@
 # ifndef BOOST_PREPROCESSOR_LIST_DETAIL_EDG_FOLD_RIGHT_HPP
 # define BOOST_PREPROCESSOR_LIST_DETAIL_EDG_FOLD_RIGHT_HPP
 #
-# include <boost/preprocessor/control/iif.hpp>
-# include <boost/preprocessor/list/adt.hpp>
-# include <boost/preprocessor/tuple/eat.hpp>
+# include <ndnboost/preprocessor/control/iif.hpp>
+# include <ndnboost/preprocessor/list/adt.hpp>
+# include <ndnboost/preprocessor/tuple/eat.hpp>
 #
 # define BOOST_PP_LIST_FOLD_RIGHT_1(o, s, l) BOOST_PP_LIST_FOLD_RIGHT_1_D(o, s, l)
 # define BOOST_PP_LIST_FOLD_RIGHT_2(o, s, l) BOOST_PP_LIST_FOLD_RIGHT_2_D(o, s, l)
diff --git a/boost/preprocessor/list/detail/fold_left.hpp b/ndnboost/preprocessor/list/detail/fold_left.hpp
similarity index 99%
rename from boost/preprocessor/list/detail/fold_left.hpp
rename to ndnboost/preprocessor/list/detail/fold_left.hpp
index f5fcab7..18b6d56 100644
--- a/boost/preprocessor/list/detail/fold_left.hpp
+++ b/ndnboost/preprocessor/list/detail/fold_left.hpp
@@ -14,10 +14,10 @@
 # ifndef BOOST_PREPROCESSOR_LIST_DETAIL_FOLD_LEFT_HPP
 # define BOOST_PREPROCESSOR_LIST_DETAIL_FOLD_LEFT_HPP
 #
-# include <boost/preprocessor/control/expr_iif.hpp>
-# include <boost/preprocessor/control/iif.hpp>
-# include <boost/preprocessor/list/adt.hpp>
-# include <boost/preprocessor/tuple/eat.hpp>
+# include <ndnboost/preprocessor/control/expr_iif.hpp>
+# include <ndnboost/preprocessor/control/iif.hpp>
+# include <ndnboost/preprocessor/list/adt.hpp>
+# include <ndnboost/preprocessor/tuple/eat.hpp>
 #
 # define BOOST_PP_LIST_FOLD_LEFT_1(o, s, l) BOOST_PP_IIF(BOOST_PP_LIST_IS_CONS(l), BOOST_PP_LIST_FOLD_LEFT_2, s BOOST_PP_TUPLE_EAT_3)(o, BOOST_PP_EXPR_IIF(BOOST_PP_LIST_IS_CONS(l), o)(2, s, BOOST_PP_LIST_FIRST(l)), BOOST_PP_LIST_REST(l))
 # define BOOST_PP_LIST_FOLD_LEFT_2(o, s, l) BOOST_PP_IIF(BOOST_PP_LIST_IS_CONS(l), BOOST_PP_LIST_FOLD_LEFT_3, s BOOST_PP_TUPLE_EAT_3)(o, BOOST_PP_EXPR_IIF(BOOST_PP_LIST_IS_CONS(l), o)(3, s, BOOST_PP_LIST_FIRST(l)), BOOST_PP_LIST_REST(l))
diff --git a/boost/preprocessor/list/detail/fold_right.hpp b/ndnboost/preprocessor/list/detail/fold_right.hpp
similarity index 99%
rename from boost/preprocessor/list/detail/fold_right.hpp
rename to ndnboost/preprocessor/list/detail/fold_right.hpp
index 29146d5..72dfe91 100644
--- a/boost/preprocessor/list/detail/fold_right.hpp
+++ b/ndnboost/preprocessor/list/detail/fold_right.hpp
@@ -14,8 +14,8 @@
 # ifndef BOOST_PREPROCESSOR_LIST_DETAIL_FOLD_RIGHT_HPP
 # define BOOST_PREPROCESSOR_LIST_DETAIL_FOLD_RIGHT_HPP
 #
-# include <boost/preprocessor/list/fold_left.hpp>
-# include <boost/preprocessor/list/reverse.hpp>
+# include <ndnboost/preprocessor/list/fold_left.hpp>
+# include <ndnboost/preprocessor/list/reverse.hpp>
 #
 # define BOOST_PP_LIST_FOLD_RIGHT_1(o, s, l) BOOST_PP_LIST_FOLD_LEFT_1(o, s, BOOST_PP_LIST_REVERSE_D(1, l))
 # define BOOST_PP_LIST_FOLD_RIGHT_2(o, s, l) BOOST_PP_LIST_FOLD_LEFT_2(o, s, BOOST_PP_LIST_REVERSE_D(2, l))
diff --git a/boost/preprocessor/list/fold_left.hpp b/ndnboost/preprocessor/list/fold_left.hpp
similarity index 97%
rename from boost/preprocessor/list/fold_left.hpp
rename to ndnboost/preprocessor/list/fold_left.hpp
index f235aec..4be193f 100644
--- a/boost/preprocessor/list/fold_left.hpp
+++ b/ndnboost/preprocessor/list/fold_left.hpp
@@ -14,10 +14,10 @@
 # ifndef BOOST_PREPROCESSOR_LIST_FOLD_LEFT_HPP
 # define BOOST_PREPROCESSOR_LIST_FOLD_LEFT_HPP
 #
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/control/while.hpp>
-# include <boost/preprocessor/debug/error.hpp>
-# include <boost/preprocessor/detail/auto_rec.hpp>
+# include <ndnboost/preprocessor/cat.hpp>
+# include <ndnboost/preprocessor/control/while.hpp>
+# include <ndnboost/preprocessor/debug/error.hpp>
+# include <ndnboost/preprocessor/detail/auto_rec.hpp>
 #
 # /* BOOST_PP_LIST_FOLD_LEFT */
 #
@@ -34,11 +34,11 @@
 # define BOOST_PP_LIST_FOLD_LEFT_2ND_D BOOST_PP_LIST_FOLD_LEFT_D
 #
 # if BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_EDG()
-#    include <boost/preprocessor/list/detail/edg/fold_left.hpp>
+#    include <ndnboost/preprocessor/list/detail/edg/fold_left.hpp>
 # elif BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_DMC()
-#    include <boost/preprocessor/list/detail/dmc/fold_left.hpp>
+#    include <ndnboost/preprocessor/list/detail/dmc/fold_left.hpp>
 # else
-#    include <boost/preprocessor/list/detail/fold_left.hpp>
+#    include <ndnboost/preprocessor/list/detail/fold_left.hpp>
 # endif
 #
 # define BOOST_PP_LIST_FOLD_LEFT_CHECK_BOOST_PP_NIL 1
diff --git a/boost/preprocessor/list/fold_right.hpp b/ndnboost/preprocessor/list/fold_right.hpp
similarity index 75%
rename from boost/preprocessor/list/fold_right.hpp
rename to ndnboost/preprocessor/list/fold_right.hpp
index ce18afe..951bd9e 100644
--- a/boost/preprocessor/list/fold_right.hpp
+++ b/ndnboost/preprocessor/list/fold_right.hpp
@@ -14,10 +14,10 @@
 # ifndef BOOST_PREPROCESSOR_LIST_FOLD_RIGHT_HPP
 # define BOOST_PREPROCESSOR_LIST_FOLD_RIGHT_HPP
 #
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/control/while.hpp>
-# include <boost/preprocessor/debug/error.hpp>
-# include <boost/preprocessor/detail/auto_rec.hpp>
+# include <ndnboost/preprocessor/cat.hpp>
+# include <ndnboost/preprocessor/control/while.hpp>
+# include <ndnboost/preprocessor/debug/error.hpp>
+# include <ndnboost/preprocessor/detail/auto_rec.hpp>
 #
 # if 0
 #    define BOOST_PP_LIST_FOLD_RIGHT(op, state, list)
@@ -32,9 +32,9 @@
 # define BOOST_PP_LIST_FOLD_RIGHT_2ND_D BOOST_PP_LIST_FOLD_RIGHT_D
 #
 # if BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_EDG()
-#    include <boost/preprocessor/list/detail/edg/fold_right.hpp>
+#    include <ndnboost/preprocessor/list/detail/edg/fold_right.hpp>
 # else
-#    include <boost/preprocessor/list/detail/fold_right.hpp>
+#    include <ndnboost/preprocessor/list/detail/fold_right.hpp>
 # endif
 #
 # endif
diff --git a/boost/preprocessor/list/for_each_i.hpp b/ndnboost/preprocessor/list/for_each_i.hpp
similarity index 90%
rename from boost/preprocessor/list/for_each_i.hpp
rename to ndnboost/preprocessor/list/for_each_i.hpp
index 8f02e2e..1b88524 100644
--- a/boost/preprocessor/list/for_each_i.hpp
+++ b/ndnboost/preprocessor/list/for_each_i.hpp
@@ -14,12 +14,12 @@
 # ifndef BOOST_PREPROCESSOR_LIST_LIST_FOR_EACH_I_HPP
 # define BOOST_PREPROCESSOR_LIST_LIST_FOR_EACH_I_HPP
 #
-# include <boost/preprocessor/arithmetic/inc.hpp>
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/list/adt.hpp>
-# include <boost/preprocessor/repetition/for.hpp>
-# include <boost/preprocessor/tuple/elem.hpp>
-# include <boost/preprocessor/tuple/rem.hpp>
+# include <ndnboost/preprocessor/arithmetic/inc.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/list/adt.hpp>
+# include <ndnboost/preprocessor/repetition/for.hpp>
+# include <ndnboost/preprocessor/tuple/elem.hpp>
+# include <ndnboost/preprocessor/tuple/rem.hpp>
 #
 # /* BOOST_PP_LIST_FOR_EACH_I */
 #
diff --git a/boost/preprocessor/list/reverse.hpp b/ndnboost/preprocessor/list/reverse.hpp
similarity index 92%
rename from boost/preprocessor/list/reverse.hpp
rename to ndnboost/preprocessor/list/reverse.hpp
index 651da05..d23fffc 100644
--- a/boost/preprocessor/list/reverse.hpp
+++ b/ndnboost/preprocessor/list/reverse.hpp
@@ -14,8 +14,8 @@
 # ifndef BOOST_PREPROCESSOR_LIST_REVERSE_HPP
 # define BOOST_PREPROCESSOR_LIST_REVERSE_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/list/fold_left.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/list/fold_left.hpp>
 #
 # /* BOOST_PP_LIST_REVERSE */
 #
diff --git a/boost/preprocessor/list/transform.hpp b/ndnboost/preprocessor/list/transform.hpp
similarity index 91%
rename from boost/preprocessor/list/transform.hpp
rename to ndnboost/preprocessor/list/transform.hpp
index 840f306..8be863f 100644
--- a/boost/preprocessor/list/transform.hpp
+++ b/ndnboost/preprocessor/list/transform.hpp
@@ -14,10 +14,10 @@
 # ifndef BOOST_PREPROCESSOR_LIST_TRANSFORM_HPP
 # define BOOST_PREPROCESSOR_LIST_TRANSFORM_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/list/fold_right.hpp>
-# include <boost/preprocessor/tuple/elem.hpp>
-# include <boost/preprocessor/tuple/rem.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/list/fold_right.hpp>
+# include <ndnboost/preprocessor/tuple/elem.hpp>
+# include <ndnboost/preprocessor/tuple/rem.hpp>
 #
 # /* BOOST_PP_LIST_TRANSFORM */
 #
diff --git a/boost/preprocessor/logical/and.hpp b/ndnboost/preprocessor/logical/and.hpp
similarity index 83%
rename from boost/preprocessor/logical/and.hpp
rename to ndnboost/preprocessor/logical/and.hpp
index 8590365..ca3b619 100644
--- a/boost/preprocessor/logical/and.hpp
+++ b/ndnboost/preprocessor/logical/and.hpp
@@ -14,9 +14,9 @@
 # ifndef BOOST_PREPROCESSOR_LOGICAL_AND_HPP
 # define BOOST_PREPROCESSOR_LOGICAL_AND_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/logical/bool.hpp>
-# include <boost/preprocessor/logical/bitand.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/logical/bool.hpp>
+# include <ndnboost/preprocessor/logical/bitand.hpp>
 #
 # /* BOOST_PP_AND */
 #
diff --git a/boost/preprocessor/logical/bitand.hpp b/ndnboost/preprocessor/logical/bitand.hpp
similarity index 96%
rename from boost/preprocessor/logical/bitand.hpp
rename to ndnboost/preprocessor/logical/bitand.hpp
index 74e9527..56ab392 100644
--- a/boost/preprocessor/logical/bitand.hpp
+++ b/ndnboost/preprocessor/logical/bitand.hpp
@@ -12,7 +12,7 @@
 # ifndef BOOST_PREPROCESSOR_LOGICAL_BITAND_HPP
 # define BOOST_PREPROCESSOR_LOGICAL_BITAND_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
 #
 # /* BOOST_PP_BITAND */
 #
diff --git a/boost/preprocessor/logical/bool.hpp b/ndnboost/preprocessor/logical/bool.hpp
similarity index 99%
rename from boost/preprocessor/logical/bool.hpp
rename to ndnboost/preprocessor/logical/bool.hpp
index fc01b5b..e14f4d3 100644
--- a/boost/preprocessor/logical/bool.hpp
+++ b/ndnboost/preprocessor/logical/bool.hpp
@@ -14,7 +14,7 @@
 # ifndef BOOST_PREPROCESSOR_LOGICAL_BOOL_HPP
 # define BOOST_PREPROCESSOR_LOGICAL_BOOL_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
 #
 # /* BOOST_PP_BOOL */
 #
diff --git a/boost/preprocessor/logical/compl.hpp b/ndnboost/preprocessor/logical/compl.hpp
similarity index 95%
rename from boost/preprocessor/logical/compl.hpp
rename to ndnboost/preprocessor/logical/compl.hpp
index ad4c7a4..214d64c 100644
--- a/boost/preprocessor/logical/compl.hpp
+++ b/ndnboost/preprocessor/logical/compl.hpp
@@ -12,7 +12,7 @@
 # ifndef BOOST_PREPROCESSOR_LOGICAL_COMPL_HPP
 # define BOOST_PREPROCESSOR_LOGICAL_COMPL_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
 #
 # /* BOOST_PP_COMPL */
 #
diff --git a/boost/preprocessor/punctuation/comma.hpp b/ndnboost/preprocessor/punctuation/comma.hpp
similarity index 100%
rename from boost/preprocessor/punctuation/comma.hpp
rename to ndnboost/preprocessor/punctuation/comma.hpp
diff --git a/boost/preprocessor/punctuation/comma_if.hpp b/ndnboost/preprocessor/punctuation/comma_if.hpp
similarity index 79%
rename from boost/preprocessor/punctuation/comma_if.hpp
rename to ndnboost/preprocessor/punctuation/comma_if.hpp
index c711f36..eaf0702 100644
--- a/boost/preprocessor/punctuation/comma_if.hpp
+++ b/ndnboost/preprocessor/punctuation/comma_if.hpp
@@ -14,10 +14,10 @@
 # ifndef BOOST_PREPROCESSOR_PUNCTUATION_COMMA_IF_HPP
 # define BOOST_PREPROCESSOR_PUNCTUATION_COMMA_IF_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/control/if.hpp>
-# include <boost/preprocessor/facilities/empty.hpp>
-# include <boost/preprocessor/punctuation/comma.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/control/if.hpp>
+# include <ndnboost/preprocessor/facilities/empty.hpp>
+# include <ndnboost/preprocessor/punctuation/comma.hpp>
 #
 # /* BOOST_PP_COMMA_IF */
 #
diff --git a/boost/preprocessor/repeat.hpp b/ndnboost/preprocessor/repeat.hpp
similarity index 92%
rename from boost/preprocessor/repeat.hpp
rename to ndnboost/preprocessor/repeat.hpp
index 7c47ee8..f98c65c 100644
--- a/boost/preprocessor/repeat.hpp
+++ b/ndnboost/preprocessor/repeat.hpp
@@ -12,6 +12,6 @@
 # ifndef BOOST_PREPROCESSOR_REPEAT_HPP
 # define BOOST_PREPROCESSOR_REPEAT_HPP
 #
-# include <boost/preprocessor/repetition/repeat.hpp>
+# include <ndnboost/preprocessor/repetition/repeat.hpp>
 #
 # endif
diff --git a/boost/preprocessor/repetition/detail/dmc/for.hpp b/ndnboost/preprocessor/repetition/detail/dmc/for.hpp
similarity index 99%
rename from boost/preprocessor/repetition/detail/dmc/for.hpp
rename to ndnboost/preprocessor/repetition/detail/dmc/for.hpp
index 1d907ff..da6fe49 100644
--- a/boost/preprocessor/repetition/detail/dmc/for.hpp
+++ b/ndnboost/preprocessor/repetition/detail/dmc/for.hpp
@@ -14,10 +14,10 @@
 # ifndef BOOST_PREPROCESSOR_REPETITION_DETAIL_FOR_HPP
 # define BOOST_PREPROCESSOR_REPETITION_DETAIL_FOR_HPP
 #
-# include <boost/preprocessor/control/expr_iif.hpp>
-# include <boost/preprocessor/control/iif.hpp>
-# include <boost/preprocessor/logical/bool.hpp>
-# include <boost/preprocessor/tuple/eat.hpp>
+# include <ndnboost/preprocessor/control/expr_iif.hpp>
+# include <ndnboost/preprocessor/control/iif.hpp>
+# include <ndnboost/preprocessor/logical/bool.hpp>
+# include <ndnboost/preprocessor/tuple/eat.hpp>
 #
 # define BOOST_PP_FOR_1(s, p, o, m) BOOST_PP_FOR_1_C(BOOST_PP_BOOL(p##(2, s)), s, p, o, m)
 # define BOOST_PP_FOR_2(s, p, o, m) BOOST_PP_FOR_2_C(BOOST_PP_BOOL(p##(3, s)), s, p, o, m)
diff --git a/boost/preprocessor/repetition/detail/edg/for.hpp b/ndnboost/preprocessor/repetition/detail/edg/for.hpp
similarity index 99%
rename from boost/preprocessor/repetition/detail/edg/for.hpp
rename to ndnboost/preprocessor/repetition/detail/edg/for.hpp
index 212921a..4230ab0 100644
--- a/boost/preprocessor/repetition/detail/edg/for.hpp
+++ b/ndnboost/preprocessor/repetition/detail/edg/for.hpp
@@ -14,8 +14,8 @@
 # ifndef BOOST_PREPROCESSOR_REPETITION_DETAIL_EDG_FOR_HPP
 # define BOOST_PREPROCESSOR_REPETITION_DETAIL_EDG_FOR_HPP
 #
-# include <boost/preprocessor/control/if.hpp>
-# include <boost/preprocessor/tuple/eat.hpp>
+# include <ndnboost/preprocessor/control/if.hpp>
+# include <ndnboost/preprocessor/tuple/eat.hpp>
 #
 # define BOOST_PP_FOR_1(s, p, o, m) BOOST_PP_FOR_1_I(s, p, o, m)
 # define BOOST_PP_FOR_2(s, p, o, m) BOOST_PP_FOR_2_I(s, p, o, m)
diff --git a/boost/preprocessor/repetition/detail/for.hpp b/ndnboost/preprocessor/repetition/detail/for.hpp
similarity index 99%
rename from boost/preprocessor/repetition/detail/for.hpp
rename to ndnboost/preprocessor/repetition/detail/for.hpp
index 2770f2c..2f6ed27 100644
--- a/boost/preprocessor/repetition/detail/for.hpp
+++ b/ndnboost/preprocessor/repetition/detail/for.hpp
@@ -14,10 +14,10 @@
 # ifndef BOOST_PREPROCESSOR_REPETITION_DETAIL_FOR_HPP
 # define BOOST_PREPROCESSOR_REPETITION_DETAIL_FOR_HPP
 #
-# include <boost/preprocessor/control/expr_iif.hpp>
-# include <boost/preprocessor/control/iif.hpp>
-# include <boost/preprocessor/logical/bool.hpp>
-# include <boost/preprocessor/tuple/eat.hpp>
+# include <ndnboost/preprocessor/control/expr_iif.hpp>
+# include <ndnboost/preprocessor/control/iif.hpp>
+# include <ndnboost/preprocessor/logical/bool.hpp>
+# include <ndnboost/preprocessor/tuple/eat.hpp>
 #
 # define BOOST_PP_FOR_1(s, p, o, m) BOOST_PP_FOR_1_C(BOOST_PP_BOOL(p(2, s)), s, p, o, m)
 # define BOOST_PP_FOR_2(s, p, o, m) BOOST_PP_FOR_2_C(BOOST_PP_BOOL(p(3, s)), s, p, o, m)
diff --git a/boost/preprocessor/repetition/detail/msvc/for.hpp b/ndnboost/preprocessor/repetition/detail/msvc/for.hpp
similarity index 99%
rename from boost/preprocessor/repetition/detail/msvc/for.hpp
rename to ndnboost/preprocessor/repetition/detail/msvc/for.hpp
index 35c1996..1d09508 100644
--- a/boost/preprocessor/repetition/detail/msvc/for.hpp
+++ b/ndnboost/preprocessor/repetition/detail/msvc/for.hpp
@@ -14,8 +14,8 @@
 # ifndef BOOST_PREPROCESSOR_REPETITION_DETAIL_MSVC_FOR_HPP
 # define BOOST_PREPROCESSOR_REPETITION_DETAIL_MSVC_FOR_HPP
 #
-# include <boost/preprocessor/control/if.hpp>
-# include <boost/preprocessor/tuple/eat.hpp>
+# include <ndnboost/preprocessor/control/if.hpp>
+# include <ndnboost/preprocessor/tuple/eat.hpp>
 #
 # define BOOST_PP_FOR_1(s, p, o, m) BOOST_PP_IF(p(2, s), m, BOOST_PP_TUPLE_EAT_2)(2, s) BOOST_PP_IF(p(2, s), BOOST_PP_FOR_2, BOOST_PP_TUPLE_EAT_4)(o(2, s), p, o, m)
 # define BOOST_PP_FOR_2(s, p, o, m) BOOST_PP_IF(p(3, s), m, BOOST_PP_TUPLE_EAT_2)(3, s) BOOST_PP_IF(p(3, s), BOOST_PP_FOR_3, BOOST_PP_TUPLE_EAT_4)(o(3, s), p, o, m)
diff --git a/boost/preprocessor/repetition/enum_params.hpp b/ndnboost/preprocessor/repetition/enum_params.hpp
similarity index 88%
rename from boost/preprocessor/repetition/enum_params.hpp
rename to ndnboost/preprocessor/repetition/enum_params.hpp
index 65a2369..33c8579 100644
--- a/boost/preprocessor/repetition/enum_params.hpp
+++ b/ndnboost/preprocessor/repetition/enum_params.hpp
@@ -14,9 +14,9 @@
 # ifndef BOOST_PREPROCESSOR_REPETITION_ENUM_PARAMS_HPP
 # define BOOST_PREPROCESSOR_REPETITION_ENUM_PARAMS_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/punctuation/comma_if.hpp>
-# include <boost/preprocessor/repetition/repeat.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/punctuation/comma_if.hpp>
+# include <ndnboost/preprocessor/repetition/repeat.hpp>
 #
 # /* BOOST_PP_ENUM_PARAMS */
 #
diff --git a/boost/preprocessor/repetition/for.hpp b/ndnboost/preprocessor/repetition/for.hpp
similarity index 97%
rename from boost/preprocessor/repetition/for.hpp
rename to ndnboost/preprocessor/repetition/for.hpp
index 5a63753..ff8114b 100644
--- a/boost/preprocessor/repetition/for.hpp
+++ b/ndnboost/preprocessor/repetition/for.hpp
@@ -14,9 +14,9 @@
 # ifndef BOOST_PREPROCESSOR_REPETITION_FOR_HPP
 # define BOOST_PREPROCESSOR_REPETITION_FOR_HPP
 #
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/debug/error.hpp>
-# include <boost/preprocessor/detail/auto_rec.hpp>
+# include <ndnboost/preprocessor/cat.hpp>
+# include <ndnboost/preprocessor/debug/error.hpp>
+# include <ndnboost/preprocessor/detail/auto_rec.hpp>
 #
 # /* BOOST_PP_FOR */
 #
@@ -33,13 +33,13 @@
 # define BOOST_PP_FOR_SR_M(r, s) BOOST_PP_NIL
 #
 # if BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_EDG()
-#    include <boost/preprocessor/repetition/detail/edg/for.hpp>
+#    include <ndnboost/preprocessor/repetition/detail/edg/for.hpp>
 # elif BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MSVC()
-#    include <boost/preprocessor/repetition/detail/msvc/for.hpp>
+#    include <ndnboost/preprocessor/repetition/detail/msvc/for.hpp>
 # elif BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_DMC()
-#    include <boost/preprocessor/repetition/detail/dmc/for.hpp>
+#    include <ndnboost/preprocessor/repetition/detail/dmc/for.hpp>
 # else
-#    include <boost/preprocessor/repetition/detail/for.hpp>
+#    include <ndnboost/preprocessor/repetition/detail/for.hpp>
 # endif
 #
 # define BOOST_PP_FOR_257(s, p, o, m) BOOST_PP_ERROR(0x0002)
diff --git a/boost/preprocessor/repetition/repeat.hpp b/ndnboost/preprocessor/repetition/repeat.hpp
similarity index 99%
rename from boost/preprocessor/repetition/repeat.hpp
rename to ndnboost/preprocessor/repetition/repeat.hpp
index 0172738..1ec7d70 100644
--- a/boost/preprocessor/repetition/repeat.hpp
+++ b/ndnboost/preprocessor/repetition/repeat.hpp
@@ -14,11 +14,11 @@
 # ifndef BOOST_PREPROCESSOR_REPETITION_REPEAT_HPP
 # define BOOST_PREPROCESSOR_REPETITION_REPEAT_HPP
 #
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/debug/error.hpp>
-# include <boost/preprocessor/detail/auto_rec.hpp>
-# include <boost/preprocessor/tuple/eat.hpp>
+# include <ndnboost/preprocessor/cat.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/debug/error.hpp>
+# include <ndnboost/preprocessor/detail/auto_rec.hpp>
+# include <ndnboost/preprocessor/tuple/eat.hpp>
 #
 # /* BOOST_PP_REPEAT */
 #
diff --git a/boost/preprocessor/slot/detail/counter.hpp b/ndnboost/preprocessor/slot/detail/counter.hpp
similarity index 99%
rename from boost/preprocessor/slot/detail/counter.hpp
rename to ndnboost/preprocessor/slot/detail/counter.hpp
index a1c0df1..fb98a8d 100644
--- a/boost/preprocessor/slot/detail/counter.hpp
+++ b/ndnboost/preprocessor/slot/detail/counter.hpp
@@ -11,7 +11,7 @@
 #
 # define BOOST_PP_VALUE BOOST_PP_COUNTER + 1
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_COUNTER
 #
diff --git a/boost/preprocessor/slot/detail/def.hpp b/ndnboost/preprocessor/slot/detail/def.hpp
similarity index 100%
rename from boost/preprocessor/slot/detail/def.hpp
rename to ndnboost/preprocessor/slot/detail/def.hpp
diff --git a/boost/preprocessor/slot/detail/shared.hpp b/ndnboost/preprocessor/slot/detail/shared.hpp
similarity index 100%
rename from boost/preprocessor/slot/detail/shared.hpp
rename to ndnboost/preprocessor/slot/detail/shared.hpp
diff --git a/boost/preprocessor/slot/detail/slot1.hpp b/ndnboost/preprocessor/slot/detail/slot1.hpp
similarity index 99%
rename from boost/preprocessor/slot/detail/slot1.hpp
rename to ndnboost/preprocessor/slot/detail/slot1.hpp
index b22748e..686af64 100644
--- a/boost/preprocessor/slot/detail/slot1.hpp
+++ b/ndnboost/preprocessor/slot/detail/slot1.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_SLOT_1
 #
diff --git a/boost/preprocessor/slot/detail/slot2.hpp b/ndnboost/preprocessor/slot/detail/slot2.hpp
similarity index 99%
rename from boost/preprocessor/slot/detail/slot2.hpp
rename to ndnboost/preprocessor/slot/detail/slot2.hpp
index 5d5258c..3df9b4f 100644
--- a/boost/preprocessor/slot/detail/slot2.hpp
+++ b/ndnboost/preprocessor/slot/detail/slot2.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_SLOT_2
 #
diff --git a/boost/preprocessor/slot/detail/slot3.hpp b/ndnboost/preprocessor/slot/detail/slot3.hpp
similarity index 99%
rename from boost/preprocessor/slot/detail/slot3.hpp
rename to ndnboost/preprocessor/slot/detail/slot3.hpp
index 005cf21..b05bfad 100644
--- a/boost/preprocessor/slot/detail/slot3.hpp
+++ b/ndnboost/preprocessor/slot/detail/slot3.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_SLOT_3
 #
diff --git a/boost/preprocessor/slot/detail/slot4.hpp b/ndnboost/preprocessor/slot/detail/slot4.hpp
similarity index 99%
rename from boost/preprocessor/slot/detail/slot4.hpp
rename to ndnboost/preprocessor/slot/detail/slot4.hpp
index 9aa4d8a..0b0f725 100644
--- a/boost/preprocessor/slot/detail/slot4.hpp
+++ b/ndnboost/preprocessor/slot/detail/slot4.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_SLOT_4
 #
diff --git a/boost/preprocessor/slot/detail/slot5.hpp b/ndnboost/preprocessor/slot/detail/slot5.hpp
similarity index 99%
rename from boost/preprocessor/slot/detail/slot5.hpp
rename to ndnboost/preprocessor/slot/detail/slot5.hpp
index d17535d..d4b8ac1 100644
--- a/boost/preprocessor/slot/detail/slot5.hpp
+++ b/ndnboost/preprocessor/slot/detail/slot5.hpp
@@ -9,7 +9,7 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/slot/detail/shared.hpp>
+# include <ndnboost/preprocessor/slot/detail/shared.hpp>
 #
 # undef BOOST_PP_SLOT_5
 #
diff --git a/boost/preprocessor/slot/slot.hpp b/ndnboost/preprocessor/slot/slot.hpp
similarity index 64%
rename from boost/preprocessor/slot/slot.hpp
rename to ndnboost/preprocessor/slot/slot.hpp
index 147b097..f8fe419 100644
--- a/boost/preprocessor/slot/slot.hpp
+++ b/ndnboost/preprocessor/slot/slot.hpp
@@ -12,18 +12,18 @@
 # ifndef BOOST_PREPROCESSOR_SLOT_SLOT_HPP
 # define BOOST_PREPROCESSOR_SLOT_SLOT_HPP
 #
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/slot/detail/def.hpp>
+# include <ndnboost/preprocessor/cat.hpp>
+# include <ndnboost/preprocessor/slot/detail/def.hpp>
 #
 # /* BOOST_PP_ASSIGN_SLOT */
 #
 # define BOOST_PP_ASSIGN_SLOT(i) BOOST_PP_CAT(BOOST_PP_ASSIGN_SLOT_, i)
 #
-# define BOOST_PP_ASSIGN_SLOT_1 <boost/preprocessor/slot/detail/slot1.hpp>
-# define BOOST_PP_ASSIGN_SLOT_2 <boost/preprocessor/slot/detail/slot2.hpp>
-# define BOOST_PP_ASSIGN_SLOT_3 <boost/preprocessor/slot/detail/slot3.hpp>
-# define BOOST_PP_ASSIGN_SLOT_4 <boost/preprocessor/slot/detail/slot4.hpp>
-# define BOOST_PP_ASSIGN_SLOT_5 <boost/preprocessor/slot/detail/slot5.hpp>
+# define BOOST_PP_ASSIGN_SLOT_1 <ndnboost/preprocessor/slot/detail/slot1.hpp>
+# define BOOST_PP_ASSIGN_SLOT_2 <ndnboost/preprocessor/slot/detail/slot2.hpp>
+# define BOOST_PP_ASSIGN_SLOT_3 <ndnboost/preprocessor/slot/detail/slot3.hpp>
+# define BOOST_PP_ASSIGN_SLOT_4 <ndnboost/preprocessor/slot/detail/slot4.hpp>
+# define BOOST_PP_ASSIGN_SLOT_5 <ndnboost/preprocessor/slot/detail/slot5.hpp>
 #
 # /* BOOST_PP_SLOT */
 #
diff --git a/boost/preprocessor/tuple/eat.hpp b/ndnboost/preprocessor/tuple/eat.hpp
similarity index 99%
rename from boost/preprocessor/tuple/eat.hpp
rename to ndnboost/preprocessor/tuple/eat.hpp
index 708015e..89fe571 100644
--- a/boost/preprocessor/tuple/eat.hpp
+++ b/ndnboost/preprocessor/tuple/eat.hpp
@@ -15,7 +15,7 @@
 # ifndef BOOST_PREPROCESSOR_TUPLE_EAT_HPP
 # define BOOST_PREPROCESSOR_TUPLE_EAT_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
 #
 # /* BOOST_PP_EAT */
 #
diff --git a/boost/preprocessor/tuple/elem.hpp b/ndnboost/preprocessor/tuple/elem.hpp
similarity index 99%
rename from boost/preprocessor/tuple/elem.hpp
rename to ndnboost/preprocessor/tuple/elem.hpp
index 3eba1c5..ac2dcdd 100644
--- a/boost/preprocessor/tuple/elem.hpp
+++ b/ndnboost/preprocessor/tuple/elem.hpp
@@ -15,11 +15,11 @@
 # ifndef BOOST_PREPROCESSOR_TUPLE_ELEM_HPP
 # define BOOST_PREPROCESSOR_TUPLE_ELEM_HPP
 #
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/facilities/overload.hpp>
-# include <boost/preprocessor/tuple/rem.hpp>
-# include <boost/preprocessor/variadic/elem.hpp>
+# include <ndnboost/preprocessor/cat.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/facilities/overload.hpp>
+# include <ndnboost/preprocessor/tuple/rem.hpp>
+# include <ndnboost/preprocessor/variadic/elem.hpp>
 #
 # if BOOST_PP_VARIADICS
 #    if BOOST_PP_VARIADICS_MSVC
diff --git a/boost/preprocessor/tuple/rem.hpp b/ndnboost/preprocessor/tuple/rem.hpp
similarity index 99%
rename from boost/preprocessor/tuple/rem.hpp
rename to ndnboost/preprocessor/tuple/rem.hpp
index 4e3362c..2a6d5b6 100644
--- a/boost/preprocessor/tuple/rem.hpp
+++ b/ndnboost/preprocessor/tuple/rem.hpp
@@ -13,9 +13,9 @@
 # ifndef BOOST_PREPROCESSOR_TUPLE_REM_HPP
 # define BOOST_PREPROCESSOR_TUPLE_REM_HPP
 #
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/facilities/overload.hpp>
+# include <ndnboost/preprocessor/cat.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/facilities/overload.hpp>
 #
 # /* BOOST_PP_REM */
 #
diff --git a/boost/preprocessor/tuple/to_list.hpp b/ndnboost/preprocessor/tuple/to_list.hpp
similarity index 99%
rename from boost/preprocessor/tuple/to_list.hpp
rename to ndnboost/preprocessor/tuple/to_list.hpp
index 2a9d6fe..f6d6409 100644
--- a/boost/preprocessor/tuple/to_list.hpp
+++ b/ndnboost/preprocessor/tuple/to_list.hpp
@@ -15,10 +15,10 @@
 # ifndef BOOST_PREPROCESSOR_TUPLE_TO_LIST_HPP
 # define BOOST_PREPROCESSOR_TUPLE_TO_LIST_HPP
 #
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/facilities/overload.hpp>
-# include <boost/preprocessor/variadic/size.hpp>
+# include <ndnboost/preprocessor/cat.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/facilities/overload.hpp>
+# include <ndnboost/preprocessor/variadic/size.hpp>
 #
 # /* BOOST_PP_TUPLE_TO_LIST */
 #
diff --git a/boost/preprocessor/variadic/elem.hpp b/ndnboost/preprocessor/variadic/elem.hpp
similarity index 99%
rename from boost/preprocessor/variadic/elem.hpp
rename to ndnboost/preprocessor/variadic/elem.hpp
index be38a94..67f5c66 100644
--- a/boost/preprocessor/variadic/elem.hpp
+++ b/ndnboost/preprocessor/variadic/elem.hpp
@@ -13,8 +13,8 @@
 # ifndef BOOST_PREPROCESSOR_VARIADIC_ELEM_HPP
 # define BOOST_PREPROCESSOR_VARIADIC_ELEM_HPP
 #
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/cat.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
 #
 # /* BOOST_PP_VARIADIC_ELEM */
 #
diff --git a/boost/preprocessor/variadic/size.hpp b/ndnboost/preprocessor/variadic/size.hpp
similarity index 95%
rename from boost/preprocessor/variadic/size.hpp
rename to ndnboost/preprocessor/variadic/size.hpp
index b92a5ff..9e84101 100644
--- a/boost/preprocessor/variadic/size.hpp
+++ b/ndnboost/preprocessor/variadic/size.hpp
@@ -13,8 +13,8 @@
 # ifndef BOOST_PREPROCESSOR_VARIADIC_SIZE_HPP
 # define BOOST_PREPROCESSOR_VARIADIC_SIZE_HPP
 #
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/config/config.hpp>
+# include <ndnboost/preprocessor/cat.hpp>
+# include <ndnboost/preprocessor/config/config.hpp>
 #
 # /* BOOST_PP_VARIADIC_SIZE */
 #
diff --git a/boost/shared_ptr.hpp b/ndnboost/shared_ptr.hpp
similarity index 91%
rename from boost/shared_ptr.hpp
rename to ndnboost/shared_ptr.hpp
index d31978c..d51926a 100644
--- a/boost/shared_ptr.hpp
+++ b/ndnboost/shared_ptr.hpp
@@ -14,6 +14,6 @@
 //  See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation.
 //
 
-#include <boost/smart_ptr/shared_ptr.hpp>
+#include <ndnboost/smart_ptr/shared_ptr.hpp>
 
 #endif  // #ifndef BOOST_SHARED_PTR_HPP_INCLUDED
diff --git a/boost/smart_ptr/allocate_shared_array.hpp b/ndnboost/smart_ptr/allocate_shared_array.hpp
similarity index 97%
rename from boost/smart_ptr/allocate_shared_array.hpp
rename to ndnboost/smart_ptr/allocate_shared_array.hpp
index 48ad5d3..3a78bd2 100644
--- a/boost/smart_ptr/allocate_shared_array.hpp
+++ b/ndnboost/smart_ptr/allocate_shared_array.hpp
@@ -9,11 +9,11 @@
 #ifndef BOOST_SMART_PTR_ALLOCATE_SHARED_ARRAY_HPP
 #define BOOST_SMART_PTR_ALLOCATE_SHARED_ARRAY_HPP
 
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/detail/allocate_array_helper.hpp>
-#include <boost/smart_ptr/detail/array_deleter.hpp>
-#include <boost/smart_ptr/detail/array_traits.hpp>
-#include <boost/smart_ptr/detail/sp_if_array.hpp>
+#include <ndnboost/smart_ptr/shared_ptr.hpp>
+#include <ndnboost/smart_ptr/detail/allocate_array_helper.hpp>
+#include <ndnboost/smart_ptr/detail/array_deleter.hpp>
+#include <ndnboost/smart_ptr/detail/array_traits.hpp>
+#include <ndnboost/smart_ptr/detail/sp_if_array.hpp>
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
 #include <initializer_list>
 #endif
diff --git a/boost/smart_ptr/bad_weak_ptr.hpp b/ndnboost/smart_ptr/bad_weak_ptr.hpp
similarity index 100%
rename from boost/smart_ptr/bad_weak_ptr.hpp
rename to ndnboost/smart_ptr/bad_weak_ptr.hpp
diff --git a/boost/smart_ptr/detail/allocate_array_helper.hpp b/ndnboost/smart_ptr/detail/allocate_array_helper.hpp
similarity index 99%
rename from boost/smart_ptr/detail/allocate_array_helper.hpp
rename to ndnboost/smart_ptr/detail/allocate_array_helper.hpp
index 5a59c09..a67e6e8 100644
--- a/boost/smart_ptr/detail/allocate_array_helper.hpp
+++ b/ndnboost/smart_ptr/detail/allocate_array_helper.hpp
@@ -9,7 +9,7 @@
 #ifndef BOOST_SMART_PTR_DETAIL_ALLOCATE_ARRAY_HELPER_HPP
 #define BOOST_SMART_PTR_DETAIL_ALLOCATE_ARRAY_HELPER_HPP
 
-#include <boost/type_traits/alignment_of.hpp>
+#include <ndnboost/type_traits/alignment_of.hpp>
 
 namespace ndnboost {
     namespace detail {
diff --git a/boost/smart_ptr/detail/array_deleter.hpp b/ndnboost/smart_ptr/detail/array_deleter.hpp
similarity index 96%
rename from boost/smart_ptr/detail/array_deleter.hpp
rename to ndnboost/smart_ptr/detail/array_deleter.hpp
index f97c236..2afe96c 100644
--- a/boost/smart_ptr/detail/array_deleter.hpp
+++ b/ndnboost/smart_ptr/detail/array_deleter.hpp
@@ -9,8 +9,8 @@
 #ifndef BOOST_SMART_PTR_DETAIL_ARRAY_DELETER_HPP
 #define BOOST_SMART_PTR_DETAIL_ARRAY_DELETER_HPP
 
-#include <boost/smart_ptr/detail/array_utility.hpp>
-#include <boost/smart_ptr/detail/sp_forward.hpp>
+#include <ndnboost/smart_ptr/detail/array_utility.hpp>
+#include <ndnboost/smart_ptr/detail/sp_forward.hpp>
 
 namespace ndnboost {
     namespace detail {
diff --git a/boost/smart_ptr/detail/array_traits.hpp b/ndnboost/smart_ptr/detail/array_traits.hpp
similarity index 96%
rename from boost/smart_ptr/detail/array_traits.hpp
rename to ndnboost/smart_ptr/detail/array_traits.hpp
index 4f96ccb..70d2391 100644
--- a/boost/smart_ptr/detail/array_traits.hpp
+++ b/ndnboost/smart_ptr/detail/array_traits.hpp
@@ -9,7 +9,7 @@
 #ifndef BOOST_SMART_PTR_DETAIL_ARRAY_TRAITS_HPP
 #define BOOST_SMART_PTR_DETAIL_ARRAY_TRAITS_HPP
 
-#include <boost/type_traits/remove_cv.hpp>
+#include <ndnboost/type_traits/remove_cv.hpp>
 
 namespace ndnboost {
     namespace detail {
diff --git a/boost/smart_ptr/detail/array_utility.hpp b/ndnboost/smart_ptr/detail/array_utility.hpp
similarity index 97%
rename from boost/smart_ptr/detail/array_utility.hpp
rename to ndnboost/smart_ptr/detail/array_utility.hpp
index 4efe449..c482b54 100644
--- a/boost/smart_ptr/detail/array_utility.hpp
+++ b/ndnboost/smart_ptr/detail/array_utility.hpp
@@ -9,9 +9,9 @@
 #ifndef BOOST_SMART_PTR_DETAIL_ARRAY_UTILITY_HPP
 #define BOOST_SMART_PTR_DETAIL_ARRAY_UTILITY_HPP
 
-#include <boost/config.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
+#include <ndnboost/config.hpp>
+#include <ndnboost/type_traits/has_trivial_constructor.hpp>
+#include <ndnboost/type_traits/has_trivial_destructor.hpp>
 
 namespace ndnboost {
     namespace detail {
diff --git a/boost/smart_ptr/detail/atomic_count.hpp b/ndnboost/smart_ptr/detail/atomic_count.hpp
similarity index 86%
rename from boost/smart_ptr/detail/atomic_count.hpp
rename to ndnboost/smart_ptr/detail/atomic_count.hpp
index 1a25197..01b661b 100644
--- a/boost/smart_ptr/detail/atomic_count.hpp
+++ b/ndnboost/smart_ptr/detail/atomic_count.hpp
@@ -72,8 +72,8 @@
 //      are called driven by smart_ptr interface...
 //
 
-#include <boost/config.hpp>
-#include <boost/smart_ptr/detail/sp_has_sync.hpp>
+#include <ndnboost/config.hpp>
+#include <ndnboost/smart_ptr/detail/sp_has_sync.hpp>
 
 #ifndef BOOST_HAS_THREADS
 
@@ -90,24 +90,24 @@
 }
 
 #elif defined(BOOST_AC_USE_PTHREADS)
-#  include <boost/smart_ptr/detail/atomic_count_pthreads.hpp>
+#  include <ndnboost/smart_ptr/detail/atomic_count_pthreads.hpp>
 
 #elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) )
-#  include <boost/smart_ptr/detail/atomic_count_gcc_x86.hpp>
+#  include <ndnboost/smart_ptr/detail/atomic_count_gcc_x86.hpp>
 
 #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#  include <boost/smart_ptr/detail/atomic_count_win32.hpp>
+#  include <ndnboost/smart_ptr/detail/atomic_count_win32.hpp>
 
 #elif defined( BOOST_SP_HAS_SYNC )
-#  include <boost/smart_ptr/detail/atomic_count_sync.hpp>
+#  include <ndnboost/smart_ptr/detail/atomic_count_sync.hpp>
 
 #elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
-#  include <boost/smart_ptr/detail/atomic_count_gcc.hpp>
+#  include <ndnboost/smart_ptr/detail/atomic_count_gcc.hpp>
 
 #elif defined(BOOST_HAS_PTHREADS)
 
 #  define BOOST_AC_USE_PTHREADS
-#  include <boost/smart_ptr/detail/atomic_count_pthreads.hpp>
+#  include <ndnboost/smart_ptr/detail/atomic_count_pthreads.hpp>
 
 #else
 
diff --git a/boost/smart_ptr/detail/atomic_count_gcc.hpp b/ndnboost/smart_ptr/detail/atomic_count_gcc.hpp
similarity index 100%
rename from boost/smart_ptr/detail/atomic_count_gcc.hpp
rename to ndnboost/smart_ptr/detail/atomic_count_gcc.hpp
diff --git a/boost/smart_ptr/detail/atomic_count_gcc_x86.hpp b/ndnboost/smart_ptr/detail/atomic_count_gcc_x86.hpp
similarity index 100%
rename from boost/smart_ptr/detail/atomic_count_gcc_x86.hpp
rename to ndnboost/smart_ptr/detail/atomic_count_gcc_x86.hpp
diff --git a/boost/smart_ptr/detail/atomic_count_pthreads.hpp b/ndnboost/smart_ptr/detail/atomic_count_pthreads.hpp
similarity index 100%
rename from boost/smart_ptr/detail/atomic_count_pthreads.hpp
rename to ndnboost/smart_ptr/detail/atomic_count_pthreads.hpp
diff --git a/boost/smart_ptr/detail/atomic_count_sync.hpp b/ndnboost/smart_ptr/detail/atomic_count_sync.hpp
similarity index 100%
rename from boost/smart_ptr/detail/atomic_count_sync.hpp
rename to ndnboost/smart_ptr/detail/atomic_count_sync.hpp
diff --git a/boost/smart_ptr/detail/atomic_count_win32.hpp b/ndnboost/smart_ptr/detail/atomic_count_win32.hpp
similarity index 96%
rename from boost/smart_ptr/detail/atomic_count_win32.hpp
rename to ndnboost/smart_ptr/detail/atomic_count_win32.hpp
index eddbd49..0d0477a 100644
--- a/boost/smart_ptr/detail/atomic_count_win32.hpp
+++ b/ndnboost/smart_ptr/detail/atomic_count_win32.hpp
@@ -17,7 +17,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/interlocked.hpp>
+#include <ndnboost/detail/interlocked.hpp>
 
 namespace ndnboost
 {
diff --git a/boost/smart_ptr/detail/lightweight_mutex.hpp b/ndnboost/smart_ptr/detail/lightweight_mutex.hpp
similarity index 86%
rename from boost/smart_ptr/detail/lightweight_mutex.hpp
rename to ndnboost/smart_ptr/detail/lightweight_mutex.hpp
index ddd57d2..a48bb45 100644
--- a/boost/smart_ptr/detail/lightweight_mutex.hpp
+++ b/ndnboost/smart_ptr/detail/lightweight_mutex.hpp
@@ -26,14 +26,14 @@
 //  It maps to a CRITICAL_SECTION on Windows or a pthread_mutex on POSIX.
 //
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 #if !defined(BOOST_HAS_THREADS)
-#  include <boost/smart_ptr/detail/lwm_nop.hpp>
+#  include <ndnboost/smart_ptr/detail/lwm_nop.hpp>
 #elif defined(BOOST_HAS_PTHREADS)
-#  include <boost/smart_ptr/detail/lwm_pthreads.hpp>
+#  include <ndnboost/smart_ptr/detail/lwm_pthreads.hpp>
 #elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#  include <boost/smart_ptr/detail/lwm_win32_cs.hpp>
+#  include <ndnboost/smart_ptr/detail/lwm_win32_cs.hpp>
 #else
 // Use #define BOOST_DISABLE_THREADS to avoid the error
 #  error Unrecognized threading platform
diff --git a/boost/smart_ptr/detail/lwm_nop.hpp b/ndnboost/smart_ptr/detail/lwm_nop.hpp
similarity index 100%
rename from boost/smart_ptr/detail/lwm_nop.hpp
rename to ndnboost/smart_ptr/detail/lwm_nop.hpp
diff --git a/boost/smart_ptr/detail/lwm_pthreads.hpp b/ndnboost/smart_ptr/detail/lwm_pthreads.hpp
similarity index 97%
rename from boost/smart_ptr/detail/lwm_pthreads.hpp
rename to ndnboost/smart_ptr/detail/lwm_pthreads.hpp
index cd91543..38bbc91 100644
--- a/boost/smart_ptr/detail/lwm_pthreads.hpp
+++ b/ndnboost/smart_ptr/detail/lwm_pthreads.hpp
@@ -17,7 +17,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/assert.hpp>
+#include <ndnboost/assert.hpp>
 #include <pthread.h>
 
 namespace ndnboost
diff --git a/boost/smart_ptr/detail/lwm_win32_cs.hpp b/ndnboost/smart_ptr/detail/lwm_win32_cs.hpp
similarity index 100%
rename from boost/smart_ptr/detail/lwm_win32_cs.hpp
rename to ndnboost/smart_ptr/detail/lwm_win32_cs.hpp
diff --git a/boost/smart_ptr/detail/make_array_helper.hpp b/ndnboost/smart_ptr/detail/make_array_helper.hpp
similarity index 98%
rename from boost/smart_ptr/detail/make_array_helper.hpp
rename to ndnboost/smart_ptr/detail/make_array_helper.hpp
index 2496fd6..e989f22 100644
--- a/boost/smart_ptr/detail/make_array_helper.hpp
+++ b/ndnboost/smart_ptr/detail/make_array_helper.hpp
@@ -9,7 +9,7 @@
 #ifndef BOOST_SMART_PTR_DETAIL_MAKE_ARRAY_HELPER_HPP
 #define BOOST_SMART_PTR_DETAIL_MAKE_ARRAY_HELPER_HPP
 
-#include <boost/type_traits/alignment_of.hpp>
+#include <ndnboost/type_traits/alignment_of.hpp>
 
 namespace ndnboost {
     namespace detail {
diff --git a/boost/smart_ptr/detail/operator_bool.hpp b/ndnboost/smart_ptr/detail/operator_bool.hpp
similarity index 100%
rename from boost/smart_ptr/detail/operator_bool.hpp
rename to ndnboost/smart_ptr/detail/operator_bool.hpp
diff --git a/boost/smart_ptr/detail/quick_allocator.hpp b/ndnboost/smart_ptr/detail/quick_allocator.hpp
similarity index 95%
rename from boost/smart_ptr/detail/quick_allocator.hpp
rename to ndnboost/smart_ptr/detail/quick_allocator.hpp
index afa2f72..637c4ec 100644
--- a/boost/smart_ptr/detail/quick_allocator.hpp
+++ b/ndnboost/smart_ptr/detail/quick_allocator.hpp
@@ -18,11 +18,11 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
-#include <boost/smart_ptr/detail/lightweight_mutex.hpp>
-#include <boost/type_traits/type_with_alignment.hpp>
-#include <boost/type_traits/alignment_of.hpp>
+#include <ndnboost/smart_ptr/detail/lightweight_mutex.hpp>
+#include <ndnboost/type_traits/type_with_alignment.hpp>
+#include <ndnboost/type_traits/alignment_of.hpp>
 
 #include <new>              // ::operator new, ::operator delete
 #include <cstddef>          // std::size_t
diff --git a/boost/smart_ptr/detail/shared_count.hpp b/ndnboost/smart_ptr/detail/shared_count.hpp
similarity index 96%
rename from boost/smart_ptr/detail/shared_count.hpp
rename to ndnboost/smart_ptr/detail/shared_count.hpp
index 89ac02c..ad53ec0 100644
--- a/boost/smart_ptr/detail/shared_count.hpp
+++ b/ndnboost/smart_ptr/detail/shared_count.hpp
@@ -22,18 +22,18 @@
 # pragma warn -8027     // Functions containing try are not expanded inline
 #endif
 
-#include <boost/config.hpp>
-#include <boost/checked_delete.hpp>
-#include <boost/throw_exception.hpp>
-#include <boost/smart_ptr/bad_weak_ptr.hpp>
-#include <boost/smart_ptr/detail/sp_counted_base.hpp>
-#include <boost/smart_ptr/detail/sp_counted_impl.hpp>
-#include <boost/detail/workaround.hpp>
+#include <ndnboost/config.hpp>
+#include <ndnboost/checked_delete.hpp>
+#include <ndnboost/throw_exception.hpp>
+#include <ndnboost/smart_ptr/bad_weak_ptr.hpp>
+#include <ndnboost/smart_ptr/detail/sp_counted_base.hpp>
+#include <ndnboost/smart_ptr/detail/sp_counted_impl.hpp>
+#include <ndnboost/detail/workaround.hpp>
 // In order to avoid circular dependencies with Boost.TR1
 // we make sure that our include of <memory> doesn't try to
 // pull in the TR1 headers: that's why we use this header 
 // rather than including <memory> directly:
-#include <boost/config/no_tr1/memory.hpp>  // std::auto_ptr
+#include <ndnboost/config/no_tr1/memory.hpp>  // std::auto_ptr
 #include <functional>       // std::less
 
 #ifdef BOOST_NO_EXCEPTIONS
@@ -41,7 +41,7 @@
 #endif
 
 #if !defined( BOOST_NO_CXX11_SMART_PTR )
-# include <boost/utility/addressof.hpp>
+# include <ndnboost/utility/addressof.hpp>
 #endif
 
 namespace ndnboost
diff --git a/boost/smart_ptr/detail/shared_ptr_nmt.hpp b/ndnboost/smart_ptr/detail/shared_ptr_nmt.hpp
similarity index 95%
rename from boost/smart_ptr/detail/shared_ptr_nmt.hpp
rename to ndnboost/smart_ptr/detail/shared_ptr_nmt.hpp
index ad04e9a..76e6fdd 100644
--- a/boost/smart_ptr/detail/shared_ptr_nmt.hpp
+++ b/ndnboost/smart_ptr/detail/shared_ptr_nmt.hpp
@@ -14,10 +14,10 @@
 //  See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation.
 //
 
-#include <boost/assert.hpp>
-#include <boost/checked_delete.hpp>
-#include <boost/throw_exception.hpp>
-#include <boost/smart_ptr/detail/atomic_count.hpp>
+#include <ndnboost/assert.hpp>
+#include <ndnboost/checked_delete.hpp>
+#include <ndnboost/throw_exception.hpp>
+#include <ndnboost/smart_ptr/detail/atomic_count.hpp>
 
 #ifndef BOOST_NO_AUTO_PTR
 # include <memory>          // for std::auto_ptr
diff --git a/boost/smart_ptr/detail/sp_convertible.hpp b/ndnboost/smart_ptr/detail/sp_convertible.hpp
similarity index 98%
rename from boost/smart_ptr/detail/sp_convertible.hpp
rename to ndnboost/smart_ptr/detail/sp_convertible.hpp
index 3c29f9f..f4e5463 100644
--- a/boost/smart_ptr/detail/sp_convertible.hpp
+++ b/ndnboost/smart_ptr/detail/sp_convertible.hpp
@@ -15,7 +15,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 #if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) && defined( BOOST_NO_SFINAE )
 # define BOOST_SP_NO_SP_CONVERTIBLE
diff --git a/ndnboost/smart_ptr/detail/sp_counted_base.hpp b/ndnboost/smart_ptr/detail/sp_counted_base.hpp
new file mode 100644
index 0000000..a9b5b81
--- /dev/null
+++ b/ndnboost/smart_ptr/detail/sp_counted_base.hpp
@@ -0,0 +1,79 @@
+#ifndef BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_HPP_INCLUDED
+#define BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_HPP_INCLUDED
+
+// MS compatible compilers support #pragma once
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+//
+//  detail/sp_counted_base.hpp
+//
+//  Copyright 2005, 2006 Peter Dimov
+//
+// 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)
+//
+
+#include <ndnboost/config.hpp>
+#include <ndnboost/smart_ptr/detail/sp_has_sync.hpp>
+
+#if defined( BOOST_SP_DISABLE_THREADS )
+# include <ndnboost/smart_ptr/detail/sp_counted_base_nt.hpp>
+
+#elif defined( BOOST_SP_USE_SPINLOCK )
+# include <ndnboost/smart_ptr/detail/sp_counted_base_spin.hpp>
+
+#elif defined( BOOST_SP_USE_PTHREADS )
+# include <ndnboost/smart_ptr/detail/sp_counted_base_pt.hpp>
+
+#elif defined( BOOST_DISABLE_THREADS ) && !defined( BOOST_SP_ENABLE_THREADS ) && !defined( BOOST_DISABLE_WIN32 )
+# include <ndnboost/smart_ptr/detail/sp_counted_base_nt.hpp>
+
+#elif defined( __SNC__ )
+# include <ndnboost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp>
+
+#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) && !defined(__PATHSCALE__)
+# include <ndnboost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp>
+
+#elif defined(__HP_aCC) && defined(__ia64)
+# include <ndnboost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp>
+
+#elif defined( __GNUC__ ) && defined( __ia64__ ) && !defined( __INTEL_COMPILER ) && !defined(__PATHSCALE__)
+# include <ndnboost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp>
+
+#elif defined( __IBMCPP__ ) && defined( __powerpc )
+# include <ndnboost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp>
+
+#elif defined( __MWERKS__ ) && defined( __POWERPC__ )
+# include <ndnboost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp>
+
+#elif defined( __GNUC__ ) && ( defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc ) ) && !defined(__PATHSCALE__) && !defined( _AIX )
+# include <ndnboost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp>
+
+#elif defined( __GNUC__ ) && ( defined( __mips__ ) || defined( _mips ) ) && !defined(__PATHSCALE__)
+# include <ndnboost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp>
+
+#elif defined( BOOST_SP_HAS_SYNC )
+# include <ndnboost/smart_ptr/detail/sp_counted_base_sync.hpp>
+
+#elif defined(__GNUC__) && ( defined( __sparcv9 ) || ( defined( __sparcv8 ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 ) ) )
+# include <ndnboost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp>
+
+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined(__CYGWIN__)
+# include <ndnboost/smart_ptr/detail/sp_counted_base_w32.hpp>
+
+#elif defined( _AIX )
+# include <ndnboost/smart_ptr/detail/sp_counted_base_aix.hpp>
+
+#elif !defined( BOOST_HAS_THREADS )
+# include <ndnboost/smart_ptr/detail/sp_counted_base_nt.hpp>
+
+#else
+# include <ndnboost/smart_ptr/detail/sp_counted_base_spin.hpp>
+
+#endif
+
+#endif  // #ifndef BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_HPP_INCLUDED
diff --git a/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp b/ndnboost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp
similarity index 98%
rename from boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp
index a7779ef..a4dadf6 100644
--- a/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp
@@ -15,7 +15,7 @@
 //  Lock-free algorithm by Alexander Terekhov
 //
 
-#include <boost/detail/sp_typeinfo.hpp>
+#include <ndnboost/detail/sp_typeinfo.hpp>
 #include <machine/sys/inline.h>
 
 namespace ndnboost
diff --git a/boost/smart_ptr/detail/sp_counted_base_aix.hpp b/ndnboost/smart_ptr/detail/sp_counted_base_aix.hpp
similarity index 98%
rename from boost/smart_ptr/detail/sp_counted_base_aix.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_base_aix.hpp
index d1214cf..a9a72cc 100644
--- a/boost/smart_ptr/detail/sp_counted_base_aix.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_base_aix.hpp
@@ -20,7 +20,7 @@
 //  formulation
 //
 
-#include <boost/detail/sp_typeinfo.hpp>
+#include <ndnboost/detail/sp_typeinfo.hpp>
 #include <builtins.h>
 #include <sys/atomic_op.h>
 
diff --git a/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp b/ndnboost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp
similarity index 98%
rename from boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp
index d7340a8..af43e37 100644
--- a/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp
@@ -24,7 +24,7 @@
 //  formulation
 //
 
-#include <boost/detail/sp_typeinfo.hpp>
+#include <ndnboost/detail/sp_typeinfo.hpp>
 
 namespace ndnboost
 {
diff --git a/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp b/ndnboost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp
similarity index 98%
rename from boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp
index 279428d..c3652f4 100644
--- a/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp
@@ -16,7 +16,7 @@
 //  Lock-free algorithm by Alexander Terekhov
 //
 
-#include <boost/detail/sp_typeinfo.hpp>
+#include <ndnboost/detail/sp_typeinfo.hpp>
 
 namespace ndnboost
 {
diff --git a/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp b/ndnboost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
similarity index 98%
rename from boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
index 613a0bb..e11b25a 100644
--- a/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
@@ -20,7 +20,7 @@
 //  Lock-free algorithm by Alexander Terekhov
 //
 
-#include <boost/detail/sp_typeinfo.hpp>
+#include <ndnboost/detail/sp_typeinfo.hpp>
 
 namespace ndnboost
 {
diff --git a/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp b/ndnboost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp
similarity index 98%
rename from boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp
index fb660ca..9beacd0 100644
--- a/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp
@@ -24,7 +24,7 @@
 //  formulation
 //
 
-#include <boost/detail/sp_typeinfo.hpp>
+#include <ndnboost/detail/sp_typeinfo.hpp>
 
 namespace ndnboost
 {
diff --git a/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp b/ndnboost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp
similarity index 98%
rename from boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp
index c888ea1..a9e1b4e 100644
--- a/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp
@@ -19,7 +19,7 @@
 //
 //  Thanks to Michael van der Westhuizen
 
-#include <boost/detail/sp_typeinfo.hpp>
+#include <ndnboost/detail/sp_typeinfo.hpp>
 #include <inttypes.h> // int32_t
 
 namespace ndnboost
diff --git a/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp b/ndnboost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp
similarity index 98%
rename from boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp
index 528d426..24a3798 100644
--- a/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp
@@ -24,7 +24,7 @@
 //  formulation
 //
 
-#include <boost/detail/sp_typeinfo.hpp>
+#include <ndnboost/detail/sp_typeinfo.hpp>
 
 namespace ndnboost
 {
diff --git a/boost/smart_ptr/detail/sp_counted_base_nt.hpp b/ndnboost/smart_ptr/detail/sp_counted_base_nt.hpp
similarity index 97%
rename from boost/smart_ptr/detail/sp_counted_base_nt.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_base_nt.hpp
index d081383..3442f1f 100644
--- a/boost/smart_ptr/detail/sp_counted_base_nt.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_base_nt.hpp
@@ -18,7 +18,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/sp_typeinfo.hpp>
+#include <ndnboost/detail/sp_typeinfo.hpp>
 
 namespace ndnboost
 {
diff --git a/boost/smart_ptr/detail/sp_counted_base_pt.hpp b/ndnboost/smart_ptr/detail/sp_counted_base_pt.hpp
similarity index 98%
rename from boost/smart_ptr/detail/sp_counted_base_pt.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_base_pt.hpp
index 92dda3d..51c42a3 100644
--- a/boost/smart_ptr/detail/sp_counted_base_pt.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_base_pt.hpp
@@ -18,7 +18,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/sp_typeinfo.hpp>
+#include <ndnboost/detail/sp_typeinfo.hpp>
 #include <pthread.h>
 
 namespace ndnboost
diff --git a/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp b/ndnboost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp
similarity index 98%
rename from boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp
index 410ff31..4609d7d 100644
--- a/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp
@@ -19,7 +19,7 @@
 //
 //  Thanks to Michael van der Westhuizen
 
-#include <boost/detail/sp_typeinfo.hpp>
+#include <ndnboost/detail/sp_typeinfo.hpp>
 #include <inttypes.h> // uint32_t
 
 namespace ndnboost
diff --git a/boost/smart_ptr/detail/sp_counted_base_spin.hpp b/ndnboost/smart_ptr/detail/sp_counted_base_spin.hpp
similarity index 96%
rename from boost/smart_ptr/detail/sp_counted_base_spin.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_base_spin.hpp
index 3c11036..29d3a84 100644
--- a/boost/smart_ptr/detail/sp_counted_base_spin.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_base_spin.hpp
@@ -18,8 +18,8 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/sp_typeinfo.hpp>
-#include <boost/smart_ptr/detail/spinlock_pool.hpp>
+#include <ndnboost/detail/sp_typeinfo.hpp>
+#include <ndnboost/smart_ptr/detail/spinlock_pool.hpp>
 
 namespace ndnboost
 {
diff --git a/boost/smart_ptr/detail/sp_counted_base_sync.hpp b/ndnboost/smart_ptr/detail/sp_counted_base_sync.hpp
similarity index 98%
rename from boost/smart_ptr/detail/sp_counted_base_sync.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_base_sync.hpp
index 6465425..6ee7fac 100644
--- a/boost/smart_ptr/detail/sp_counted_base_sync.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_base_sync.hpp
@@ -15,7 +15,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/sp_typeinfo.hpp>
+#include <ndnboost/detail/sp_typeinfo.hpp>
 #include <limits.h>
 
 #if defined( __ia64__ ) && defined( __INTEL_COMPILER )
diff --git a/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp b/ndnboost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp
similarity index 98%
rename from boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp
index 8874502..9ffae4d 100644
--- a/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp
@@ -21,7 +21,7 @@
 //  formulation
 //
 
-#include <boost/detail/sp_typeinfo.hpp>
+#include <ndnboost/detail/sp_typeinfo.hpp>
 
 extern "builtin" void __lwsync(void);
 extern "builtin" void __isync(void);
diff --git a/boost/smart_ptr/detail/sp_counted_base_w32.hpp b/ndnboost/smart_ptr/detail/sp_counted_base_w32.hpp
similarity index 95%
rename from boost/smart_ptr/detail/sp_counted_base_w32.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_base_w32.hpp
index f104659..283fc79 100644
--- a/boost/smart_ptr/detail/sp_counted_base_w32.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_base_w32.hpp
@@ -24,9 +24,9 @@
 //  formulation
 //
 
-#include <boost/detail/interlocked.hpp>
-#include <boost/detail/workaround.hpp>
-#include <boost/detail/sp_typeinfo.hpp>
+#include <ndnboost/detail/interlocked.hpp>
+#include <ndnboost/detail/workaround.hpp>
+#include <ndnboost/detail/sp_typeinfo.hpp>
 
 namespace ndnboost
 {
diff --git a/boost/smart_ptr/detail/sp_counted_impl.hpp b/ndnboost/smart_ptr/detail/sp_counted_impl.hpp
similarity index 96%
rename from boost/smart_ptr/detail/sp_counted_impl.hpp
rename to ndnboost/smart_ptr/detail/sp_counted_impl.hpp
index 224ddd7..9b03a26 100644
--- a/boost/smart_ptr/detail/sp_counted_impl.hpp
+++ b/ndnboost/smart_ptr/detail/sp_counted_impl.hpp
@@ -18,17 +18,17 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 #if defined(BOOST_SP_USE_STD_ALLOCATOR) && defined(BOOST_SP_USE_QUICK_ALLOCATOR)
 # error BOOST_SP_USE_STD_ALLOCATOR and BOOST_SP_USE_QUICK_ALLOCATOR are incompatible.
 #endif
 
-#include <boost/checked_delete.hpp>
-#include <boost/smart_ptr/detail/sp_counted_base.hpp>
+#include <ndnboost/checked_delete.hpp>
+#include <ndnboost/smart_ptr/detail/sp_counted_base.hpp>
 
 #if defined(BOOST_SP_USE_QUICK_ALLOCATOR)
-#include <boost/smart_ptr/detail/quick_allocator.hpp>
+#include <ndnboost/smart_ptr/detail/quick_allocator.hpp>
 #endif
 
 #if defined(BOOST_SP_USE_STD_ALLOCATOR)
diff --git a/boost/smart_ptr/detail/sp_forward.hpp b/ndnboost/smart_ptr/detail/sp_forward.hpp
similarity index 95%
rename from boost/smart_ptr/detail/sp_forward.hpp
rename to ndnboost/smart_ptr/detail/sp_forward.hpp
index 04823a0..d22d9a4 100644
--- a/boost/smart_ptr/detail/sp_forward.hpp
+++ b/ndnboost/smart_ptr/detail/sp_forward.hpp
@@ -15,7 +15,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 namespace ndnboost
 {
diff --git a/boost/smart_ptr/detail/sp_has_sync.hpp b/ndnboost/smart_ptr/detail/sp_has_sync.hpp
similarity index 100%
rename from boost/smart_ptr/detail/sp_has_sync.hpp
rename to ndnboost/smart_ptr/detail/sp_has_sync.hpp
diff --git a/boost/smart_ptr/detail/sp_if_array.hpp b/ndnboost/smart_ptr/detail/sp_if_array.hpp
similarity index 94%
rename from boost/smart_ptr/detail/sp_if_array.hpp
rename to ndnboost/smart_ptr/detail/sp_if_array.hpp
index f12ffe7..8f9d56d 100644
--- a/boost/smart_ptr/detail/sp_if_array.hpp
+++ b/ndnboost/smart_ptr/detail/sp_if_array.hpp
@@ -9,7 +9,7 @@
 #ifndef BOOST_SMART_PTR_DETAIL_SP_IF_ARRAY_HPP
 #define BOOST_SMART_PTR_DETAIL_SP_IF_ARRAY_HPP
 
-#include <boost/smart_ptr/shared_ptr.hpp>
+#include <ndnboost/smart_ptr/shared_ptr.hpp>
 
 namespace ndnboost {
     namespace detail {
diff --git a/boost/smart_ptr/detail/sp_nullptr_t.hpp b/ndnboost/smart_ptr/detail/sp_nullptr_t.hpp
similarity index 96%
rename from boost/smart_ptr/detail/sp_nullptr_t.hpp
rename to ndnboost/smart_ptr/detail/sp_nullptr_t.hpp
index 2375927..13e2a9a 100644
--- a/boost/smart_ptr/detail/sp_nullptr_t.hpp
+++ b/ndnboost/smart_ptr/detail/sp_nullptr_t.hpp
@@ -15,7 +15,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 #include <cstddef>
 
 #if !defined( BOOST_NO_CXX11_NULLPTR )
diff --git a/boost/smart_ptr/detail/spinlock.hpp b/ndnboost/smart_ptr/detail/spinlock.hpp
similarity index 71%
rename from boost/smart_ptr/detail/spinlock.hpp
rename to ndnboost/smart_ptr/detail/spinlock.hpp
index 88d7ad6..ab6c807 100644
--- a/boost/smart_ptr/detail/spinlock.hpp
+++ b/ndnboost/smart_ptr/detail/spinlock.hpp
@@ -28,26 +28,26 @@
 //  #define BOOST_DETAIL_SPINLOCK_INIT <unspecified>
 //
 
-#include <boost/config.hpp>
-#include <boost/smart_ptr/detail/sp_has_sync.hpp>
+#include <ndnboost/config.hpp>
+#include <ndnboost/smart_ptr/detail/sp_has_sync.hpp>
 
 #if defined( BOOST_SP_USE_PTHREADS )
-#  include <boost/smart_ptr/detail/spinlock_pt.hpp>
+#  include <ndnboost/smart_ptr/detail/spinlock_pt.hpp>
 
 #elif defined(__GNUC__) && defined( __arm__ ) && !defined( __thumb__ )
-#  include <boost/smart_ptr/detail/spinlock_gcc_arm.hpp>
+#  include <ndnboost/smart_ptr/detail/spinlock_gcc_arm.hpp>
 
 #elif defined( BOOST_SP_HAS_SYNC )
-#  include <boost/smart_ptr/detail/spinlock_sync.hpp>
+#  include <ndnboost/smart_ptr/detail/spinlock_sync.hpp>
 
 #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#  include <boost/smart_ptr/detail/spinlock_w32.hpp>
+#  include <ndnboost/smart_ptr/detail/spinlock_w32.hpp>
 
 #elif defined(BOOST_HAS_PTHREADS)
-#  include <boost/smart_ptr/detail/spinlock_pt.hpp>
+#  include <ndnboost/smart_ptr/detail/spinlock_pt.hpp>
 
 #elif !defined(BOOST_HAS_THREADS)
-#  include <boost/smart_ptr/detail/spinlock_nt.hpp>
+#  include <ndnboost/smart_ptr/detail/spinlock_nt.hpp>
 
 #else
 #  error Unrecognized threading platform
diff --git a/boost/smart_ptr/detail/spinlock_gcc_arm.hpp b/ndnboost/smart_ptr/detail/spinlock_gcc_arm.hpp
similarity index 97%
rename from boost/smart_ptr/detail/spinlock_gcc_arm.hpp
rename to ndnboost/smart_ptr/detail/spinlock_gcc_arm.hpp
index 3eb00e7..7155fbe 100644
--- a/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
+++ b/ndnboost/smart_ptr/detail/spinlock_gcc_arm.hpp
@@ -9,7 +9,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/smart_ptr/detail/yield_k.hpp>
+#include <ndnboost/smart_ptr/detail/yield_k.hpp>
 
 #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7S__)
 
diff --git a/boost/smart_ptr/detail/spinlock_nt.hpp b/ndnboost/smart_ptr/detail/spinlock_nt.hpp
similarity index 97%
rename from boost/smart_ptr/detail/spinlock_nt.hpp
rename to ndnboost/smart_ptr/detail/spinlock_nt.hpp
index 97ee029..59cc715 100644
--- a/boost/smart_ptr/detail/spinlock_nt.hpp
+++ b/ndnboost/smart_ptr/detail/spinlock_nt.hpp
@@ -15,7 +15,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/assert.hpp>
+#include <ndnboost/assert.hpp>
 
 namespace ndnboost
 {
diff --git a/boost/smart_ptr/detail/spinlock_pool.hpp b/ndnboost/smart_ptr/detail/spinlock_pool.hpp
similarity index 97%
rename from boost/smart_ptr/detail/spinlock_pool.hpp
rename to ndnboost/smart_ptr/detail/spinlock_pool.hpp
index 8784026..f23a045 100644
--- a/boost/smart_ptr/detail/spinlock_pool.hpp
+++ b/ndnboost/smart_ptr/detail/spinlock_pool.hpp
@@ -21,8 +21,8 @@
 //  spinlock_pool<2> is reserved for shared_ptr atomic access
 //
 
-#include <boost/config.hpp>
-#include <boost/smart_ptr/detail/spinlock.hpp>
+#include <ndnboost/config.hpp>
+#include <ndnboost/smart_ptr/detail/spinlock.hpp>
 #include <cstddef>
 
 namespace ndnboost
diff --git a/boost/smart_ptr/detail/spinlock_pt.hpp b/ndnboost/smart_ptr/detail/spinlock_pt.hpp
similarity index 100%
rename from boost/smart_ptr/detail/spinlock_pt.hpp
rename to ndnboost/smart_ptr/detail/spinlock_pt.hpp
diff --git a/boost/smart_ptr/detail/spinlock_sync.hpp b/ndnboost/smart_ptr/detail/spinlock_sync.hpp
similarity index 96%
rename from boost/smart_ptr/detail/spinlock_sync.hpp
rename to ndnboost/smart_ptr/detail/spinlock_sync.hpp
index fe8b2d5..fa1df85 100644
--- a/boost/smart_ptr/detail/spinlock_sync.hpp
+++ b/ndnboost/smart_ptr/detail/spinlock_sync.hpp
@@ -15,7 +15,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/smart_ptr/detail/yield_k.hpp>
+#include <ndnboost/smart_ptr/detail/yield_k.hpp>
 
 #if defined( __ia64__ ) && defined( __INTEL_COMPILER )
 # include <ia64intrin.h>
diff --git a/boost/smart_ptr/detail/spinlock_w32.hpp b/ndnboost/smart_ptr/detail/spinlock_w32.hpp
similarity index 95%
rename from boost/smart_ptr/detail/spinlock_w32.hpp
rename to ndnboost/smart_ptr/detail/spinlock_w32.hpp
index 2f15a17..393b5a1 100644
--- a/boost/smart_ptr/detail/spinlock_w32.hpp
+++ b/ndnboost/smart_ptr/detail/spinlock_w32.hpp
@@ -15,8 +15,8 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/interlocked.hpp>
-#include <boost/smart_ptr/detail/yield_k.hpp>
+#include <ndnboost/detail/interlocked.hpp>
+#include <ndnboost/smart_ptr/detail/yield_k.hpp>
 
 // BOOST_COMPILER_FENCE
 
diff --git a/boost/smart_ptr/detail/yield_k.hpp b/ndnboost/smart_ptr/detail/yield_k.hpp
similarity index 98%
rename from boost/smart_ptr/detail/yield_k.hpp
rename to ndnboost/smart_ptr/detail/yield_k.hpp
index 62916a0..4dc447e 100644
--- a/boost/smart_ptr/detail/yield_k.hpp
+++ b/ndnboost/smart_ptr/detail/yield_k.hpp
@@ -23,7 +23,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 // BOOST_SMT_PAUSE
 
diff --git a/boost/smart_ptr/make_shared.hpp b/ndnboost/smart_ptr/make_shared.hpp
similarity index 77%
rename from boost/smart_ptr/make_shared.hpp
rename to ndnboost/smart_ptr/make_shared.hpp
index 8d0e3ea..0f9b124 100644
--- a/boost/smart_ptr/make_shared.hpp
+++ b/ndnboost/smart_ptr/make_shared.hpp
@@ -12,11 +12,11 @@
 //  See http://www.boost.org/libs/smart_ptr/make_shared.html
 //  for documentation.
 
-#include <boost/smart_ptr/make_shared_object.hpp>
+#include <ndnboost/smart_ptr/make_shared_object.hpp>
 
 #if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) && !defined( BOOST_NO_SFINAE )
-# include <boost/smart_ptr/make_shared_array.hpp>
-# include <boost/smart_ptr/allocate_shared_array.hpp>
+# include <ndnboost/smart_ptr/make_shared_array.hpp>
+# include <ndnboost/smart_ptr/allocate_shared_array.hpp>
 #endif
 
 #endif // #ifndef BOOST_SMART_PTR_MAKE_SHARED_HPP_INCLUDED
diff --git a/boost/smart_ptr/make_shared_array.hpp b/ndnboost/smart_ptr/make_shared_array.hpp
similarity index 97%
rename from boost/smart_ptr/make_shared_array.hpp
rename to ndnboost/smart_ptr/make_shared_array.hpp
index b7ab194..15b092b 100644
--- a/boost/smart_ptr/make_shared_array.hpp
+++ b/ndnboost/smart_ptr/make_shared_array.hpp
@@ -9,11 +9,11 @@
 #ifndef BOOST_SMART_PTR_MAKE_SHARED_ARRAY_HPP
 #define BOOST_SMART_PTR_MAKE_SHARED_ARRAY_HPP
 
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/detail/array_deleter.hpp>
-#include <boost/smart_ptr/detail/array_traits.hpp>
-#include <boost/smart_ptr/detail/make_array_helper.hpp>
-#include <boost/smart_ptr/detail/sp_if_array.hpp>
+#include <ndnboost/smart_ptr/shared_ptr.hpp>
+#include <ndnboost/smart_ptr/detail/array_deleter.hpp>
+#include <ndnboost/smart_ptr/detail/array_traits.hpp>
+#include <ndnboost/smart_ptr/detail/make_array_helper.hpp>
+#include <ndnboost/smart_ptr/detail/sp_if_array.hpp>
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
 #include <initializer_list>
 #endif
diff --git a/boost/smart_ptr/make_shared_object.hpp b/ndnboost/smart_ptr/make_shared_object.hpp
similarity index 99%
rename from boost/smart_ptr/make_shared_object.hpp
rename to ndnboost/smart_ptr/make_shared_object.hpp
index 7f4e18d..1d1ae7a 100644
--- a/boost/smart_ptr/make_shared_object.hpp
+++ b/ndnboost/smart_ptr/make_shared_object.hpp
@@ -12,11 +12,11 @@
 //  See http://www.boost.org/libs/smart_ptr/make_shared.html
 //  for documentation.
 
-#include <boost/config.hpp>
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/detail/sp_forward.hpp>
-#include <boost/type_traits/type_with_alignment.hpp>
-#include <boost/type_traits/alignment_of.hpp>
+#include <ndnboost/config.hpp>
+#include <ndnboost/smart_ptr/shared_ptr.hpp>
+#include <ndnboost/smart_ptr/detail/sp_forward.hpp>
+#include <ndnboost/type_traits/type_with_alignment.hpp>
+#include <ndnboost/type_traits/alignment_of.hpp>
 #include <cstddef>
 #include <new>
 
diff --git a/boost/smart_ptr/shared_ptr.hpp b/ndnboost/smart_ptr/shared_ptr.hpp
similarity index 97%
rename from boost/smart_ptr/shared_ptr.hpp
rename to ndnboost/smart_ptr/shared_ptr.hpp
index d750308..78d6e30 100644
--- a/boost/smart_ptr/shared_ptr.hpp
+++ b/ndnboost/smart_ptr/shared_ptr.hpp
@@ -14,29 +14,29 @@
 //  See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation.
 //
 
-#include <boost/config.hpp>   // for broken compiler workarounds
+#include <ndnboost/config.hpp>   // for broken compiler workarounds
 
 #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
-#include <boost/smart_ptr/detail/shared_ptr_nmt.hpp>
+#include <ndnboost/smart_ptr/detail/shared_ptr_nmt.hpp>
 #else
 
 // In order to avoid circular dependencies with Boost.TR1
 // we make sure that our include of <memory> doesn't try to
 // pull in the TR1 headers: that's why we use this header 
 // rather than including <memory> directly:
-#include <boost/config/no_tr1/memory.hpp>  // std::auto_ptr
+#include <ndnboost/config/no_tr1/memory.hpp>  // std::auto_ptr
 
-#include <boost/assert.hpp>
-#include <boost/checked_delete.hpp>
-#include <boost/throw_exception.hpp>
-#include <boost/smart_ptr/detail/shared_count.hpp>
-#include <boost/detail/workaround.hpp>
-#include <boost/smart_ptr/detail/sp_convertible.hpp>
-#include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
+#include <ndnboost/assert.hpp>
+#include <ndnboost/checked_delete.hpp>
+#include <ndnboost/throw_exception.hpp>
+#include <ndnboost/smart_ptr/detail/shared_count.hpp>
+#include <ndnboost/detail/workaround.hpp>
+#include <ndnboost/smart_ptr/detail/sp_convertible.hpp>
+#include <ndnboost/smart_ptr/detail/sp_nullptr_t.hpp>
 
 #if !defined(BOOST_SP_NO_ATOMIC_ACCESS)
-#include <boost/smart_ptr/detail/spinlock_pool.hpp>
-#include <boost/memory_order.hpp>
+#include <ndnboost/smart_ptr/detail/spinlock_pool.hpp>
+#include <ndnboost/memory_order.hpp>
 #endif
 
 #include <algorithm>            // for std::swap
@@ -669,7 +669,7 @@
     }
 
 // implicit conversion to "bool"
-#include <boost/smart_ptr/detail/operator_bool.hpp>
+#include <ndnboost/smart_ptr/detail/operator_bool.hpp>
 
     bool unique() const BOOST_NOEXCEPT
     {
diff --git a/boost/static_assert.hpp b/ndnboost/static_assert.hpp
similarity index 98%
rename from boost/static_assert.hpp
rename to ndnboost/static_assert.hpp
index bb75695..c85cb2b 100644
--- a/boost/static_assert.hpp
+++ b/ndnboost/static_assert.hpp
@@ -14,8 +14,8 @@
 #ifndef BOOST_STATIC_ASSERT_HPP
 #define BOOST_STATIC_ASSERT_HPP
 
-#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <ndnboost/config.hpp>
+#include <ndnboost/detail/workaround.hpp>
 
 #if defined(__GNUC__) && !defined(__GXX_EXPERIMENTAL_CXX0X__)
 //
diff --git a/boost/throw_exception.hpp b/ndnboost/throw_exception.hpp
similarity index 92%
rename from boost/throw_exception.hpp
rename to ndnboost/throw_exception.hpp
index 84b82fc..e9212d1 100644
--- a/boost/throw_exception.hpp
+++ b/ndnboost/throw_exception.hpp
@@ -26,9 +26,9 @@
 //  http://www.boost.org/libs/utility/throw_exception.html
 //
 
-#include <boost/exception/detail/attribute_noreturn.hpp>
-#include <boost/detail/workaround.hpp>
-#include <boost/config.hpp>
+#include <ndnboost/exception/detail/attribute_noreturn.hpp>
+#include <ndnboost/detail/workaround.hpp>
+#include <ndnboost/config.hpp>
 #include <exception>
 
 #if !defined( BOOST_EXCEPTION_DISABLE ) && defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x593) )
@@ -40,8 +40,8 @@
 #endif
 
 #if !defined( BOOST_EXCEPTION_DISABLE )
-# include <boost/exception/exception.hpp>
-# include <boost/current_function.hpp>
+# include <ndnboost/exception/exception.hpp>
+# include <ndnboost/current_function.hpp>
 # define BOOST_THROW_EXCEPTION(x) ::ndnboost::exception_detail::throw_exception_(x,BOOST_CURRENT_FUNCTION,__FILE__,__LINE__)
 #else
 # define BOOST_THROW_EXCEPTION(x) ::ndnboost::throw_exception(x)
diff --git a/boost/type.hpp b/ndnboost/type.hpp
similarity index 100%
rename from boost/type.hpp
rename to ndnboost/type.hpp
diff --git a/boost/type_traits/add_lvalue_reference.hpp b/ndnboost/type_traits/add_lvalue_reference.hpp
similarity index 77%
rename from boost/type_traits/add_lvalue_reference.hpp
rename to ndnboost/type_traits/add_lvalue_reference.hpp
index 95ea8df..5a3a256 100644
--- a/boost/type_traits/add_lvalue_reference.hpp
+++ b/ndnboost/type_traits/add_lvalue_reference.hpp
@@ -6,10 +6,10 @@
 #ifndef BOOST_TYPE_TRAITS_EXT_ADD_LVALUE_REFERENCE__HPP
 #define BOOST_TYPE_TRAITS_EXT_ADD_LVALUE_REFERENCE__HPP
 
-#include <boost/type_traits/add_reference.hpp>
+#include <ndnboost/type_traits/add_reference.hpp>
 
 // should be the last #include
-#include <boost/type_traits/detail/type_trait_def.hpp>
+#include <ndnboost/type_traits/detail/type_trait_def.hpp>
 
 namespace ndnboost{
 
@@ -21,6 +21,6 @@
 
 }
 
-#include <boost/type_traits/detail/type_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/type_trait_undef.hpp>
 
 #endif  // BOOST_TYPE_TRAITS_EXT_ADD_LVALUE_REFERENCE__HPP
diff --git a/boost/type_traits/add_reference.hpp b/ndnboost/type_traits/add_reference.hpp
similarity index 91%
rename from boost/type_traits/add_reference.hpp
rename to ndnboost/type_traits/add_reference.hpp
index 2d9844e..d825355 100644
--- a/boost/type_traits/add_reference.hpp
+++ b/ndnboost/type_traits/add_reference.hpp
@@ -9,12 +9,12 @@
 #ifndef BOOST_TT_ADD_REFERENCE_HPP_INCLUDED
 #define BOOST_TT_ADD_REFERENCE_HPP_INCLUDED
 
-#include <boost/type_traits/is_reference.hpp>
-#include <boost/detail/workaround.hpp>
-#include <boost/config.hpp>
+#include <ndnboost/type_traits/is_reference.hpp>
+#include <ndnboost/detail/workaround.hpp>
+#include <ndnboost/config.hpp>
 
 // should be the last #include
-#include <boost/type_traits/detail/type_trait_def.hpp>
+#include <ndnboost/type_traits/detail/type_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -102,6 +102,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/type_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/type_trait_undef.hpp>
 
 #endif // BOOST_TT_ADD_REFERENCE_HPP_INCLUDED
diff --git a/boost/type_traits/add_rvalue_reference.hpp b/ndnboost/type_traits/add_rvalue_reference.hpp
similarity index 89%
rename from boost/type_traits/add_rvalue_reference.hpp
rename to ndnboost/type_traits/add_rvalue_reference.hpp
index 758886f..1a09de7 100644
--- a/boost/type_traits/add_rvalue_reference.hpp
+++ b/ndnboost/type_traits/add_rvalue_reference.hpp
@@ -8,15 +8,15 @@
 #ifndef BOOST_TYPE_TRAITS_EXT_ADD_RVALUE_REFERENCE__HPP
 #define BOOST_TYPE_TRAITS_EXT_ADD_RVALUE_REFERENCE__HPP
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 //----------------------------------------------------------------------------//
 
-#include <boost/type_traits/is_void.hpp>
-#include <boost/type_traits/is_reference.hpp>
+#include <ndnboost/type_traits/is_void.hpp>
+#include <ndnboost/type_traits/is_reference.hpp>
 
 // should be the last #include
-#include <boost/type_traits/detail/type_trait_def.hpp>
+#include <ndnboost/type_traits/detail/type_trait_def.hpp>
 
 //----------------------------------------------------------------------------//
 //                                                                            //
@@ -60,7 +60,7 @@
 
 }  // namespace ndnboost
 
-#include <boost/type_traits/detail/type_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/type_trait_undef.hpp>
 
 #endif  // BOOST_TYPE_TRAITS_EXT_ADD_RVALUE_REFERENCE__HPP
 
diff --git a/boost/type_traits/alignment_of.hpp b/ndnboost/type_traits/alignment_of.hpp
similarity index 94%
rename from boost/type_traits/alignment_of.hpp
rename to ndnboost/type_traits/alignment_of.hpp
index 157e458..e27ff7b 100644
--- a/boost/type_traits/alignment_of.hpp
+++ b/ndnboost/type_traits/alignment_of.hpp
@@ -9,12 +9,12 @@
 #ifndef BOOST_TT_ALIGNMENT_OF_HPP_INCLUDED
 #define BOOST_TT_ALIGNMENT_OF_HPP_INCLUDED
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 #include <cstddef>
 
-#include <boost/type_traits/intrinsics.hpp>
+#include <ndnboost/type_traits/intrinsics.hpp>
 // should be the last #include
-#include <boost/type_traits/detail/size_t_trait_def.hpp>
+#include <ndnboost/type_traits/detail/size_t_trait_def.hpp>
 
 #ifdef BOOST_MSVC
 #   pragma warning(push)
@@ -122,7 +122,7 @@
 #   pragma warning(pop)
 #endif
 
-#include <boost/type_traits/detail/size_t_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/size_t_trait_undef.hpp>
 
 #endif // BOOST_TT_ALIGNMENT_OF_HPP_INCLUDED
 
diff --git a/boost/type_traits/broken_compiler_spec.hpp b/ndnboost/type_traits/broken_compiler_spec.hpp
similarity index 97%
rename from boost/type_traits/broken_compiler_spec.hpp
rename to ndnboost/type_traits/broken_compiler_spec.hpp
index 715dbd7..7e5023d 100644
--- a/boost/type_traits/broken_compiler_spec.hpp
+++ b/ndnboost/type_traits/broken_compiler_spec.hpp
@@ -9,8 +9,8 @@
 #ifndef BOOST_TT_BROKEN_COMPILER_SPEC_HPP_INCLUDED
 #define BOOST_TT_BROKEN_COMPILER_SPEC_HPP_INCLUDED
 
-#include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/config.hpp>
+#include <ndnboost/mpl/aux_/lambda_support.hpp>
+#include <ndnboost/config.hpp>
 
 // these are needed regardless of BOOST_TT_NO_BROKEN_COMPILER_SPEC 
 #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
@@ -88,7 +88,7 @@
     }}                                                                              \
     /**/
 
-#   include <boost/type_traits/detail/type_trait_undef.hpp>
+#   include <ndnboost/type_traits/detail/type_trait_undef.hpp>
 
 #endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
diff --git a/boost/type_traits/config.hpp b/ndnboost/type_traits/config.hpp
similarity index 96%
rename from boost/type_traits/config.hpp
rename to ndnboost/type_traits/config.hpp
index 7934454..05fc352 100644
--- a/boost/type_traits/config.hpp
+++ b/ndnboost/type_traits/config.hpp
@@ -10,10 +10,10 @@
 #define BOOST_TT_CONFIG_HPP_INCLUDED
 
 #ifndef BOOST_CONFIG_HPP
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 #endif
 
-#include <boost/detail/workaround.hpp>
+#include <ndnboost/detail/workaround.hpp>
 
 //
 // whenever we have a conversion function with ellipses
diff --git a/boost/type_traits/detail/bool_trait_def.hpp b/ndnboost/type_traits/detail/bool_trait_def.hpp
similarity index 95%
rename from boost/type_traits/detail/bool_trait_def.hpp
rename to ndnboost/type_traits/detail/bool_trait_def.hpp
index fcfa0c7..a80e999 100644
--- a/boost/type_traits/detail/bool_trait_def.hpp
+++ b/ndnboost/type_traits/detail/bool_trait_def.hpp
@@ -11,11 +11,11 @@
 // $Date: 2011-10-09 15:28:33 -0700 (Sun, 09 Oct 2011) $
 // $Revision: 74865 $
 
-#include <boost/type_traits/detail/template_arity_spec.hpp>
-#include <boost/type_traits/integral_constant.hpp>
-#include <boost/mpl/bool.hpp>
-#include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/config.hpp>
+#include <ndnboost/type_traits/detail/template_arity_spec.hpp>
+#include <ndnboost/type_traits/integral_constant.hpp>
+#include <ndnboost/mpl/bool.hpp>
+#include <ndnboost/mpl/aux_/lambda_support.hpp>
+#include <ndnboost/config.hpp>
 
 //
 // Unfortunately some libraries have started using this header without
diff --git a/boost/type_traits/detail/bool_trait_undef.hpp b/ndnboost/type_traits/detail/bool_trait_undef.hpp
similarity index 100%
rename from boost/type_traits/detail/bool_trait_undef.hpp
rename to ndnboost/type_traits/detail/bool_trait_undef.hpp
diff --git a/boost/type_traits/detail/cv_traits_impl.hpp b/ndnboost/type_traits/detail/cv_traits_impl.hpp
similarity index 95%
rename from boost/type_traits/detail/cv_traits_impl.hpp
rename to ndnboost/type_traits/detail/cv_traits_impl.hpp
index fadfc68..5f1dd5e 100644
--- a/boost/type_traits/detail/cv_traits_impl.hpp
+++ b/ndnboost/type_traits/detail/cv_traits_impl.hpp
@@ -11,8 +11,8 @@
 #ifndef BOOST_TT_DETAIL_CV_TRAITS_IMPL_HPP_INCLUDED
 #define BOOST_TT_DETAIL_CV_TRAITS_IMPL_HPP_INCLUDED
 
-#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <ndnboost/config.hpp>
+#include <ndnboost/detail/workaround.hpp>
 
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
@@ -23,7 +23,7 @@
 namespace ndnboost {
 namespace detail {
 #else
-#include <boost/type_traits/detail/yes_no_type.hpp>
+#include <ndnboost/type_traits/detail/yes_no_type.hpp>
 namespace ndnboost {
 namespace type_traits {
 namespace gcc8503 {
diff --git a/boost/type_traits/detail/false_result.hpp b/ndnboost/type_traits/detail/false_result.hpp
similarity index 95%
rename from boost/type_traits/detail/false_result.hpp
rename to ndnboost/type_traits/detail/false_result.hpp
index 32d0cbc..d0bd864 100644
--- a/boost/type_traits/detail/false_result.hpp
+++ b/ndnboost/type_traits/detail/false_result.hpp
@@ -9,7 +9,7 @@
 #ifndef BOOST_TT_DETAIL_FALSE_RESULT_HPP_INCLUDED
 #define BOOST_TT_DETAIL_FALSE_RESULT_HPP_INCLUDED
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 namespace ndnboost {
 namespace type_traits {
diff --git a/boost/type_traits/detail/ice_and.hpp b/ndnboost/type_traits/detail/ice_and.hpp
similarity index 96%
rename from boost/type_traits/detail/ice_and.hpp
rename to ndnboost/type_traits/detail/ice_and.hpp
index 61b534d..75d1ae6 100644
--- a/boost/type_traits/detail/ice_and.hpp
+++ b/ndnboost/type_traits/detail/ice_and.hpp
@@ -9,7 +9,7 @@
 #ifndef BOOST_TT_DETAIL_ICE_AND_HPP_INCLUDED
 #define BOOST_TT_DETAIL_ICE_AND_HPP_INCLUDED
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 namespace ndnboost {
 namespace type_traits {
diff --git a/boost/type_traits/detail/ice_eq.hpp b/ndnboost/type_traits/detail/ice_eq.hpp
similarity index 96%
rename from boost/type_traits/detail/ice_eq.hpp
rename to ndnboost/type_traits/detail/ice_eq.hpp
index 55c11a2..293d3d7 100644
--- a/boost/type_traits/detail/ice_eq.hpp
+++ b/ndnboost/type_traits/detail/ice_eq.hpp
@@ -8,7 +8,7 @@
 #ifndef BOOST_TT_DETAIL_ICE_EQ_HPP_INCLUDED
 #define BOOST_TT_DETAIL_ICE_EQ_HPP_INCLUDED
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 namespace ndnboost {
 namespace type_traits {
diff --git a/boost/type_traits/detail/ice_not.hpp b/ndnboost/type_traits/detail/ice_not.hpp
similarity index 95%
rename from boost/type_traits/detail/ice_not.hpp
rename to ndnboost/type_traits/detail/ice_not.hpp
index 5589625..47457d4 100644
--- a/boost/type_traits/detail/ice_not.hpp
+++ b/ndnboost/type_traits/detail/ice_not.hpp
@@ -8,7 +8,7 @@
 #ifndef BOOST_TT_DETAIL_ICE_NOT_HPP_INCLUDED
 #define BOOST_TT_DETAIL_ICE_NOT_HPP_INCLUDED
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 namespace ndnboost {
 namespace type_traits {
diff --git a/boost/type_traits/detail/ice_or.hpp b/ndnboost/type_traits/detail/ice_or.hpp
similarity index 96%
rename from boost/type_traits/detail/ice_or.hpp
rename to ndnboost/type_traits/detail/ice_or.hpp
index 763c0d3..0d49b96 100644
--- a/boost/type_traits/detail/ice_or.hpp
+++ b/ndnboost/type_traits/detail/ice_or.hpp
@@ -8,7 +8,7 @@
 #ifndef BOOST_TT_DETAIL_ICE_OR_HPP_INCLUDED
 #define BOOST_TT_DETAIL_ICE_OR_HPP_INCLUDED
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 namespace ndnboost {
 namespace type_traits {
diff --git a/boost/type_traits/detail/is_function_ptr_helper.hpp b/ndnboost/type_traits/detail/is_function_ptr_helper.hpp
similarity index 98%
rename from boost/type_traits/detail/is_function_ptr_helper.hpp
rename to ndnboost/type_traits/detail/is_function_ptr_helper.hpp
index bb7a798..aa6fdde 100644
--- a/boost/type_traits/detail/is_function_ptr_helper.hpp
+++ b/ndnboost/type_traits/detail/is_function_ptr_helper.hpp
@@ -15,12 +15,12 @@
 #ifndef BOOST_TT_DETAIL_IS_FUNCTION_PTR_HELPER_HPP_INCLUDED
 #define BOOST_TT_DETAIL_IS_FUNCTION_PTR_HELPER_HPP_INCLUDED
 
-#include <boost/type_traits/config.hpp>
+#include <ndnboost/type_traits/config.hpp>
 
 #if defined(BOOST_TT_PREPROCESSING_MODE)
-#   include <boost/preprocessor/iterate.hpp>
-#   include <boost/preprocessor/enum_params.hpp>
-#   include <boost/preprocessor/comma_if.hpp>
+#   include <ndnboost/preprocessor/iterate.hpp>
+#   include <ndnboost/preprocessor/enum_params.hpp>
+#   include <ndnboost/preprocessor/comma_if.hpp>
 #endif
 
 namespace ndnboost {
@@ -195,7 +195,7 @@
 
 #undef BOOST_STATIC_CONSTANT
 #define BOOST_PP_ITERATION_PARAMS_1 \
-    (3, (0, 25, "boost/type_traits/detail/is_function_ptr_helper.hpp"))
+    (3, (0, 25, "ndnboost/type_traits/detail/is_function_ptr_helper.hpp"))
 #include BOOST_PP_ITERATE()
 
 #endif // BOOST_TT_PREPROCESSING_MODE
diff --git a/boost/type_traits/detail/is_function_ptr_tester.hpp b/ndnboost/type_traits/detail/is_function_ptr_tester.hpp
similarity index 99%
rename from boost/type_traits/detail/is_function_ptr_tester.hpp
rename to ndnboost/type_traits/detail/is_function_ptr_tester.hpp
index 00fe31e..dc0654a 100644
--- a/boost/type_traits/detail/is_function_ptr_tester.hpp
+++ b/ndnboost/type_traits/detail/is_function_ptr_tester.hpp
@@ -14,13 +14,13 @@
 #ifndef BOOST_TT_DETAIL_IS_FUNCTION_PTR_TESTER_HPP_INCLUDED
 #define BOOST_TT_DETAIL_IS_FUNCTION_PTR_TESTER_HPP_INCLUDED
 
-#include <boost/type_traits/detail/yes_no_type.hpp>
-#include <boost/type_traits/config.hpp>
+#include <ndnboost/type_traits/detail/yes_no_type.hpp>
+#include <ndnboost/type_traits/config.hpp>
 
 #if defined(BOOST_TT_PREPROCESSING_MODE)
-#   include <boost/preprocessor/iterate.hpp>
-#   include <boost/preprocessor/enum_params.hpp>
-#   include <boost/preprocessor/comma_if.hpp>
+#   include <ndnboost/preprocessor/iterate.hpp>
+#   include <ndnboost/preprocessor/enum_params.hpp>
+#   include <ndnboost/preprocessor/comma_if.hpp>
 #endif
 
 namespace ndnboost {
@@ -609,7 +609,7 @@
 #else
 
 #define BOOST_PP_ITERATION_PARAMS_1 \
-    (3, (0, 25, "boost/type_traits/detail/is_function_ptr_tester.hpp"))
+    (3, (0, 25, "ndnboost/type_traits/detail/is_function_ptr_tester.hpp"))
 #include BOOST_PP_ITERATE()
 
 #endif // BOOST_TT_PREPROCESSING_MODE
diff --git a/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp b/ndnboost/type_traits/detail/is_mem_fun_pointer_impl.hpp
similarity index 99%
rename from boost/type_traits/detail/is_mem_fun_pointer_impl.hpp
rename to ndnboost/type_traits/detail/is_mem_fun_pointer_impl.hpp
index db09352..b278ea3 100644
--- a/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp
+++ b/ndnboost/type_traits/detail/is_mem_fun_pointer_impl.hpp
@@ -14,12 +14,12 @@
 #ifndef BOOST_TT_DETAIL_IS_MEM_FUN_POINTER_IMPL_HPP_INCLUDED
 #define BOOST_TT_DETAIL_IS_MEM_FUN_POINTER_IMPL_HPP_INCLUDED
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 #if defined(BOOST_TT_PREPROCESSING_MODE)
-#   include <boost/preprocessor/iterate.hpp>
-#   include <boost/preprocessor/enum_params.hpp>
-#   include <boost/preprocessor/comma_if.hpp>
+#   include <ndnboost/preprocessor/iterate.hpp>
+#   include <ndnboost/preprocessor/enum_params.hpp>
+#   include <ndnboost/preprocessor/comma_if.hpp>
 #endif
 
 namespace ndnboost {
@@ -768,7 +768,7 @@
 
 #undef BOOST_STATIC_CONSTANT
 #define BOOST_PP_ITERATION_PARAMS_1 \
-    (3, (0, 25, "boost/type_traits/detail/is_mem_fun_pointer_impl.hpp"))
+    (3, (0, 25, "ndnboost/type_traits/detail/is_mem_fun_pointer_impl.hpp"))
 #include BOOST_PP_ITERATE()
 
 #endif // BOOST_TT_PREPROCESSING_MODE
diff --git a/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp b/ndnboost/type_traits/detail/is_mem_fun_pointer_tester.hpp
similarity index 99%
rename from boost/type_traits/detail/is_mem_fun_pointer_tester.hpp
rename to ndnboost/type_traits/detail/is_mem_fun_pointer_tester.hpp
index 3bb6e98..767c4f1 100644
--- a/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp
+++ b/ndnboost/type_traits/detail/is_mem_fun_pointer_tester.hpp
@@ -14,13 +14,13 @@
 #ifndef BOOST_TT_DETAIL_IS_MEM_FUN_POINTER_TESTER_HPP_INCLUDED
 #define BOOST_TT_DETAIL_IS_MEM_FUN_POINTER_TESTER_HPP_INCLUDED
 
-#include <boost/type_traits/detail/yes_no_type.hpp>
-#include <boost/type_traits/config.hpp>
+#include <ndnboost/type_traits/detail/yes_no_type.hpp>
+#include <ndnboost/type_traits/config.hpp>
 
 #if defined(BOOST_TT_PREPROCESSING_MODE)
-#   include <boost/preprocessor/iterate.hpp>
-#   include <boost/preprocessor/enum_params.hpp>
-#   include <boost/preprocessor/comma_if.hpp>
+#   include <ndnboost/preprocessor/iterate.hpp>
+#   include <ndnboost/preprocessor/enum_params.hpp>
+#   include <ndnboost/preprocessor/comma_if.hpp>
 #endif
 
 namespace ndnboost {
@@ -2636,7 +2636,7 @@
 #else
 
 #define BOOST_PP_ITERATION_PARAMS_1 \
-    (3, (0, 25, "boost/type_traits/detail/is_mem_fun_pointer_tester.hpp"))
+    (3, (0, 25, "ndnboost/type_traits/detail/is_mem_fun_pointer_tester.hpp"))
 #include BOOST_PP_ITERATE()
 
 #endif // BOOST_TT_PREPROCESSING_MODE
diff --git a/boost/type_traits/detail/size_t_trait_def.hpp b/ndnboost/type_traits/detail/size_t_trait_def.hpp
similarity index 88%
rename from boost/type_traits/detail/size_t_trait_def.hpp
rename to ndnboost/type_traits/detail/size_t_trait_def.hpp
index edae56c..48afada 100644
--- a/boost/type_traits/detail/size_t_trait_def.hpp
+++ b/ndnboost/type_traits/detail/size_t_trait_def.hpp
@@ -11,10 +11,10 @@
 // $Date: 2011-04-25 05:26:48 -0700 (Mon, 25 Apr 2011) $
 // $Revision: 71481 $
 
-#include <boost/type_traits/detail/template_arity_spec.hpp>
-#include <boost/type_traits/integral_constant.hpp>
-#include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/mpl/size_t.hpp>
+#include <ndnboost/type_traits/detail/template_arity_spec.hpp>
+#include <ndnboost/type_traits/integral_constant.hpp>
+#include <ndnboost/mpl/aux_/lambda_support.hpp>
+#include <ndnboost/mpl/size_t.hpp>
 
 #include <cstddef>
 
diff --git a/boost/type_traits/detail/size_t_trait_undef.hpp b/ndnboost/type_traits/detail/size_t_trait_undef.hpp
similarity index 100%
rename from boost/type_traits/detail/size_t_trait_undef.hpp
rename to ndnboost/type_traits/detail/size_t_trait_undef.hpp
diff --git a/boost/type_traits/detail/template_arity_spec.hpp b/ndnboost/type_traits/detail/template_arity_spec.hpp
similarity index 74%
rename from boost/type_traits/detail/template_arity_spec.hpp
rename to ndnboost/type_traits/detail/template_arity_spec.hpp
index fe9b422..cef622d 100644
--- a/boost/type_traits/detail/template_arity_spec.hpp
+++ b/ndnboost/type_traits/detail/template_arity_spec.hpp
@@ -7,11 +7,11 @@
 // (See accompanying file LICENSE_1_0.txt or copy at 
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/template_arity_fwd.hpp>
-#include <boost/mpl/aux_/preprocessor/params.hpp>
-#include <boost/mpl/aux_/config/lambda.hpp>
-#include <boost/mpl/aux_/config/overload_resolution.hpp>
+#include <ndnboost/mpl/int.hpp>
+#include <ndnboost/mpl/aux_/template_arity_fwd.hpp>
+#include <ndnboost/mpl/aux_/preprocessor/params.hpp>
+#include <ndnboost/mpl/aux_/config/lambda.hpp>
+#include <ndnboost/mpl/aux_/config/overload_resolution.hpp>
 
 #if defined(BOOST_MPL_CFG_NO_FULL_LAMBDA_SUPPORT) \
     && defined(BOOST_MPL_CFG_BROKEN_OVERLOAD_RESOLUTION)
diff --git a/boost/type_traits/detail/type_trait_def.hpp b/ndnboost/type_traits/detail/type_trait_def.hpp
similarity index 92%
rename from boost/type_traits/detail/type_trait_def.hpp
rename to ndnboost/type_traits/detail/type_trait_def.hpp
index 224f848..acb8111 100644
--- a/boost/type_traits/detail/type_trait_def.hpp
+++ b/ndnboost/type_traits/detail/type_trait_def.hpp
@@ -11,8 +11,8 @@
 // $Date: 2011-04-25 05:26:48 -0700 (Mon, 25 Apr 2011) $
 // $Revision: 71481 $
 
-#include <boost/type_traits/detail/template_arity_spec.hpp>
-#include <boost/mpl/aux_/lambda_support.hpp>
+#include <ndnboost/type_traits/detail/template_arity_spec.hpp>
+#include <ndnboost/mpl/aux_/lambda_support.hpp>
 
 #define BOOST_TT_AUX_TYPE_TRAIT_DEF1(trait,T,result) \
 template< typename T > struct trait \
diff --git a/boost/type_traits/detail/type_trait_undef.hpp b/ndnboost/type_traits/detail/type_trait_undef.hpp
similarity index 100%
rename from boost/type_traits/detail/type_trait_undef.hpp
rename to ndnboost/type_traits/detail/type_trait_undef.hpp
diff --git a/boost/type_traits/detail/wrap.hpp b/ndnboost/type_traits/detail/wrap.hpp
similarity index 100%
rename from boost/type_traits/detail/wrap.hpp
rename to ndnboost/type_traits/detail/wrap.hpp
diff --git a/boost/type_traits/detail/yes_no_type.hpp b/ndnboost/type_traits/detail/yes_no_type.hpp
similarity index 100%
rename from boost/type_traits/detail/yes_no_type.hpp
rename to ndnboost/type_traits/detail/yes_no_type.hpp
diff --git a/boost/type_traits/has_trivial_constructor.hpp b/ndnboost/type_traits/has_trivial_constructor.hpp
similarity index 81%
rename from boost/type_traits/has_trivial_constructor.hpp
rename to ndnboost/type_traits/has_trivial_constructor.hpp
index dfb9a33..9eb5ded 100644
--- a/boost/type_traits/has_trivial_constructor.hpp
+++ b/ndnboost/type_traits/has_trivial_constructor.hpp
@@ -9,13 +9,13 @@
 #ifndef BOOST_TT_HAS_TRIVIAL_CONSTRUCTOR_HPP_INCLUDED
 #define BOOST_TT_HAS_TRIVIAL_CONSTRUCTOR_HPP_INCLUDED
 
-#include <boost/type_traits/config.hpp>
-#include <boost/type_traits/intrinsics.hpp>
-#include <boost/type_traits/is_pod.hpp>
-#include <boost/type_traits/detail/ice_or.hpp>
+#include <ndnboost/type_traits/config.hpp>
+#include <ndnboost/type_traits/intrinsics.hpp>
+#include <ndnboost/type_traits/is_pod.hpp>
+#include <ndnboost/type_traits/detail/ice_or.hpp>
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -46,6 +46,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_HAS_TRIVIAL_CONSTRUCTOR_HPP_INCLUDED
diff --git a/boost/type_traits/has_trivial_destructor.hpp b/ndnboost/type_traits/has_trivial_destructor.hpp
similarity index 81%
rename from boost/type_traits/has_trivial_destructor.hpp
rename to ndnboost/type_traits/has_trivial_destructor.hpp
index 35c6665..f47ab64 100644
--- a/boost/type_traits/has_trivial_destructor.hpp
+++ b/ndnboost/type_traits/has_trivial_destructor.hpp
@@ -9,13 +9,13 @@
 #ifndef BOOST_TT_HAS_TRIVIAL_DESTRUCTOR_HPP_INCLUDED
 #define BOOST_TT_HAS_TRIVIAL_DESTRUCTOR_HPP_INCLUDED
 
-#include <boost/type_traits/config.hpp>
-#include <boost/type_traits/intrinsics.hpp>
-#include <boost/type_traits/is_pod.hpp>
-#include <boost/type_traits/detail/ice_or.hpp>
+#include <ndnboost/type_traits/config.hpp>
+#include <ndnboost/type_traits/intrinsics.hpp>
+#include <ndnboost/type_traits/is_pod.hpp>
+#include <ndnboost/type_traits/detail/ice_or.hpp>
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -44,6 +44,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_HAS_TRIVIAL_DESTRUCTOR_HPP_INCLUDED
diff --git a/boost/type_traits/ice.hpp b/ndnboost/type_traits/ice.hpp
similarity index 67%
rename from boost/type_traits/ice.hpp
rename to ndnboost/type_traits/ice.hpp
index 134bc4b..e68c229 100644
--- a/boost/type_traits/ice.hpp
+++ b/ndnboost/type_traits/ice.hpp
@@ -11,10 +11,10 @@
 #ifndef BOOST_TT_ICE_HPP_INCLUDED
 #define BOOST_TT_ICE_HPP_INCLUDED
 
-#include <boost/type_traits/detail/yes_no_type.hpp>
-#include <boost/type_traits/detail/ice_or.hpp>
-#include <boost/type_traits/detail/ice_and.hpp>
-#include <boost/type_traits/detail/ice_not.hpp>
-#include <boost/type_traits/detail/ice_eq.hpp>
+#include <ndnboost/type_traits/detail/yes_no_type.hpp>
+#include <ndnboost/type_traits/detail/ice_or.hpp>
+#include <ndnboost/type_traits/detail/ice_and.hpp>
+#include <ndnboost/type_traits/detail/ice_not.hpp>
+#include <ndnboost/type_traits/detail/ice_eq.hpp>
 
 #endif // BOOST_TT_ICE_HPP_INCLUDED
diff --git a/boost/type_traits/integral_constant.hpp b/ndnboost/type_traits/integral_constant.hpp
similarity index 92%
rename from boost/type_traits/integral_constant.hpp
rename to ndnboost/type_traits/integral_constant.hpp
index 9f57ecd..0539f1c 100644
--- a/boost/type_traits/integral_constant.hpp
+++ b/ndnboost/type_traits/integral_constant.hpp
@@ -6,9 +6,9 @@
 #ifndef BOOST_TYPE_TRAITS_INTEGRAL_CONSTANT_HPP
 #define BOOST_TYPE_TRAITS_INTEGRAL_CONSTANT_HPP
 
-#include <boost/config.hpp>
-#include <boost/mpl/bool.hpp>
-#include <boost/mpl/integral_c.hpp>
+#include <ndnboost/config.hpp>
+#include <ndnboost/mpl/bool.hpp>
+#include <ndnboost/mpl/integral_c.hpp>
 
 namespace ndnboost{
 
diff --git a/boost/type_traits/intrinsics.hpp b/ndnboost/type_traits/intrinsics.hpp
similarity index 93%
rename from boost/type_traits/intrinsics.hpp
rename to ndnboost/type_traits/intrinsics.hpp
index c816a6d..53f894c 100644
--- a/boost/type_traits/intrinsics.hpp
+++ b/ndnboost/type_traits/intrinsics.hpp
@@ -9,7 +9,7 @@
 #define BOOST_TT_INTRINSICS_HPP_INCLUDED
 
 #ifndef BOOST_TT_CONFIG_HPP_INCLUDED
-#include <boost/type_traits/config.hpp>
+#include <ndnboost/type_traits/config.hpp>
 #endif
 
 //
@@ -44,7 +44,7 @@
 #ifdef BOOST_HAS_SGI_TYPE_TRAITS
     // Hook into SGI's __type_traits class, this will pick up user supplied
     // specializations as well as SGI - compiler supplied specializations.
-#   include <boost/type_traits/is_same.hpp>
+#   include <ndnboost/type_traits/is_same.hpp>
 #   ifdef __NetBSD__
       // There are two different versions of type_traits.h on NetBSD on Spark
       // use an implicit include via algorithm instead, to make sure we get
@@ -81,8 +81,8 @@
 
 #if (defined(BOOST_MSVC) && defined(BOOST_MSVC_FULL_VER) && (BOOST_MSVC_FULL_VER >=140050215))\
          || (defined(BOOST_INTEL) && defined(_MSC_VER) && (_MSC_VER >= 1500))
-#   include <boost/type_traits/is_same.hpp>
-#   include <boost/type_traits/is_function.hpp>
+#   include <ndnboost/type_traits/is_same.hpp>
+#   include <ndnboost/type_traits/is_function.hpp>
 
 #   define BOOST_IS_UNION(T) __is_union(T)
 #   define BOOST_IS_POD(T) (__is_pod(T) && __has_trivial_constructor(T))
@@ -127,9 +127,9 @@
 
 #if defined(BOOST_CLANG) && defined(__has_feature)
 #   include <cstddef>
-#   include <boost/type_traits/is_same.hpp>
-#   include <boost/type_traits/is_reference.hpp>
-#   include <boost/type_traits/is_volatile.hpp>
+#   include <ndnboost/type_traits/is_same.hpp>
+#   include <ndnboost/type_traits/is_reference.hpp>
+#   include <ndnboost/type_traits/is_volatile.hpp>
 
 #   if __has_feature(is_union)
 #     define BOOST_IS_UNION(T) __is_union(T)
@@ -174,7 +174,7 @@
 #     define BOOST_IS_CLASS(T) __is_class(T)
 #   endif
 #   if __has_feature(is_convertible_to)
-#     include <boost/type_traits/is_abstract.hpp>
+#     include <ndnboost/type_traits/is_abstract.hpp>
 #     define BOOST_IS_CONVERTIBLE(T,U) (__is_convertible_to(T,U) && !::ndnboost::is_abstract<U>::value)
 #   endif
 #   if __has_feature(is_enum)
@@ -189,9 +189,9 @@
 #endif
 
 #if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3) && !defined(__GCCXML__))) && !defined(BOOST_CLANG)
-#   include <boost/type_traits/is_same.hpp>
-#   include <boost/type_traits/is_reference.hpp>
-#   include <boost/type_traits/is_volatile.hpp>
+#   include <ndnboost/type_traits/is_same.hpp>
+#   include <ndnboost/type_traits/is_reference.hpp>
+#   include <ndnboost/type_traits/is_volatile.hpp>
 
 #ifdef BOOST_INTEL
 #  define BOOST_INTEL_TT_OPTS || is_pod<T>::value
@@ -227,9 +227,9 @@
 #endif
 
 #if defined(__ghs__) && (__GHS_VERSION_NUMBER >= 600)
-#   include <boost/type_traits/is_same.hpp>
-#   include <boost/type_traits/is_reference.hpp>
-#   include <boost/type_traits/is_volatile.hpp>
+#   include <ndnboost/type_traits/is_same.hpp>
+#   include <ndnboost/type_traits/is_reference.hpp>
+#   include <ndnboost/type_traits/is_volatile.hpp>
 
 #   define BOOST_IS_UNION(T) __is_union(T)
 #   define BOOST_IS_POD(T) __is_pod(T)
@@ -254,10 +254,10 @@
 #endif
 
 # if defined(__CODEGEARC__)
-#   include <boost/type_traits/is_same.hpp>
-#   include <boost/type_traits/is_reference.hpp>
-#   include <boost/type_traits/is_volatile.hpp>
-#   include <boost/type_traits/is_void.hpp>
+#   include <ndnboost/type_traits/is_same.hpp>
+#   include <ndnboost/type_traits/is_reference.hpp>
+#   include <ndnboost/type_traits/is_volatile.hpp>
+#   include <ndnboost/type_traits/is_void.hpp>
 
 #   define BOOST_IS_UNION(T) __is_union(T)
 #   define BOOST_IS_POD(T) __is_pod(T)
diff --git a/boost/type_traits/is_abstract.hpp b/ndnboost/type_traits/is_abstract.hpp
similarity index 91%
rename from boost/type_traits/is_abstract.hpp
rename to ndnboost/type_traits/is_abstract.hpp
index e43bc6c..8a13010 100644
--- a/boost/type_traits/is_abstract.hpp
+++ b/ndnboost/type_traits/is_abstract.hpp
@@ -48,18 +48,18 @@
 //              to degrade gracefully, rather than trash the compiler (John Maddock).
 //
 
-#include <boost/type_traits/intrinsics.hpp>
+#include <ndnboost/type_traits/intrinsics.hpp>
 #ifndef BOOST_IS_ABSTRACT
-#include <boost/static_assert.hpp>
-#include <boost/type_traits/detail/yes_no_type.hpp>
-#include <boost/type_traits/is_class.hpp>
-#include <boost/type_traits/detail/ice_and.hpp>
+#include <ndnboost/static_assert.hpp>
+#include <ndnboost/type_traits/detail/yes_no_type.hpp>
+#include <ndnboost/type_traits/is_class.hpp>
+#include <ndnboost/type_traits/detail/ice_and.hpp>
 #ifdef BOOST_NO_IS_ABSTRACT
-#include <boost/type_traits/is_polymorphic.hpp>
+#include <ndnboost/type_traits/is_polymorphic.hpp>
 #endif
 #endif
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 
 namespace ndnboost {
@@ -148,6 +148,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif //BOOST_TT_IS_ABSTRACT_CLASS_HPP
diff --git a/boost/type_traits/is_arithmetic.hpp b/ndnboost/type_traits/is_arithmetic.hpp
similarity index 80%
rename from boost/type_traits/is_arithmetic.hpp
rename to ndnboost/type_traits/is_arithmetic.hpp
index 46d6fde..9878ca9 100644
--- a/boost/type_traits/is_arithmetic.hpp
+++ b/ndnboost/type_traits/is_arithmetic.hpp
@@ -10,14 +10,14 @@
 #define BOOST_TT_IS_ARITHMETIC_HPP_INCLUDED
 
 #if !defined( __CODEGEARC__ )
-#include <boost/type_traits/is_integral.hpp>
-#include <boost/type_traits/is_float.hpp>
-#include <boost/type_traits/detail/ice_or.hpp>
-#include <boost/config.hpp>
+#include <ndnboost/type_traits/is_integral.hpp>
+#include <ndnboost/type_traits/is_float.hpp>
+#include <ndnboost/type_traits/detail/ice_or.hpp>
+#include <ndnboost/config.hpp>
 #endif
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -46,6 +46,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_ARITHMETIC_HPP_INCLUDED
diff --git a/boost/type_traits/is_array.hpp b/ndnboost/type_traits/is_array.hpp
similarity index 91%
rename from boost/type_traits/is_array.hpp
rename to ndnboost/type_traits/is_array.hpp
index 0411cb1..51d3571 100644
--- a/boost/type_traits/is_array.hpp
+++ b/ndnboost/type_traits/is_array.hpp
@@ -14,17 +14,17 @@
 #ifndef BOOST_TT_IS_ARRAY_HPP_INCLUDED
 #define BOOST_TT_IS_ARRAY_HPP_INCLUDED
 
-#include <boost/type_traits/config.hpp>
+#include <ndnboost/type_traits/config.hpp>
 
 #ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-#   include <boost/type_traits/detail/yes_no_type.hpp>
-#   include <boost/type_traits/detail/wrap.hpp>
+#   include <ndnboost/type_traits/detail/yes_no_type.hpp>
+#   include <ndnboost/type_traits/detail/wrap.hpp>
 #endif
 
 #include <cstddef>
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -86,6 +86,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_ARRAY_HPP_INCLUDED
diff --git a/boost/type_traits/is_class.hpp b/ndnboost/type_traits/is_class.hpp
similarity index 85%
rename from boost/type_traits/is_class.hpp
rename to ndnboost/type_traits/is_class.hpp
index 50b1efc..6629d0a 100644
--- a/boost/type_traits/is_class.hpp
+++ b/ndnboost/type_traits/is_class.hpp
@@ -10,31 +10,31 @@
 #ifndef BOOST_TT_IS_CLASS_HPP_INCLUDED
 #define BOOST_TT_IS_CLASS_HPP_INCLUDED
 
-#include <boost/type_traits/config.hpp>
-#include <boost/type_traits/intrinsics.hpp>
+#include <ndnboost/type_traits/config.hpp>
+#include <ndnboost/type_traits/intrinsics.hpp>
 #ifndef BOOST_IS_CLASS
-#   include <boost/type_traits/is_union.hpp>
-#   include <boost/type_traits/detail/ice_and.hpp>
-#   include <boost/type_traits/detail/ice_not.hpp>
+#   include <ndnboost/type_traits/is_union.hpp>
+#   include <ndnboost/type_traits/detail/ice_and.hpp>
+#   include <ndnboost/type_traits/detail/ice_not.hpp>
 
 #ifdef BOOST_TT_HAS_CONFORMING_IS_CLASS_IMPLEMENTATION
-#   include <boost/type_traits/detail/yes_no_type.hpp>
+#   include <ndnboost/type_traits/detail/yes_no_type.hpp>
 #else
-#   include <boost/type_traits/is_scalar.hpp>
-#   include <boost/type_traits/is_array.hpp>
-#   include <boost/type_traits/is_reference.hpp>
-#   include <boost/type_traits/is_void.hpp>
-#   include <boost/type_traits/is_function.hpp>
+#   include <ndnboost/type_traits/is_scalar.hpp>
+#   include <ndnboost/type_traits/is_array.hpp>
+#   include <ndnboost/type_traits/is_reference.hpp>
+#   include <ndnboost/type_traits/is_void.hpp>
+#   include <ndnboost/type_traits/is_function.hpp>
 #endif
 
 #endif // BOOST_IS_CLASS
 
 #ifdef __EDG_VERSION__
-#   include <boost/type_traits/remove_cv.hpp>
+#   include <ndnboost/type_traits/remove_cv.hpp>
 #endif
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -135,6 +135,6 @@
     
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_CLASS_HPP_INCLUDED
diff --git a/boost/type_traits/is_const.hpp b/ndnboost/type_traits/is_const.hpp
similarity index 88%
rename from boost/type_traits/is_const.hpp
rename to ndnboost/type_traits/is_const.hpp
index a8e871a..369239b 100644
--- a/boost/type_traits/is_const.hpp
+++ b/ndnboost/type_traits/is_const.hpp
@@ -21,26 +21,26 @@
 #ifndef BOOST_TT_IS_CONST_HPP_INCLUDED
 #define BOOST_TT_IS_CONST_HPP_INCLUDED
 
-#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <ndnboost/config.hpp>
+#include <ndnboost/detail/workaround.hpp>
 
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-#   include <boost/type_traits/detail/cv_traits_impl.hpp>
+#   include <ndnboost/type_traits/detail/cv_traits_impl.hpp>
 #   ifdef __GNUC__
-#       include <boost/type_traits/is_reference.hpp>
+#       include <ndnboost/type_traits/is_reference.hpp>
 #   endif
 #   if BOOST_WORKAROUND(BOOST_MSVC, < 1400)
-#       include <boost/type_traits/remove_bounds.hpp>
+#       include <ndnboost/type_traits/remove_bounds.hpp>
 #   endif
 #else
-#   include <boost/type_traits/is_reference.hpp>
-#   include <boost/type_traits/is_array.hpp>
-#   include <boost/type_traits/detail/yes_no_type.hpp>
-#   include <boost/type_traits/detail/false_result.hpp>
+#   include <ndnboost/type_traits/is_reference.hpp>
+#   include <ndnboost/type_traits/is_array.hpp>
+#   include <ndnboost/type_traits/detail/yes_no_type.hpp>
+#   include <ndnboost/type_traits/detail/false_result.hpp>
 #endif
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -159,7 +159,7 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_CONST_HPP_INCLUDED
 
diff --git a/boost/type_traits/is_convertible.hpp b/ndnboost/type_traits/is_convertible.hpp
similarity index 95%
rename from boost/type_traits/is_convertible.hpp
rename to ndnboost/type_traits/is_convertible.hpp
index d42a259..e34579d 100644
--- a/boost/type_traits/is_convertible.hpp
+++ b/ndnboost/type_traits/is_convertible.hpp
@@ -12,29 +12,29 @@
 #ifndef BOOST_TT_IS_CONVERTIBLE_HPP_INCLUDED
 #define BOOST_TT_IS_CONVERTIBLE_HPP_INCLUDED
 
-#include <boost/type_traits/intrinsics.hpp>
+#include <ndnboost/type_traits/intrinsics.hpp>
 #ifndef BOOST_IS_CONVERTIBLE
-#include <boost/type_traits/detail/yes_no_type.hpp>
-#include <boost/type_traits/config.hpp>
-#include <boost/type_traits/is_array.hpp>
-#include <boost/type_traits/ice.hpp>
-#include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/type_traits/is_void.hpp>
+#include <ndnboost/type_traits/detail/yes_no_type.hpp>
+#include <ndnboost/type_traits/config.hpp>
+#include <ndnboost/type_traits/is_array.hpp>
+#include <ndnboost/type_traits/ice.hpp>
+#include <ndnboost/type_traits/is_arithmetic.hpp>
+#include <ndnboost/type_traits/is_void.hpp>
 #ifndef BOOST_NO_IS_ABSTRACT
-#include <boost/type_traits/is_abstract.hpp>
+#include <ndnboost/type_traits/is_abstract.hpp>
 #endif
-#include <boost/type_traits/add_lvalue_reference.hpp>
-#include <boost/type_traits/add_rvalue_reference.hpp>
-#include <boost/type_traits/is_function.hpp>
+#include <ndnboost/type_traits/add_lvalue_reference.hpp>
+#include <ndnboost/type_traits/add_rvalue_reference.hpp>
+#include <ndnboost/type_traits/is_function.hpp>
 
 #if defined(__MWERKS__)
-#include <boost/type_traits/remove_reference.hpp>
+#include <ndnboost/type_traits/remove_reference.hpp>
 #endif
 
 #endif // BOOST_IS_CONVERTIBLE
 
 // should be always the last #include directive
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -487,6 +487,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_CONVERTIBLE_HPP_INCLUDED
diff --git a/boost/type_traits/is_enum.hpp b/ndnboost/type_traits/is_enum.hpp
similarity index 89%
rename from boost/type_traits/is_enum.hpp
rename to ndnboost/type_traits/is_enum.hpp
index f9b2ef5..814632d 100644
--- a/boost/type_traits/is_enum.hpp
+++ b/ndnboost/type_traits/is_enum.hpp
@@ -11,25 +11,25 @@
 #ifndef BOOST_TT_IS_ENUM_HPP_INCLUDED
 #define BOOST_TT_IS_ENUM_HPP_INCLUDED
 
-#include <boost/type_traits/intrinsics.hpp>
+#include <ndnboost/type_traits/intrinsics.hpp>
 #ifndef BOOST_IS_ENUM
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/type_traits/is_reference.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_array.hpp>
+#include <ndnboost/type_traits/add_reference.hpp>
+#include <ndnboost/type_traits/is_arithmetic.hpp>
+#include <ndnboost/type_traits/is_reference.hpp>
+#include <ndnboost/type_traits/is_convertible.hpp>
+#include <ndnboost/type_traits/is_array.hpp>
 #ifdef __GNUC__
-#include <boost/type_traits/is_function.hpp>
+#include <ndnboost/type_traits/is_function.hpp>
 #endif
-#include <boost/type_traits/config.hpp>
+#include <ndnboost/type_traits/config.hpp>
 #if defined(BOOST_TT_HAS_CONFORMING_IS_CLASS_IMPLEMENTATION) 
-#  include <boost/type_traits/is_class.hpp>
-#  include <boost/type_traits/is_union.hpp>
+#  include <ndnboost/type_traits/is_class.hpp>
+#  include <ndnboost/type_traits/is_union.hpp>
 #endif
 #endif
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -184,6 +184,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_ENUM_HPP_INCLUDED
diff --git a/boost/type_traits/is_float.hpp b/ndnboost/type_traits/is_float.hpp
similarity index 88%
rename from boost/type_traits/is_float.hpp
rename to ndnboost/type_traits/is_float.hpp
index 5ee223a..b16495a 100644
--- a/boost/type_traits/is_float.hpp
+++ b/ndnboost/type_traits/is_float.hpp
@@ -10,7 +10,7 @@
 #define BOOST_TYPE_TRAITS_IS_FLOAT_HPP_INCLUDED
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -22,6 +22,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TYPE_TRAITS_IS_FLOAT_HPP_INCLUDED
diff --git a/boost/type_traits/is_function.hpp b/ndnboost/type_traits/is_function.hpp
similarity index 85%
rename from boost/type_traits/is_function.hpp
rename to ndnboost/type_traits/is_function.hpp
index df5a6c7..51136f5 100644
--- a/boost/type_traits/is_function.hpp
+++ b/ndnboost/type_traits/is_function.hpp
@@ -11,19 +11,19 @@
 #ifndef BOOST_TT_IS_FUNCTION_HPP_INCLUDED
 #define BOOST_TT_IS_FUNCTION_HPP_INCLUDED
 
-#include <boost/type_traits/is_reference.hpp>
-#include <boost/type_traits/detail/false_result.hpp>
-#include <boost/config.hpp>
+#include <ndnboost/type_traits/is_reference.hpp>
+#include <ndnboost/type_traits/detail/false_result.hpp>
+#include <ndnboost/config.hpp>
 
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_TT_TEST_MS_FUNC_SIGS)
-#   include <boost/type_traits/detail/is_function_ptr_helper.hpp>
+#   include <ndnboost/type_traits/detail/is_function_ptr_helper.hpp>
 #else
-#   include <boost/type_traits/detail/is_function_ptr_tester.hpp>
-#   include <boost/type_traits/detail/yes_no_type.hpp>
+#   include <ndnboost/type_traits/detail/is_function_ptr_tester.hpp>
+#   include <ndnboost/type_traits/detail/yes_no_type.hpp>
 #endif
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 // is a type a function?
 // Please note that this implementation is unnecessarily complex:
@@ -106,6 +106,6 @@
 #endif
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_FUNCTION_HPP_INCLUDED
diff --git a/boost/type_traits/is_integral.hpp b/ndnboost/type_traits/is_integral.hpp
similarity index 95%
rename from boost/type_traits/is_integral.hpp
rename to ndnboost/type_traits/is_integral.hpp
index 9d41a55..72e13d3 100644
--- a/boost/type_traits/is_integral.hpp
+++ b/ndnboost/type_traits/is_integral.hpp
@@ -9,10 +9,10 @@
 #ifndef BOOST_TT_IS_INTEGRAL_HPP_INCLUDED
 #define BOOST_TT_IS_INTEGRAL_HPP_INCLUDED
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -78,6 +78,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_INTEGRAL_HPP_INCLUDED
diff --git a/boost/type_traits/is_lvalue_reference.hpp b/ndnboost/type_traits/is_lvalue_reference.hpp
similarity index 94%
rename from boost/type_traits/is_lvalue_reference.hpp
rename to ndnboost/type_traits/is_lvalue_reference.hpp
index bb5fe2f..420c2e6 100644
--- a/boost/type_traits/is_lvalue_reference.hpp
+++ b/ndnboost/type_traits/is_lvalue_reference.hpp
@@ -21,15 +21,15 @@
 #ifndef BOOST_TT_IS_LVALUE_REFERENCE_HPP_INCLUDED
 #define BOOST_TT_IS_LVALUE_REFERENCE_HPP_INCLUDED
 
-#include <boost/type_traits/config.hpp>
+#include <ndnboost/type_traits/config.hpp>
 
 #ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-#   include <boost/type_traits/detail/yes_no_type.hpp>
-#   include <boost/type_traits/detail/wrap.hpp>
+#   include <ndnboost/type_traits/detail/yes_no_type.hpp>
+#   include <ndnboost/type_traits/detail/wrap.hpp>
 #endif
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -112,7 +112,7 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_REFERENCE_HPP_INCLUDED
 
diff --git a/boost/type_traits/is_member_function_pointer.hpp b/ndnboost/type_traits/is_member_function_pointer.hpp
similarity index 83%
rename from boost/type_traits/is_member_function_pointer.hpp
rename to ndnboost/type_traits/is_member_function_pointer.hpp
index 4f72699..63115b9 100644
--- a/boost/type_traits/is_member_function_pointer.hpp
+++ b/ndnboost/type_traits/is_member_function_pointer.hpp
@@ -11,8 +11,8 @@
 #ifndef BOOST_TT_IS_MEMBER_FUNCTION_POINTER_HPP_INCLUDED
 #define BOOST_TT_IS_MEMBER_FUNCTION_POINTER_HPP_INCLUDED
 
-#include <boost/type_traits/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <ndnboost/type_traits/config.hpp>
+#include <ndnboost/detail/workaround.hpp>
 
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
    && !BOOST_WORKAROUND(__BORLANDC__, < 0x600) && !defined(BOOST_TT_TEST_MS_FUNC_SIGS)
@@ -21,19 +21,19 @@
    // __stdcall etc function types, where as the partial specialisation
    // version does not do so.
    //
-#   include <boost/type_traits/detail/is_mem_fun_pointer_impl.hpp>
-#   include <boost/type_traits/remove_cv.hpp>
+#   include <ndnboost/type_traits/detail/is_mem_fun_pointer_impl.hpp>
+#   include <ndnboost/type_traits/remove_cv.hpp>
 #else
-#   include <boost/type_traits/is_reference.hpp>
-#   include <boost/type_traits/is_array.hpp>
-#   include <boost/type_traits/detail/yes_no_type.hpp>
-#   include <boost/type_traits/detail/false_result.hpp>
-#   include <boost/type_traits/detail/ice_or.hpp>
-#   include <boost/type_traits/detail/is_mem_fun_pointer_tester.hpp>
+#   include <ndnboost/type_traits/is_reference.hpp>
+#   include <ndnboost/type_traits/is_array.hpp>
+#   include <ndnboost/type_traits/detail/yes_no_type.hpp>
+#   include <ndnboost/type_traits/detail/false_result.hpp>
+#   include <ndnboost/type_traits/detail/ice_or.hpp>
+#   include <ndnboost/type_traits/detail/is_mem_fun_pointer_tester.hpp>
 #endif
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -131,6 +131,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_MEMBER_FUNCTION_POINTER_HPP_INCLUDED
diff --git a/boost/type_traits/is_member_pointer.hpp b/ndnboost/type_traits/is_member_pointer.hpp
similarity index 86%
rename from boost/type_traits/is_member_pointer.hpp
rename to ndnboost/type_traits/is_member_pointer.hpp
index 04b6413..6a2bd61 100644
--- a/boost/type_traits/is_member_pointer.hpp
+++ b/ndnboost/type_traits/is_member_pointer.hpp
@@ -21,22 +21,22 @@
 #ifndef BOOST_TT_IS_MEMBER_POINTER_HPP_INCLUDED
 #define BOOST_TT_IS_MEMBER_POINTER_HPP_INCLUDED
 
-#include <boost/type_traits/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <ndnboost/type_traits/config.hpp>
+#include <ndnboost/detail/workaround.hpp>
 
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !BOOST_WORKAROUND(__BORLANDC__, < 0x600)
-#   include <boost/type_traits/is_member_function_pointer.hpp>
+#   include <ndnboost/type_traits/is_member_function_pointer.hpp>
 #else
-#   include <boost/type_traits/is_reference.hpp>
-#   include <boost/type_traits/is_array.hpp>
-#   include <boost/type_traits/detail/is_mem_fun_pointer_tester.hpp>
-#   include <boost/type_traits/detail/yes_no_type.hpp>
-#   include <boost/type_traits/detail/false_result.hpp>
-#   include <boost/type_traits/detail/ice_or.hpp>
+#   include <ndnboost/type_traits/is_reference.hpp>
+#   include <ndnboost/type_traits/is_array.hpp>
+#   include <ndnboost/type_traits/detail/is_mem_fun_pointer_tester.hpp>
+#   include <ndnboost/type_traits/detail/yes_no_type.hpp>
+#   include <ndnboost/type_traits/detail/false_result.hpp>
+#   include <ndnboost/type_traits/detail/ice_or.hpp>
 #endif
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -111,6 +111,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_MEMBER_POINTER_HPP_INCLUDED
diff --git a/boost/type_traits/is_pod.hpp b/ndnboost/type_traits/is_pod.hpp
similarity index 90%
rename from boost/type_traits/is_pod.hpp
rename to ndnboost/type_traits/is_pod.hpp
index fdda925..2440a0e 100644
--- a/boost/type_traits/is_pod.hpp
+++ b/ndnboost/type_traits/is_pod.hpp
@@ -9,16 +9,16 @@
 #ifndef BOOST_TT_IS_POD_HPP_INCLUDED
 #define BOOST_TT_IS_POD_HPP_INCLUDED
 
-#include <boost/type_traits/config.hpp>
-#include <boost/type_traits/is_void.hpp>
-#include <boost/type_traits/is_scalar.hpp>
-#include <boost/type_traits/detail/ice_or.hpp>
-#include <boost/type_traits/intrinsics.hpp>
+#include <ndnboost/type_traits/config.hpp>
+#include <ndnboost/type_traits/is_void.hpp>
+#include <ndnboost/type_traits/is_scalar.hpp>
+#include <ndnboost/type_traits/detail/ice_or.hpp>
+#include <ndnboost/type_traits/intrinsics.hpp>
 
 #include <cstddef>
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 #ifndef BOOST_IS_POD
 #define BOOST_INTERNAL_IS_POD(T) false
@@ -136,7 +136,7 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #undef BOOST_INTERNAL_IS_POD
 
diff --git a/boost/type_traits/is_pointer.hpp b/ndnboost/type_traits/is_pointer.hpp
similarity index 87%
rename from boost/type_traits/is_pointer.hpp
rename to ndnboost/type_traits/is_pointer.hpp
index ffe14af..0f3f87e 100644
--- a/boost/type_traits/is_pointer.hpp
+++ b/ndnboost/type_traits/is_pointer.hpp
@@ -21,24 +21,24 @@
 #ifndef BOOST_TT_IS_POINTER_HPP_INCLUDED
 #define BOOST_TT_IS_POINTER_HPP_INCLUDED
 
-#include <boost/type_traits/is_member_pointer.hpp>
-#include <boost/type_traits/detail/ice_and.hpp>
-#include <boost/type_traits/detail/ice_not.hpp>
-#include <boost/type_traits/config.hpp>
+#include <ndnboost/type_traits/is_member_pointer.hpp>
+#include <ndnboost/type_traits/detail/ice_and.hpp>
+#include <ndnboost/type_traits/detail/ice_not.hpp>
+#include <ndnboost/type_traits/config.hpp>
 #if !BOOST_WORKAROUND(BOOST_MSVC,<=1300)
-#include <boost/type_traits/remove_cv.hpp>
+#include <ndnboost/type_traits/remove_cv.hpp>
 #endif
 
 #ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-#   include <boost/type_traits/is_reference.hpp>
-#   include <boost/type_traits/is_array.hpp>
-#   include <boost/type_traits/detail/is_function_ptr_tester.hpp>
-#   include <boost/type_traits/detail/false_result.hpp>
-#   include <boost/type_traits/detail/ice_or.hpp>
+#   include <ndnboost/type_traits/is_reference.hpp>
+#   include <ndnboost/type_traits/is_array.hpp>
+#   include <ndnboost/type_traits/detail/is_function_ptr_tester.hpp>
+#   include <ndnboost/type_traits/detail/false_result.hpp>
+#   include <ndnboost/type_traits/detail/ice_or.hpp>
 #endif
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -157,6 +157,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_POINTER_HPP_INCLUDED
diff --git a/boost/type_traits/is_polymorphic.hpp b/ndnboost/type_traits/is_polymorphic.hpp
similarity index 89%
rename from boost/type_traits/is_polymorphic.hpp
rename to ndnboost/type_traits/is_polymorphic.hpp
index ece1a1f..f49cd12 100644
--- a/boost/type_traits/is_polymorphic.hpp
+++ b/ndnboost/type_traits/is_polymorphic.hpp
@@ -8,14 +8,14 @@
 #ifndef BOOST_TT_IS_POLYMORPHIC_HPP
 #define BOOST_TT_IS_POLYMORPHIC_HPP
 
-#include <boost/type_traits/intrinsics.hpp>
+#include <ndnboost/type_traits/intrinsics.hpp>
 #ifndef BOOST_IS_POLYMORPHIC
-#include <boost/type_traits/is_class.hpp>
-#include <boost/type_traits/remove_cv.hpp>
+#include <ndnboost/type_traits/is_class.hpp>
+#include <ndnboost/type_traits/remove_cv.hpp>
 #endif
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
-#include <boost/detail/workaround.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/detail/workaround.hpp>
 
 namespace ndnboost{
 
@@ -109,6 +109,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif
diff --git a/boost/type_traits/is_reference.hpp b/ndnboost/type_traits/is_reference.hpp
similarity index 77%
rename from boost/type_traits/is_reference.hpp
rename to ndnboost/type_traits/is_reference.hpp
index 2fd9364..72ff28d 100644
--- a/boost/type_traits/is_reference.hpp
+++ b/ndnboost/type_traits/is_reference.hpp
@@ -12,13 +12,13 @@
 #ifndef BOOST_TT_IS_REFERENCE_HPP_INCLUDED
 #define BOOST_TT_IS_REFERENCE_HPP_INCLUDED
 
-#include <boost/type_traits/config.hpp>
-#include <boost/type_traits/is_lvalue_reference.hpp>
-#include <boost/type_traits/is_rvalue_reference.hpp>
-#include <boost/type_traits/ice.hpp>
+#include <ndnboost/type_traits/config.hpp>
+#include <ndnboost/type_traits/is_lvalue_reference.hpp>
+#include <ndnboost/type_traits/is_rvalue_reference.hpp>
+#include <ndnboost/type_traits/ice.hpp>
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -39,7 +39,7 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_REFERENCE_HPP_INCLUDED
 
diff --git a/boost/type_traits/is_rvalue_reference.hpp b/ndnboost/type_traits/is_rvalue_reference.hpp
similarity index 81%
rename from boost/type_traits/is_rvalue_reference.hpp
rename to ndnboost/type_traits/is_rvalue_reference.hpp
index b5a37fc..78aa8d6 100644
--- a/boost/type_traits/is_rvalue_reference.hpp
+++ b/ndnboost/type_traits/is_rvalue_reference.hpp
@@ -9,10 +9,10 @@
 #ifndef BOOST_TT_IS_RVALUE_REFERENCE_HPP_INCLUDED
 #define BOOST_TT_IS_RVALUE_REFERENCE_HPP_INCLUDED
 
-#include <boost/type_traits/config.hpp>
+#include <ndnboost/type_traits/config.hpp>
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -23,7 +23,7 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_REFERENCE_HPP_INCLUDED
 
diff --git a/boost/type_traits/is_same.hpp b/ndnboost/type_traits/is_same.hpp
similarity index 90%
rename from boost/type_traits/is_same.hpp
rename to ndnboost/type_traits/is_same.hpp
index f3721fa..58a03c4 100644
--- a/boost/type_traits/is_same.hpp
+++ b/ndnboost/type_traits/is_same.hpp
@@ -21,14 +21,14 @@
 #ifndef BOOST_TT_IS_SAME_HPP_INCLUDED
 #define BOOST_TT_IS_SAME_HPP_INCLUDED
 
-#include <boost/type_traits/config.hpp>
+#include <ndnboost/type_traits/config.hpp>
 #ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-#include <boost/type_traits/detail/yes_no_type.hpp>
-#include <boost/type_traits/detail/ice_and.hpp>
-#include <boost/type_traits/is_reference.hpp>
+#include <ndnboost/type_traits/detail/yes_no_type.hpp>
+#include <ndnboost/type_traits/detail/ice_and.hpp>
+#include <ndnboost/type_traits/is_reference.hpp>
 #endif
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -97,7 +97,7 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif  // BOOST_TT_IS_SAME_HPP_INCLUDED
 
diff --git a/boost/type_traits/is_scalar.hpp b/ndnboost/type_traits/is_scalar.hpp
similarity index 79%
rename from boost/type_traits/is_scalar.hpp
rename to ndnboost/type_traits/is_scalar.hpp
index 8043d70..358d3d5 100644
--- a/boost/type_traits/is_scalar.hpp
+++ b/ndnboost/type_traits/is_scalar.hpp
@@ -9,15 +9,15 @@
 #ifndef BOOST_TT_IS_SCALAR_HPP_INCLUDED
 #define BOOST_TT_IS_SCALAR_HPP_INCLUDED
 
-#include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_pointer.hpp>
-#include <boost/type_traits/is_member_pointer.hpp>
-#include <boost/type_traits/detail/ice_or.hpp>
-#include <boost/config.hpp>
+#include <ndnboost/type_traits/is_arithmetic.hpp>
+#include <ndnboost/type_traits/is_enum.hpp>
+#include <ndnboost/type_traits/is_pointer.hpp>
+#include <ndnboost/type_traits/is_member_pointer.hpp>
+#include <ndnboost/type_traits/detail/ice_or.hpp>
+#include <ndnboost/config.hpp>
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -50,6 +50,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_SCALAR_HPP_INCLUDED
diff --git a/boost/type_traits/is_union.hpp b/ndnboost/type_traits/is_union.hpp
similarity index 84%
rename from boost/type_traits/is_union.hpp
rename to ndnboost/type_traits/is_union.hpp
index 660d7cd..7be09d9 100644
--- a/boost/type_traits/is_union.hpp
+++ b/ndnboost/type_traits/is_union.hpp
@@ -11,12 +11,12 @@
 #ifndef BOOST_TT_IS_UNION_HPP_INCLUDED
 #define BOOST_TT_IS_UNION_HPP_INCLUDED
 
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/config.hpp>
-#include <boost/type_traits/intrinsics.hpp>
+#include <ndnboost/type_traits/remove_cv.hpp>
+#include <ndnboost/type_traits/config.hpp>
+#include <ndnboost/type_traits/intrinsics.hpp>
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -52,6 +52,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_UNION_HPP_INCLUDED
diff --git a/boost/type_traits/is_void.hpp b/ndnboost/type_traits/is_void.hpp
similarity index 87%
rename from boost/type_traits/is_void.hpp
rename to ndnboost/type_traits/is_void.hpp
index 1f5167a..3b19b2d 100644
--- a/boost/type_traits/is_void.hpp
+++ b/ndnboost/type_traits/is_void.hpp
@@ -9,10 +9,10 @@
 #ifndef BOOST_TT_IS_VOID_HPP_INCLUDED
 #define BOOST_TT_IS_VOID_HPP_INCLUDED
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -33,6 +33,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_VOID_HPP_INCLUDED
diff --git a/boost/type_traits/is_volatile.hpp b/ndnboost/type_traits/is_volatile.hpp
similarity index 89%
rename from boost/type_traits/is_volatile.hpp
rename to ndnboost/type_traits/is_volatile.hpp
index 5d40889..07af0b4 100644
--- a/boost/type_traits/is_volatile.hpp
+++ b/ndnboost/type_traits/is_volatile.hpp
@@ -21,23 +21,23 @@
 #ifndef BOOST_TT_IS_VOLATILE_HPP_INCLUDED
 #define BOOST_TT_IS_VOLATILE_HPP_INCLUDED
 
-#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <ndnboost/config.hpp>
+#include <ndnboost/detail/workaround.hpp>
 
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-#   include <boost/type_traits/detail/cv_traits_impl.hpp>
+#   include <ndnboost/type_traits/detail/cv_traits_impl.hpp>
 #   if BOOST_WORKAROUND(BOOST_MSVC, < 1400)
-#       include <boost/type_traits/remove_bounds.hpp>
+#       include <ndnboost/type_traits/remove_bounds.hpp>
 #   endif
 #else
-#   include <boost/type_traits/is_reference.hpp>
-#   include <boost/type_traits/is_array.hpp>
-#   include <boost/type_traits/detail/yes_no_type.hpp>
-#   include <boost/type_traits/detail/false_result.hpp>
+#   include <ndnboost/type_traits/is_reference.hpp>
+#   include <ndnboost/type_traits/is_array.hpp>
+#   include <ndnboost/type_traits/detail/yes_no_type.hpp>
+#   include <ndnboost/type_traits/detail/false_result.hpp>
 #endif
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -147,6 +147,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_IS_VOLATILE_HPP_INCLUDED
diff --git a/boost/type_traits/msvc/remove_bounds.hpp b/ndnboost/type_traits/msvc/remove_bounds.hpp
similarity index 93%
rename from boost/type_traits/msvc/remove_bounds.hpp
rename to ndnboost/type_traits/msvc/remove_bounds.hpp
index a187893..ab923bc 100644
--- a/boost/type_traits/msvc/remove_bounds.hpp
+++ b/ndnboost/type_traits/msvc/remove_bounds.hpp
@@ -5,8 +5,8 @@
 #ifndef BOOST_TYPE_TRAITS_MSVC_REMOVE_BOUNDS_HOLT_2004_0827
 #define BOOST_TYPE_TRAITS_MSVC_REMOVE_BOUNDS_HOLT_2004_0827
 
-#include <boost/type_traits/msvc/typeof.hpp>
-#include <boost/type_traits/is_array.hpp>
+#include <ndnboost/type_traits/msvc/typeof.hpp>
+#include <ndnboost/type_traits/is_array.hpp>
 
 namespace ndnboost {
     namespace detail {
diff --git a/boost/type_traits/msvc/remove_cv.hpp b/ndnboost/type_traits/msvc/remove_cv.hpp
similarity index 96%
rename from boost/type_traits/msvc/remove_cv.hpp
rename to ndnboost/type_traits/msvc/remove_cv.hpp
index e2e15c0..ae16e9f 100644
--- a/boost/type_traits/msvc/remove_cv.hpp
+++ b/ndnboost/type_traits/msvc/remove_cv.hpp
@@ -5,11 +5,11 @@
 #ifndef BOOST_TYPE_TRAITS_MSVC_REMOVE_CV_HOLT_2004_0901
 #define BOOST_TYPE_TRAITS_MSVC_REMOVE_CV_HOLT_2004_0901
 
-#include <boost/type_traits/msvc/typeof.hpp>
-#include <boost/type_traits/is_volatile.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_pointer.hpp>
-#include <boost/type_traits/is_array.hpp>
+#include <ndnboost/type_traits/msvc/typeof.hpp>
+#include <ndnboost/type_traits/is_volatile.hpp>
+#include <ndnboost/type_traits/is_const.hpp>
+#include <ndnboost/type_traits/is_pointer.hpp>
+#include <ndnboost/type_traits/is_array.hpp>
 
 namespace ndnboost {
     namespace detail {
diff --git a/boost/type_traits/msvc/remove_reference.hpp b/ndnboost/type_traits/msvc/remove_reference.hpp
similarity index 93%
rename from boost/type_traits/msvc/remove_reference.hpp
rename to ndnboost/type_traits/msvc/remove_reference.hpp
index d6c4c2d..7d8ef67 100644
--- a/boost/type_traits/msvc/remove_reference.hpp
+++ b/ndnboost/type_traits/msvc/remove_reference.hpp
@@ -5,8 +5,8 @@
 #ifndef BOOST_TYPE_TRAITS_MSVC_REMOVE_REFERENCE_HOLT_2004_0827
 #define BOOST_TYPE_TRAITS_MSVC_REMOVE_REFERENCE_HOLT_2004_0827
 
-#include <boost/type_traits/msvc/typeof.hpp>
-#include <boost/type_traits/is_reference.hpp>
+#include <ndnboost/type_traits/msvc/typeof.hpp>
+#include <ndnboost/type_traits/is_reference.hpp>
 
 namespace ndnboost {
     namespace detail {
diff --git a/boost/type_traits/msvc/typeof.hpp b/ndnboost/type_traits/msvc/typeof.hpp
similarity index 94%
rename from boost/type_traits/msvc/typeof.hpp
rename to ndnboost/type_traits/msvc/typeof.hpp
index d2f2402..dabc975 100644
--- a/boost/type_traits/msvc/typeof.hpp
+++ b/ndnboost/type_traits/msvc/typeof.hpp
@@ -5,8 +5,8 @@
 #ifndef BOOST_TYPETRAITS_MSVC_TYPEOF_HPP
 #define BOOST_TYPETRAITS_MSVC_TYPEOF_HPP
 
-#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <ndnboost/config.hpp>
+#include <ndnboost/detail/workaround.hpp>
 
 namespace ndnboost { namespace detail {
 # if BOOST_WORKAROUND(BOOST_MSVC,==1300)
diff --git a/boost/type_traits/remove_bounds.hpp b/ndnboost/type_traits/remove_bounds.hpp
similarity index 87%
rename from boost/type_traits/remove_bounds.hpp
rename to ndnboost/type_traits/remove_bounds.hpp
index b9ee623..11372da 100644
--- a/boost/type_traits/remove_bounds.hpp
+++ b/ndnboost/type_traits/remove_bounds.hpp
@@ -9,16 +9,16 @@
 #ifndef BOOST_TT_REMOVE_BOUNDS_HPP_INCLUDED
 #define BOOST_TT_REMOVE_BOUNDS_HPP_INCLUDED
 
-#include <boost/config.hpp>
+#include <ndnboost/config.hpp>
 #include <cstddef>
-#include <boost/detail/workaround.hpp>
+#include <ndnboost/detail/workaround.hpp>
 
 #if BOOST_WORKAROUND(BOOST_MSVC,<=1300)
-#include <boost/type_traits/msvc/remove_bounds.hpp>
+#include <ndnboost/type_traits/msvc/remove_bounds.hpp>
 #endif
 
 // should be the last #include
-#include <boost/type_traits/detail/type_trait_def.hpp>
+#include <ndnboost/type_traits/detail/type_trait_def.hpp>
 
 #if !BOOST_WORKAROUND(BOOST_MSVC,<=1300)
 
@@ -43,6 +43,6 @@
 
 #endif
 
-#include <boost/type_traits/detail/type_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/type_trait_undef.hpp>
 
 #endif // BOOST_TT_REMOVE_BOUNDS_HPP_INCLUDED
diff --git a/boost/type_traits/remove_cv.hpp b/ndnboost/type_traits/remove_cv.hpp
similarity index 85%
rename from boost/type_traits/remove_cv.hpp
rename to ndnboost/type_traits/remove_cv.hpp
index c87d2b0..22cf78f 100644
--- a/boost/type_traits/remove_cv.hpp
+++ b/ndnboost/type_traits/remove_cv.hpp
@@ -11,19 +11,19 @@
 #ifndef BOOST_TT_REMOVE_CV_HPP_INCLUDED
 #define BOOST_TT_REMOVE_CV_HPP_INCLUDED
 
-#include <boost/type_traits/broken_compiler_spec.hpp>
-#include <boost/type_traits/detail/cv_traits_impl.hpp>
-#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <ndnboost/type_traits/broken_compiler_spec.hpp>
+#include <ndnboost/type_traits/detail/cv_traits_impl.hpp>
+#include <ndnboost/config.hpp>
+#include <ndnboost/detail/workaround.hpp>
 
 #include <cstddef>
 
 #if BOOST_WORKAROUND(BOOST_MSVC,<=1300)
-#include <boost/type_traits/msvc/remove_cv.hpp>
+#include <ndnboost/type_traits/msvc/remove_cv.hpp>
 #endif
 
 // should be the last #include
-#include <boost/type_traits/detail/type_trait_def.hpp>
+#include <ndnboost/type_traits/detail/type_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -79,6 +79,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/type_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/type_trait_undef.hpp>
 
 #endif // BOOST_TT_REMOVE_CV_HPP_INCLUDED
diff --git a/boost/type_traits/remove_reference.hpp b/ndnboost/type_traits/remove_reference.hpp
similarity index 86%
rename from boost/type_traits/remove_reference.hpp
rename to ndnboost/type_traits/remove_reference.hpp
index 4b991d5..d84c6ac 100644
--- a/boost/type_traits/remove_reference.hpp
+++ b/ndnboost/type_traits/remove_reference.hpp
@@ -9,16 +9,16 @@
 #ifndef BOOST_TT_REMOVE_REFERENCE_HPP_INCLUDED
 #define BOOST_TT_REMOVE_REFERENCE_HPP_INCLUDED
 
-#include <boost/type_traits/broken_compiler_spec.hpp>
-#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <ndnboost/type_traits/broken_compiler_spec.hpp>
+#include <ndnboost/config.hpp>
+#include <ndnboost/detail/workaround.hpp>
 
 #if BOOST_WORKAROUND(BOOST_MSVC,<=1300)
-#include <boost/type_traits/msvc/remove_reference.hpp>
+#include <ndnboost/type_traits/msvc/remove_reference.hpp>
 #endif
 
 // should be the last #include
-#include <boost/type_traits/detail/type_trait_def.hpp>
+#include <ndnboost/type_traits/detail/type_trait_def.hpp>
 
 namespace ndnboost {
 
@@ -65,6 +65,6 @@
 
 } // namespace ndnboost
 
-#include <boost/type_traits/detail/type_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/type_trait_undef.hpp>
 
 #endif // BOOST_TT_REMOVE_REFERENCE_HPP_INCLUDED
diff --git a/boost/type_traits/type_with_alignment.hpp b/ndnboost/type_traits/type_with_alignment.hpp
similarity index 95%
rename from boost/type_traits/type_with_alignment.hpp
rename to ndnboost/type_traits/type_with_alignment.hpp
index 5c4547a..06b7f91 100644
--- a/boost/type_traits/type_with_alignment.hpp
+++ b/ndnboost/type_traits/type_with_alignment.hpp
@@ -8,19 +8,19 @@
 #ifndef BOOST_TT_TYPE_WITH_ALIGNMENT_INCLUDED
 #define BOOST_TT_TYPE_WITH_ALIGNMENT_INCLUDED
 
-#include <boost/mpl/if.hpp>
-#include <boost/preprocessor/list/for_each_i.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/list/transform.hpp>
-#include <boost/preprocessor/list/append.hpp>
-#include <boost/type_traits/alignment_of.hpp>
-#include <boost/type_traits/is_pod.hpp>
-#include <boost/static_assert.hpp>
-#include <boost/config.hpp>
+#include <ndnboost/mpl/if.hpp>
+#include <ndnboost/preprocessor/list/for_each_i.hpp>
+#include <ndnboost/preprocessor/tuple/to_list.hpp>
+#include <ndnboost/preprocessor/cat.hpp>
+#include <ndnboost/preprocessor/list/transform.hpp>
+#include <ndnboost/preprocessor/list/append.hpp>
+#include <ndnboost/type_traits/alignment_of.hpp>
+#include <ndnboost/type_traits/is_pod.hpp>
+#include <ndnboost/static_assert.hpp>
+#include <ndnboost/config.hpp>
 
 // should be the last #include
-#include <boost/type_traits/detail/bool_trait_def.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_def.hpp>
 
 #include <cstddef>
 
@@ -392,7 +392,7 @@
 #   pragma warning(pop)
 #endif
 
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#include <ndnboost/type_traits/detail/bool_trait_undef.hpp>
 
 #endif // BOOST_TT_TYPE_WITH_ALIGNMENT_INCLUDED
 
diff --git a/boost/utility/addressof.hpp b/ndnboost/utility/addressof.hpp
similarity index 96%
rename from boost/utility/addressof.hpp
rename to ndnboost/utility/addressof.hpp
index eecf731..8eddab4 100644
--- a/boost/utility/addressof.hpp
+++ b/ndnboost/utility/addressof.hpp
@@ -12,8 +12,8 @@
 #ifndef BOOST_UTILITY_ADDRESSOF_HPP
 # define BOOST_UTILITY_ADDRESSOF_HPP
 
-# include <boost/config.hpp>
-# include <boost/detail/workaround.hpp>
+# include <ndnboost/config.hpp>
+# include <ndnboost/detail/workaround.hpp>
 
 namespace ndnboost
 {
diff --git a/boost/version.hpp b/ndnboost/version.hpp
similarity index 100%
rename from boost/version.hpp
rename to ndnboost/version.hpp