diff --git a/nsync/openssl.h b/nsync/openssl.h
index a8707a9..6b6798c 100644
--- a/nsync/openssl.h
+++ b/nsync/openssl.h
@@ -1,5 +1,5 @@
-#ifndef NSYNC_OPENSSL_H
-#define NSYNC_OPENSSL_H
+#ifndef NLSR_NSYNC_OPENSSL_H
+#define NLSR_NSYNC_OPENSSL_H
 
 // suppress deprecation warnings in OSX >= 10.7
 
@@ -18,4 +18,4 @@
 
 #include <openssl/evp.h>
 
-#endif // NSYNC_OPENSSL_H
+#endif // NLSR_NSYNC_OPENSSL_H
diff --git a/nsync/sync-common.h b/nsync/sync-common.h
index f20956c..41eaeab 100644
--- a/nsync/sync-common.h
+++ b/nsync/sync-common.h
@@ -19,8 +19,8 @@
  *
  **/
 
-#ifndef NSYNC_SYNC_COMMON_HPP
-#define NSYNC_SYNC_COMMON_HPP
+#ifndef NLSR_NSYNC_SYNC_COMMON_H
+#define NLSR_NSYNC_SYNC_COMMON_H
 
 #include <boost/exception/all.hpp>
 
@@ -46,4 +46,4 @@
 
 } // namespace Sync
 
-#endif // NSYNC_SYNC_COMMON_HPP
+#endif // NLSR_NSYNC_SYNC_COMMON_H
diff --git a/nsync/sync-diff-leaf.h b/nsync/sync-diff-leaf.h
index 598a83e..eb16209 100644
--- a/nsync/sync-diff-leaf.h
+++ b/nsync/sync-diff-leaf.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_DIFF_LEAF_H
-#define SYNC_DIFF_LEAF_H
+#ifndef NLSR_NSYNC_SYNC_DIFF_LEAF_H
+#define NLSR_NSYNC_SYNC_DIFF_LEAF_H
 
 #include "sync-leaf.h"
 #include <boost/exception/all.hpp>
@@ -88,4 +88,4 @@
 
 } // Sync
 
-#endif // SYNC_DIFF_LEAF_H
+#endif // NLSR_NSYNC_SYNC_DIFF_LEAF_H
diff --git a/nsync/sync-diff-state-container.h b/nsync/sync-diff-state-container.h
index 9cbec2b..f85ff1c 100644
--- a/nsync/sync-diff-state-container.h
+++ b/nsync/sync-diff-state-container.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_DIFF_STATE_CONTAINER_H
-#define SYNC_DIFF_STATE_CONTAINER_H
+#ifndef NLSR_NSYNC_SYNC_DIFF_STATE_CONTAINER_H
+#define NLSR_NSYNC_SYNC_DIFF_STATE_CONTAINER_H
 
 #include "sync-diff-state.h"
 #include "sync-digest.h"
@@ -69,4 +69,4 @@
 
 } // Sync
 
-#endif // SYNC_DIFF_STATE_CONTAINER_H
+#endif // NLSR_NSYNC_SYNC_DIFF_STATE_CONTAINER_H
diff --git a/nsync/sync-diff-state.h b/nsync/sync-diff-state.h
index fd80809..9f5f6b1 100644
--- a/nsync/sync-diff-state.h
+++ b/nsync/sync-diff-state.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_DIFF_STATE_H
-#define SYNC_DIFF_STATE_H
+#ifndef NLSR_NSYNC_SYNC_DIFF_STATE_H
+#define NLSR_NSYNC_SYNC_DIFF_STATE_H
 
 #include "sync-state.h"
 #include <iostream>
@@ -99,4 +99,4 @@
 
 } // Sync
 
