diff --git a/core/common.hpp b/core/common.hpp
index 96d34a7..aff3ab2 100644
--- a/core/common.hpp
+++ b/core/common.hpp
@@ -71,11 +71,8 @@
 #include <ndn-cxx/util/span.hpp>
 #include <ndn-cxx/util/time.hpp>
 
-#include <boost/asio.hpp>
 #include <boost/assert.hpp>
 #include <boost/core/noncopyable.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/property_tree/ptree.hpp>
 
 namespace nfd {
 
diff --git a/core/network.cpp b/core/network.cpp
index bfecec5..5e75b7f 100644
--- a/core/network.cpp
+++ b/core/network.cpp
@@ -25,9 +25,13 @@
 
 #include "network.hpp"
 
+#include <boost/lexical_cast.hpp>
 #include <boost/utility/value_init.hpp>
+
 #include <algorithm>
 #include <cctype>
+#include <istream>
+#include <ostream>
 
 namespace nfd {
 
diff --git a/core/network.hpp b/core/network.hpp
index cc6c2bb..f9fbe4f 100644
--- a/core/network.hpp
+++ b/core/network.hpp
@@ -26,7 +26,8 @@
 #ifndef NFD_CORE_NETWORK_HPP
 #define NFD_CORE_NETWORK_HPP
 
-#include "common.hpp"
+#include <boost/asio/ip/address.hpp>
+#include <string_view>
 
 namespace nfd {