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 {