diff --git a/.gitignore b/.gitignore
index 0fd0443..410c804 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,7 @@
 /include/config.h
 /_configs.sed
 /stamp-h1
-/include/ndn-cpp/ndn-cpp-config.h
+/include/ndn-cpp-dev/ndn-cpp-config.h
 /include/stamp-h1
 /aclocal.m4
 /libtool
diff --git a/Makefile.am b/Makefile.am
index 49df82f..5f69d3b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@
 ## to provide a way for the user to supply additional arguments.
 ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
 
-lib_LTLIBRARIES = libndn-c.la libndn-cpp.la
+lib_LTLIBRARIES = libndn-cpp-dev.la
 
 # "make install" will also install the include headers.
 SUBDIRS = include . tools examples
@@ -81,7 +81,7 @@
 # C++ code and also the C code.
 ## To regenerate:
 ## for i in `find src -name '*.cpp' -or -name '*.hpp' -or -name '*.h' -and -not -path 'src/c/*'`; do echo "  $i \\"; done
-libndn_cpp_la_SOURCES = $(libndn_c_la_SOURCES) \
+libndn_cpp_dev_la_SOURCES = $(libndn_c_la_SOURCES) \
   src/common.cpp \
   src/data.cpp \
   src/encoding/binary-xml-decoder.hpp \
@@ -124,13 +124,13 @@
   src/util/time.hpp
 
 if HAVE_OSX_SECURITY
-  libndn_cpp_la_SOURCES += src/security/sec-tpm-osx.cpp
+  libndn_cpp_dev_la_SOURCES += src/security/sec-tpm-osx.cpp
 else
   EXTRA_DIST = src/security/sec-tpm-osx.cpp
 endif
 
-libndn_cpp_la_LIBADD  = @OPENSSL_LIBS@     @CRYPTOPP_LIBS@     @OSX_SECURITY_LIBS@  @BOOST_SYSTEM_LIB@
-libndn_cpp_la_LDFLAGS = @OPENSSL_LDFLAGS@  @CRYPTOPP_LDFLAGS@  @SQLITE3_LDFLAGS@    @BOOST_LDFLAGS@
-libndn_cpp_la_CFLAGS  = @OPENSSL_INCLUDES@ @CRYPTOPP_INCLUDES@ @SQLITE3_CFLAGS@     @BOOST_CPPFLAGS@
+libndn_cpp_dev_la_LIBADD  = @OPENSSL_LIBS@     @CRYPTOPP_LIBS@     @OSX_SECURITY_LIBS@  @BOOST_SYSTEM_LIB@
+libndn_cpp_dev_la_LDFLAGS = @OPENSSL_LDFLAGS@  @CRYPTOPP_LDFLAGS@  @SQLITE3_LDFLAGS@    @BOOST_LDFLAGS@
+libndn_cpp_dev_la_CFLAGS  = @OPENSSL_INCLUDES@ @CRYPTOPP_INCLUDES@ @SQLITE3_CFLAGS@     @BOOST_CPPFLAGS@
 
 dist_noinst_SCRIPTS = autogen.sh
diff --git a/configure.ac b/configure.ac
index 33b5696..695e7db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # To build using autotools, see the Development section of the file INSTALL.
 
 AC_PREREQ([2.59])
