diff --git a/daemon/table/cs-entry.hpp b/daemon/table/cs-entry.hpp
index ce3d538..33f7d64 100644
--- a/daemon/table/cs-entry.hpp
+++ b/daemon/table/cs-entry.hpp
@@ -24,8 +24,8 @@
  * \author Ilya Moiseenko <iliamo@ucla.edu>
  */
 
-#ifndef NFD_TABLE_CS_ENTRY_HPP
-#define NFD_TABLE_CS_ENTRY_HPP
+#ifndef NFD_DAEMON_TABLE_CS_ENTRY_HPP
+#define NFD_DAEMON_TABLE_CS_ENTRY_HPP
 
 #include "common.hpp"
 #include <ndn-cpp-dev/util/crypto.hpp>
@@ -166,4 +166,4 @@
 } // namespace cs
 } // namespace nfd
 
-#endif // NFD_TABLE_CS_ENTRY_HPP
+#endif // NFD_DAEMON_TABLE_CS_ENTRY_HPP
diff --git a/daemon/table/cs.hpp b/daemon/table/cs.hpp
index f52585b..5e3b79d 100644
--- a/daemon/table/cs.hpp
+++ b/daemon/table/cs.hpp
@@ -24,8 +24,8 @@
  * \author Ilya Moiseenko <iliamo@ucla.edu>
  */
 
-#ifndef NFD_TABLE_CS_HPP
-#define NFD_TABLE_CS_HPP
+#ifndef NFD_DAEMON_TABLE_CS_HPP
+#define NFD_DAEMON_TABLE_CS_HPP
 
 #include "common.hpp"
 #include "cs-entry.hpp"
@@ -224,4 +224,4 @@
 
 } // namespace nfd
 
-#endif // NFD_TABLE_CS_HPP
+#endif // NFD_DAEMON_TABLE_CS_HPP
diff --git a/daemon/table/fib-entry.hpp b/daemon/table/fib-entry.hpp
index e30f9d7..1d03426 100644
--- a/daemon/table/fib-entry.hpp
+++ b/daemon/table/fib-entry.hpp
@@ -22,8 +22,8 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef NFD_TABLE_FIB_ENTRY_HPP
-#define NFD_TABLE_FIB_ENTRY_HPP
+#ifndef NFD_DAEMON_TABLE_FIB_ENTRY_HPP
+#define NFD_DAEMON_TABLE_FIB_ENTRY_HPP
 
 #include "fib-nexthop.hpp"
 
@@ -111,4 +111,4 @@
 } // namespace fib
 } // namespace nfd
 
-#endif // NFD_TABLE_FIB_ENTRY_HPP
+#endif // NFD_DAEMON_TABLE_FIB_ENTRY_HPP
diff --git a/daemon/table/fib-nexthop.hpp b/daemon/table/fib-nexthop.hpp
index abf5082..691cf6b 100644
--- a/daemon/table/fib-nexthop.hpp
+++ b/daemon/table/fib-nexthop.hpp
@@ -22,8 +22,8 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef NFD_TABLE_FIB_NEXTHOP_HPP
-#define NFD_TABLE_FIB_NEXTHOP_HPP
+#ifndef NFD_DAEMON_TABLE_FIB_NEXTHOP_HPP
+#define NFD_DAEMON_TABLE_FIB_NEXTHOP_HPP
 
 #include "common.hpp"
 #include "face/face.hpp"
@@ -59,4 +59,4 @@
 } // namespace fib
 } // namespace nfd
 
-#endif // NFD_TABLE_FIB_NEXTHOP_HPP
+#endif // NFD_DAEMON_TABLE_FIB_NEXTHOP_HPP
diff --git a/daemon/table/fib.hpp b/daemon/table/fib.hpp
index f7ae4d5..e5aaf15 100644
--- a/daemon/table/fib.hpp
+++ b/daemon/table/fib.hpp
@@ -22,8 +22,8 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef NFD_TABLE_FIB_HPP
-#define NFD_TABLE_FIB_HPP
+#ifndef NFD_DAEMON_TABLE_FIB_HPP
+#define NFD_DAEMON_TABLE_FIB_HPP
 
 #include "fib-entry.hpp"
 #include "name-tree.hpp"
