diff --git a/src/detail/ca-memory.hpp b/src/detail/ca-memory.hpp
index 63a3274..594875b 100644
--- a/src/detail/ca-memory.hpp
+++ b/src/detail/ca-memory.hpp
@@ -18,8 +18,8 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#ifndef NDNCERT_CA_DETAIL_CA_MEMORY_HPP
-#define NDNCERT_CA_DETAIL_CA_MEMORY_HPP
+#ifndef NDNCERT_DETAIL_CA_MEMORY_HPP
+#define NDNCERT_DETAIL_CA_MEMORY_HPP
 
 #include "detail/ca-storage.hpp"
 
@@ -64,4 +64,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#endif // NDNCERT_CA_DETAIL_CA_MEMORY_HPP
+#endif // NDNCERT_DETAIL_CA_MEMORY_HPP
diff --git a/src/detail/ca-sqlite.hpp b/src/detail/ca-sqlite.hpp
index 220fb21..a74395f 100644
--- a/src/detail/ca-sqlite.hpp
+++ b/src/detail/ca-sqlite.hpp
@@ -18,8 +18,8 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#ifndef NDNCERT_CA_DETAIL_CA_SQLITE_HPP
-#define NDNCERT_CA_DETAIL_CA_SQLITE_HPP
+#ifndef NDNCERT_DETAIL_CA_SQLITE_HPP
+#define NDNCERT_DETAIL_CA_SQLITE_HPP
 
 #include "detail/ca-storage.hpp"
 
@@ -70,4 +70,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#endif // NDNCERT_CA_DETAIL_CA_SQLITE_HPP
+#endif // NDNCERT_DETAIL_CA_SQLITE_HPP
diff --git a/src/detail/ca-state.hpp b/src/detail/ca-state.hpp
index 897d98d..cbf1442 100644
--- a/src/detail/ca-state.hpp
+++ b/src/detail/ca-state.hpp
@@ -18,8 +18,8 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#ifndef NDNCERT_CA_STATE_HPP
-#define NDNCERT_CA_STATE_HPP
+#ifndef NDNCERT_DETAIL_CA_STATE_HPP
+#define NDNCERT_DETAIL_CA_STATE_HPP
 
 #include "detail/ndncert-common.hpp"
 #include <array>
@@ -95,4 +95,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#endif // NDNCERT_CA_STATE_HPP
+#endif // NDNCERT_DETAIL_CA_STATE_HPP
diff --git a/src/detail/ca-storage.hpp b/src/detail/ca-storage.hpp
index b5c2ce7..7349300 100644
--- a/src/detail/ca-storage.hpp
+++ b/src/detail/ca-storage.hpp
@@ -18,8 +18,8 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#ifndef NDNCERT_CA_STORAGE_HPP
-#define NDNCERT_CA_STORAGE_HPP
+#ifndef NDNCERT_DETAIL_CA_STORAGE_HPP
+#define NDNCERT_DETAIL_CA_STORAGE_HPP
 
 #include "detail/ca-state.hpp"
 
@@ -92,4 +92,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#endif // NDNCERT_CA_STORAGE_HPP
+#endif // NDNCERT_DETAIL_CA_STORAGE_HPP
diff --git a/src/detail/challenge-encoder.hpp b/src/detail/challenge-encoder.hpp
index e714095..9ef19a9 100644
--- a/src/detail/challenge-encoder.hpp
+++ b/src/detail/challenge-encoder.hpp
@@ -18,8 +18,8 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#ifndef NDNCERT_PROTOCOL_DETAIL_CHALLENGE_STEP_HPP
-#define NDNCERT_PROTOCOL_DETAIL_CHALLENGE_STEP_HPP
+#ifndef NDNCERT_DETAIL_CHALLENGE_STEP_HPP
+#define NDNCERT_DETAIL_CHALLENGE_STEP_HPP
 
 #include "detail/ca-state.hpp"
 #include "requester-state.hpp"
