diff --git a/tools/ndn-autoconfig/multicast-discovery.cpp b/tools/ndn-autoconfig/multicast-discovery.cpp
index cf87ec2..61312cd 100644
--- a/tools/ndn-autoconfig/multicast-discovery.cpp
+++ b/tools/ndn-autoconfig/multicast-discovery.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -28,6 +28,7 @@
 #include <boost/lexical_cast.hpp>
 
 #include <ndn-cxx/encoding/tlv-nfd.hpp>
+#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
 
 namespace ndn::autoconfig {
 
diff --git a/tools/nfd-autoreg.cpp b/tools/nfd-autoreg.cpp
index fe079de..4876090 100644
--- a/tools/nfd-autoreg.cpp
+++ b/tools/nfd-autoreg.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -29,7 +29,7 @@
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/mgmt/nfd/controller.hpp>
 #include <ndn-cxx/mgmt/nfd/face-monitor.hpp>
-#include <ndn-cxx/mgmt/nfd/face-status.hpp>
+#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
 #include <ndn-cxx/net/face-uri.hpp>
 #include <ndn-cxx/security/key-chain.hpp>
 
diff --git a/tools/nfdc/channel-module.cpp b/tools/nfdc/channel-module.cpp
index 085fc35..3d36df2 100644
--- a/tools/nfdc/channel-module.cpp
+++ b/tools/nfdc/channel-module.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,8 @@
 #include "channel-module.hpp"
 #include "format-helpers.hpp"
 
+#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
+
 namespace nfd::tools::nfdc {
 
 void
diff --git a/tools/nfdc/channel-module.hpp b/tools/nfdc/channel-module.hpp
index 02b01ad..2be055c 100644
--- a/tools/nfdc/channel-module.hpp
+++ b/tools/nfdc/channel-module.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -28,6 +28,8 @@
 
 #include "module.hpp"
 
+#include <ndn-cxx/mgmt/nfd/channel-status.hpp>
+
 namespace nfd::tools::nfdc {
 
 using ndn::nfd::ChannelStatus;
@@ -35,7 +37,7 @@
 /** \brief Provides access to NFD channel dataset.
  *  \sa https://redmine.named-data.net/projects/nfd/wiki/FaceMgmt#Channel-Dataset
  */
-class ChannelModule : public Module, noncopyable
+class ChannelModule : public Module, boost::noncopyable
 {
 public:
   void
diff --git a/tools/nfdc/cs-module.cpp b/tools/nfdc/cs-module.cpp
index 73d066c..341034b 100644
--- a/tools/nfdc/cs-module.cpp
+++ b/tools/nfdc/cs-module.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,7 @@
 #include "cs-module.hpp"
 #include "format-helpers.hpp"
 
+#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
 #include <ndn-cxx/util/indented-stream.hpp>
 
 namespace nfd::tools::nfdc {
diff --git a/tools/nfdc/cs-module.hpp b/tools/nfdc/cs-module.hpp
index f2cbef9..5bfec40 100644
--- a/tools/nfdc/cs-module.hpp
+++ b/tools/nfdc/cs-module.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -26,8 +26,10 @@
 #ifndef NFD_TOOLS_NFDC_CS_MODULE_HPP
 #define NFD_TOOLS_NFDC_CS_MODULE_HPP
 
-#include "command-parser.hpp"
 #include "module.hpp"
+#include "command-parser.hpp"
+
+#include <ndn-cxx/mgmt/nfd/cs-info.hpp>
 
 namespace nfd::tools::nfdc {
 
@@ -36,7 +38,7 @@
 /** \brief Provides access to NFD CS management.
  *  \sa https://redmine.named-data.net/projects/nfd/wiki/CsMgmt
  */
-class CsModule : public Module, noncopyable
+class CsModule : public Module, boost::noncopyable
 {
 public:
   /** \brief Register 'cs config' command.
diff --git a/tools/nfdc/execute-command.hpp b/tools/nfdc/execute-command.hpp
index 8132774..ee11cf4 100644
--- a/tools/nfdc/execute-command.hpp
+++ b/tools/nfdc/execute-command.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -34,7 +34,6 @@
 #include <ndn-cxx/mgmt/nfd/control-command.hpp>
 #include <ndn-cxx/mgmt/nfd/control-parameters.hpp>
 #include <ndn-cxx/mgmt/nfd/control-response.hpp>
-#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
 #include <ndn-cxx/security/key-chain.hpp>
 
 namespace nfd::tools::nfdc {
diff --git a/tools/nfdc/face-helpers.cpp b/tools/nfdc/face-helpers.cpp
index 93b896c..36982a4 100644
--- a/tools/nfdc/face-helpers.cpp
+++ b/tools/nfdc/face-helpers.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,7 @@
 #include "face-helpers.hpp"
 #include "format-helpers.hpp"
 
+#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
 #include <ndn-cxx/util/logger.hpp>
 
 namespace nfd::tools::nfdc {
diff --git a/tools/nfdc/face-helpers.hpp b/tools/nfdc/face-helpers.hpp
index fbd5faa..1f54e0a 100644
--- a/tools/nfdc/face-helpers.hpp
+++ b/tools/nfdc/face-helpers.hpp
@@ -28,6 +28,9 @@
 
 #include "execute-command.hpp"
 
+#include <ndn-cxx/mgmt/nfd/face-query-filter.hpp>
+#include <ndn-cxx/mgmt/nfd/face-status.hpp>
+
 namespace nfd::tools::nfdc {
 
 using ndn::nfd::FaceQueryFilter;
diff --git a/tools/nfdc/face-module.cpp b/tools/nfdc/face-module.cpp
index 136a4f9..5af5e8d 100644
--- a/tools/nfdc/face-module.cpp
+++ b/tools/nfdc/face-module.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,8 @@
 #include "face-module.hpp"
 #include "face-helpers.hpp"
 
+#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
+
 #include <boost/lexical_cast/try_lexical_convert.hpp>
 
 namespace nfd::tools::nfdc {
diff --git a/tools/nfdc/face-module.hpp b/tools/nfdc/face-module.hpp
index 1f7393a..641e272 100644
--- a/tools/nfdc/face-module.hpp
+++ b/tools/nfdc/face-module.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -30,6 +30,8 @@
 #include "command-parser.hpp"
 #include "format-helpers.hpp"
 
+#include <ndn-cxx/mgmt/nfd/face-status.hpp>
+
 namespace nfd::tools::nfdc {
 
 using ndn::nfd::FaceStatus;
@@ -37,7 +39,7 @@
 /** \brief Provides access to NFD face management.
  *  \sa https://redmine.named-data.net/projects/nfd/wiki/FaceMgmt
  */
-class FaceModule : public Module, noncopyable
+class FaceModule : public Module, boost::noncopyable
 {
 public:
   /** \brief Register 'face list', 'face show', 'face create', 'face destroy' commands.
diff --git a/tools/nfdc/fib-module.cpp b/tools/nfdc/fib-module.cpp
index 92f7212..e4d3b0e 100644
--- a/tools/nfdc/fib-module.cpp
+++ b/tools/nfdc/fib-module.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,8 @@
 #include "fib-module.hpp"
 #include "format-helpers.hpp"
 
+#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
+
 namespace nfd::tools::nfdc {
 
 void
diff --git a/tools/nfdc/fib-module.hpp b/tools/nfdc/fib-module.hpp
index 50200cb..ee466da 100644
--- a/tools/nfdc/fib-module.hpp
+++ b/tools/nfdc/fib-module.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -28,6 +28,8 @@
 
 #include "module.hpp"
 
+#include <ndn-cxx/mgmt/nfd/fib-entry.hpp>
+
 namespace nfd::tools::nfdc {
 
 using ndn::nfd::FibEntry;
@@ -36,7 +38,7 @@
 /** \brief Provides access to NFD FIB management.
  *  \sa https://redmine.named-data.net/projects/nfd/wiki/FibMgmt
  */
-class FibModule : public Module, noncopyable
+class FibModule : public Module, boost::noncopyable
 {
 public:
   void
diff --git a/tools/nfdc/forwarder-general-module.cpp b/tools/nfdc/forwarder-general-module.cpp
index 7cfab84..516eefd 100644
--- a/tools/nfdc/forwarder-general-module.cpp
+++ b/tools/nfdc/forwarder-general-module.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,7 @@
 #include "forwarder-general-module.hpp"
 #include "format-helpers.hpp"
 
+#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
 #include <ndn-cxx/util/indented-stream.hpp>
 
 namespace nfd::tools::nfdc {
diff --git a/tools/nfdc/forwarder-general-module.hpp b/tools/nfdc/forwarder-general-module.hpp
index 6b1b49b..5bc4ba1 100644
--- a/tools/nfdc/forwarder-general-module.hpp
+++ b/tools/nfdc/forwarder-general-module.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -28,6 +28,8 @@
 
 #include "module.hpp"
 
+#include <ndn-cxx/mgmt/nfd/forwarder-status.hpp>
+
 namespace nfd::tools::nfdc {
 
 using ndn::nfd::ForwarderStatus;
@@ -35,7 +37,7 @@
 /** \brief Provides access to NFD forwarder general status.
  *  \sa https://redmine.named-data.net/projects/nfd/wiki/ForwarderStatus
  */
-class ForwarderGeneralModule : public Module, noncopyable
+class ForwarderGeneralModule : public Module, boost::noncopyable
 {
 public:
   void
diff --git a/tools/nfdc/module.hpp b/tools/nfdc/module.hpp
index af0f651..c10e27b 100644
--- a/tools/nfdc/module.hpp
+++ b/tools/nfdc/module.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -26,17 +26,19 @@
 #ifndef NFD_TOOLS_NFDC_MODULE_HPP
 #define NFD_TOOLS_NFDC_MODULE_HPP
 
-#include "core/common.hpp"
 #include <ndn-cxx/mgmt/nfd/command-options.hpp>
 #include <ndn-cxx/mgmt/nfd/controller.hpp>
 
+#include <ostream>
+
 namespace nfd::tools::nfdc {
 
 using ndn::nfd::CommandOptions;
 using ndn::nfd::Controller;
 
-/** \brief Provides access to an NFD management module.
- *  \note This type is an interface. It should not have member fields.
+/**
+ * \brief Provides access to an NFD management module.
+ * \note This type is an interface. It should not have any member fields.
  */
 class Module
 {
diff --git a/tools/nfdc/rib-module.cpp b/tools/nfdc/rib-module.cpp
index bf3b662..36e8391 100644
--- a/tools/nfdc/rib-module.cpp
+++ b/tools/nfdc/rib-module.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -28,6 +28,8 @@
 #include "face-helpers.hpp"
 #include "format-helpers.hpp"
 
+#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
+
 namespace nfd::tools::nfdc {
 
 void
diff --git a/tools/nfdc/rib-module.hpp b/tools/nfdc/rib-module.hpp
index d81f6a7..568e100 100644
--- a/tools/nfdc/rib-module.hpp
+++ b/tools/nfdc/rib-module.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -29,6 +29,8 @@
 #include "module.hpp"
 #include "command-parser.hpp"
 
+#include <ndn-cxx/mgmt/nfd/rib-entry.hpp>
+
 namespace nfd::tools::nfdc {
 
 using ndn::nfd::RibEntry;
@@ -37,7 +39,7 @@
 /** \brief Provides access to NFD RIB management.
  *  \sa https://redmine.named-data.net/projects/nfd/wiki/RibMgmt
  */
-class RibModule : public Module, noncopyable
+class RibModule : public Module, boost::noncopyable
 {
 public:
   /** \brief Register 'route list', 'route show', 'route add', 'route remove' commands.
diff --git a/tools/nfdc/status-report.hpp b/tools/nfdc/status-report.hpp
index f1a84a6..1d0cb91 100644
--- a/tools/nfdc/status-report.hpp
+++ b/tools/nfdc/status-report.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,7 @@
 #ifndef NFD_TOOLS_NFDC_STATUS_REPORT_HPP
 #define NFD_TOOLS_NFDC_STATUS_REPORT_HPP
 
+#include "core/common.hpp"
 #include "module.hpp"
 
 #include <ndn-cxx/face.hpp>
@@ -46,9 +47,10 @@
 std::ostream&
 operator<<(std::ostream& os, ReportFormat fmt);
 
-/** \brief Collects and prints NFD status report.
+/**
+ * \brief Collects and prints NFD status report.
  */
-class StatusReport : noncopyable
+class StatusReport : boost::noncopyable
 {
 public:
 #ifdef NFD_WITH_TESTS
diff --git a/tools/nfdc/strategy-choice-module.cpp b/tools/nfdc/strategy-choice-module.cpp
index 1fbca4c..1d08126 100644
--- a/tools/nfdc/strategy-choice-module.cpp
+++ b/tools/nfdc/strategy-choice-module.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,8 @@
 #include "strategy-choice-module.hpp"
 #include "format-helpers.hpp"
 
+#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
+
 namespace nfd::tools::nfdc {
 
 void
diff --git a/tools/nfdc/strategy-choice-module.hpp b/tools/nfdc/strategy-choice-module.hpp
index 43ac78b..d9f37fa 100644
--- a/tools/nfdc/strategy-choice-module.hpp
+++ b/tools/nfdc/strategy-choice-module.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -29,6 +29,8 @@
 #include "module.hpp"
 #include "command-parser.hpp"
 
+#include <ndn-cxx/mgmt/nfd/strategy-choice.hpp>
+
 namespace nfd::tools::nfdc {
 
 using ndn::nfd::StrategyChoice;
@@ -36,7 +38,7 @@
 /** \brief Provides access to NFD Strategy Choice management.
  *  \sa https://redmine.named-data.net/projects/nfd/wiki/StrategyChoice
  */
-class StrategyChoiceModule : public Module, noncopyable
+class StrategyChoiceModule : public Module, boost::noncopyable
 {
 public:
   /** \brief Register 'strategy list', 'strategy show', 'strategy set', 'strategy unset' commands.