diff --git a/tools/nfd-status/format-helpers.hpp b/tools/nfd-status/format-helpers.hpp
index 11d3d5a..f98d8f1 100644
--- a/tools/nfd-status/format-helpers.hpp
+++ b/tools/nfd-status/format-helpers.hpp
@@ -26,7 +26,7 @@
 #ifndef NFD_TOOLS_NFD_STATUS_FORMAT_HELPERS_HPP
 #define NFD_TOOLS_NFD_STATUS_FORMAT_HELPERS_HPP
 
-#include "common.hpp"
+#include "core/common.hpp"
 
 namespace nfd {
 namespace tools {
diff --git a/tools/nfd-status/main.cpp b/tools/nfd-status/main.cpp
index a3033a6..b43e4cc 100644
--- a/tools/nfd-status/main.cpp
+++ b/tools/nfd-status/main.cpp
@@ -23,7 +23,7 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "version.hpp"
+#include "core/version.hpp"
 #include <ndn-cxx/security/validator-null.hpp>
 
 #include <boost/program_options/options_description.hpp>
diff --git a/tools/nfd-status/module.hpp b/tools/nfd-status/module.hpp
index 07d5647..bf1b90c 100644
--- a/tools/nfd-status/module.hpp
+++ b/tools/nfd-status/module.hpp
@@ -26,7 +26,7 @@
 #ifndef NFD_TOOLS_NFD_STATUS_MODULE_HPP
 #define NFD_TOOLS_NFD_STATUS_MODULE_HPP
 
-#include "common.hpp"
+#include "core/common.hpp"
 #include <ndn-cxx/management/nfd-controller.hpp>
 
 namespace nfd {