diff --git a/src/clients/iterative-query-controller.cpp b/src/clients/iterative-query-controller.cpp
index ab64adc..8b582a3 100644
--- a/src/clients/iterative-query-controller.cpp
+++ b/src/clients/iterative-query-controller.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "iterative-query-controller.hpp"
-#include "validator.hpp"
 #include "logger.hpp"
 #include <iostream>
 
diff --git a/src/clients/iterative-query-controller.hpp b/src/clients/iterative-query-controller.hpp
index 037284b..b1a0995 100644
--- a/src/clients/iterative-query-controller.hpp
+++ b/src/clients/iterative-query-controller.hpp
@@ -26,7 +26,7 @@
 #include "query-controller.hpp"
 #include "config.hpp"
 #include "common.hpp"
-#include "validator.hpp"
+#include "validator/validator.hpp"
 
 #include <ndn-cxx/common.hpp>
 #include <ndn-cxx/data.hpp>
diff --git a/src/daemon/name-server.hpp b/src/daemon/name-server.hpp
index d62cf79..d54a71b 100644
--- a/src/daemon/name-server.hpp
+++ b/src/daemon/name-server.hpp
@@ -25,7 +25,7 @@
 #include "db-mgr.hpp"
 #include "ndns-label.hpp"
 #include "ndns-tlv.hpp"
-#include "validator.hpp"
+#include "validator/validator.hpp"
 #include "common.hpp"
 
 #include <ndn-cxx/security/key-chain.hpp>
diff --git a/src/validator.cpp b/src/validator/validator.cpp
similarity index 100%
rename from src/validator.cpp
rename to src/validator/validator.cpp
diff --git a/src/validator.hpp b/src/validator/validator.hpp
similarity index 91%
rename from src/validator.hpp
rename to src/validator/validator.hpp
index d082c38..da1cba1 100644
--- a/src/validator.hpp
+++ b/src/validator/validator.hpp
@@ -17,8 +17,8 @@
  * NDNS, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NDNS_VALIDATOR_HPP
-#define NDNS_VALIDATOR_HPP
+#ifndef NDNS_VALIDATOR_VALIDATOR_HPP
+#define NDNS_VALIDATOR_VALIDATOR_HPP
 
 #include "config.hpp"
 
@@ -40,4 +40,4 @@
 } // namespace ndns
 } // namespace ndn
 
-#endif // NDNS_VALIDATOR_HPP
+#endif // NDNS_VALIDATOR_VALIDATOR_HPP