diff --git a/tools/ndncert-ca-server.cpp b/tools/ndncert-ca-server.cpp
index 232c0d9..57493e9 100644
--- a/tools/ndncert-ca-server.cpp
+++ b/tools/ndncert-ca-server.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "ca-module.hpp"
-#include "challenge-module.hpp"
+#include "identity-challenge/challenge-module.hpp"
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/security/key-chain.hpp>
 #include <boost/asio.hpp>
diff --git a/tools/ndncert-ca-status.cpp b/tools/ndncert-ca-status.cpp
index 4b75cb9..bced16a 100644
--- a/tools/ndncert-ca-status.cpp
+++ b/tools/ndncert-ca-status.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "ca-module.hpp"
-#include "ca-storage-detail/ca-sqlite.hpp"
+#include "ca-storage/ca-sqlite.hpp"
 #include <iostream>
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
diff --git a/tools/ndncert-client.cpp b/tools/ndncert-client.cpp
index cecb978..b2f4d4e 100644
--- a/tools/ndncert-client.cpp
+++ b/tools/ndncert-client.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "challenge-module.hpp"
+#include "identity-challenge/challenge-module.hpp"
 #include "protocol-detail/info.hpp"
 #include "requester.hpp"
 #include <ndn-cxx/security/verification-helpers.hpp>