diff --git a/rib/auto-prefix-propagator.hpp b/rib/auto-prefix-propagator.hpp
index bd3ef50..efc48cb 100644
--- a/rib/auto-prefix-propagator.hpp
+++ b/rib/auto-prefix-propagator.hpp
@@ -31,10 +31,10 @@
 #include "propagated-entry.hpp"
 
 #include <ndn-cxx/security/key-chain.hpp>
-#include <ndn-cxx/management/nfd-controller.hpp>
-#include <ndn-cxx/management/nfd-control-command.hpp>
-#include <ndn-cxx/management/nfd-control-parameters.hpp>
-#include <ndn-cxx/management/nfd-command-options.hpp>
+#include <ndn-cxx/mgmt/nfd/controller.hpp>
+#include <ndn-cxx/mgmt/nfd/control-command.hpp>
+#include <ndn-cxx/mgmt/nfd/control-parameters.hpp>
+#include <ndn-cxx/mgmt/nfd/command-options.hpp>
 #include <ndn-cxx/util/signal.hpp>
 
 namespace nfd {
diff --git a/rib/fib-updater.cpp b/rib/fib-updater.cpp
index c6b4f09..a430c68 100644
--- a/rib/fib-updater.cpp
+++ b/rib/fib-updater.cpp
@@ -27,7 +27,7 @@
 
 #include "core/logger.hpp"
 
-#include <ndn-cxx/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/mgmt/nfd/control-parameters.hpp>
 
 namespace nfd {
 namespace rib {
diff --git a/rib/fib-updater.hpp b/rib/fib-updater.hpp
index fed7aed..d68210c 100644
--- a/rib/fib-updater.hpp
+++ b/rib/fib-updater.hpp
@@ -31,7 +31,7 @@
 #include "rib.hpp"
 #include "rib-update-batch.hpp"
 
-#include <ndn-cxx/management/nfd-controller.hpp>
+#include <ndn-cxx/mgmt/nfd/controller.hpp>
 
 namespace nfd {
 namespace rib {
diff --git a/rib/rib-entry.cpp b/rib/rib-entry.cpp
index 64e7195..7d4cff8 100644
--- a/rib/rib-entry.cpp
+++ b/rib/rib-entry.cpp
@@ -27,7 +27,7 @@
 
 #include "core/logger.hpp"
 
-#include <ndn-cxx/management/nfd-control-command.hpp>
+#include <ndn-cxx/mgmt/nfd/control-command.hpp>
 
 NFD_LOG_INIT("RibEntry");
 
diff --git a/rib/rib-manager.cpp b/rib/rib-manager.cpp
index b291a22..c0c6ce8 100644
--- a/rib/rib-manager.cpp
+++ b/rib/rib-manager.cpp
@@ -28,8 +28,8 @@
 #include "core/logger.hpp"
 #include "core/scheduler.hpp"
 #include <ndn-cxx/lp/tags.hpp>
-#include <ndn-cxx/management/nfd-face-status.hpp>
-#include <ndn-cxx/management/nfd-rib-entry.hpp>
+#include <ndn-cxx/mgmt/nfd/face-status.hpp>
+#include <ndn-cxx/mgmt/nfd/rib-entry.hpp>
 
 namespace nfd {
 namespace rib {
diff --git a/rib/rib-manager.hpp b/rib/rib-manager.hpp
index c28ea71..686ecd7 100644
--- a/rib/rib-manager.hpp
+++ b/rib/rib-manager.hpp
@@ -34,11 +34,11 @@
 
 #include <ndn-cxx/encoding/buffer-stream.hpp>
 #include <ndn-cxx/security/validator-config.hpp>
-#include <ndn-cxx/management/nfd-face-monitor.hpp>
-#include <ndn-cxx/management/nfd-controller.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>
+#include <ndn-cxx/mgmt/nfd/face-monitor.hpp>
+#include <ndn-cxx/mgmt/nfd/controller.hpp>
+#include <ndn-cxx/mgmt/nfd/control-command.hpp>
+#include <ndn-cxx/mgmt/nfd/control-response.hpp>
+#include <ndn-cxx/mgmt/nfd/control-parameters.hpp>
 
 namespace nfd {
 namespace rib {
diff --git a/rib/rib.hpp b/rib/rib.hpp
index db452b4..4c9e608 100644
--- a/rib/rib.hpp
+++ b/rib/rib.hpp
@@ -29,7 +29,7 @@
 #include "rib-entry.hpp"
 #include "rib-update-batch.hpp"
 
-#include <ndn-cxx/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/mgmt/nfd/control-parameters.hpp>
 
 namespace nfd {
 namespace rib {