-AC_INIT([ndn-cpp], [0.2], [ndn-lib@lists.cs.ucla.edu], [ndn-cpp], [https://github.com/named-data/ndn-cpp])
+AC_INIT([ndn-cpp-dev], [0.2.1], [ndn-lib@lists.cs.ucla.edu], [ndn-cpp-dev], [https://github.com/named-data/ndn-cpp])
 AM_INIT_AUTOMAKE([1.10 -Wall no-define foreign])
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -9,7 +9,7 @@
 # Create config.h without prefixes.  Put it in the include directory so CFLAGS will have -I./include .
 AC_CONFIG_HEADERS(include/config.h)
 # Add prefixes and output to a unique file name which will go into the ndn-cpp include install directory.
-AX_PREFIX_CONFIG_H(include/ndn-cpp/ndn-cpp-config.h)
+AX_PREFIX_CONFIG_H(include/ndn-cpp-dev/ndn-cpp-config.h, ndn-cpp)
 AM_MAINTAINER_MODE
 AM_PROG_AR
 AC_PROG_LIBTOOL
diff --git a/examples/Makefile.am b/examples/Makefile.am
index ee2b0e3..121a867 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,5 +1,5 @@
 
-LDADD = ../libndn-cpp.la @BOOST_SYSTEM_LIB@
+LDADD = ../libndn-cpp-dev.la @BOOST_SYSTEM_LIB@
 
 noinst_PROGRAMS=consumer producer
 
diff --git a/examples/consumer.cpp b/examples/consumer.cpp
index c2be4af..3e57d20 100644
--- a/examples/consumer.cpp
+++ b/examples/consumer.cpp
@@ -5,7 +5,7 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include <ndn-cpp/face.hpp>
+#include <ndn-cpp-dev/face.hpp>
 #include <stdexcept>
 
 #if NDN_CPP_HAVE_CXX11
diff --git a/examples/producer.cpp b/examples/producer.cpp
index 00f3e75..fd25515 100644
--- a/examples/producer.cpp
+++ b/examples/producer.cpp
@@ -5,9 +5,9 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include <ndn-cpp/face.hpp>
+#include <ndn-cpp-dev/face.hpp>
 
-#include <ndn-cpp/security/key-chain.hpp>
+#include <ndn-cpp-dev/security/key-chain.hpp>
 
 #if NDN_CPP_HAVE_CXX11
 // In the std library, the placeholders are in a different namespace than boost.
diff --git a/include/Makefile.am b/include/Makefile.am
index cab21a1..cf09eae 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,24 +1,24 @@
 # "make install" will install these in the install include directory, for example
-# /usr/local/ndn-cpp/name.hpp.
+# /usr/local/ndn-cpp-dev/name.hpp.
 # These files are included by the application with, for example
-# #include <ndn-cpp/namp.hpp>
+# #include <ndn-cpp-dev/namp.hpp>
 # Internal include headers are not put in this public install directory.
 
 # Public C headers.
 ndn_cpp_c_headers = \
-  $(wildcard ndn-cpp/*.h) \
-  $(wildcard ndn-cpp/c/*.*) \
-  $(wildcard ndn-cpp/c/encoding/*.*) \
-  $(wildcard ndn-cpp/c/util/*.*)
+  $(wildcard ndn-cpp-dev/*.h) \
+  $(wildcard ndn-cpp-dev/c/*.*) \
+  $(wildcard ndn-cpp-dev/c/encoding/*.*) \
+  $(wildcard ndn-cpp-dev/c/util/*.*)
 
 # Public C++ headers.
-# Use ndn-cpp/*.hpp instead of *.* to not overwrite *.h from above.
+# Use ndn-cpp-dev/*.hpp instead of *.* to not overwrite *.h from above.
 ndn_cpp_cpp_headers = \
-  $(wildcard ndn-cpp/*.hpp) \
-  $(wildcard ndn-cpp/encoding/*.*) \
-  $(wildcard ndn-cpp/security/*.*) \
-  $(wildcard ndn-cpp/transport/*.*) \
-  $(wildcard ndn-cpp/util/*.*)
+  $(wildcard ndn-cpp-dev/*.hpp) \
+  $(wildcard ndn-cpp-dev/encoding/*.*) \
+  $(wildcard ndn-cpp-dev/security/*.*) \
+  $(wildcard ndn-cpp-dev/transport/*.*) \
+  $(wildcard ndn-cpp-dev/util/*.*)
 
 ndnboost_headers = \
   $(wildcard ndnboost/*.*) \
diff --git a/include/ndn-cpp/c/common.h b/include/ndn-cpp-dev/c/common.h
similarity index 93%
rename from include/ndn-cpp/c/common.h
rename to include/ndn-cpp-dev/c/common.h
index 0cb68d5..42edcef 100644
--- a/include/ndn-cpp/c/common.h
+++ b/include/ndn-cpp-dev/c/common.h
@@ -7,7 +7,7 @@
 #ifndef NDN_COMMON_H
 #define NDN_COMMON_H
 
-#include <ndn-cpp/ndn-cpp-config.h>
+#include <ndn-cpp-dev/ndn-cpp-config.h>
 #include <stdint.h>
 // TODO: Is stddef.h portable?
 #include <stddef.h>
diff --git a/include/ndn-cpp/c/data-types.h b/include/ndn-cpp-dev/c/data-types.h
similarity index 100%
rename from include/ndn-cpp/c/data-types.h
rename to include/ndn-cpp-dev/c/data-types.h
diff --git a/include/ndn-cpp/c/encoding/element-listener.h b/include/ndn-cpp-dev/c/encoding/element-listener.h
similarity index 100%
rename from include/ndn-cpp/c/encoding/element-listener.h
rename to include/ndn-cpp-dev/c/encoding/element-listener.h
diff --git a/include/ndn-cpp/c/forwarding-flags.h b/include/ndn-cpp-dev/c/forwarding-flags.h
similarity index 100%
rename from include/ndn-cpp/c/forwarding-flags.h
rename to include/ndn-cpp-dev/c/forwarding-flags.h
diff --git a/include/ndn-cpp/c/interest-types.h b/include/ndn-cpp-dev/c/interest-types.h
similarity index 100%
rename from include/ndn-cpp/c/interest-types.h
rename to include/ndn-cpp-dev/c/interest-types.h
diff --git a/include/ndn-cpp/c/key-types.h b/include/ndn-cpp-dev/c/key-types.h
similarity index 100%
rename from include/ndn-cpp/c/key-types.h
rename to include/ndn-cpp-dev/c/key-types.h
diff --git a/include/ndn-cpp/c/util/crypto.h b/include/ndn-cpp-dev/c/util/crypto.h
similarity index 94%
rename from include/ndn-cpp/c/util/crypto.h
rename to include/ndn-cpp-dev/c/util/crypto.h
index 586108b..43d47eb 100644
--- a/include/ndn-cpp/c/util/crypto.h
+++ b/include/ndn-cpp-dev/c/util/crypto.h
@@ -9,7 +9,7 @@
 
 #include <openssl/ssl.h>
 #include <openssl/rsa.h>
-#include <ndn-cpp/c/common.h>
+#include <ndn-cpp-dev/c/common.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/ndn-cpp/common.hpp b/include/ndn-cpp-dev/common.hpp
similarity index 93%
rename from include/ndn-cpp/common.hpp
rename to include/ndn-cpp-dev/common.hpp
index e266750..59c49b5 100644
--- a/include/ndn-cpp/common.hpp
+++ b/include/ndn-cpp-dev/common.hpp
@@ -15,7 +15,7 @@
 #if NDN_CPP_HAVE_CXX11
 
 #if (__cplusplus < 201103L)
-#error "NDN-CPP library is configured and compiled in C++11 mode, but the current compiler is not C++11 enabled"
+#error "NDN-CPP-DEV library is configured and compiled in C++11 mode, but the current compiler is not C++11 enabled"
 #endif
 
 // Depending on where ./configure found shared_ptr, define the ptr_lib namespace.
@@ -43,8 +43,8 @@
 #else // use embedded boost headers
 /* Use the boost header files in this distribution that were extracted with:
 cd <BOOST DEVELOPMENT DIRECTORY WITH boost SUBDIRECTORY>
-dist/bin/bcp --namespace=ndnboost shared_ptr make_shared weak_ptr function bind any iostreams <NDN-CPP ROOT>/include
-cd <NDN-CPP ROOT>/include
+dist/bin/bcp --namespace=ndnboost shared_ptr make_shared weak_ptr function bind any iostreams <NDN-CPP-DEV ROOT>/include
+cd <NDN-CPP-DEV ROOT>/include
 rm -rf boost.css boost.png Jamroot libs
 mv boost ndnboost
 cd ndnboost
diff --git a/include/ndn-cpp/data.hpp b/include/ndn-cpp-dev/data.hpp
similarity index 100%
rename from include/ndn-cpp/data.hpp
rename to include/ndn-cpp-dev/data.hpp
diff --git a/include/ndn-cpp/encoding/binary-xml-wire-format.hpp b/include/ndn-cpp-dev/encoding/binary-xml-wire-format.hpp
similarity index 100%
rename from include/ndn-cpp/encoding/binary-xml-wire-format.hpp
rename to include/ndn-cpp-dev/encoding/binary-xml-wire-format.hpp
diff --git a/include/ndn-cpp/encoding/block-helpers.hpp b/include/ndn-cpp-dev/encoding/block-helpers.hpp
similarity index 100%
rename from include/ndn-cpp/encoding/block-helpers.hpp
rename to include/ndn-cpp-dev/encoding/block-helpers.hpp
diff --git a/include/ndn-cpp/encoding/block.hpp b/include/ndn-cpp-dev/encoding/block.hpp
similarity index 99%
rename from include/ndn-cpp/encoding/block.hpp
rename to include/ndn-cpp-dev/encoding/block.hpp
index 81bc97a..85cdaf5 100644
--- a/include/ndn-cpp/encoding/block.hpp
+++ b/include/ndn-cpp-dev/encoding/block.hpp
@@ -10,7 +10,7 @@
 #ifndef NDN_BLOCK_HPP
 #define NDN_BLOCK_HPP
 
-#include <ndn-cpp/common.hpp>
+#include <ndn-cpp-dev/common.hpp>
 
 #include <list>
 #include <exception>
diff --git a/include/ndn-cpp/encoding/buffer.hpp b/include/ndn-cpp-dev/encoding/buffer.hpp
similarity index 98%
rename from include/ndn-cpp/encoding/buffer.hpp
rename to include/ndn-cpp-dev/encoding/buffer.hpp
index ec71112..368b445 100644
--- a/include/ndn-cpp/encoding/buffer.hpp
+++ b/include/ndn-cpp-dev/encoding/buffer.hpp
@@ -10,7 +10,7 @@
 #ifndef NDN_BUFFER_HPP
 #define NDN_BUFFER_HPP
 
-#include <ndn-cpp/common.hpp>
+#include <ndn-cpp-dev/common.hpp>
 
 #include <boost/iostreams/detail/ios.hpp>
 #include <boost/iostreams/categories.hpp>
diff --git a/include/ndn-cpp/encoding/element-listener.hpp b/include/ndn-cpp-dev/encoding/element-listener.hpp
similarity index 100%
rename from include/ndn-cpp/encoding/element-listener.hpp
rename to include/ndn-cpp-dev/encoding/element-listener.hpp
diff --git a/include/ndn-cpp/encoding/endian.h b/include/ndn-cpp-dev/encoding/endian.h
similarity index 100%
rename from include/ndn-cpp/encoding/endian.h
rename to include/ndn-cpp-dev/encoding/endian.h
diff --git a/include/ndn-cpp/encoding/oid.hpp b/include/ndn-cpp-dev/encoding/oid.hpp
similarity index 100%
rename from include/ndn-cpp/encoding/oid.hpp
rename to include/ndn-cpp-dev/encoding/oid.hpp
diff --git a/include/ndn-cpp/encoding/tlv-face-management.hpp b/include/ndn-cpp-dev/encoding/tlv-face-management.hpp
similarity index 100%
rename from include/ndn-cpp/encoding/tlv-face-management.hpp
rename to include/ndn-cpp-dev/encoding/tlv-face-management.hpp
diff --git a/include/ndn-cpp/encoding/tlv.hpp b/include/ndn-cpp-dev/encoding/tlv.hpp
similarity index 100%
rename from include/ndn-cpp/encoding/tlv.hpp
rename to include/ndn-cpp-dev/encoding/tlv.hpp
diff --git a/include/ndn-cpp/encoding/wire-format.hpp b/include/ndn-cpp-dev/encoding/wire-format.hpp
similarity index 100%
rename from include/ndn-cpp/encoding/wire-format.hpp
rename to include/ndn-cpp-dev/encoding/wire-format.hpp
diff --git a/include/ndn-cpp/exclude.hpp b/include/ndn-cpp-dev/exclude.hpp
similarity index 100%
rename from include/ndn-cpp/exclude.hpp
rename to include/ndn-cpp-dev/exclude.hpp
diff --git a/include/ndn-cpp/face-instance.hpp b/include/ndn-cpp-dev/face-instance.hpp
similarity index 100%
rename from include/ndn-cpp/face-instance.hpp
rename to include/ndn-cpp-dev/face-instance.hpp
diff --git a/include/ndn-cpp/face.hpp b/include/ndn-cpp-dev/face.hpp
similarity index 100%
rename from include/ndn-cpp/face.hpp
rename to include/ndn-cpp-dev/face.hpp
diff --git a/include/ndn-cpp/forwarding-entry.hpp b/include/ndn-cpp-dev/forwarding-entry.hpp
similarity index 100%
rename from include/ndn-cpp/forwarding-entry.hpp
rename to include/ndn-cpp-dev/forwarding-entry.hpp
diff --git a/include/ndn-cpp/forwarding-flags.hpp b/include/ndn-cpp-dev/forwarding-flags.hpp
similarity index 100%
rename from include/ndn-cpp/forwarding-flags.hpp
rename to include/ndn-cpp-dev/forwarding-flags.hpp
diff --git a/include/ndn-cpp/interest.hpp b/include/ndn-cpp-dev/interest.hpp
similarity index 100%
rename from include/ndn-cpp/interest.hpp
rename to include/ndn-cpp-dev/interest.hpp
diff --git a/include/ndn-cpp/key-locator.hpp b/include/ndn-cpp-dev/key-locator.hpp
similarity index 100%
rename from include/ndn-cpp/key-locator.hpp
rename to include/ndn-cpp-dev/key-locator.hpp
diff --git a/include/ndn-cpp/meta-info.hpp b/include/ndn-cpp-dev/meta-info.hpp
similarity index 100%
rename from include/ndn-cpp/meta-info.hpp
rename to include/ndn-cpp-dev/meta-info.hpp
diff --git a/include/ndn-cpp/name.hpp b/include/ndn-cpp-dev/name.hpp
similarity index 100%
rename from include/ndn-cpp/name.hpp
rename to include/ndn-cpp-dev/name.hpp
diff --git a/include/ndn-cpp/node.hpp b/include/ndn-cpp-dev/node.hpp
similarity index 100%
rename from include/ndn-cpp/node.hpp
rename to include/ndn-cpp-dev/node.hpp
diff --git a/include/ndn-cpp/security/certificate-extension.hpp b/include/ndn-cpp-dev/security/certificate-extension.hpp
similarity index 100%
rename from include/ndn-cpp/security/certificate-extension.hpp
rename to include/ndn-cpp-dev/security/certificate-extension.hpp
diff --git a/include/ndn-cpp/security/certificate-subject-description.hpp b/include/ndn-cpp-dev/security/certificate-subject-description.hpp
similarity index 100%
rename from include/ndn-cpp/security/certificate-subject-description.hpp
rename to include/ndn-cpp-dev/security/certificate-subject-description.hpp
diff --git a/include/ndn-cpp/security/certificate.hpp b/include/ndn-cpp-dev/security/certificate.hpp
similarity index 100%
rename from include/ndn-cpp/security/certificate.hpp
rename to include/ndn-cpp-dev/security/certificate.hpp
diff --git a/include/ndn-cpp/security/encryption-manager.hpp b/include/ndn-cpp-dev/security/encryption-manager.hpp
similarity index 100%
rename from include/ndn-cpp/security/encryption-manager.hpp
rename to include/ndn-cpp-dev/security/encryption-manager.hpp
diff --git a/include/ndn-cpp/security/identity-certificate.hpp b/include/ndn-cpp-dev/security/identity-certificate.hpp
similarity index 100%
rename from include/ndn-cpp/security/identity-certificate.hpp
rename to include/ndn-cpp-dev/security/identity-certificate.hpp
diff --git a/include/ndn-cpp/security/key-chain.hpp b/include/ndn-cpp-dev/security/key-chain.hpp
similarity index 100%
rename from include/ndn-cpp/security/key-chain.hpp
rename to include/ndn-cpp-dev/security/key-chain.hpp
diff --git a/include/ndn-cpp/security/public-key.hpp b/include/ndn-cpp-dev/security/public-key.hpp
similarity index 100%
rename from include/ndn-cpp/security/public-key.hpp
rename to include/ndn-cpp-dev/security/public-key.hpp
diff --git a/include/ndn-cpp/security/sec-policy-no-verify.hpp b/include/ndn-cpp-dev/security/sec-policy-no-verify.hpp
similarity index 100%
rename from include/ndn-cpp/security/sec-policy-no-verify.hpp
rename to include/ndn-cpp-dev/security/sec-policy-no-verify.hpp
diff --git a/include/ndn-cpp/security/sec-policy-self-verify.hpp b/include/ndn-cpp-dev/security/sec-policy-self-verify.hpp
similarity index 100%
rename from include/ndn-cpp/security/sec-policy-self-verify.hpp
rename to include/ndn-cpp-dev/security/sec-policy-self-verify.hpp
diff --git a/include/ndn-cpp/security/sec-policy.hpp b/include/ndn-cpp-dev/security/sec-policy.hpp
similarity index 100%
rename from include/ndn-cpp/security/sec-policy.hpp
rename to include/ndn-cpp-dev/security/sec-policy.hpp
diff --git a/include/ndn-cpp/security/sec-public-info-memory.hpp b/include/ndn-cpp-dev/security/sec-public-info-memory.hpp
similarity index 100%
rename from include/ndn-cpp/security/sec-public-info-memory.hpp
rename to include/ndn-cpp-dev/security/sec-public-info-memory.hpp
diff --git a/include/ndn-cpp/security/sec-public-info-sqlite3.hpp b/include/ndn-cpp-dev/security/sec-public-info-sqlite3.hpp
similarity index 99%
rename from include/ndn-cpp/security/sec-public-info-sqlite3.hpp
rename to include/ndn-cpp-dev/security/sec-public-info-sqlite3.hpp
index 89ffe6e..f83c27e 100644
--- a/include/ndn-cpp/security/sec-public-info-sqlite3.hpp
+++ b/include/ndn-cpp-dev/security/sec-public-info-sqlite3.hpp
@@ -10,7 +10,7 @@
 #define NDN_SEC_PUBLIC_INFO_SQLITE3_HPP
 
 // Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_SQLITE3.
-#include <ndn-cpp/ndn-cpp-config.h>
+#include <ndn-cpp-dev/ndn-cpp-config.h>
 #ifdef NDN_CPP_HAVE_SQLITE3
 
 #include <sqlite3.h>
diff --git a/include/ndn-cpp/security/sec-public-info.hpp b/include/ndn-cpp-dev/security/sec-public-info.hpp
similarity index 100%
rename from include/ndn-cpp/security/sec-public-info.hpp
rename to include/ndn-cpp-dev/security/sec-public-info.hpp
diff --git a/include/ndn-cpp/security/sec-tpm-memory.hpp b/include/ndn-cpp-dev/security/sec-tpm-memory.hpp
similarity index 100%
rename from include/ndn-cpp/security/sec-tpm-memory.hpp
rename to include/ndn-cpp-dev/security/sec-tpm-memory.hpp
diff --git a/include/ndn-cpp/security/sec-tpm-osx.hpp b/include/ndn-cpp-dev/security/sec-tpm-osx.hpp
similarity index 98%
rename from include/ndn-cpp/security/sec-tpm-osx.hpp
rename to include/ndn-cpp-dev/security/sec-tpm-osx.hpp
index 47e83ab..4839e3d 100644
--- a/include/ndn-cpp/security/sec-tpm-osx.hpp
+++ b/include/ndn-cpp-dev/security/sec-tpm-osx.hpp
@@ -9,7 +9,7 @@
 #define NDN_SEC_TPM_OSX_HPP
 
 // Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_OSX_SECURITY 1.
-#include <ndn-cpp/ndn-cpp-config.h>
+#include <ndn-cpp-dev/ndn-cpp-config.h>
 #if NDN_CPP_HAVE_OSX_SECURITY
 
 #include "../common.hpp"
diff --git a/include/ndn-cpp/security/sec-tpm.hpp b/include/ndn-cpp-dev/security/sec-tpm.hpp
similarity index 100%
rename from include/ndn-cpp/security/sec-tpm.hpp
rename to include/ndn-cpp-dev/security/sec-tpm.hpp
diff --git a/include/ndn-cpp/security/security-common.hpp b/include/ndn-cpp-dev/security/security-common.hpp
similarity index 100%
rename from include/ndn-cpp/security/security-common.hpp
rename to include/ndn-cpp-dev/security/security-common.hpp
diff --git a/include/ndn-cpp/security/security-exception.hpp b/include/ndn-cpp-dev/security/security-exception.hpp
similarity index 100%
rename from include/ndn-cpp/security/security-exception.hpp
rename to include/ndn-cpp-dev/security/security-exception.hpp
diff --git a/include/ndn-cpp/security/sha256-with-rsa-handler.hpp b/include/ndn-cpp-dev/security/sha256-with-rsa-handler.hpp
similarity index 100%
rename from include/ndn-cpp/security/sha256-with-rsa-handler.hpp
rename to include/ndn-cpp-dev/security/sha256-with-rsa-handler.hpp
diff --git a/include/ndn-cpp/security/signature-sha256-with-rsa.hpp b/include/ndn-cpp-dev/security/signature-sha256-with-rsa.hpp
similarity index 100%
rename from include/ndn-cpp/security/signature-sha256-with-rsa.hpp
rename to include/ndn-cpp-dev/security/signature-sha256-with-rsa.hpp
diff --git a/include/ndn-cpp/security/validation-request.hpp b/include/ndn-cpp-dev/security/validation-request.hpp
similarity index 100%
rename from include/ndn-cpp/security/validation-request.hpp
rename to include/ndn-cpp-dev/security/validation-request.hpp
diff --git a/include/ndn-cpp/security/verifier.hpp b/include/ndn-cpp-dev/security/verifier.hpp
similarity index 100%
rename from include/ndn-cpp/security/verifier.hpp
rename to include/ndn-cpp-dev/security/verifier.hpp
diff --git a/include/ndn-cpp/signature.hpp b/include/ndn-cpp-dev/signature.hpp
similarity index 100%
rename from include/ndn-cpp/signature.hpp
rename to include/ndn-cpp-dev/signature.hpp
diff --git a/include/ndn-cpp/status-response.hpp b/include/ndn-cpp-dev/status-response.hpp
similarity index 100%
rename from include/ndn-cpp/status-response.hpp
rename to include/ndn-cpp-dev/status-response.hpp
diff --git a/include/ndn-cpp/transport/transport.hpp b/include/ndn-cpp-dev/transport/transport.hpp
similarity index 98%
rename from include/ndn-cpp/transport/transport.hpp
rename to include/ndn-cpp-dev/transport/transport.hpp
index 064107b..ddbff52 100644
--- a/include/ndn-cpp/transport/transport.hpp
+++ b/include/ndn-cpp-dev/transport/transport.hpp
@@ -8,7 +8,7 @@
 #ifndef NDN_TRANSPORT_HPP
 #define NDN_TRANSPORT_HPP
 
-#include <ndn-cpp/common.hpp>
+#include <ndn-cpp-dev/common.hpp>
 
 #include <vector>
 #include <boost/asio.hpp>
diff --git a/include/ndn-cpp/transport/unix-transport.hpp b/include/ndn-cpp-dev/transport/unix-transport.hpp
similarity index 100%
rename from include/ndn-cpp/transport/unix-transport.hpp
rename to include/ndn-cpp-dev/transport/unix-transport.hpp
diff --git a/include/ndn-cpp/util/blob.hpp b/include/ndn-cpp-dev/util/blob.hpp
similarity index 100%
rename from include/ndn-cpp/util/blob.hpp
rename to include/ndn-cpp-dev/util/blob.hpp
diff --git a/include/ndn-cpp/util/signed-blob.hpp b/include/ndn-cpp-dev/util/signed-blob.hpp
similarity index 100%
rename from include/ndn-cpp/util/signed-blob.hpp
rename to include/ndn-cpp-dev/util/signed-blob.hpp
diff --git a/src/c/data.h b/src/c/data.h
index 4750ae9..ffaa83c 100644
--- a/src/c/data.h
+++ b/src/c/data.h
@@ -7,7 +7,7 @@
 #ifndef NDN_DATA_H
 #define NDN_DATA_H
 
-#include <ndn-cpp/c/data-types.h>
+#include <ndn-cpp-dev/c/data-types.h>
 #include "name.h"
 #include "publisher-public-key-digest.h"
 #include "key-locator.h"
diff --git a/src/c/encoding/binary-xml-decoder.h b/src/c/encoding/binary-xml-decoder.h
index 3f427c1..8fe1469 100644
--- a/src/c/encoding/binary-xml-decoder.h
+++ b/src/c/encoding/binary-xml-decoder.h
@@ -7,7 +7,7 @@
 #ifndef NDN_BINARYXMLDECODER_H
 #define NDN_BINARYXMLDECODER_H
 
-#include <ndn-cpp/c/common.h>
+#include <ndn-cpp-dev/c/common.h>
 #include "../errors.h"
 #include "../util/blob.h"
 
diff --git a/src/c/encoding/binary-xml-element-reader.h b/src/c/encoding/binary-xml-element-reader.h
index 89f8c8d..194f397 100644
--- a/src/c/encoding/binary-xml-element-reader.h
+++ b/src/c/encoding/binary-xml-element-reader.h
@@ -7,7 +7,7 @@
 #ifndef NDN_BINARY_XML_ELEMENT_READER_H
 #define NDN_BINARY_XML_ELEMENT_READER_H
 
-#include <ndn-cpp/c/encoding/element-listener.h>
+#include <ndn-cpp-dev/c/encoding/element-listener.h>
 #include "../errors.h"
 #include "binary-xml-structure-decoder.h"
 #include "../util/dynamic-uint8-array.h"
diff --git a/src/c/encoding/binary-xml-structure-decoder.h b/src/c/encoding/binary-xml-structure-decoder.h
index 54a92d5..da5ad08 100644
--- a/src/c/encoding/binary-xml-structure-decoder.h
+++ b/src/c/encoding/binary-xml-structure-decoder.h
@@ -7,7 +7,7 @@
 #ifndef NDN_BINARYXMLSTRUCTUREDECODER_H
 #define NDN_BINARYXMLSTRUCTUREDECODER_H
 
-#include <ndn-cpp/c/common.h>
+#include <ndn-cpp-dev/c/common.h>
 #include "../errors.h"
 
 #ifdef __cplusplus
diff --git a/src/c/forwarding-entry.h b/src/c/forwarding-entry.h
index 48bbf5e..38ead4c 100644
--- a/src/c/forwarding-entry.h
+++ b/src/c/forwarding-entry.h
@@ -7,8 +7,8 @@
 #ifndef NDN_FORWARDING_ENTRY_H
 #define NDN_FORWARDING_ENTRY_H
 
-#include <ndn-cpp/c/common.h>
-#include <ndn-cpp/c/forwarding-flags.h>
+#include <ndn-cpp-dev/c/common.h>
+#include <ndn-cpp-dev/c/forwarding-flags.h>
 #include "name.h"
 #include "publisher-public-key-digest.h"
 
diff --git a/src/c/interest.h b/src/c/interest.h
index 53bcdf6..8f0a587 100644
--- a/src/c/interest.h
+++ b/src/c/interest.h
@@ -7,7 +7,7 @@
 #ifndef NDN_INTEREST_H
 #define NDN_INTEREST_H
 
-#include <ndn-cpp/c/interest-types.h>
+#include <ndn-cpp-dev/c/interest-types.h>
 #include "name.h"
 #include "publisher-public-key-digest.h"
 
diff --git a/src/c/key-locator.h b/src/c/key-locator.h
index b609d97..1275ba9 100644
--- a/src/c/key-locator.h
+++ b/src/c/key-locator.h
@@ -7,7 +7,7 @@
 #ifndef NDN_KEY_LOCATOR_H
 #define NDN_KEY_LOCATOR_H
 
-#include <ndn-cpp/c/key-types.h>
+#include <ndn-cpp-dev/c/key-types.h>
 #include "name.h"
 
 #ifdef __cplusplus
diff --git a/src/c/name.h b/src/c/name.h
index 3a0ba31..c28f1b1 100644
--- a/src/c/name.h
+++ b/src/c/name.h
@@ -7,7 +7,7 @@
 #ifndef NDN_NAME_H
 #define NDN_NAME_H
 
-#include <ndn-cpp/c/common.h>
+#include <ndn-cpp-dev/c/common.h>
 #include "errors.h"
 #include "util/blob.h"
 
diff --git a/src/c/publisher-public-key-digest.h b/src/c/publisher-public-key-digest.h
index 95faf1d..771ac32 100644
--- a/src/c/publisher-public-key-digest.h
+++ b/src/c/publisher-public-key-digest.h
@@ -7,7 +7,7 @@
 #ifndef NDN_PUBLISHERPUBLICKEYDIGEST_H
 #define NDN_PUBLISHERPUBLICKEYDIGEST_H
 
-#include <ndn-cpp/c/common.h>
+#include <ndn-cpp-dev/c/common.h>
 #include "util/blob.h"
 
 #ifdef __cplusplus
diff --git a/src/c/transport/socket-transport.h b/src/c/transport/socket-transport.h
index 85e297e..d1dbb56 100644
--- a/src/c/transport/socket-transport.h
+++ b/src/c/transport/socket-transport.h
@@ -8,7 +8,7 @@
 #define NDN_SOCKETTRANSPORT_H
 
 #include <sys/socket.h>
-#include <ndn-cpp/c/common.h>
+#include <ndn-cpp-dev/c/common.h>
 #include "../errors.h"
 
 #ifdef __cplusplus
diff --git a/src/c/util/blob.h b/src/c/util/blob.h
index 8d1f784..94bbaf9 100644
--- a/src/c/util/blob.h
+++ b/src/c/util/blob.h
@@ -7,7 +7,7 @@
 #ifndef NDN_BLOB_H
 #define NDN_BLOB_H
 
-#include <ndn-cpp/c/common.h>
+#include <ndn-cpp-dev/c/common.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/c/util/crypto.c b/src/c/util/crypto.c
index e8dfbfd..384e5b8 100644
--- a/src/c/util/crypto.c
+++ b/src/c/util/crypto.c
@@ -4,7 +4,7 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include "ndn-cpp/c/util/crypto.h"
+#include "ndn-cpp-dev/c/util/crypto.h"
 
 void ndn_digestSha256(const uint8_t *data, size_t dataLength, uint8_t *digest)
 {
diff --git a/src/c/util/ndn_memory.h b/src/c/util/ndn_memory.h
index 56bd699..27b552d 100644
--- a/src/c/util/ndn_memory.h
+++ b/src/c/util/ndn_memory.h
@@ -11,7 +11,7 @@
 #ifndef NDN_MEMORY_H
 #define NDN_MEMORY_H
 
-#include <ndn-cpp/c/common.h>
+#include <ndn-cpp-dev/c/common.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/c/util/time.c b/src/c/util/time.c
index 29c20c6..00719c2 100644
--- a/src/c/util/time.c
+++ b/src/c/util/time.c
@@ -4,7 +4,7 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include <ndn-cpp/ndn-cpp-config.h>
+#include <ndn-cpp-dev/ndn-cpp-config.h>
 #if NDN_CPP_HAVE_TIME_H
 #include <time.h>
 #endif
diff --git a/src/c/util/time.h b/src/c/util/time.h
index 75f95df..674ef21 100644
--- a/src/c/util/time.h
+++ b/src/c/util/time.h
@@ -7,7 +7,7 @@
 #ifndef NDN_TIME_H
 #define NDN_TIME_H
 
-#include <ndn-cpp/c/common.h>
+#include <ndn-cpp-dev/c/common.h>
 #include "../errors.h"
 
 #ifdef  __cplusplus
diff --git a/src/common.cpp b/src/common.cpp
index 16a5b7a..31569e3 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -6,7 +6,7 @@
  */
 
 #include <sstream>
-#include <ndn-cpp/common.hpp>
+#include <ndn-cpp-dev/common.hpp>
 
 #if NDN_CPP_HAVE_TIME_H
 #include <time.h>
diff --git a/src/data.cpp b/src/data.cpp
index 5a31e50..19db78f 100644
--- a/src/data.cpp
+++ b/src/data.cpp
@@ -5,8 +5,8 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include <ndn-cpp/common.hpp>
-#include <ndn-cpp/data.hpp>
+#include <ndn-cpp-dev/common.hpp>
+#include <ndn-cpp-dev/data.hpp>
 
 using namespace std;
 
diff --git a/src/encoding/binary-xml-encoder.hpp b/src/encoding/binary-xml-encoder.hpp
index 5961891..6ae3913 100644
--- a/src/encoding/binary-xml-encoder.hpp
+++ b/src/encoding/binary-xml-encoder.hpp
@@ -9,7 +9,7 @@
 #define NDN_BINARYXMLENCODER_HPP
 
 #include <vector>
-#include <ndn-cpp/common.hpp>
+#include <ndn-cpp-dev/common.hpp>
 #include "../util/dynamic-uint8-vector.hpp"
 #include "../c/encoding/binary-xml-encoder.h"
 
diff --git a/src/encoding/binary-xml-wire-format.cpp b/src/encoding/binary-xml-wire-format.cpp
index 73d8fd6..dce8b7b 100644
--- a/src/encoding/binary-xml-wire-format.cpp
+++ b/src/encoding/binary-xml-wire-format.cpp
@@ -6,10 +6,10 @@
  */
 
 #include <stdexcept>
-#include <ndn-cpp/interest.hpp>
-#include <ndn-cpp/data.hpp>
-#include <ndn-cpp/forwarding-entry.hpp>
-#include <ndn-cpp/encoding/binary-xml-wire-format.hpp>
+#include <ndn-cpp-dev/interest.hpp>
+#include <ndn-cpp-dev/data.hpp>
+#include <ndn-cpp-dev/forwarding-entry.hpp>
+#include <ndn-cpp-dev/encoding/binary-xml-wire-format.hpp>
 #include "../c/encoding/binary-xml-interest.h"
 #include "../c/encoding/binary-xml-data.h"
 #include "../c/encoding/binary-xml-forwarding-entry.h"
diff --git a/src/encoding/block.cpp b/src/encoding/block.cpp
index c19cee7..7fab48f 100644
--- a/src/encoding/block.cpp
+++ b/src/encoding/block.cpp
@@ -7,8 +7,8 @@
  * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include <ndn-cpp/encoding/block.hpp>
-#include <ndn-cpp/encoding/tlv.hpp>
+#include <ndn-cpp-dev/encoding/block.hpp>
+#include <ndn-cpp-dev/encoding/tlv.hpp>
 
 namespace ndn {
 
diff --git a/src/encoding/cryptopp/asn_ext.cpp b/src/encoding/cryptopp/asn_ext.cpp
index a1ee39d..7a8eda1 100644
--- a/src/encoding/cryptopp/asn_ext.cpp
+++ b/src/encoding/cryptopp/asn_ext.cpp
@@ -6,7 +6,7 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include <ndn-cpp/ndn-cpp-config.h>
+#include <ndn-cpp-dev/ndn-cpp-config.h>
 #include "asn_ext.hpp"
 
 #if NDN_CPP_HAVE_TIME_H
diff --git a/src/encoding/cryptopp/asn_ext.hpp b/src/encoding/cryptopp/asn_ext.hpp
index 57538f4..f0ed463 100644
--- a/src/encoding/cryptopp/asn_ext.hpp
+++ b/src/encoding/cryptopp/asn_ext.hpp
@@ -23,7 +23,7 @@
 #endif
 
 #include <stdexcept>
-#include <ndn-cpp/common.hpp>
+#include <ndn-cpp-dev/common.hpp>
 #include <cryptopp/asn.h>
 
 namespace ndn {
diff --git a/src/encoding/element-listener.cpp b/src/encoding/element-listener.cpp
index 58bb875..3b56717 100644
--- a/src/encoding/element-listener.cpp
+++ b/src/encoding/element-listener.cpp
@@ -5,7 +5,7 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include <ndn-cpp/encoding/element-listener.hpp>
+#include <ndn-cpp-dev/encoding/element-listener.hpp>
 
 namespace ndn {
 
diff --git a/src/encoding/oid.cpp b/src/encoding/oid.cpp
index c10a143..4edbf01 100644
--- a/src/encoding/oid.cpp
+++ b/src/encoding/oid.cpp
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <sstream>
 
-#include <ndn-cpp/encoding/oid.hpp>
+#include <ndn-cpp-dev/encoding/oid.hpp>
 #include <cryptopp/asn.h>
 
 using namespace std;
diff --git a/src/encoding/wire-format.cpp b/src/encoding/wire-format.cpp
index 8751d16..cff24e5 100644
--- a/src/encoding/wire-format.cpp
+++ b/src/encoding/wire-format.cpp
@@ -6,7 +6,7 @@
  */
 
 #include <stdexcept>
-#include <ndn-cpp/encoding/wire-format.hpp>
+#include <ndn-cpp-dev/encoding/wire-format.hpp>
 
 using namespace std;
 
diff --git a/src/exclude.cpp b/src/exclude.cpp
index 446db79..8d49040 100644
--- a/src/exclude.cpp
+++ b/src/exclude.cpp
@@ -8,7 +8,7 @@
  * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include <ndn-cpp/exclude.hpp>
+#include <ndn-cpp-dev/exclude.hpp>
 
 namespace ndn
 {
diff --git a/src/face.cpp b/src/face.cpp
index 9faabe9..1161192 100644
--- a/src/face.cpp
+++ b/src/face.cpp
@@ -5,7 +5,7 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include <ndn-cpp/face.hpp>
+#include <ndn-cpp-dev/face.hpp>
 
 using namespace std;
 
diff --git a/src/interest.cpp b/src/interest.cpp
index c4046a4..bbaf90a 100644
--- a/src/interest.cpp
+++ b/src/interest.cpp
@@ -6,8 +6,8 @@
  */
 
 #include <stdexcept>
-#include <ndn-cpp/common.hpp>
-#include <ndn-cpp/interest.hpp>
+#include <ndn-cpp-dev/common.hpp>
+#include <ndn-cpp-dev/interest.hpp>
 
 #if __clang__
 #pragma clang diagnostic push
diff --git a/src/name.cpp b/src/name.cpp
index 35380c3..6cd8e0d 100644
--- a/src/name.cpp
+++ b/src/name.cpp
@@ -9,7 +9,7 @@
 #include <stdexcept>
 #include <algorithm>
 #include <string.h>
-#include <ndn-cpp/name.hpp>
+#include <ndn-cpp-dev/name.hpp>
 #include "c/util/ndn_memory.h"
 #include "c/util/time.h"
 
diff --git a/src/node.cpp b/src/node.cpp
index 26a3b07..2b8e8b7 100644
--- a/src/node.cpp
+++ b/src/node.cpp
@@ -8,14 +8,14 @@
 #include <stdexcept>
 #include "c/util/time.h"
 
-#include <ndn-cpp/forwarding-entry.hpp>
-#include <ndn-cpp/face-instance.hpp>
-#include <ndn-cpp/node.hpp>
+#include <ndn-cpp-dev/forwarding-entry.hpp>
+#include <ndn-cpp-dev/face-instance.hpp>
+#include <ndn-cpp-dev/node.hpp>
 
 #include "util/ndnd-id-fetcher.hpp"
 
-#include <ndn-cpp/security/signature-sha256-with-rsa.hpp>
-#include <ndn-cpp/status-response.hpp>
+#include <ndn-cpp-dev/security/signature-sha256-with-rsa.hpp>
+#include <ndn-cpp-dev/status-response.hpp>
 
 using namespace std;
 #if NDN_CPP_HAVE_CXX11
diff --git a/src/security/certificate-extension.cpp b/src/security/certificate-extension.cpp
index 5494a2c..81d7d34 100644
--- a/src/security/certificate-extension.cpp
+++ b/src/security/certificate-extension.cpp
@@ -18,7 +18,7 @@
 #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
-#include <ndn-cpp/security/certificate-extension.hpp>
+#include <ndn-cpp-dev/security/certificate-extension.hpp>
 #include <cryptopp/asn.h>
 
 using namespace std;
diff --git a/src/security/certificate-subject-description.cpp b/src/security/certificate-subject-description.cpp
index 3dc46f5..383e189 100644
--- a/src/security/certificate-subject-description.cpp
+++ b/src/security/certificate-subject-description.cpp
@@ -18,7 +18,7 @@
 #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
-#include <ndn-cpp/security/certificate-subject-description.hpp>
+#include <ndn-cpp-dev/security/certificate-subject-description.hpp>
 #include <cryptopp/asn.h>
 
 using namespace std;
diff --git a/src/security/certificate.cpp b/src/security/certificate.cpp
index 3f87c9c..add546c 100644
--- a/src/security/certificate.cpp
+++ b/src/security/certificate.cpp
@@ -18,9 +18,9 @@
 #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
-#include <ndn-cpp/common.hpp>
+#include <ndn-cpp-dev/common.hpp>
 
-#include <ndn-cpp/security/certificate.hpp>
+#include <ndn-cpp-dev/security/certificate.hpp>
 
 #include "../util/logging.hpp"
 #include "../util/time.hpp"
diff --git a/src/security/identity-certificate.cpp b/src/security/identity-certificate.cpp
index 4f9f9c8..5157d2d 100644
--- a/src/security/identity-certificate.cpp
+++ b/src/security/identity-certificate.cpp
@@ -6,7 +6,7 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include <ndn-cpp/security/identity-certificate.hpp>
+#include <ndn-cpp-dev/security/identity-certificate.hpp>
 
 using namespace std;
 
diff --git a/src/security/public-key.cpp b/src/security/public-key.cpp
index 2923ece..53019ff 100644
--- a/src/security/public-key.cpp
+++ b/src/security/public-key.cpp
@@ -18,8 +18,8 @@
 #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
-#include <ndn-cpp/common.hpp>
-#include <ndn-cpp/security/public-key.hpp>
+#include <ndn-cpp-dev/common.hpp>
+#include <ndn-cpp-dev/security/public-key.hpp>
 
 #include <cryptopp/rsa.h>
 #include <cryptopp/base64.h>
diff --git a/src/security/sec-policy-no-verify.cpp b/src/security/sec-policy-no-verify.cpp
index c2f7866..640cf86 100644
--- a/src/security/sec-policy-no-verify.cpp
+++ b/src/security/sec-policy-no-verify.cpp
@@ -6,7 +6,7 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include <ndn-cpp/security/sec-policy-no-verify.hpp>
+#include <ndn-cpp-dev/security/sec-policy-no-verify.hpp>
 
 using namespace std;
 
diff --git a/src/security/sec-policy-self-verify.cpp b/src/security/sec-policy-self-verify.cpp
index 6d2081c..3df26ce 100644
--- a/src/security/sec-policy-self-verify.cpp
+++ b/src/security/sec-policy-self-verify.cpp
@@ -9,8 +9,8 @@
 #ifdef TEMPRORARILY_DISABLED
 
 #include "../c/util/crypto.h"
-#include <ndn-cpp/security/identity-storage.hpp>
-#include <ndn-cpp/security/sec-policy-self-verify.hpp>
+#include <ndn-cpp-dev/security/identity-storage.hpp>
+#include <ndn-cpp-dev/security/sec-policy-self-verify.hpp>
 
 using namespace std;
 
diff --git a/src/security/sec-public-info-memory.cpp b/src/security/sec-public-info-memory.cpp
index 61c6109..a46e872 100644
--- a/src/security/sec-public-info-memory.cpp
+++ b/src/security/sec-public-info-memory.cpp
@@ -5,10 +5,10 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include <ndn-cpp/security/sec-public-info-memory.hpp>
+#include <ndn-cpp-dev/security/sec-public-info-memory.hpp>
 
 #include <algorithm>
-#include <ndn-cpp/security/identity-certificate.hpp>
+#include <ndn-cpp-dev/security/identity-certificate.hpp>
 
 using namespace std;
 
diff --git a/src/security/sec-public-info-sqlite3.cpp b/src/security/sec-public-info-sqlite3.cpp
index 37e872e..80f7b78 100644
--- a/src/security/sec-public-info-sqlite3.cpp
+++ b/src/security/sec-public-info-sqlite3.cpp
@@ -7,7 +7,7 @@
  */
 
 // Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_SQLITE3.
-#include <ndn-cpp/ndn-cpp-config.h>
+#include <ndn-cpp-dev/ndn-cpp-config.h>
 #ifdef NDN_CPP_HAVE_SQLITE3
 
 #include <stdio.h>
@@ -16,10 +16,10 @@
 #include <fstream>
 #include "../util/logging.hpp"
 #include "../c/util/time.h"
-#include <ndn-cpp/data.hpp>
-#include <ndn-cpp/security/identity-certificate.hpp>
-#include <ndn-cpp/security/sec-public-info-sqlite3.hpp>
-#include <ndn-cpp/security/signature-sha256-with-rsa.hpp>
+#include <ndn-cpp-dev/data.hpp>
+#include <ndn-cpp-dev/security/identity-certificate.hpp>
+#include <ndn-cpp-dev/security/sec-public-info-sqlite3.hpp>
+#include <ndn-cpp-dev/security/signature-sha256-with-rsa.hpp>
 
 
 INIT_LOGGER("BasicKeyMetaInfo");
diff --git a/src/security/sec-tpm-memory.cpp b/src/security/sec-tpm-memory.cpp
index 205e93a..3ee60aa 100644
--- a/src/security/sec-tpm-memory.cpp
+++ b/src/security/sec-tpm-memory.cpp
@@ -5,8 +5,8 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include <ndn-cpp/security/sec-tpm-memory.hpp>
-#include <ndn-cpp/security/public-key.hpp>
+#include <ndn-cpp-dev/security/sec-tpm-memory.hpp>
+#include <ndn-cpp-dev/security/public-key.hpp>
 #include <openssl/ssl.h>
 #include <openssl/sha.h>
 #include <openssl/rsa.h>
diff --git a/src/security/sec-tpm-osx.cpp b/src/security/sec-tpm-osx.cpp
index cd1b17f..db319c4 100644
--- a/src/security/sec-tpm-osx.cpp
+++ b/src/security/sec-tpm-osx.cpp
@@ -5,15 +5,15 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include <ndn-cpp/ndn-cpp-config.h>
+#include <ndn-cpp-dev/ndn-cpp-config.h>
 
 #include <fstream>
 #include <sstream>
 
 #include "../util/logging.hpp"
 
-#include <ndn-cpp/security/sec-tpm-osx.hpp>
-#include <ndn-cpp/security/public-key.hpp>
+#include <ndn-cpp-dev/security/sec-tpm-osx.hpp>
+#include <ndn-cpp-dev/security/public-key.hpp>
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Security/Security.h>
diff --git a/src/security/verifier.cpp b/src/security/verifier.cpp
index 67a9273..1734726 100644
--- a/src/security/verifier.cpp
+++ b/src/security/verifier.cpp
@@ -18,9 +18,9 @@
 #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
-#include <ndn-cpp/security/verifier.hpp>
+#include <ndn-cpp-dev/security/verifier.hpp>
 
-#include <ndn-cpp/security/sec-policy.hpp>
+#include <ndn-cpp-dev/security/sec-policy.hpp>
 
 #include <cryptopp/rsa.h>
 
diff --git a/src/transport/unix-transport.cpp b/src/transport/unix-transport.cpp
index cd00a46..954b12c 100644
--- a/src/transport/unix-transport.cpp
+++ b/src/transport/unix-transport.cpp
@@ -8,8 +8,8 @@
 #include <stdexcept>
 #include <stdlib.h>
 
-#include <ndn-cpp/face.hpp>
-#include <ndn-cpp/transport/unix-transport.hpp>
+#include <ndn-cpp-dev/face.hpp>
+#include <ndn-cpp-dev/transport/unix-transport.hpp>
 #include "../c/util/ndn_memory.h"
 
 #include <boost/asio.hpp>
diff --git a/src/util/blob-stream.hpp b/src/util/blob-stream.hpp
index e376b77..3bad4b7 100644
--- a/src/util/blob-stream.hpp
+++ b/src/util/blob-stream.hpp
@@ -9,7 +9,7 @@
 #ifndef NDN_BLOB_STREAM_HPP
 #define NDN_BLOB_STREAM_HPP
 
-#include <ndn-cpp/common.hpp>
+#include <ndn-cpp-dev/common.hpp>
 
 #if NDN_CPP_USE_SYSTEM_BOOST
 #include <boost/iostreams/detail/ios.hpp>
diff --git a/src/util/blob.cpp b/src/util/blob.cpp
index 7d4e218..46297c6 100644
--- a/src/util/blob.cpp
+++ b/src/util/blob.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "../c/util/blob.h"
-#include <ndn-cpp/util/blob.hpp>
+#include <ndn-cpp-dev/util/blob.hpp>
 
 using namespace std;
 
diff --git a/src/util/changed-event.hpp b/src/util/changed-event.hpp
index e20f3d5..aee8549 100644
--- a/src/util/changed-event.hpp
+++ b/src/util/changed-event.hpp
@@ -9,7 +9,7 @@
 #define NDN_CHANGED_EVENT_HPP
 
 #include <vector>
-#include <ndn-cpp/common.hpp>
+#include <ndn-cpp-dev/common.hpp>
 
 namespace ndn {
 
diff --git a/src/util/dynamic-uint8-vector.hpp b/src/util/dynamic-uint8-vector.hpp
index da26a63..55ed1ee 100644
--- a/src/util/dynamic-uint8-vector.hpp
+++ b/src/util/dynamic-uint8-vector.hpp
@@ -9,7 +9,7 @@
 #define NDN_DYNAMIC_UCHAR_VECTOR_HPP
 
 #include <vector>
-#include <ndn-cpp/common.hpp>
+#include <ndn-cpp-dev/common.hpp>
 #include "../c/util/dynamic-uint8-array.h"
 
 namespace ndn {
diff --git a/src/util/logging.hpp b/src/util/logging.hpp
index ab99010..73c6d12 100644
--- a/src/util/logging.hpp
+++ b/src/util/logging.hpp
@@ -9,7 +9,7 @@
 #ifndef NDN_LOGGING_HPP
 #define NDN_LOGGING_HPP
 
-#include <ndn-cpp/common.hpp>
+#include <ndn-cpp-dev/common.hpp>
 
 #ifdef NDN_CPP_HAVE_LOG4CXX
 
diff --git a/src/util/ndnd-id-fetcher.hpp b/src/util/ndnd-id-fetcher.hpp
index 843eb83..6a1224e 100644
--- a/src/util/ndnd-id-fetcher.hpp
+++ b/src/util/ndnd-id-fetcher.hpp
@@ -8,8 +8,8 @@
 #ifndef NDN_NDND_ID_FETCHER_HPP
 #define NDN_NDND_ID_FETCHER_HPP
 
-#include <ndn-cpp/common.hpp>
-#include "ndn-cpp/c/util/crypto.h"
+#include <ndn-cpp-dev/common.hpp>
+#include "ndn-cpp-dev/c/util/crypto.h"
 
 namespace ndn {
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 09627f2..ae99ab5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 
-LDADD = ../libndn-cpp.la @BOOST_SYSTEM_LIB@
+LDADD = ../libndn-cpp-dev.la @BOOST_SYSTEM_LIB@
 
 noinst_PROGRAMS = \
 	test-get-async \
diff --git a/tests/test-encode-decode-benchmark.cpp b/tests/test-encode-decode-benchmark.cpp
index 57b888a..bb678f0 100644
--- a/tests/test-encode-decode-benchmark.cpp
+++ b/tests/test-encode-decode-benchmark.cpp
@@ -10,15 +10,15 @@
 #include <sys/time.h>
 #include <sstream>
 #include <stdexcept>
-#include <ndn-cpp/data.hpp>
-#include <ndn-cpp/security/key-chain.hpp>
-// #include <ndn-cpp/security/policy/self-verify-policy-manager.hpp>
+#include <ndn-cpp-dev/data.hpp>
+#include <ndn-cpp-dev/security/key-chain.hpp>
+// #include <ndn-cpp-dev/security/policy/self-verify-policy-manager.hpp>
 
 // Hack: Hook directly into non-API functions.
 #include "../src/c/encoding/binary-xml-decoder.h"
 #include "../src/c/data.h"
 #include "../src/c/encoding/binary-xml-data.h"
-#include <ndn-cpp/c/util/crypto.h>
+#include <ndn-cpp-dev/c/util/crypto.h>
 
 using namespace std;
 using namespace ndn;
diff --git a/tests/test-get-async.cpp b/tests/test-get-async.cpp
index 388d7a5..ce04cd8 100644
--- a/tests/test-get-async.cpp
+++ b/tests/test-get-async.cpp
@@ -8,7 +8,7 @@
 #include <sstream>
 #include <iostream>
 #include <unistd.h>
-#include <ndn-cpp/face.hpp>
+#include <ndn-cpp-dev/face.hpp>
 
 using namespace std;
 using namespace ndn;
diff --git a/tests/test-publish-async.cpp b/tests/test-publish-async.cpp
index 839bd06..92fcae8 100644
--- a/tests/test-publish-async.cpp
+++ b/tests/test-publish-async.cpp
@@ -9,8 +9,8 @@
 #include <iostream>
 #include <time.h>
 #include <unistd.h>
-#include <ndn-cpp/face.hpp>
-#include <ndn-cpp/security/key-chain.hpp>
+#include <ndn-cpp-dev/face.hpp>
+#include <ndn-cpp-dev/security/key-chain.hpp>
 
 using namespace std;
 using namespace ndn;
diff --git a/tests_boost/Makefile.am b/tests_boost/Makefile.am
index b47a9e4..dadf1c1 100644
--- a/tests_boost/Makefile.am
+++ b/tests_boost/Makefile.am
@@ -9,4 +9,4 @@
   test-encode-decode-interest.cpp \
   test-encode-decode-forwarding-entry.cpp
 
-unit_tests_LDADD = ../libndn-cpp.la @BOOST_SYSTEM_LIB@ @BOOST_UNIT_TEST_FRAMEWORK_LIB@ @OPENSSL_LIBS@ @CRYPTOPP_LIBS@ @OSX_SECURITY_LIBS@
+unit_tests_LDADD = ../libndn-cpp-dev.la @BOOST_SYSTEM_LIB@ @BOOST_UNIT_TEST_FRAMEWORK_LIB@ @OPENSSL_LIBS@ @CRYPTOPP_LIBS@ @OSX_SECURITY_LIBS@
diff --git a/tests_boost/test-encode-decode-certificate.cpp b/tests_boost/test-encode-decode-certificate.cpp
index 4799ce9..b8f0159 100644
--- a/tests_boost/test-encode-decode-certificate.cpp
+++ b/tests_boost/test-encode-decode-certificate.cpp
@@ -6,8 +6,8 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <ndn-cpp/security/certificate.hpp>
-#include <ndn-cpp/security/public-key.hpp>
+#include <ndn-cpp-dev/security/certificate.hpp>
+#include <ndn-cpp-dev/security/public-key.hpp>
 
 #if __clang__
 #pragma clang diagnostic push
diff --git a/tests_boost/test-encode-decode-data.cpp b/tests_boost/test-encode-decode-data.cpp
index 15e5689..e8f5372 100644
--- a/tests_boost/test-encode-decode-data.cpp
+++ b/tests_boost/test-encode-decode-data.cpp
@@ -6,8 +6,8 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <ndn-cpp/data.hpp>
-#include <ndn-cpp/security/key-chain.hpp>
+#include <ndn-cpp-dev/data.hpp>
+#include <ndn-cpp-dev/security/key-chain.hpp>
 
 #include <fstream>
 
diff --git a/tests_boost/test-encode-decode-forwarding-entry.cpp b/tests_boost/test-encode-decode-forwarding-entry.cpp
index 6ad8249..9d06ed3 100644
--- a/tests_boost/test-encode-decode-forwarding-entry.cpp
+++ b/tests_boost/test-encode-decode-forwarding-entry.cpp
@@ -6,7 +6,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <ndn-cpp/forwarding-entry.hpp>
+#include <ndn-cpp-dev/forwarding-entry.hpp>
 
 #if __clang__
 #pragma clang diagnostic push
diff --git a/tests_boost/test-encode-decode-interest.cpp b/tests_boost/test-encode-decode-interest.cpp
index 3b7c4d1..e5fc83f 100644
--- a/tests_boost/test-encode-decode-interest.cpp
+++ b/tests_boost/test-encode-decode-interest.cpp
@@ -6,7 +6,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <ndn-cpp/interest.hpp>
+#include <ndn-cpp-dev/interest.hpp>
 
 using namespace std;
 using namespace ndn;
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 216bb82..3b9d701 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,11 +1,10 @@
+LDADD = ../libndn-cpp-dev.la @BOOST_SYSTEM_LIB@
 
 bin_PROGRAMS = tlvdump ndncatchunks ndnputchunks
 
-tlvdump_SOURCES = tlvdump.cpp
-tlvdump_LDADD = ../libndn-cpp.la @BOOST_SYSTEM_LIB@
+tlvdump_SOURCES      = tlvdump.cpp
 
 ndncatchunks_SOURCES = ndncatchunks.cpp
-ndncatchunks_LDADD = ../libndn-cpp.la @BOOST_SYSTEM_LIB@
 
 ndnputchunks_SOURCES = ndnputchunks.cpp
-ndnputchunks_LDADD = ../libndn-cpp.la @BOOST_SYSTEM_LIB@
+
diff --git a/tools/ndncatchunks.cpp b/tools/ndncatchunks.cpp
index c48fdef..7da6060 100644
--- a/tools/ndncatchunks.cpp
+++ b/tools/ndncatchunks.cpp
@@ -19,7 +19,7 @@
  */
 
 
-#include <ndn-cpp/face.hpp>
+#include <ndn-cpp-dev/face.hpp>
 #include <stdexcept>
 #include <iostream>
 
diff --git a/tools/ndnputchunks.cpp b/tools/ndnputchunks.cpp
index a1d581b..e19afe9 100644
--- a/tools/ndnputchunks.cpp
+++ b/tools/ndnputchunks.cpp
@@ -18,8 +18,8 @@
  * Author: Wentao Shang <wentao@cs.ucla.edu>
  */
 
-#include <ndn-cpp/face.hpp>
-#include <ndn-cpp/security/key-chain.hpp>
+#include <ndn-cpp-dev/face.hpp>
+#include <ndn-cpp-dev/security/key-chain.hpp>
 
 #if NDN_CPP_HAVE_CXX11
 // In the std library, the placeholders are in a different namespace than boost.
diff --git a/tools/tlvdump.cpp b/tools/tlvdump.cpp
index 0c5f4bb..be80899 100644
--- a/tools/tlvdump.cpp
+++ b/tools/tlvdump.cpp
@@ -5,8 +5,8 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include <ndn-cpp/face.hpp>
-#include <ndn-cpp/encoding/block.hpp>
+#include <ndn-cpp-dev/face.hpp>
+#include <ndn-cpp-dev/encoding/block.hpp>
 
 #include <iomanip>
 #include <fstream>