-#endif // SYNC_DIFF_STATE_H
+#endif // NLSR_NSYNC_SYNC_DIFF_STATE_H
diff --git a/nsync/sync-digest.h b/nsync/sync-digest.h
index b7dbe41..b376f88 100644
--- a/nsync/sync-digest.h
+++ b/nsync/sync-digest.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_DIGEST_H
-#define SYNC_DIGEST_H
+#ifndef NLSR_NSYNC_SYNC_DIGEST_H
+#define NLSR_NSYNC_SYNC_DIGEST_H
 
 #include "sync-common.h"
 
@@ -196,4 +196,4 @@
 
 } // Sync
 
-#endif // SYNC_DIGEST_H
+#endif // NLSR_NSYNC_SYNC_DIGEST_H
diff --git a/nsync/sync-event.h b/nsync/sync-event.h
index 083ca61..a847431 100644
--- a/nsync/sync-event.h
+++ b/nsync/sync-event.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_EVENT_H
-#define SYNC_EVENT_H
+#ifndef NLSR_NSYNC_SYNC_EVENT_H
+#define NLSR_NSYNC_SYNC_EVENT_H
 
 #include "sync-common.h"
 
@@ -32,4 +32,4 @@
 
 } // Sync
 
-#endif // SYNC_EVENT_H
+#endif // NLSR_NSYNC_SYNC_EVENT_H
diff --git a/nsync/sync-full-leaf.h b/nsync/sync-full-leaf.h
index 5946c0d..b1f5ef4 100644
--- a/nsync/sync-full-leaf.h
+++ b/nsync/sync-full-leaf.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_FULL_LEAF_H
-#define SYNC_FULL_LEAF_H
+#ifndef NLSR_NSYNC_SYNC_FULL_LEAF_H
+#define NLSR_NSYNC_SYNC_FULL_LEAF_H
 
 #include "sync-leaf.h"
 
@@ -68,4 +68,4 @@
 
 } // Sync
 
-#endif // SYNC_FULL_LEAF_H
+#endif // NLSR_NSYNC_SYNC_FULL_LEAF_H
diff --git a/nsync/sync-full-state.h b/nsync/sync-full-state.h
index 0905004..34ed139 100644
--- a/nsync/sync-full-state.h
+++ b/nsync/sync-full-state.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_FULL_STATE_H
-#define SYNC_FULL_STATE_H
+#ifndef NLSR_NSYNC_SYNC_FULL_STATE_H
+#define NLSR_NSYNC_SYNC_FULL_STATE_H
 
 #include <ndn-cxx/util/time.hpp>
 #include "sync-state.h"
@@ -76,4 +76,4 @@
 
 } // Sync
 
-#endif // SYNC_STATE_H
+#endif // NLSR_NSYNC_SYNC_FULL_STATE_H
diff --git a/nsync/sync-interest-container.h b/nsync/sync-interest-container.h
index 96086fa..d0b88c8 100644
--- a/nsync/sync-interest-container.h
+++ b/nsync/sync-interest-container.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_INTEREST_CONTAINER_H
-#define SYNC_INTEREST_CONTAINER_H
+#ifndef NLSR_NSYNC_SYNC_INTEREST_CONTAINER_H
+#define NLSR_NSYNC_SYNC_INTEREST_CONTAINER_H
 
 #include <ndn-cxx/util/time.hpp>
 
@@ -96,4 +96,4 @@
 
 } // Sync
 
-#endif // SYNC_INTEREST_CONTAINER_H
+#endif // NLSR_NSYNC_SYNC_INTEREST_CONTAINER_H
diff --git a/nsync/sync-interest-table.h b/nsync/sync-interest-table.h
index 13ea3bc..899ddbd 100644
--- a/nsync/sync-interest-table.h
+++ b/nsync/sync-interest-table.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_INTEREST_TABLE_H
-#define SYNC_INTEREST_TABLE_H
+#ifndef NLSR_NSYNC_SYNC_INTEREST_TABLE_H
+#define NLSR_NSYNC_SYNC_INTEREST_TABLE_H
 
 #include <ndn-cxx/util/scheduler.hpp>
 
