diff --git a/daemon/face/local-face.hpp b/daemon/face/local-face.hpp
index dbcb9bd..118dce7 100644
--- a/daemon/face/local-face.hpp
+++ b/daemon/face/local-face.hpp
@@ -26,7 +26,7 @@
 #define NFD_DAEMON_FACE_LOCAL_FACE_HPP
 
 #include "face.hpp"
-#include <ndn-cpp-dev/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/management/nfd-control-parameters.hpp>
 
 namespace nfd {
 
diff --git a/daemon/face/ndnlp-slicer.cpp b/daemon/face/ndnlp-slicer.cpp
index 22d8c3b..9efe7d6 100644
--- a/daemon/face/ndnlp-slicer.cpp
+++ b/daemon/face/ndnlp-slicer.cpp
@@ -24,7 +24,7 @@
 
 #include "ndnlp-slicer.hpp"
 
-#include <ndn-cpp-dev/encoding/encoding-buffer.hpp>
+#include <ndn-cxx/encoding/encoding-buffer.hpp>
 
 namespace nfd {
 namespace ndnlp {
diff --git a/daemon/face/tcp-channel.hpp b/daemon/face/tcp-channel.hpp
index 4398ee7..c4f269c 100644
--- a/daemon/face/tcp-channel.hpp
+++ b/daemon/face/tcp-channel.hpp
@@ -26,7 +26,7 @@
 #define NFD_DAEMON_FACE_TCP_CHANNEL_HPP
 
 #include "channel.hpp"
-#include <ndn-cpp-dev/util/monotonic_deadline_timer.hpp>
+#include <ndn-cxx/util/monotonic_deadline_timer.hpp>
 #include "tcp-face.hpp"
 
 namespace nfd {
diff --git a/daemon/mgmt/app-face.hpp b/daemon/mgmt/app-face.hpp
index 1539b9e..476fda7 100644
--- a/daemon/mgmt/app-face.hpp
+++ b/daemon/mgmt/app-face.hpp
@@ -27,7 +27,7 @@
 
 #include "common.hpp"
 
-#include <ndn-cpp-dev/security/key-chain.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/command-validator.cpp b/daemon/mgmt/command-validator.cpp
index ad3443c..f7b0df2 100644
--- a/daemon/mgmt/command-validator.cpp
+++ b/daemon/mgmt/command-validator.cpp
@@ -25,8 +25,8 @@
 #include "command-validator.hpp"
 #include "core/logger.hpp"
 
-#include <ndn-cpp-dev/util/io.hpp>
-#include <ndn-cpp-dev/security/identity-certificate.hpp>
+#include <ndn-cxx/util/io.hpp>
+#include <ndn-cxx/security/identity-certificate.hpp>
 
 #include <boost/filesystem.hpp>
 #include <fstream>
diff --git a/daemon/mgmt/command-validator.hpp b/daemon/mgmt/command-validator.hpp
index 8456db3..b2cb184 100644
--- a/daemon/mgmt/command-validator.hpp
+++ b/daemon/mgmt/command-validator.hpp
@@ -27,7 +27,7 @@
 
 #include "common.hpp"
 #include "config-file.hpp"
-#include <ndn-cpp-dev/util/command-interest-validator.hpp>
+#include <ndn-cxx/util/command-interest-validator.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/face-flags.hpp b/daemon/mgmt/face-flags.hpp
index c4809a0..1451a27 100644
--- a/daemon/mgmt/face-flags.hpp
+++ b/daemon/mgmt/face-flags.hpp
@@ -26,7 +26,7 @@
 #define NFD_DAEMON_MGMT_FACE_FLAGS_HPP
 
 #include "face/face.hpp"
-#include <ndn-cpp-dev/management/nfd-face-flags.hpp>
+#include <ndn-cxx/management/nfd-face-flags.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/face-manager.cpp b/daemon/mgmt/face-manager.cpp
index 8397253..c514637 100644
--- a/daemon/mgmt/face-manager.cpp
+++ b/daemon/mgmt/face-manager.cpp
@@ -41,7 +41,7 @@
 #include "face/ethernet-factory.hpp"
 #endif // HAVE_LIBPCAP
 
-#include <ndn-cpp-dev/management/nfd-face-event-notification.hpp>
+#include <ndn-cxx/management/nfd-face-event-notification.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/face-manager.hpp b/daemon/mgmt/face-manager.hpp
index ed33975..b5a7890 100644
--- a/daemon/mgmt/face-manager.hpp
+++ b/daemon/mgmt/face-manager.hpp
@@ -31,8 +31,8 @@
 #include "mgmt/face-status-publisher.hpp"
 #include "mgmt/notification-stream.hpp"
 
-#include <ndn-cpp-dev/management/nfd-control-parameters.hpp>
-#include <ndn-cpp-dev/management/nfd-control-response.hpp>
+#include <ndn-cxx/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/management/nfd-control-response.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/face-status-publisher.cpp b/daemon/mgmt/face-status-publisher.cpp
index 3e0ec42..28e7155 100644
--- a/daemon/mgmt/face-status-publisher.cpp
+++ b/daemon/mgmt/face-status-publisher.cpp
@@ -27,7 +27,7 @@
 #include "core/logger.hpp"
 #include "fw/face-table.hpp"
 
-#include <ndn-cpp-dev/management/nfd-face-status.hpp>
+#include <ndn-cxx/management/nfd-face-status.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/fib-enumeration-publisher.cpp b/daemon/mgmt/fib-enumeration-publisher.cpp
index daa5908..4278c98 100644
--- a/daemon/mgmt/fib-enumeration-publisher.cpp
+++ b/daemon/mgmt/fib-enumeration-publisher.cpp
@@ -26,7 +26,7 @@
 #include "core/logger.hpp"
 #include "table/fib.hpp"
 
-#include <ndn-cpp-dev/management/nfd-fib-entry.hpp>
+#include <ndn-cxx/management/nfd-fib-entry.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/fib-manager.cpp b/daemon/mgmt/fib-manager.cpp
index 5afa492..0936f5c 100644
--- a/daemon/mgmt/fib-manager.cpp
+++ b/daemon/mgmt/fib-manager.cpp
@@ -30,7 +30,7 @@
 #include "mgmt/internal-face.hpp"
 #include "mgmt/app-face.hpp"
 
-#include <ndn-cpp-dev/encoding/tlv.hpp>
+#include <ndn-cxx/encoding/tlv.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/manager-base.hpp b/daemon/mgmt/manager-base.hpp
index 5d19b2a..2eac9e3 100644
--- a/daemon/mgmt/manager-base.hpp
+++ b/daemon/mgmt/manager-base.hpp
@@ -30,9 +30,9 @@
 #include "mgmt/command-validator.hpp"
 #include "mgmt/internal-face.hpp"
 
-#include <ndn-cpp-dev/management/nfd-control-command.hpp>
-#include <ndn-cpp-dev/management/nfd-control-response.hpp>
-#include <ndn-cpp-dev/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/management/nfd-control-command.hpp>
+#include <ndn-cxx/management/nfd-control-response.hpp>
+#include <ndn-cxx/management/nfd-control-parameters.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/segment-publisher.cpp b/daemon/mgmt/segment-publisher.cpp
index fd8a16e..01f3d12 100644
--- a/daemon/mgmt/segment-publisher.cpp
+++ b/daemon/mgmt/segment-publisher.cpp
@@ -27,7 +27,7 @@
 #include "core/logger.hpp"
 #include "face/face.hpp"
 
-#include <ndn-cpp-dev/util/time.hpp>
+#include <ndn-cxx/util/time.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/segment-publisher.hpp b/daemon/mgmt/segment-publisher.hpp
index a01ff76..eeefda7 100644
--- a/daemon/mgmt/segment-publisher.hpp
+++ b/daemon/mgmt/segment-publisher.hpp
@@ -28,7 +28,7 @@
 #include "common.hpp"
 #include "mgmt/app-face.hpp"
 
-#include <ndn-cpp-dev/encoding/encoding-buffer.hpp>
+#include <ndn-cxx/encoding/encoding-buffer.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/status-server.hpp b/daemon/mgmt/status-server.hpp
index 60cbf39..c046adf 100644
--- a/daemon/mgmt/status-server.hpp
+++ b/daemon/mgmt/status-server.hpp
@@ -26,7 +26,7 @@
 #define NFD_DAEMON_MGMT_STATUS_SERVER_HPP
 
 #include "mgmt/app-face.hpp"
-#include <ndn-cpp-dev/management/nfd-forwarder-status.hpp>
+#include <ndn-cxx/management/nfd-forwarder-status.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/strategy-choice-manager.hpp b/daemon/mgmt/strategy-choice-manager.hpp
index 94cdb11..cf46e96 100644
--- a/daemon/mgmt/strategy-choice-manager.hpp
+++ b/daemon/mgmt/strategy-choice-manager.hpp
@@ -27,7 +27,7 @@
 
 #include "mgmt/manager-base.hpp"
 
-#include <ndn-cpp-dev/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/management/nfd-control-parameters.hpp>
 
 namespace nfd {
 
diff --git a/daemon/table/cs-entry.hpp b/daemon/table/cs-entry.hpp
index 33f7d64..2150b32 100644
--- a/daemon/table/cs-entry.hpp
+++ b/daemon/table/cs-entry.hpp
@@ -28,7 +28,7 @@
 #define NFD_DAEMON_TABLE_CS_ENTRY_HPP
 
 #include "common.hpp"
-#include <ndn-cpp-dev/util/crypto.hpp>
+#include <ndn-cxx/util/crypto.hpp>
 
 namespace nfd {
 
diff --git a/daemon/table/cs.cpp b/daemon/table/cs.cpp
index e5da3fa..80312c8 100644
--- a/daemon/table/cs.cpp
+++ b/daemon/table/cs.cpp
@@ -26,8 +26,8 @@
 
 #include "cs.hpp"
 #include "core/logger.hpp"
-#include <ndn-cpp-dev/util/crypto.hpp>
-#include "ndn-cpp-dev/security/signature-sha256-with-rsa.hpp"
+#include <ndn-cxx/util/crypto.hpp>
+#include "ndn-cxx/security/signature-sha256-with-rsa.hpp"
 
 #define SKIPLIST_MAX_LAYERS 32
 #define SKIPLIST_PROBABILITY 25         // 25% (p = 1/4)