@@ -40,4 +40,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#endif // NDNCERT_PROTOCOL_DETAIL_CHALLENGE_STEP_HPP
\ No newline at end of file
+#endif // NDNCERT_DETAIL_CHALLENGE_STEP_HPP
\ No newline at end of file
diff --git a/src/detail/error-encoder.hpp b/src/detail/error-encoder.hpp
index e8cdf82..6d60462 100644
--- a/src/detail/error-encoder.hpp
+++ b/src/detail/error-encoder.hpp
@@ -18,8 +18,8 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#ifndef NDNCERT_PROTOCOL_DETAIL_ERROR_ENCODER_HPP
-#define NDNCERT_PROTOCOL_DETAIL_ERROR_ENCODER_HPP
+#ifndef NDNCERT_DETAIL_ERROR_ENCODER_HPP
+#define NDNCERT_DETAIL_ERROR_ENCODER_HPP
 
 #include "configuration.hpp"
 
@@ -45,4 +45,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#endif // NDNCERT_PROTOCOL_DETAIL_ERROR_ENCODER_HPP
\ No newline at end of file
+#endif // NDNCERT_DETAIL_ERROR_ENCODER_HPP
\ No newline at end of file
diff --git a/src/detail/info-encoder.hpp b/src/detail/info-encoder.hpp
index e0cc536..93e4d97 100644
--- a/src/detail/info-encoder.hpp
+++ b/src/detail/info-encoder.hpp
@@ -18,8 +18,8 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#ifndef NDNCERT_PROTOCOL_DETAIL_INFO_ENCODER_HPP
-#define NDNCERT_PROTOCOL_DETAIL_INFO_ENCODER_HPP
+#ifndef NDNCERT_DETAIL_INFO_ENCODER_HPP
+#define NDNCERT_DETAIL_INFO_ENCODER_HPP
 
 #include "configuration.hpp"
 
@@ -45,4 +45,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#endif // NDNCERT_PROTOCOL_DETAIL_INFO_ENCODER_HPP
\ No newline at end of file
+#endif // NDNCERT_DETAIL_INFO_ENCODER_HPP
\ No newline at end of file
diff --git a/src/detail/new-renew-revoke-encoder.hpp b/src/detail/new-renew-revoke-encoder.hpp
index 80d5866..ce90c6f 100644
--- a/src/detail/new-renew-revoke-encoder.hpp
+++ b/src/detail/new-renew-revoke-encoder.hpp
@@ -18,8 +18,8 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#ifndef NDNCERT_PROTOCOL_DETAIL_NEW_RENEW_REVOKE_ENCODER_HPP
-#define NDNCERT_PROTOCOL_DETAIL_NEW_RENEW_REVOKE_ENCODER_HPP
+#ifndef NDNCERT_DETAIL_NEW_RENEW_REVOKE_ENCODER_HPP
+#define NDNCERT_DETAIL_NEW_RENEW_REVOKE_ENCODER_HPP
 
 #include "detail/ca-state.hpp"
 
@@ -51,4 +51,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#endif // NDNCERT_PROTOCOL_DETAIL_NEW_RENEW_REVOKE_HPP
\ No newline at end of file
+#endif // NDNCERT_DETAIL_NEW_RENEW_REVOKE_ENCODER_HPP
\ No newline at end of file
diff --git a/src/detail/probe-encoder.hpp b/src/detail/probe-encoder.hpp
index df8dfec..f75e892 100644
--- a/src/detail/probe-encoder.hpp
+++ b/src/detail/probe-encoder.hpp
@@ -18,8 +18,8 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#ifndef NDNCERT_PROTOCOL_DETAIL_PROBE_ENCODER_HPP
-#define NDNCERT_PROTOCOL_DETAIL_PROBE_ENCODER_HPP
+#ifndef NDNCERT_DETAIL_PROBE_ENCODER_HPP
+#define NDNCERT_DETAIL_PROBE_ENCODER_HPP
 
 #include "configuration.hpp"
 
@@ -50,4 +50,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#endif // NDNCERT_PROTOCOL_DETAIL_PROBE_ENCODER_HPP
\ No newline at end of file
+#endif // NDNCERT_DETAIL_PROBE_ENCODER_HPP
\ No newline at end of file