@@ -93,4 +93,4 @@
 
 } // Sync
 
-#endif // SYNC_INTEREST_TABLE_H
+#endif // NLSR_NSYNC_SYNC_INTEREST_TABLE_H
diff --git a/nsync/sync-leaf.h b/nsync/sync-leaf.h
index aae1e80..1227c98 100644
--- a/nsync/sync-leaf.h
+++ b/nsync/sync-leaf.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_LEAF_H
-#define SYNC_LEAF_H
+#ifndef NLSR_NSYNC_SYNC_LEAF_H
+#define NLSR_NSYNC_SYNC_LEAF_H
 
 #include "sync-seq-no.h"
 #include "sync-name-info.h"
@@ -81,4 +81,4 @@
 
 } // Sync
 
-#endif // SYNC_LEAF_H
+#endif // NLSR_NSYNC_SYNC_LEAF_H
diff --git a/nsync/sync-logging.h b/nsync/sync-logging.h
index fce13c2..88a4ea0 100644
--- a/nsync/sync-logging.h
+++ b/nsync/sync-logging.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_LOG_H
-#define SYNC_LOG_H
+#ifndef NLSR_NSYNC_SYNC_LOGGING_H
+#define NLSR_NSYNC_SYNC_LOGGING_H
 
 #ifdef HAVE_LOG4CXX
 
@@ -71,4 +71,4 @@
 
 #endif // HAVE_LOG4CXX
 
-#endif // SYNC_LOG_H
+#endif // NLSR_NSYNC_SYNC_LOGGING_H
diff --git a/nsync/sync-logic-event-container.h b/nsync/sync-logic-event-container.h
index 11dd29a..fbf5129 100644
--- a/nsync/sync-logic-event-container.h
+++ b/nsync/sync-logic-event-container.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_LOGIC_EVENT_CONTAINER_H
-#define SYNC_LOGIC_EVENT_CONTAINER_H
+#ifndef NLSR_NSYNC_SYNC_LOGIC_EVENT_CONTAINER_H
+#define NLSR_NSYNC_SYNC_LOGIC_EVENT_CONTAINER_H
 
 #include "sync-event.h"
 
@@ -81,4 +81,4 @@
 
 } // Sync
 
-#endif // SYNC_LOGIC_EVENT_CONTAINER_H
+#endif // NLSR_NSYNC_SYNC_LOGIC_EVENT_CONTAINER_H
diff --git a/nsync/sync-logic.h b/nsync/sync-logic.h
index 6ac330b..17d98ee 100644
--- a/nsync/sync-logic.h
+++ b/nsync/sync-logic.h
@@ -21,8 +21,8 @@
  *         Yingdi Yu <yingdi@cs.ucla.edu>
  */
 
-#ifndef SYNC_LOGIC_H
-#define SYNC_LOGIC_H
+#ifndef NLSR_NSYNC_SYNC_LOGIC_H
+#define NLSR_NSYNC_SYNC_LOGIC_H
 
 #include <boost/random.hpp>
 #include <memory>
@@ -220,4 +220,4 @@
 
 } // Sync
 
-#endif // SYNC_APP_WRAPPER_H
+#endif // NLSR_NSYNC_SYNC_LOGIC_H
diff --git a/nsync/sync-name-info.h b/nsync/sync-name-info.h
index 0fa0b86..f4d94da 100644
--- a/nsync/sync-name-info.h
+++ b/nsync/sync-name-info.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_NAME_INFO_H
-#define SYNC_NAME_INFO_H
+#ifndef NLSR_NSYNC_SYNC_NAME_INFO_H
+#define NLSR_NSYNC_SYNC_NAME_INFO_H
 
 #include "sync-common.h"
 
@@ -99,4 +99,4 @@
 
 } // Sync
 
