diff --git a/daemon/mgmt/command-validator.cpp b/daemon/mgmt/command-validator.cpp
index 22b8257..ac08228 100644
--- a/daemon/mgmt/command-validator.cpp
+++ b/daemon/mgmt/command-validator.cpp
@@ -29,6 +29,7 @@
 #include <ndn-cpp-dev/security/identity-certificate.hpp>
 
 #include <boost/filesystem.hpp>
+#include <fstream>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/config-file.cpp b/daemon/mgmt/config-file.cpp
index 4af6f91..3be86c9 100644
--- a/daemon/mgmt/config-file.cpp
+++ b/daemon/mgmt/config-file.cpp
@@ -26,6 +26,7 @@
 #include "core/logger.hpp"
 
 #include <boost/property_tree/info_parser.hpp>
+#include <fstream>
 
 namespace nfd {
 
@@ -33,7 +34,6 @@
 
 ConfigFile::ConfigFile()
 {
-
 }
 
 void
diff --git a/daemon/mgmt/face-manager.cpp b/daemon/mgmt/face-manager.cpp
index 29f2b9e..95b01e0 100644
--- a/daemon/mgmt/face-manager.cpp
+++ b/daemon/mgmt/face-manager.cpp
@@ -23,16 +23,15 @@
  **/
 
 #include "face-manager.hpp"
-#include "face-flags.hpp"
 
+#include "face-flags.hpp"
 #include "core/logger.hpp"
 #include "core/face-uri.hpp"
 #include "core/network-interface.hpp"
 #include "fw/face-table.hpp"
 #include "face/tcp-factory.hpp"
 #include "face/udp-factory.hpp"
-
-#include <ndn-cpp-dev/management/nfd-face-event-notification.hpp>
+#include "mgmt/config-file.hpp"
 
 #ifdef HAVE_UNIX_SOCKETS
 #include "face/unix-stream-factory.hpp"
@@ -42,6 +41,8 @@
 #include "face/ethernet-factory.hpp"
 #endif // HAVE_PCAP
 
+#include <ndn-cpp-dev/management/nfd-face-event-notification.hpp>
+
 namespace nfd {
 
 NFD_LOG_INIT("FaceManager");
diff --git a/daemon/mgmt/face-manager.hpp b/daemon/mgmt/face-manager.hpp
index e0b4c6c..d1ba482 100644
--- a/daemon/mgmt/face-manager.hpp
+++ b/daemon/mgmt/face-manager.hpp
@@ -26,14 +26,10 @@
 #define NFD_MGMT_FACE_MANAGER_HPP
 
 #include "common.hpp"
-#include "face/face.hpp"
 #include "face/local-face.hpp"
-#include "mgmt/app-face.hpp"
 #include "mgmt/manager-base.hpp"
-#include "mgmt/config-file.hpp"
 #include "mgmt/face-status-publisher.hpp"
 #include "mgmt/notification-stream.hpp"
-#include "fw/face-table.hpp"
 
 #include <ndn-cpp-dev/management/nfd-control-parameters.hpp>
 #include <ndn-cpp-dev/management/nfd-control-response.hpp>
@@ -42,9 +38,12 @@
 
 const std::string FACE_MANAGER_PRIVILEGE = "faces";
 
-class ProtocolFactory;
-class NetworkInterfaceInfo;
+class ConfigFile;
+class Face;
+class FaceTable;
 class LocalFace;
+class NetworkInterfaceInfo;
+class ProtocolFactory;
 
 class FaceManager : public ManagerBase
 {
diff --git a/daemon/mgmt/face-status-publisher.cpp b/daemon/mgmt/face-status-publisher.cpp
index 2dc62d6..3e0ec42 100644
--- a/daemon/mgmt/face-status-publisher.cpp
+++ b/daemon/mgmt/face-status-publisher.cpp
@@ -25,6 +25,8 @@
 #include "face-status-publisher.hpp"
 #include "face-flags.hpp"
 #include "core/logger.hpp"
+#include "fw/face-table.hpp"
+
 #include <ndn-cpp-dev/management/nfd-face-status.hpp>
 
 namespace nfd {
diff --git a/daemon/mgmt/face-status-publisher.hpp b/daemon/mgmt/face-status-publisher.hpp
index 17e758d..7013ae7 100644
--- a/daemon/mgmt/face-status-publisher.hpp
+++ b/daemon/mgmt/face-status-publisher.hpp
@@ -25,11 +25,12 @@
 #ifndef NFD_MGMT_FACE_STATUS_PUBLISHER_HPP
 #define NFD_MGMT_FACE_STATUS_PUBLISHER_HPP
 
-#include "fw/face-table.hpp"
 #include "mgmt/segment-publisher.hpp"
 
 namespace nfd {
 
+class FaceTable;
+
 class FaceStatusPublisher : public SegmentPublisher
 {
 public:
diff --git a/daemon/mgmt/fib-enumeration-publisher.cpp b/daemon/mgmt/fib-enumeration-publisher.cpp
index cf40d87..daa5908 100644
--- a/daemon/mgmt/fib-enumeration-publisher.cpp
+++ b/daemon/mgmt/fib-enumeration-publisher.cpp
@@ -23,8 +23,8 @@
  **/
 
 #include "fib-enumeration-publisher.hpp"
-
 #include "core/logger.hpp"
+#include "table/fib.hpp"
 
 #include <ndn-cpp-dev/management/nfd-fib-entry.hpp>
 
@@ -38,12 +38,10 @@
   : SegmentPublisher(face, prefix)
   , m_fib(fib)
 {
-
 }
 
 FibEnumerationPublisher::~FibEnumerationPublisher()
 {
-
 }
 
 size_t
diff --git a/daemon/mgmt/fib-enumeration-publisher.hpp b/daemon/mgmt/fib-enumeration-publisher.hpp
index 7a33482..0baf3bc 100644
--- a/daemon/mgmt/fib-enumeration-publisher.hpp
+++ b/daemon/mgmt/fib-enumeration-publisher.hpp
@@ -25,11 +25,12 @@
 #ifndef NFD_MGMT_FIB_ENUMERATION_PUBLISHER_HPP
 #define NFD_MGMT_FIB_ENUMERATION_PUBLISHER_HPP
 
-#include "table/fib.hpp"
 #include "mgmt/segment-publisher.hpp"
 
 namespace nfd {
 
+class Fib;
+
 class FibEnumerationPublisher : public SegmentPublisher
 {
 public:
diff --git a/daemon/mgmt/fib-manager.hpp b/daemon/mgmt/fib-manager.hpp
index eef58fa..4c3bf8d 100644
--- a/daemon/mgmt/fib-manager.hpp
+++ b/daemon/mgmt/fib-manager.hpp
@@ -26,14 +26,12 @@
 #define NFD_MGMT_FIB_MANAGER_HPP
 
 #include "common.hpp"
-#include "face/face.hpp"
-#include "mgmt/app-face.hpp"
-#include "fw/strategy.hpp"
 #include "mgmt/manager-base.hpp"
 #include "mgmt/fib-enumeration-publisher.hpp"
 
 namespace nfd {
 
+class Face;
 class Forwarder;
 class Fib;