@@ -206,4 +206,4 @@
 
 } // namespace nfd
 
-#endif // NFD_TABLE_FIB_HPP
+#endif // NFD_DAEMON_TABLE_FIB_HPP
diff --git a/daemon/table/measurements-accessor.hpp b/daemon/table/measurements-accessor.hpp
index c7bfb33..2db0ccb 100644
--- a/daemon/table/measurements-accessor.hpp
+++ b/daemon/table/measurements-accessor.hpp
@@ -22,8 +22,8 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef NFD_TABLE_MEASUREMENTS_ACCESSOR_HPP
-#define NFD_TABLE_MEASUREMENTS_ACCESSOR_HPP
+#ifndef NFD_DAEMON_TABLE_MEASUREMENTS_ACCESSOR_HPP
+#define NFD_DAEMON_TABLE_MEASUREMENTS_ACCESSOR_HPP
 
 #include "measurements.hpp"
 #include "strategy-choice.hpp"
@@ -116,4 +116,4 @@
 
 } // namespace nfd
 
-#endif // NFD_TABLE_MEASUREMENTS_ACCESSOR_HPP
+#endif // NFD_DAEMON_TABLE_MEASUREMENTS_ACCESSOR_HPP
diff --git a/daemon/table/measurements-entry.hpp b/daemon/table/measurements-entry.hpp
index 9720cb2..6593ee9 100644
--- a/daemon/table/measurements-entry.hpp
+++ b/daemon/table/measurements-entry.hpp
@@ -22,8 +22,8 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef NFD_TABLE_MEASUREMENTS_ENTRY_HPP
-#define NFD_TABLE_MEASUREMENTS_ENTRY_HPP
+#ifndef NFD_DAEMON_TABLE_MEASUREMENTS_ENTRY_HPP
+#define NFD_DAEMON_TABLE_MEASUREMENTS_ENTRY_HPP
 
 #include "common.hpp"
 #include "strategy-info-host.hpp"
@@ -75,4 +75,4 @@
 } // namespace measurements
 } // namespace nfd
 
-#endif // NFD_TABLE_MEASUREMENTS_ENTRY_HPP
+#endif // NFD_DAEMON_TABLE_MEASUREMENTS_ENTRY_HPP
diff --git a/daemon/table/measurements.hpp b/daemon/table/measurements.hpp
index 1b9f382..4936d28 100644
--- a/daemon/table/measurements.hpp
+++ b/daemon/table/measurements.hpp
@@ -22,8 +22,8 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef NFD_TABLE_MEASUREMENTS_HPP
-#define NFD_TABLE_MEASUREMENTS_HPP
+#ifndef NFD_DAEMON_TABLE_MEASUREMENTS_HPP
+#define NFD_DAEMON_TABLE_MEASUREMENTS_HPP
 
 #include "measurements-entry.hpp"
 #include "name-tree.hpp"
@@ -108,4 +108,4 @@
 
 } // namespace nfd
 
-#endif // NFD_TABLE_MEASUREMENTS_HPP
+#endif // NFD_DAEMON_TABLE_MEASUREMENTS_HPP
diff --git a/daemon/table/name-tree-entry.hpp b/daemon/table/name-tree-entry.hpp
index ab2e307..48c9af7 100644
--- a/daemon/table/name-tree-entry.hpp
+++ b/daemon/table/name-tree-entry.hpp
@@ -24,8 +24,8 @@
 
 // Name Tree Entry (i.e., Name Prefix Entry)
 
-#ifndef NFD_TABLE_NAME_TREE_ENTRY_HPP
-#define NFD_TABLE_NAME_TREE_ENTRY_HPP
+#ifndef NFD_DAEMON_TABLE_NAME_TREE_ENTRY_HPP
+#define NFD_DAEMON_TABLE_NAME_TREE_ENTRY_HPP
 
 #include "common.hpp"
 #include "table/fib-entry.hpp"
@@ -287,4 +287,4 @@
 } // namespace name_tree
 } // namespace nfd
 