-#endif // SYNC_NAME_INFO_H
+#endif // NLSR_NSYNC_SYNC_NAME_INFO_H
diff --git a/nsync/sync-seq-no.h b/nsync/sync-seq-no.h
index 81955e2..b6de991 100644
--- a/nsync/sync-seq-no.h
+++ b/nsync/sync-seq-no.h
@@ -21,8 +21,8 @@
  *         Yingdi Yu <yingdi@cs.ucla.edu>
  */
 
-#ifndef SYNC_SEQ_NO_H
-#define SYNC_SEQ_NO_H
+#ifndef NLSR_NSYNC_SYNC_SEQ_NO_H
+#define NLSR_NSYNC_SYNC_SEQ_NO_H
 
 #include <boost/cstdint.hpp>
 #include "sync-digest.h"
@@ -195,4 +195,4 @@
 
 } // Sync
 
-#endif // SYNC_SEQ_NO_H
+#endif // NLSR_NSYNC_SYNC_SEQ_NO_H
diff --git a/nsync/sync-socket.h b/nsync/sync-socket.h
index 35b59c3..e6ca55e 100644
--- a/nsync/sync-socket.h
+++ b/nsync/sync-socket.h
@@ -18,8 +18,8 @@
  * Author: Yingdi Yu <yingdi@cs.ucla.edu>
  */
 
-#ifndef _SYNC_SOCKET_H
-#define _SYNC_SOCKET_H
+#ifndef NLSR_NSYNC_SYNC_SOCKET_H
+#define NLSR_NSYNC_SYNC_SOCKET_H
 
 #include "sync-common.h"
 
@@ -131,4 +131,4 @@
 
 } // Sync
 
-#endif // SYNC_SOCKET_H
+#endif // NLSR_NSYNC_SYNC_SOCKET_H
diff --git a/nsync/sync-state-leaf-container.h b/nsync/sync-state-leaf-container.h
index d14e635..9f0c272 100644
--- a/nsync/sync-state-leaf-container.h
+++ b/nsync/sync-state-leaf-container.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_STATE_LEAF_CONTAINER
-#define SYNC_STATE_LEAF_CONTAINER
+#ifndef NLSR_NSYNC_SYNC_STATE_LEAF_CONTAINER_H
+#define NLSR_NSYNC_SYNC_STATE_LEAF_CONTAINER_H
 
 #include "sync-leaf.h"
 #include "sync-name-info.h"
@@ -98,4 +98,4 @@
 
 } // Sync
 
-#endif // SYNC_STATE_LEAF_CONTAINER
+#endif // NLSR_NSYNC_SYNC_STATE_LEAF_CONTAINER_H
diff --git a/nsync/sync-state.h b/nsync/sync-state.h
index 0e0e237..520150a 100644
--- a/nsync/sync-state.h
+++ b/nsync/sync-state.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_STATE_H
-#define SYNC_STATE_H
+#ifndef NLSR_NSYNC_SYNC_STATE_H
+#define NLSR_NSYNC_SYNC_STATE_H
 
 #include "sync-state-leaf-container.h"
 #include <boost/exception/all.hpp>
@@ -113,4 +113,4 @@
 
 } // Sync
 
-#endif // SYNC_STATE_H
+#endif // NLSR_NSYNC_SYNC_STATE_H
diff --git a/nsync/sync-std-name-info.h b/nsync/sync-std-name-info.h
index 2385074..3726645 100644
--- a/nsync/sync-std-name-info.h
+++ b/nsync/sync-std-name-info.h
@@ -20,8 +20,8 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_STD_NAME_INFO_H
-#define SYNC_STD_NAME_INFO_H
+#ifndef NLSR_NSYNC_SYNC_STD_NAME_INFO_H
+#define NLSR_NSYNC_SYNC_STD_NAME_INFO_H
 
 #include "sync-name-info.h"
 #include <string>
