diff --git a/src/clients/iterative-query-controller.hpp b/src/clients/iterative-query-controller.hpp
index a04424e..936ca38 100644
--- a/src/clients/iterative-query-controller.hpp
+++ b/src/clients/iterative-query-controller.hpp
@@ -21,18 +21,16 @@
 #define NDNS_CLIENTS_ITERATIVE_QUERY_CONTROLLER_HPP
 
 #include "ndns-enum.hpp"
-#include "query.hpp"
-#include "response.hpp"
-#include "query-controller.hpp"
-#include "config.hpp"
 #include "common.hpp"
+#include "query.hpp"
+#include "query-controller.hpp"
+#include "response.hpp"
 #include "validator/validator.hpp"
 
-#include <ndn-cxx/common.hpp>
 #include <ndn-cxx/data.hpp>
 #include <ndn-cxx/interest.hpp>
-#include <ndn-cxx/name.hpp>
 #include <ndn-cxx/link.hpp>
+#include <ndn-cxx/name.hpp>
 #include <ndn-cxx/ims/in-memory-storage.hpp>
 
 namespace ndn {
diff --git a/src/daemon/db-mgr.hpp b/src/daemon/db-mgr.hpp
index ff0066e..8b83838 100644
--- a/src/daemon/db-mgr.hpp
+++ b/src/daemon/db-mgr.hpp
@@ -21,11 +21,10 @@
 #define NDNS_DAEMON_DB_MGR_HPP
 
 #include "config.hpp"
-#include "zone.hpp"
 #include "rrset.hpp"
+#include "zone.hpp"
 
 #include <map>
-#include <ndn-cxx/common.hpp>
 #include <sqlite3.h>
 
 namespace ndn {
diff --git a/src/mgmt/management-tool.hpp b/src/mgmt/management-tool.hpp
index a113ee9..64d2904 100644
--- a/src/mgmt/management-tool.hpp
+++ b/src/mgmt/management-tool.hpp
@@ -22,17 +22,17 @@
 
 #include "config.hpp"
 #include "ndns-enum.hpp"
-#include "./daemon/zone.hpp"
-#include "./daemon/db-mgr.hpp"
-#include "./daemon/rrset.hpp"
-#include "./daemon/rrset-factory.hpp"
-#include "./clients/response.hpp"
+#include "clients/response.hpp"
+#include "daemon/db-mgr.hpp"
+#include "daemon/rrset.hpp"
+#include "daemon/rrset-factory.hpp"
+#include "daemon/zone.hpp"
 
-#include <stdexcept>
-#include <ndn-cxx/common.hpp>
 #include <ndn-cxx/security/key-chain.hpp>
 #include <ndn-cxx/util/io.hpp>
 
+#include <stdexcept>
+
 namespace ndn {
 namespace ndns {