-#endif // NFD_TABLE_NAME_TREE_ENTRY_HPP
+#endif // NFD_DAEMON_TABLE_NAME_TREE_ENTRY_HPP
diff --git a/daemon/table/name-tree.hpp b/daemon/table/name-tree.hpp
index 4048137..2f404bf 100644
--- a/daemon/table/name-tree.hpp
+++ b/daemon/table/name-tree.hpp
@@ -24,8 +24,8 @@
 
 // Name Tree (Name Prefix Hash Table)
 
-#ifndef NFD_TABLE_NAME_TREE_HPP
-#define NFD_TABLE_NAME_TREE_HPP
+#ifndef NFD_DAEMON_TABLE_NAME_TREE_HPP
+#define NFD_DAEMON_TABLE_NAME_TREE_HPP
 
 #include "common.hpp"
 #include "name-tree-entry.hpp"
@@ -372,4 +372,4 @@
 
 } // namespace nfd
 
-#endif // NFD_TABLE_NAME_TREE_HPP
+#endif // NFD_DAEMON_TABLE_NAME_TREE_HPP
diff --git a/daemon/table/pit-entry.hpp b/daemon/table/pit-entry.hpp
index e281bc7..c419f78 100644
--- a/daemon/table/pit-entry.hpp
+++ b/daemon/table/pit-entry.hpp
@@ -22,8 +22,8 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef NFD_TABLE_PIT_ENTRY_HPP
-#define NFD_TABLE_PIT_ENTRY_HPP
+#ifndef NFD_DAEMON_TABLE_PIT_ENTRY_HPP
+#define NFD_DAEMON_TABLE_PIT_ENTRY_HPP
 
 #include "pit-in-record.hpp"
 #include "pit-out-record.hpp"
@@ -165,4 +165,4 @@
 } // namespace pit
 } // namespace nfd
 
-#endif // NFD_TABLE_PIT_ENTRY_HPP
+#endif // NFD_DAEMON_TABLE_PIT_ENTRY_HPP
diff --git a/daemon/table/pit-face-record.hpp b/daemon/table/pit-face-record.hpp
index 713b801..a4cea26 100644
--- a/daemon/table/pit-face-record.hpp
+++ b/daemon/table/pit-face-record.hpp
@@ -22,8 +22,8 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef NFD_TABLE_PIT_FACE_RECORD_HPP
-#define NFD_TABLE_PIT_FACE_RECORD_HPP
+#ifndef NFD_DAEMON_TABLE_PIT_FACE_RECORD_HPP
+#define NFD_DAEMON_TABLE_PIT_FACE_RECORD_HPP
 
 #include "face/face.hpp"
 #include "strategy-info-host.hpp"
@@ -98,4 +98,4 @@
 } // namespace pit
 } // namespace nfd
 
-#endif // NFD_TABLE_PIT_FACE_RECORD_HPP
+#endif // NFD_DAEMON_TABLE_PIT_FACE_RECORD_HPP
diff --git a/daemon/table/pit-in-record.hpp b/daemon/table/pit-in-record.hpp
index 58738aa..95b90ba 100644
--- a/daemon/table/pit-in-record.hpp
+++ b/daemon/table/pit-in-record.hpp
@@ -22,8 +22,8 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef NFD_TABLE_PIT_IN_RECORD_HPP
-#define NFD_TABLE_PIT_IN_RECORD_HPP
+#ifndef NFD_DAEMON_TABLE_PIT_IN_RECORD_HPP
+#define NFD_DAEMON_TABLE_PIT_IN_RECORD_HPP
 
 #include "pit-face-record.hpp"
 
@@ -61,4 +61,4 @@
 } // namespace pit
 } // namespace nfd
 
-#endif // NFD_TABLE_PIT_IN_RECORD_HPP
+#endif // NFD_DAEMON_TABLE_PIT_IN_RECORD_HPP
diff --git a/daemon/table/pit-out-record.hpp b/daemon/table/pit-out-record.hpp
index 8df3b72..9b954e6 100644
--- a/daemon/table/pit-out-record.hpp
+++ b/daemon/table/pit-out-record.hpp
@@ -22,8 +22,8 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef NFD_TABLE_PIT_OUT_RECORD_HPP
-#define NFD_TABLE_PIT_OUT_RECORD_HPP
+#ifndef NFD_DAEMON_TABLE_PIT_OUT_RECORD_HPP
+#define NFD_DAEMON_TABLE_PIT_OUT_RECORD_HPP
 
 #include "pit-face-record.hpp"
 