@@ -71,4 +71,4 @@
 
 } // Sync
 
-#endif // SYNC_CCNX_NAME_INFO_H
+#endif // NLSR_NSYNC_SYNC_STD_NAME_INFO_H
diff --git a/src/conf-file-processor.hpp b/src/conf-file-processor.hpp
index 1b99cea..2a32cee 100644
--- a/src/conf-file-processor.hpp
+++ b/src/conf-file-processor.hpp
@@ -21,8 +21,8 @@
  * \author Minsheng Zhang <mzhang4@memphis.edu>
  *
  **/
-#ifndef CONF_PROCESSOR_HPP
-#define CONF_PROCESSOR_HPP
+#ifndef NLSR_CONF_FILE_PROCESSOR_HPP
+#define NLSR_CONF_FILE_PROCESSOR_HPP
 
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/property_tree/ptree.hpp>
@@ -77,4 +77,4 @@
 };
 
 } // namespace nlsr
-#endif //CONF_PROCESSOR_HPP
+#endif // NLSR_CONF_FILE_PROCESSOR_HPP
diff --git a/src/conf-parameter.hpp b/src/conf-parameter.hpp
index 5718b12..0bee942 100644
--- a/src/conf-parameter.hpp
+++ b/src/conf-parameter.hpp
@@ -19,8 +19,8 @@
  * NLSR, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef CONF_PARAMETER_HPP
-#define CONF_PARAMETER_HPP
+#ifndef NLSR_CONF_PARAMETER_HPP
+#define NLSR_CONF_PARAMETER_HPP
 
 #include <iostream>
 #include <boost/cstdint.hpp>
@@ -447,4 +447,4 @@
 
 } // namespace nlsr
 
-#endif //CONF_PARAMETER_HPP
+#endif // NLSR_CONF_PARAMETER_HPP
diff --git a/src/update/prefix-update-commands.hpp b/src/update/prefix-update-commands.hpp
index 4b499d2..9cb2790 100644
--- a/src/update/prefix-update-commands.hpp
+++ b/src/update/prefix-update-commands.hpp
@@ -19,8 +19,8 @@
  * NLSR, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef UPDATE_PREFIX_UPDATE_COMMANDS_HPP
-#define UPDATE_PREFIX_UPDATE_COMMANDS_HPP
+#ifndef NLSR_UPDATE_PREFIX_UPDATE_COMMANDS_HPP
+#define NLSR_UPDATE_PREFIX_UPDATE_COMMANDS_HPP
 
 #include <ndn-cxx/mgmt/nfd/control-command.hpp>
 
@@ -42,4 +42,4 @@
 } // namespace update
 } // namespace nlsr
 
-#endif // UPDATE_PREFIX_UPDATE_COMMANDS_HPP
+#endif // NLSR_UPDATE_PREFIX_UPDATE_COMMANDS_HPP
diff --git a/src/update/prefix-update-processor.hpp b/src/update/prefix-update-processor.hpp
index b1347b8..4f08bc7 100644
--- a/src/update/prefix-update-processor.hpp
+++ b/src/update/prefix-update-processor.hpp
@@ -19,8 +19,8 @@
  * NLSR, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef UPDATE_PREFIX_UPDATE_PROCESSOR_HPP
-#define UPDATE_PREFIX_UPDATE_PROCESSOR_HPP
+#ifndef NLSR_UPDATE_PREFIX_UPDATE_PROCESSOR_HPP
+#define NLSR_UPDATE_PREFIX_UPDATE_PROCESSOR_HPP
 
 #include "name-prefix-list.hpp"
 #include "test-access-control.hpp"
@@ -149,4 +149,4 @@
 } // namespace update
 } // namespace nlsr
 
-#endif // UPDATE_PREFIX_UPDATE_PROCESSOR_HPP
+#endif // NLSR_UPDATE_PREFIX_UPDATE_PROCESSOR_HPP