@@ -45,4 +45,4 @@
 } // namespace pit
 } // namespace nfd
 
-#endif // NFD_TABLE_PIT_IN_RECORD_HPP
+#endif // NFD_DAEMON_TABLE_PIT_IN_RECORD_HPP
diff --git a/daemon/table/pit.hpp b/daemon/table/pit.hpp
index 808c6a8..48a267b 100644
--- a/daemon/table/pit.hpp
+++ b/daemon/table/pit.hpp
@@ -22,8 +22,8 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef NFD_TABLE_PIT_HPP
-#define NFD_TABLE_PIT_HPP
+#ifndef NFD_DAEMON_TABLE_PIT_HPP
+#define NFD_DAEMON_TABLE_PIT_HPP
 
 #include "name-tree.hpp"
 #include "pit-entry.hpp"
@@ -90,4 +90,4 @@
 
 } // namespace nfd
 
-#endif // NFD_TABLE_PIT_HPP
+#endif // NFD_DAEMON_TABLE_PIT_HPP
diff --git a/daemon/table/strategy-choice-entry.hpp b/daemon/table/strategy-choice-entry.hpp
index b256163..4fe904e 100644
--- a/daemon/table/strategy-choice-entry.hpp
+++ b/daemon/table/strategy-choice-entry.hpp
@@ -22,8 +22,8 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef NFD_TABLE_STRATEGY_CHOICE_ENTRY_HPP
-#define NFD_TABLE_STRATEGY_CHOICE_ENTRY_HPP
+#ifndef NFD_DAEMON_TABLE_STRATEGY_CHOICE_ENTRY_HPP
+#define NFD_DAEMON_TABLE_STRATEGY_CHOICE_ENTRY_HPP
 
 #include "common.hpp"
 
@@ -81,4 +81,4 @@
 } // namespace strategy_choice
 } // namespace nfd
 
-#endif // NFD_TABLE_STRATEGY_CHOICE_ENTRY_HPP
+#endif // NFD_DAEMON_TABLE_STRATEGY_CHOICE_ENTRY_HPP
diff --git a/daemon/table/strategy-choice.hpp b/daemon/table/strategy-choice.hpp
index 3df32aa..8ffe4d6 100644
--- a/daemon/table/strategy-choice.hpp
+++ b/daemon/table/strategy-choice.hpp
@@ -22,8 +22,8 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef NFD_TABLE_STRATEGY_CHOICE_HPP
-#define NFD_TABLE_STRATEGY_CHOICE_HPP
+#ifndef NFD_DAEMON_TABLE_STRATEGY_CHOICE_HPP
+#define NFD_DAEMON_TABLE_STRATEGY_CHOICE_HPP
 
 #include "strategy-choice-entry.hpp"
 #include "name-tree.hpp"
@@ -116,4 +116,4 @@
 
 } // namespace nfd
 
-#endif // NFD_TABLE_STRATEGY_CHOICE_HPP
+#endif // NFD_DAEMON_TABLE_STRATEGY_CHOICE_HPP
diff --git a/daemon/table/strategy-info-host.hpp b/daemon/table/strategy-info-host.hpp
index ec5b133..dfe9341 100644
--- a/daemon/table/strategy-info-host.hpp
+++ b/daemon/table/strategy-info-host.hpp
@@ -22,8 +22,8 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef NFD_TABLE_STRATEGY_INFO_HOST_HPP
-#define NFD_TABLE_STRATEGY_INFO_HOST_HPP
+#ifndef NFD_DAEMON_TABLE_STRATEGY_INFO_HOST_HPP
+#define NFD_DAEMON_TABLE_STRATEGY_INFO_HOST_HPP
 
 #include "fw/strategy-info.hpp"
 
@@ -99,4 +99,4 @@
 
 } // namespace nfd
 
-#endif // NFD_TABLE_STRATEGY_INFO_HOST_HPP
+#endif // NFD_DAEMON_TABLE_STRATEGY_INFO_HOST_HPP