diff --git a/ndn-cxx/delegation-list.hpp b/ndn-cxx/delegation-list.hpp
index 0570426..9fa7700 100644
--- a/ndn-cxx/delegation-list.hpp
+++ b/ndn-cxx/delegation-list.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_DELEGATION_LIST_HPP
-#define NDN_DELEGATION_LIST_HPP
+#ifndef NDN_CXX_DELEGATION_LIST_HPP
+#define NDN_CXX_DELEGATION_LIST_HPP
 
 #include "ndn-cxx/delegation.hpp"
 
@@ -261,4 +261,4 @@
 
 } // namespace ndn
 
-#endif // NDN_DELEGATION_LIST_HPP
+#endif // NDN_CXX_DELEGATION_LIST_HPP
diff --git a/ndn-cxx/delegation.hpp b/ndn-cxx/delegation.hpp
index c9ac24d..6ceb68c 100644
--- a/ndn-cxx/delegation.hpp
+++ b/ndn-cxx/delegation.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_DELEGATION_HPP
-#define NDN_DELEGATION_HPP
+#ifndef NDN_CXX_DELEGATION_HPP
+#define NDN_CXX_DELEGATION_HPP
 
 #include "ndn-cxx/name.hpp"
 
@@ -86,4 +86,4 @@
 
 } // namespace ndn
 
-#endif // NDN_DELEGATION_HPP
+#endif // NDN_CXX_DELEGATION_HPP
diff --git a/ndn-cxx/detail/asio-fwd.hpp b/ndn-cxx/detail/asio-fwd.hpp
index 5789abd..b90d23b 100644
--- a/ndn-cxx/detail/asio-fwd.hpp
+++ b/ndn-cxx/detail/asio-fwd.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_DETAIL_ASIO_FWD_HPP
-#define NDN_DETAIL_ASIO_FWD_HPP
+#ifndef NDN_CXX_DETAIL_ASIO_FWD_HPP
+#define NDN_CXX_DETAIL_ASIO_FWD_HPP
 
 #include <boost/version.hpp>
 
@@ -37,4 +37,4 @@
 } // namespace asio
 } // namespace boost
 
-#endif // NDN_DETAIL_ASIO_FWD_HPP
+#endif // NDN_CXX_DETAIL_ASIO_FWD_HPP
diff --git a/ndn-cxx/detail/cancel-handle.hpp b/ndn-cxx/detail/cancel-handle.hpp
index 6415993..ed6629b 100644
--- a/ndn-cxx/detail/cancel-handle.hpp
+++ b/ndn-cxx/detail/cancel-handle.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_DETAIL_CANCEL_HANDLE_HPP
-#define NDN_DETAIL_CANCEL_HANDLE_HPP
+#ifndef NDN_CXX_DETAIL_CANCEL_HANDLE_HPP
+#define NDN_CXX_DETAIL_CANCEL_HANDLE_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -136,4 +136,4 @@
 } // namespace detail
 } // namespace ndn
 
-#endif // NDN_DETAIL_CANCEL_HANDLE_HPP
+#endif // NDN_CXX_DETAIL_CANCEL_HANDLE_HPP
diff --git a/ndn-cxx/detail/cf-releaser-osx.hpp b/ndn-cxx/detail/cf-releaser-osx.hpp
index fff58ab..156e7a4 100644
--- a/ndn-cxx/detail/cf-releaser-osx.hpp
+++ b/ndn-cxx/detail/cf-releaser-osx.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_DETAIL_CF_RELEASER_OSX_HPP
-#define NDN_DETAIL_CF_RELEASER_OSX_HPP
+#ifndef NDN_CXX_DETAIL_CF_RELEASER_OSX_HPP
+#define NDN_CXX_DETAIL_CF_RELEASER_OSX_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -148,4 +148,4 @@
 } // namespace detail
 } // namespace ndn
 
-#endif // NDN_DETAIL_CF_RELEASER_OSX_HPP
+#endif // NDN_CXX_DETAIL_CF_RELEASER_OSX_HPP
diff --git a/ndn-cxx/detail/cf-string-osx.hpp b/ndn-cxx/detail/cf-string-osx.hpp
index ddd79aa..6be2499 100644
--- a/ndn-cxx/detail/cf-string-osx.hpp
+++ b/ndn-cxx/detail/cf-string-osx.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_DETAIL_CF_STRING_OSX_HPP
-#define NDN_DETAIL_CF_STRING_OSX_HPP
+#ifndef NDN_CXX_DETAIL_CF_STRING_OSX_HPP
+#define NDN_CXX_DETAIL_CF_STRING_OSX_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -65,4 +65,4 @@
 } // namespace detail
 } // namespace ndn
 
-#endif // NDN_DETAIL_CF_STRING_OSX_HPP
+#endif // NDN_CXX_DETAIL_CF_STRING_OSX_HPP
diff --git a/ndn-cxx/detail/common.hpp b/ndn-cxx/detail/common.hpp
index 5118887..ace537b 100644
--- a/ndn-cxx/detail/common.hpp
+++ b/ndn-cxx/detail/common.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -25,8 +25,8 @@
  *           Aliases imported in this file MUST NOT be used outside of ndn-cxx.
  */
 
-#ifndef NDN_DETAIL_COMMON_HPP
-#define NDN_DETAIL_COMMON_HPP
+#ifndef NDN_CXX_DETAIL_COMMON_HPP
+#define NDN_CXX_DETAIL_COMMON_HPP
 
 #include "ndn-cxx/detail/config.hpp"
 
@@ -121,4 +121,4 @@
 #include "ndn-cxx/util/backports.hpp"
 #include "ndn-cxx/util/exception.hpp"
 
-#endif // NDN_DETAIL_COMMON_HPP
+#endif // NDN_CXX_DETAIL_COMMON_HPP
diff --git a/ndn-cxx/detail/packet-base.hpp b/ndn-cxx/detail/packet-base.hpp
index 8903fd7..43d836d 100644
--- a/ndn-cxx/detail/packet-base.hpp
+++ b/ndn-cxx/detail/packet-base.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_DETAIL_PACKET_BASE_HPP
-#define NDN_DETAIL_PACKET_BASE_HPP
+#ifndef NDN_CXX_DETAIL_PACKET_BASE_HPP
+#define NDN_CXX_DETAIL_PACKET_BASE_HPP
 
 #include "ndn-cxx/detail/tag-host.hpp"
 
@@ -44,4 +44,4 @@
 
 } // namespace ndn
 
-#endif // NDN_DETAIL_PACKET_BASE_HPP
+#endif // NDN_CXX_DETAIL_PACKET_BASE_HPP
diff --git a/ndn-cxx/detail/tag-host.hpp b/ndn-cxx/detail/tag-host.hpp
index 8fecc63..8d3039c 100644
--- a/ndn-cxx/detail/tag-host.hpp
+++ b/ndn-cxx/detail/tag-host.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_DETAIL_TAG_HOST_HPP
-#define NDN_DETAIL_TAG_HOST_HPP
+#ifndef NDN_CXX_DETAIL_TAG_HOST_HPP
+#define NDN_CXX_DETAIL_TAG_HOST_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 #include "ndn-cxx/tag.hpp"
@@ -97,4 +97,4 @@
 
 } // namespace ndn
 
-#endif // NDN_DETAIL_TAG_HOST_HPP
+#endif // NDN_CXX_DETAIL_TAG_HOST_HPP
diff --git a/ndn-cxx/encoding/block-helpers.hpp b/ndn-cxx/encoding/block-helpers.hpp
index fd29186..2986752 100644
--- a/ndn-cxx/encoding/block-helpers.hpp
+++ b/ndn-cxx/encoding/block-helpers.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_ENCODING_BLOCK_HELPERS_HPP
-#define NDN_ENCODING_BLOCK_HELPERS_HPP
+#ifndef NDN_CXX_ENCODING_BLOCK_HELPERS_HPP
+#define NDN_CXX_ENCODING_BLOCK_HELPERS_HPP
 
 #include "ndn-cxx/encoding/block.hpp"
 #include "ndn-cxx/encoding/encoding-buffer.hpp"
@@ -324,4 +324,4 @@
 
 } // namespace ndn
 
-#endif // NDN_ENCODING_BLOCK_HELPERS_HPP
+#endif // NDN_CXX_ENCODING_BLOCK_HELPERS_HPP
diff --git a/ndn-cxx/encoding/buffer-stream.hpp b/ndn-cxx/encoding/buffer-stream.hpp
index bd865c0..d31d6d2 100644
--- a/ndn-cxx/encoding/buffer-stream.hpp
+++ b/ndn-cxx/encoding/buffer-stream.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,8 +21,8 @@
  * @author Alexander Afanasyev <http://lasr.cs.ucla.edu/afanasyev/index.html>
  */
 
-#ifndef NDN_ENCODING_BUFFER_STREAM_HPP
-#define NDN_ENCODING_BUFFER_STREAM_HPP
+#ifndef NDN_CXX_ENCODING_BUFFER_STREAM_HPP
+#define NDN_CXX_ENCODING_BUFFER_STREAM_HPP
 
 #include "ndn-cxx/encoding/buffer.hpp"
 
@@ -87,4 +87,4 @@
 
 } // namespace ndn
 
-#endif // NDN_ENCODING_BUFFER_STREAM_HPP
+#endif // NDN_CXX_ENCODING_BUFFER_STREAM_HPP
diff --git a/ndn-cxx/encoding/buffer.hpp b/ndn-cxx/encoding/buffer.hpp
index 748bba7..591ff9b 100644
--- a/ndn-cxx/encoding/buffer.hpp
+++ b/ndn-cxx/encoding/buffer.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,8 +21,8 @@
  * @author Alexander Afanasyev <http://lasr.cs.ucla.edu/afanasyev/index.html>
  */
 
-#ifndef NDN_ENCODING_BUFFER_HPP
-#define NDN_ENCODING_BUFFER_HPP
+#ifndef NDN_CXX_ENCODING_BUFFER_HPP
+#define NDN_CXX_ENCODING_BUFFER_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -140,4 +140,4 @@
 
 } // namespace ndn
 
-#endif // NDN_ENCODING_BUFFER_HPP
+#endif // NDN_CXX_ENCODING_BUFFER_HPP
diff --git a/ndn-cxx/encoding/encoder.hpp b/ndn-cxx/encoding/encoder.hpp
index 773d87a..d875cbf 100644
--- a/ndn-cxx/encoding/encoder.hpp
+++ b/ndn-cxx/encoding/encoder.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_ENCODING_ENCODER_HPP
-#define NDN_ENCODING_ENCODER_HPP
+#ifndef NDN_CXX_ENCODING_ENCODER_HPP
+#define NDN_CXX_ENCODING_ENCODER_HPP
 
 #include "ndn-cxx/encoding/block.hpp"
 
@@ -340,4 +340,4 @@
 } // namespace encoding
 } // namespace ndn
 
-#endif // NDN_ENCODING_ENCODER_HPP
+#endif // NDN_CXX_ENCODING_ENCODER_HPP
diff --git a/ndn-cxx/encoding/encoding-buffer-fwd.hpp b/ndn-cxx/encoding/encoding-buffer-fwd.hpp
index 1222a5b..02f4016 100644
--- a/ndn-cxx/encoding/encoding-buffer-fwd.hpp
+++ b/ndn-cxx/encoding/encoding-buffer-fwd.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_ENCODING_ENCODING_BUFFER_FWD_HPP
-#define NDN_ENCODING_ENCODING_BUFFER_FWD_HPP
+#ifndef NDN_CXX_ENCODING_ENCODING_BUFFER_FWD_HPP
+#define NDN_CXX_ENCODING_ENCODING_BUFFER_FWD_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -58,4 +58,4 @@
   template size_t \
   ClassName::wireEncode<::ndn::encoding::EstimatorTag>(::ndn::EncodingEstimator&) const \
 
-#endif // NDN_ENCODING_ENCODING_BUFFER_FWD_HPP
+#endif // NDN_CXX_ENCODING_ENCODING_BUFFER_FWD_HPP
diff --git a/ndn-cxx/encoding/encoding-buffer.hpp b/ndn-cxx/encoding/encoding-buffer.hpp
index 60b334b..01471c6 100644
--- a/ndn-cxx/encoding/encoding-buffer.hpp
+++ b/ndn-cxx/encoding/encoding-buffer.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_ENCODING_ENCODING_BUFFER_HPP
-#define NDN_ENCODING_ENCODING_BUFFER_HPP
+#ifndef NDN_CXX_ENCODING_ENCODING_BUFFER_HPP
+#define NDN_CXX_ENCODING_ENCODING_BUFFER_HPP
 
 #include "ndn-cxx/encoding/encoding-buffer-fwd.hpp"
 #include "ndn-cxx/encoding/encoder.hpp"
@@ -65,4 +65,4 @@
 } // namespace encoding
 } // namespace ndn
 
-#endif // NDN_ENCODING_ENCODING_BUFFER_HPP
+#endif // NDN_CXX_ENCODING_ENCODING_BUFFER_HPP
diff --git a/ndn-cxx/encoding/estimator.hpp b/ndn-cxx/encoding/estimator.hpp
index c564cb0..b5b3654 100644
--- a/ndn-cxx/encoding/estimator.hpp
+++ b/ndn-cxx/encoding/estimator.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_ENCODING_ESTIMATOR_HPP
-#define NDN_ENCODING_ESTIMATOR_HPP
+#ifndef NDN_CXX_ENCODING_ESTIMATOR_HPP
+#define NDN_CXX_ENCODING_ESTIMATOR_HPP
 
 #include "ndn-cxx/encoding/block.hpp"
 
@@ -147,4 +147,4 @@
 } // namespace encoding
 } // namespace ndn
 
-#endif // NDN_ENCODING_ESTIMATOR_HPP
+#endif // NDN_CXX_ENCODING_ESTIMATOR_HPP
diff --git a/ndn-cxx/encoding/nfd-constants.hpp b/ndn-cxx/encoding/nfd-constants.hpp
index 3929ce5..72b70a4 100644
--- a/ndn-cxx/encoding/nfd-constants.hpp
+++ b/ndn-cxx/encoding/nfd-constants.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_ENCODING_NFD_CONSTANTS_HPP
-#define NDN_ENCODING_NFD_CONSTANTS_HPP
+#ifndef NDN_CXX_ENCODING_NFD_CONSTANTS_HPP
+#define NDN_CXX_ENCODING_NFD_CONSTANTS_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -132,4 +132,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_ENCODING_NFD_CONSTANTS_HPP
+#endif // NDN_CXX_ENCODING_NFD_CONSTANTS_HPP
diff --git a/ndn-cxx/encoding/tlv-nfd.hpp b/ndn-cxx/encoding/tlv-nfd.hpp
index 1c30ab4..0cf13b0 100644
--- a/ndn-cxx/encoding/tlv-nfd.hpp
+++ b/ndn-cxx/encoding/tlv-nfd.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_ENCODING_TLV_NFD_HPP
-#define NDN_ENCODING_TLV_NFD_HPP
+#ifndef NDN_CXX_ENCODING_TLV_NFD_HPP
+#define NDN_CXX_ENCODING_TLV_NFD_HPP
 
 #include "ndn-cxx/encoding/tlv.hpp"
 #include "ndn-cxx/encoding/nfd-constants.hpp"
@@ -107,4 +107,4 @@
 } // namespace tlv
 } // namespace ndn
 
-#endif // NDN_ENCODING_TLV_NFD_HPP
+#endif // NDN_CXX_ENCODING_TLV_NFD_HPP
diff --git a/ndn-cxx/encoding/tlv-security.hpp b/ndn-cxx/encoding/tlv-security.hpp
index 8b70a3e..c2f170d 100644
--- a/ndn-cxx/encoding/tlv-security.hpp
+++ b/ndn-cxx/encoding/tlv-security.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_ENCODING_TLV_SECURITY_HPP
-#define NDN_ENCODING_TLV_SECURITY_HPP
+#ifndef NDN_CXX_ENCODING_TLV_SECURITY_HPP
+#define NDN_CXX_ENCODING_TLV_SECURITY_HPP
 
 #include "ndn-cxx/encoding/tlv.hpp"
 
@@ -37,4 +37,4 @@
 } // namespace tlv
 } // namespace ndn
 
-#endif // NDN_ENCODING_TLV_SECURITY_HPP
+#endif // NDN_CXX_ENCODING_TLV_SECURITY_HPP
diff --git a/ndn-cxx/encoding/tlv.hpp b/ndn-cxx/encoding/tlv.hpp
index e1dffb2..cea4a23 100644
--- a/ndn-cxx/encoding/tlv.hpp
+++ b/ndn-cxx/encoding/tlv.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_ENCODING_TLV_HPP
-#define NDN_ENCODING_TLV_HPP
+#ifndef NDN_CXX_ENCODING_TLV_HPP
+#define NDN_CXX_ENCODING_TLV_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -536,4 +536,4 @@
 } // namespace tlv
 } // namespace ndn
 
-#endif // NDN_ENCODING_TLV_HPP
+#endif // NDN_CXX_ENCODING_TLV_HPP
diff --git a/ndn-cxx/face.hpp b/ndn-cxx/face.hpp
index 39d1d39..e073ba0 100644
--- a/ndn-cxx/face.hpp
+++ b/ndn-cxx/face.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_FACE_HPP
-#define NDN_FACE_HPP
+#ifndef NDN_CXX_FACE_HPP
+#define NDN_CXX_FACE_HPP
 
 #include "ndn-cxx/data.hpp"
 #include "ndn-cxx/interest.hpp"
@@ -593,4 +593,4 @@
 
 } // namespace ndn
 
-#endif // NDN_FACE_HPP
+#endif // NDN_CXX_FACE_HPP
diff --git a/ndn-cxx/impl/common-pch.hpp b/ndn-cxx/impl/common-pch.hpp
index 003989c..5e781c6 100644
--- a/ndn-cxx/impl/common-pch.hpp
+++ b/ndn-cxx/impl/common-pch.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_IMPL_COMMON_PCH_HPP
-#define NDN_IMPL_COMMON_PCH_HPP
+#ifndef NDN_CXX_IMPL_COMMON_PCH_HPP
+#define NDN_CXX_IMPL_COMMON_PCH_HPP
 
 // If the compiler supports precompiled headers, this header should be compiled
 // and included before anything else
@@ -54,4 +54,4 @@
 #include <boost/multi_index/sequenced_index.hpp>
 #include <boost/system/error_code.hpp>
 
-#endif // NDN_IMPL_COMMON_PCH_HPP
+#endif // NDN_CXX_IMPL_COMMON_PCH_HPP
diff --git a/ndn-cxx/impl/face-impl.hpp b/ndn-cxx/impl/face-impl.hpp
index 97736e8..cbfb76b 100644
--- a/ndn-cxx/impl/face-impl.hpp
+++ b/ndn-cxx/impl/face-impl.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_IMPL_FACE_IMPL_HPP
-#define NDN_IMPL_FACE_IMPL_HPP
+#ifndef NDN_CXX_IMPL_FACE_IMPL_HPP
+#define NDN_CXX_IMPL_FACE_IMPL_HPP
 
 #include "ndn-cxx/face.hpp"
 #include "ndn-cxx/impl/interest-filter-record.hpp"
@@ -422,4 +422,4 @@
 
 } // namespace ndn
 
-#endif // NDN_IMPL_FACE_IMPL_HPP
+#endif // NDN_CXX_IMPL_FACE_IMPL_HPP
diff --git a/ndn-cxx/impl/interest-filter-record.hpp b/ndn-cxx/impl/interest-filter-record.hpp
index 3dc40fe..6472b3d 100644
--- a/ndn-cxx/impl/interest-filter-record.hpp
+++ b/ndn-cxx/impl/interest-filter-record.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_IMPL_INTEREST_FILTER_RECORD_HPP
-#define NDN_IMPL_INTEREST_FILTER_RECORD_HPP
+#ifndef NDN_CXX_IMPL_INTEREST_FILTER_RECORD_HPP
+#define NDN_CXX_IMPL_INTEREST_FILTER_RECORD_HPP
 
 #include "ndn-cxx/impl/pending-interest.hpp"
 #include "ndn-cxx/impl/record-container.hpp"
@@ -81,4 +81,4 @@
 
 } // namespace ndn
 
-#endif // NDN_IMPL_INTEREST_FILTER_RECORD_HPP
+#endif // NDN_CXX_IMPL_INTEREST_FILTER_RECORD_HPP
diff --git a/ndn-cxx/impl/lp-field-tag.hpp b/ndn-cxx/impl/lp-field-tag.hpp
index b30e51a..dd522bf 100644
--- a/ndn-cxx/impl/lp-field-tag.hpp
+++ b/ndn-cxx/impl/lp-field-tag.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_IMPL_LP_FIELD_TAG_HPP
-#define NDN_IMPL_LP_FIELD_TAG_HPP
+#ifndef NDN_CXX_IMPL_LP_FIELD_TAG_HPP
+#define NDN_CXX_IMPL_LP_FIELD_TAG_HPP
 
 #include "ndn-cxx/lp/packet.hpp"
 #include "ndn-cxx/lp/tags.hpp"
@@ -48,4 +48,4 @@
 
 } // namespace ndn
 
-#endif // NDN_IMPL_LP_FIELD_TAG_HPP
+#endif // NDN_CXX_IMPL_LP_FIELD_TAG_HPP
diff --git a/ndn-cxx/impl/name-component-types.hpp b/ndn-cxx/impl/name-component-types.hpp
index a128716..29eed49 100644
--- a/ndn-cxx/impl/name-component-types.hpp
+++ b/ndn-cxx/impl/name-component-types.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_IMPL_NAME_COMPONENT_TYPES_HPP
-#define NDN_IMPL_NAME_COMPONENT_TYPES_HPP
+#ifndef NDN_CXX_IMPL_NAME_COMPONENT_TYPES_HPP
+#define NDN_CXX_IMPL_NAME_COMPONENT_TYPES_HPP
 
 #include "ndn-cxx/name-component.hpp"
 #include "ndn-cxx/util/sha256.hpp"
@@ -415,4 +415,4 @@
 } // namespace name
 } // namespace ndn
 
-#endif // NDN_IMPL_NAME_COMPONENT_TYPES_HPP
+#endif // NDN_CXX_IMPL_NAME_COMPONENT_TYPES_HPP
diff --git a/ndn-cxx/impl/pending-interest.hpp b/ndn-cxx/impl/pending-interest.hpp
index 7ace1dc..5e1340b 100644
--- a/ndn-cxx/impl/pending-interest.hpp
+++ b/ndn-cxx/impl/pending-interest.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_IMPL_PENDING_INTEREST_HPP
-#define NDN_IMPL_PENDING_INTEREST_HPP
+#ifndef NDN_CXX_IMPL_PENDING_INTEREST_HPP
+#define NDN_CXX_IMPL_PENDING_INTEREST_HPP
 
 #include "ndn-cxx/data.hpp"
 #include "ndn-cxx/face.hpp"
@@ -185,4 +185,4 @@
 
 } // namespace ndn
 
-#endif // NDN_IMPL_PENDING_INTEREST_HPP
+#endif // NDN_CXX_IMPL_PENDING_INTEREST_HPP
diff --git a/ndn-cxx/impl/record-container.hpp b/ndn-cxx/impl/record-container.hpp
index efbb8f5..e149b40 100644
--- a/ndn-cxx/impl/record-container.hpp
+++ b/ndn-cxx/impl/record-container.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_IMPL_RECORD_CONTAINER_HPP
-#define NDN_IMPL_RECORD_CONTAINER_HPP
+#ifndef NDN_CXX_IMPL_RECORD_CONTAINER_HPP
+#define NDN_CXX_IMPL_RECORD_CONTAINER_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 #include "ndn-cxx/util/signal.hpp"
@@ -198,4 +198,4 @@
 } // namespace detail
 } // namespace ndn
 
-#endif // NDN_IMPL_RECORD_CONTAINER_HPP
+#endif // NDN_CXX_IMPL_RECORD_CONTAINER_HPP
diff --git a/ndn-cxx/impl/registered-prefix.hpp b/ndn-cxx/impl/registered-prefix.hpp
index 37fe179..8274c84 100644
--- a/ndn-cxx/impl/registered-prefix.hpp
+++ b/ndn-cxx/impl/registered-prefix.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_IMPL_REGISTERED_PREFIX_HPP
-#define NDN_IMPL_REGISTERED_PREFIX_HPP
+#ifndef NDN_CXX_IMPL_REGISTERED_PREFIX_HPP
+#define NDN_CXX_IMPL_REGISTERED_PREFIX_HPP
 
 #include "ndn-cxx/impl/record-container.hpp"
 #include "ndn-cxx/mgmt/nfd/command-options.hpp"
@@ -67,4 +67,4 @@
 
 } // namespace ndn
 
-#endif // NDN_IMPL_REGISTERED_PREFIX_HPP
+#endif // NDN_CXX_IMPL_REGISTERED_PREFIX_HPP
diff --git a/ndn-cxx/ims/in-memory-storage-entry.hpp b/ndn-cxx/ims/in-memory-storage-entry.hpp
index b257709..b412a30 100644
--- a/ndn-cxx/ims/in-memory-storage-entry.hpp
+++ b/ndn-cxx/ims/in-memory-storage-entry.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_IMS_IN_MEMORY_STORAGE_ENTRY_HPP
-#define NDN_IMS_IN_MEMORY_STORAGE_ENTRY_HPP
+#ifndef NDN_CXX_IMS_IN_MEMORY_STORAGE_ENTRY_HPP
+#define NDN_CXX_IMS_IN_MEMORY_STORAGE_ENTRY_HPP
 
 #include "ndn-cxx/data.hpp"
 #include "ndn-cxx/interest.hpp"
@@ -96,4 +96,4 @@
 
 } // namespace ndn
 
-#endif // NDN_IMS_IN_MEMORY_STORAGE_ENTRY_HPP
+#endif // NDN_CXX_IMS_IN_MEMORY_STORAGE_ENTRY_HPP
diff --git a/ndn-cxx/ims/in-memory-storage-fifo.hpp b/ndn-cxx/ims/in-memory-storage-fifo.hpp
index e66e0d9..50e5cf9 100644
--- a/ndn-cxx/ims/in-memory-storage-fifo.hpp
+++ b/ndn-cxx/ims/in-memory-storage-fifo.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_IMS_IN_MEMORY_STORAGE_FIFO_HPP
-#define NDN_IMS_IN_MEMORY_STORAGE_FIFO_HPP
+#ifndef NDN_CXX_IMS_IN_MEMORY_STORAGE_FIFO_HPP
+#define NDN_CXX_IMS_IN_MEMORY_STORAGE_FIFO_HPP
 
 #include "ndn-cxx/ims/in-memory-storage.hpp"
 
@@ -87,4 +87,4 @@
 
 } // namespace ndn
 
-#endif // NDN_IMS_IN_MEMORY_STORAGE_FIFO_HPP
+#endif // NDN_CXX_IMS_IN_MEMORY_STORAGE_FIFO_HPP
diff --git a/ndn-cxx/ims/in-memory-storage-lfu.hpp b/ndn-cxx/ims/in-memory-storage-lfu.hpp
index 6582f57..6c6ebfb 100644
--- a/ndn-cxx/ims/in-memory-storage-lfu.hpp
+++ b/ndn-cxx/ims/in-memory-storage-lfu.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_IMS_IN_MEMORY_STORAGE_LFU_HPP
-#define NDN_IMS_IN_MEMORY_STORAGE_LFU_HPP
+#ifndef NDN_CXX_IMS_IN_MEMORY_STORAGE_LFU_HPP
+#define NDN_CXX_IMS_IN_MEMORY_STORAGE_LFU_HPP
 
 #include "ndn-cxx/ims/in-memory-storage.hpp"
 
@@ -116,4 +116,4 @@
 
 } // namespace ndn
 
-#endif // NDN_IMS_IN_MEMORY_STORAGE_LFU_HPP
+#endif // NDN_CXX_IMS_IN_MEMORY_STORAGE_LFU_HPP
diff --git a/ndn-cxx/ims/in-memory-storage-lru.hpp b/ndn-cxx/ims/in-memory-storage-lru.hpp
index c425ede..b5524e5 100644
--- a/ndn-cxx/ims/in-memory-storage-lru.hpp
+++ b/ndn-cxx/ims/in-memory-storage-lru.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_IMS_IN_MEMORY_STORAGE_LRU_HPP
-#define NDN_IMS_IN_MEMORY_STORAGE_LRU_HPP
+#ifndef NDN_CXX_IMS_IN_MEMORY_STORAGE_LRU_HPP
+#define NDN_CXX_IMS_IN_MEMORY_STORAGE_LRU_HPP
 
 #include "ndn-cxx/ims/in-memory-storage.hpp"
 
@@ -96,4 +96,4 @@
 
 } // namespace ndn
 
-#endif // NDN_IMS_IN_MEMORY_STORAGE_LRU_HPP
+#endif // NDN_CXX_IMS_IN_MEMORY_STORAGE_LRU_HPP
diff --git a/ndn-cxx/ims/in-memory-storage-persistent.hpp b/ndn-cxx/ims/in-memory-storage-persistent.hpp
index a7dda69..6710434 100644
--- a/ndn-cxx/ims/in-memory-storage-persistent.hpp
+++ b/ndn-cxx/ims/in-memory-storage-persistent.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_IMS_IN_MEMORY_STORAGE_PERSISTENT_HPP
-#define NDN_IMS_IN_MEMORY_STORAGE_PERSISTENT_HPP
+#ifndef NDN_CXX_IMS_IN_MEMORY_STORAGE_PERSISTENT_HPP
+#define NDN_CXX_IMS_IN_MEMORY_STORAGE_PERSISTENT_HPP
 
 #include "ndn-cxx/ims/in-memory-storage.hpp"
 
@@ -50,4 +50,4 @@
 
 } // namespace ndn
 
-#endif // NDN_IMS_IN_MEMORY_STORAGE_PERSISTENT_HPP
+#endif // NDN_CXX_IMS_IN_MEMORY_STORAGE_PERSISTENT_HPP
diff --git a/ndn-cxx/ims/in-memory-storage.hpp b/ndn-cxx/ims/in-memory-storage.hpp
index 25adfa8..8fa603e 100644
--- a/ndn-cxx/ims/in-memory-storage.hpp
+++ b/ndn-cxx/ims/in-memory-storage.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_IMS_IN_MEMORY_STORAGE_HPP
-#define NDN_IMS_IN_MEMORY_STORAGE_HPP
+#ifndef NDN_CXX_IMS_IN_MEMORY_STORAGE_HPP
+#define NDN_CXX_IMS_IN_MEMORY_STORAGE_HPP
 
 #include "ndn-cxx/ims/in-memory-storage-entry.hpp"
 
@@ -346,4 +346,4 @@
 
 } // namespace ndn
 
-#endif // NDN_IMS_IN_MEMORY_STORAGE_HPP
+#endif // NDN_CXX_IMS_IN_MEMORY_STORAGE_HPP
diff --git a/ndn-cxx/interest-filter.hpp b/ndn-cxx/interest-filter.hpp
index 74b7229..deee5f4 100644
--- a/ndn-cxx/interest-filter.hpp
+++ b/ndn-cxx/interest-filter.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_INTEREST_FILTER_HPP
-#define NDN_INTEREST_FILTER_HPP
+#ifndef NDN_CXX_INTEREST_FILTER_HPP
+#define NDN_CXX_INTEREST_FILTER_HPP
 
 #include "ndn-cxx/name.hpp"
 
@@ -152,4 +152,4 @@
 
 } // namespace ndn
 
-#endif // NDN_INTEREST_FILTER_HPP
+#endif // NDN_CXX_INTEREST_FILTER_HPP
diff --git a/ndn-cxx/key-locator.hpp b/ndn-cxx/key-locator.hpp
index a6759b2..d502d3d 100644
--- a/ndn-cxx/key-locator.hpp
+++ b/ndn-cxx/key-locator.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_KEY_LOCATOR_HPP
-#define NDN_KEY_LOCATOR_HPP
+#ifndef NDN_CXX_KEY_LOCATOR_HPP
+#define NDN_CXX_KEY_LOCATOR_HPP
 
 #include "ndn-cxx/name.hpp"
 
@@ -157,4 +157,4 @@
 
 } // namespace ndn
 
-#endif // NDN_KEY_LOCATOR_HPP
+#endif // NDN_CXX_KEY_LOCATOR_HPP
diff --git a/ndn-cxx/link.hpp b/ndn-cxx/link.hpp
index bfe47fd..53f6258 100644
--- a/ndn-cxx/link.hpp
+++ b/ndn-cxx/link.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_LINK_HPP
-#define NDN_LINK_HPP
+#ifndef NDN_CXX_LINK_HPP
+#define NDN_CXX_LINK_HPP
 
 #include "ndn-cxx/data.hpp"
 #include "ndn-cxx/delegation-list.hpp"
@@ -117,4 +117,4 @@
 
 } // namespace ndn
 
-#endif // NDN_LINK_HPP
+#endif // NDN_CXX_LINK_HPP
diff --git a/ndn-cxx/meta-info.hpp b/ndn-cxx/meta-info.hpp
index fe3f19c..833e315 100644
--- a/ndn-cxx/meta-info.hpp
+++ b/ndn-cxx/meta-info.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_META_INFO_HPP
-#define NDN_META_INFO_HPP
+#ifndef NDN_CXX_META_INFO_HPP
+#define NDN_CXX_META_INFO_HPP
 
 #include "ndn-cxx/name-component.hpp"
 #include "ndn-cxx/encoding/block.hpp"
@@ -215,4 +215,4 @@
 
 } // namespace ndn
 
-#endif // NDN_META_INFO_HPP
+#endif // NDN_CXX_META_INFO_HPP
diff --git a/ndn-cxx/metadata-object.hpp b/ndn-cxx/metadata-object.hpp
index b6255bc..3ee3fe8 100644
--- a/ndn-cxx/metadata-object.hpp
+++ b/ndn-cxx/metadata-object.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,8 +21,8 @@
  * @author Chavoosh Ghasemi <chghasemi@cs.arizona.edu>
  */
 
-#ifndef NDN_METADATA_OBJECT_HPP
-#define NDN_METADATA_OBJECT_HPP
+#ifndef NDN_CXX_METADATA_OBJECT_HPP
+#define NDN_CXX_METADATA_OBJECT_HPP
 
 #include "ndn-cxx/data.hpp"
 #include "ndn-cxx/interest.hpp"
@@ -125,4 +125,4 @@
 
 } // namespace ndn
 
-#endif // NDN_METADATA_OBJECT_HPP
+#endif // NDN_CXX_METADATA_OBJECT_HPP
diff --git a/ndn-cxx/mgmt/control-parameters.hpp b/ndn-cxx/mgmt/control-parameters.hpp
index 787c37a..8992571 100644
--- a/ndn-cxx/mgmt/control-parameters.hpp
+++ b/ndn-cxx/mgmt/control-parameters.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_CONTROL_PARAMETERS_HPP
-#define NDN_MGMT_CONTROL_PARAMETERS_HPP
+#ifndef NDN_CXX_MGMT_CONTROL_PARAMETERS_HPP
+#define NDN_CXX_MGMT_CONTROL_PARAMETERS_HPP
 
 #include "ndn-cxx/encoding/block.hpp"
 
@@ -45,4 +45,4 @@
 } // namespace mgmt
 } // namespace ndn
 
-#endif // NDN_MGMT_CONTROL_PARAMETERS_HPP
+#endif // NDN_CXX_MGMT_CONTROL_PARAMETERS_HPP
diff --git a/ndn-cxx/mgmt/control-response.hpp b/ndn-cxx/mgmt/control-response.hpp
index d7c0e70..99239fe 100644
--- a/ndn-cxx/mgmt/control-response.hpp
+++ b/ndn-cxx/mgmt/control-response.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_CONTROL_RESPONSE_HPP
-#define NDN_MGMT_CONTROL_RESPONSE_HPP
+#ifndef NDN_CXX_MGMT_CONTROL_RESPONSE_HPP
+#define NDN_CXX_MGMT_CONTROL_RESPONSE_HPP
 
 #include "ndn-cxx/encoding/block.hpp"
 
@@ -126,4 +126,4 @@
 } // namespace mgmt
 } // namespace ndn
 
-#endif // NDN_MGMT_CONTROL_RESPONSE_HPP
+#endif // NDN_CXX_MGMT_CONTROL_RESPONSE_HPP
diff --git a/ndn-cxx/mgmt/dispatcher.hpp b/ndn-cxx/mgmt/dispatcher.hpp
index d41f415..de0a69b 100644
--- a/ndn-cxx/mgmt/dispatcher.hpp
+++ b/ndn-cxx/mgmt/dispatcher.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_DISPATCHER_HPP
-#define NDN_MGMT_DISPATCHER_HPP
+#ifndef NDN_CXX_MGMT_DISPATCHER_HPP
+#define NDN_CXX_MGMT_DISPATCHER_HPP
 
 #include "ndn-cxx/face.hpp"
 #include "ndn-cxx/encoding/block.hpp"
@@ -488,4 +488,4 @@
 } // namespace mgmt
 } // namespace ndn
 
-#endif // NDN_MGMT_DISPATCHER_HPP
+#endif // NDN_CXX_MGMT_DISPATCHER_HPP
diff --git a/ndn-cxx/mgmt/nfd/channel-status.hpp b/ndn-cxx/mgmt/nfd/channel-status.hpp
index 6b5eb8e..8c4d9b1 100644
--- a/ndn-cxx/mgmt/nfd/channel-status.hpp
+++ b/ndn-cxx/mgmt/nfd/channel-status.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_CHANNEL_STATUS_HPP
-#define NDN_MGMT_NFD_CHANNEL_STATUS_HPP
+#ifndef NDN_CXX_MGMT_NFD_CHANNEL_STATUS_HPP
+#define NDN_CXX_MGMT_NFD_CHANNEL_STATUS_HPP
 
 #include "ndn-cxx/encoding/block.hpp"
 
@@ -89,4 +89,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_CHANNEL_STATUS_HPP
+#endif // NDN_CXX_MGMT_NFD_CHANNEL_STATUS_HPP
diff --git a/ndn-cxx/mgmt/nfd/command-options.hpp b/ndn-cxx/mgmt/nfd/command-options.hpp
index ca02a96..18afe62 100644
--- a/ndn-cxx/mgmt/nfd/command-options.hpp
+++ b/ndn-cxx/mgmt/nfd/command-options.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_COMMAND_OPTIONS_HPP
-#define NDN_MGMT_NFD_COMMAND_OPTIONS_HPP
+#ifndef NDN_CXX_MGMT_NFD_COMMAND_OPTIONS_HPP
+#define NDN_CXX_MGMT_NFD_COMMAND_OPTIONS_HPP
 
 #include "ndn-cxx/security/signing-info.hpp"
 
@@ -103,4 +103,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_COMMAND_OPTIONS_HPP
+#endif // NDN_CXX_MGMT_NFD_COMMAND_OPTIONS_HPP
diff --git a/ndn-cxx/mgmt/nfd/control-command.hpp b/ndn-cxx/mgmt/nfd/control-command.hpp
index 054e000..19d12ed 100644
--- a/ndn-cxx/mgmt/nfd/control-command.hpp
+++ b/ndn-cxx/mgmt/nfd/control-command.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_CONTROL_COMMAND_HPP
-#define NDN_MGMT_NFD_CONTROL_COMMAND_HPP
+#ifndef NDN_CXX_MGMT_NFD_CONTROL_COMMAND_HPP
+#define NDN_CXX_MGMT_NFD_CONTROL_COMMAND_HPP
 
 #include "ndn-cxx/mgmt/nfd/control-parameters.hpp"
 
@@ -326,4 +326,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_CONTROL_COMMAND_HPP
+#endif // NDN_CXX_MGMT_NFD_CONTROL_COMMAND_HPP
diff --git a/ndn-cxx/mgmt/nfd/control-parameters.hpp b/ndn-cxx/mgmt/nfd/control-parameters.hpp
index d23cc27..adf96f4 100644
--- a/ndn-cxx/mgmt/nfd/control-parameters.hpp
+++ b/ndn-cxx/mgmt/nfd/control-parameters.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_CONTROL_PARAMETERS_HPP
-#define NDN_MGMT_NFD_CONTROL_PARAMETERS_HPP
+#ifndef NDN_CXX_MGMT_NFD_CONTROL_PARAMETERS_HPP
+#define NDN_CXX_MGMT_NFD_CONTROL_PARAMETERS_HPP
 
 #include "ndn-cxx/name.hpp"
 #include "ndn-cxx/encoding/nfd-constants.hpp"
@@ -665,4 +665,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_CONTROL_PARAMETERS_HPP
+#endif // NDN_CXX_MGMT_NFD_CONTROL_PARAMETERS_HPP
diff --git a/ndn-cxx/mgmt/nfd/control-response.hpp b/ndn-cxx/mgmt/nfd/control-response.hpp
index 6b6f5ff..f02f4db 100644
--- a/ndn-cxx/mgmt/nfd/control-response.hpp
+++ b/ndn-cxx/mgmt/nfd/control-response.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_CONTROL_RESPONSE_HPP
-#define NDN_MGMT_NFD_CONTROL_RESPONSE_HPP
+#ifndef NDN_CXX_MGMT_NFD_CONTROL_RESPONSE_HPP
+#define NDN_CXX_MGMT_NFD_CONTROL_RESPONSE_HPP
 
 #include "ndn-cxx/mgmt/control-response.hpp"
 
@@ -32,4 +32,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_CONTROL_RESPONSE_HPP
+#endif // NDN_CXX_MGMT_NFD_CONTROL_RESPONSE_HPP
diff --git a/ndn-cxx/mgmt/nfd/controller.hpp b/ndn-cxx/mgmt/nfd/controller.hpp
index 51bbf7c..8e7446b 100644
--- a/ndn-cxx/mgmt/nfd/controller.hpp
+++ b/ndn-cxx/mgmt/nfd/controller.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_CONTROLLER_HPP
-#define NDN_MGMT_NFD_CONTROLLER_HPP
+#ifndef NDN_CXX_MGMT_NFD_CONTROLLER_HPP
+#define NDN_CXX_MGMT_NFD_CONTROLLER_HPP
 
 #include "ndn-cxx/mgmt/nfd/command-options.hpp"
 #include "ndn-cxx/mgmt/nfd/control-command.hpp"
@@ -220,4 +220,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_CONTROLLER_HPP
+#endif // NDN_CXX_MGMT_NFD_CONTROLLER_HPP
diff --git a/ndn-cxx/mgmt/nfd/cs-info.hpp b/ndn-cxx/mgmt/nfd/cs-info.hpp
index 199eddd..85dc615 100644
--- a/ndn-cxx/mgmt/nfd/cs-info.hpp
+++ b/ndn-cxx/mgmt/nfd/cs-info.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_CS_INFO_HPP
-#define NDN_MGMT_NFD_CS_INFO_HPP
+#ifndef NDN_CXX_MGMT_NFD_CS_INFO_HPP
+#define NDN_CXX_MGMT_NFD_CS_INFO_HPP
 
 #include "ndn-cxx/encoding/block.hpp"
 #include "ndn-cxx/encoding/nfd-constants.hpp"
@@ -153,4 +153,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_CS_INFO_HPP
+#endif // NDN_CXX_MGMT_NFD_CS_INFO_HPP
diff --git a/ndn-cxx/mgmt/nfd/face-event-notification.hpp b/ndn-cxx/mgmt/nfd/face-event-notification.hpp
index 20ff0de..ea1fbdd 100644
--- a/ndn-cxx/mgmt/nfd/face-event-notification.hpp
+++ b/ndn-cxx/mgmt/nfd/face-event-notification.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_FACE_EVENT_NOTIFICATION_HPP
-#define NDN_MGMT_NFD_FACE_EVENT_NOTIFICATION_HPP
+#ifndef NDN_CXX_MGMT_NFD_FACE_EVENT_NOTIFICATION_HPP
+#define NDN_CXX_MGMT_NFD_FACE_EVENT_NOTIFICATION_HPP
 
 #include "ndn-cxx/mgmt/nfd/face-traits.hpp"
 
@@ -87,4 +87,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_FACE_EVENT_NOTIFICATION_HPP
+#endif // NDN_CXX_MGMT_NFD_FACE_EVENT_NOTIFICATION_HPP
diff --git a/ndn-cxx/mgmt/nfd/face-monitor.hpp b/ndn-cxx/mgmt/nfd/face-monitor.hpp
index 7c9639e..bb32ee2 100644
--- a/ndn-cxx/mgmt/nfd/face-monitor.hpp
+++ b/ndn-cxx/mgmt/nfd/face-monitor.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2018 Regents of the University of California,
+ * Copyright (c) 2014-2021 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
@@ -25,8 +25,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_FACE_MONITOR_HPP
-#define NDN_MGMT_NFD_FACE_MONITOR_HPP
+#ifndef NDN_CXX_MGMT_NFD_FACE_MONITOR_HPP
+#define NDN_CXX_MGMT_NFD_FACE_MONITOR_HPP
 
 #include "ndn-cxx/mgmt/nfd/face-event-notification.hpp"
 #include "ndn-cxx/util/notification-subscriber.hpp"
@@ -47,4 +47,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_FACE_MONITOR_HPP
+#endif // NDN_CXX_MGMT_NFD_FACE_MONITOR_HPP
diff --git a/ndn-cxx/mgmt/nfd/face-query-filter.hpp b/ndn-cxx/mgmt/nfd/face-query-filter.hpp
index 3ef6e80..742b6ba 100644
--- a/ndn-cxx/mgmt/nfd/face-query-filter.hpp
+++ b/ndn-cxx/mgmt/nfd/face-query-filter.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_FACE_QUERY_FILTER_HPP
-#define NDN_MGMT_NFD_FACE_QUERY_FILTER_HPP
+#ifndef NDN_CXX_MGMT_NFD_FACE_QUERY_FILTER_HPP
+#define NDN_CXX_MGMT_NFD_FACE_QUERY_FILTER_HPP
 
 #include "ndn-cxx/encoding/block.hpp"
 #include "ndn-cxx/encoding/nfd-constants.hpp"
@@ -231,4 +231,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_FACE_QUERY_FILTER_HPP
+#endif // NDN_CXX_MGMT_NFD_FACE_QUERY_FILTER_HPP
diff --git a/ndn-cxx/mgmt/nfd/face-status.hpp b/ndn-cxx/mgmt/nfd/face-status.hpp
index f1b9ddd..3f28aa6 100644
--- a/ndn-cxx/mgmt/nfd/face-status.hpp
+++ b/ndn-cxx/mgmt/nfd/face-status.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_FACE_STATUS_HPP
-#define NDN_MGMT_NFD_FACE_STATUS_HPP
+#ifndef NDN_CXX_MGMT_NFD_FACE_STATUS_HPP
+#define NDN_CXX_MGMT_NFD_FACE_STATUS_HPP
 
 #include "ndn-cxx/mgmt/nfd/face-traits.hpp"
 #include "ndn-cxx/util/time.hpp"
@@ -250,4 +250,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_FACE_STATUS_HPP
+#endif // NDN_CXX_MGMT_NFD_FACE_STATUS_HPP
diff --git a/ndn-cxx/mgmt/nfd/face-traits.hpp b/ndn-cxx/mgmt/nfd/face-traits.hpp
index f685e71..67bf8c4 100644
--- a/ndn-cxx/mgmt/nfd/face-traits.hpp
+++ b/ndn-cxx/mgmt/nfd/face-traits.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_FACE_TRAITS_HPP
-#define NDN_MGMT_NFD_FACE_TRAITS_HPP
+#ifndef NDN_CXX_MGMT_NFD_FACE_TRAITS_HPP
+#define NDN_CXX_MGMT_NFD_FACE_TRAITS_HPP
 
 #include "ndn-cxx/encoding/block.hpp"
 #include "ndn-cxx/encoding/nfd-constants.hpp"
@@ -194,4 +194,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_FACE_TRAITS_HPP
+#endif // NDN_CXX_MGMT_NFD_FACE_TRAITS_HPP
diff --git a/ndn-cxx/mgmt/nfd/fib-entry.hpp b/ndn-cxx/mgmt/nfd/fib-entry.hpp
index 74dd611..ed1925e 100644
--- a/ndn-cxx/mgmt/nfd/fib-entry.hpp
+++ b/ndn-cxx/mgmt/nfd/fib-entry.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_FIB_ENTRY_HPP
-#define NDN_MGMT_NFD_FIB_ENTRY_HPP
+#ifndef NDN_CXX_MGMT_NFD_FIB_ENTRY_HPP
+#define NDN_CXX_MGMT_NFD_FIB_ENTRY_HPP
 
 #include "ndn-cxx/name.hpp"
 #include "ndn-cxx/encoding/block.hpp"
@@ -176,4 +176,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_FIB_ENTRY_HPP
+#endif // NDN_CXX_MGMT_NFD_FIB_ENTRY_HPP
diff --git a/ndn-cxx/mgmt/nfd/forwarder-status.hpp b/ndn-cxx/mgmt/nfd/forwarder-status.hpp
index 9735337..d20a1ff 100644
--- a/ndn-cxx/mgmt/nfd/forwarder-status.hpp
+++ b/ndn-cxx/mgmt/nfd/forwarder-status.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_FORWARDER_STATUS_HPP
-#define NDN_MGMT_NFD_FORWARDER_STATUS_HPP
+#ifndef NDN_CXX_MGMT_NFD_FORWARDER_STATUS_HPP
+#define NDN_CXX_MGMT_NFD_FORWARDER_STATUS_HPP
 
 #include "ndn-cxx/encoding/block.hpp"
 #include "ndn-cxx/util/time.hpp"
@@ -252,4 +252,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_FORWARDER_STATUS_HPP
+#endif // NDN_CXX_MGMT_NFD_FORWARDER_STATUS_HPP
diff --git a/ndn-cxx/mgmt/nfd/rib-entry.hpp b/ndn-cxx/mgmt/nfd/rib-entry.hpp
index 2745be6..9cf673c 100644
--- a/ndn-cxx/mgmt/nfd/rib-entry.hpp
+++ b/ndn-cxx/mgmt/nfd/rib-entry.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_RIB_ENTRY_HPP
-#define NDN_MGMT_NFD_RIB_ENTRY_HPP
+#ifndef NDN_CXX_MGMT_NFD_RIB_ENTRY_HPP
+#define NDN_CXX_MGMT_NFD_RIB_ENTRY_HPP
 
 #include "ndn-cxx/name.hpp"
 #include "ndn-cxx/encoding/block.hpp"
@@ -228,4 +228,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_RIB_ENTRY_HPP
+#endif // NDN_CXX_MGMT_NFD_RIB_ENTRY_HPP
diff --git a/ndn-cxx/mgmt/nfd/route-flags-traits.hpp b/ndn-cxx/mgmt/nfd/route-flags-traits.hpp
index 8eff4c5..a23ab85 100644
--- a/ndn-cxx/mgmt/nfd/route-flags-traits.hpp
+++ b/ndn-cxx/mgmt/nfd/route-flags-traits.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_ROUTE_FLAGS_TRAITS_HPP
-#define NDN_MGMT_NFD_ROUTE_FLAGS_TRAITS_HPP
+#ifndef NDN_CXX_MGMT_NFD_ROUTE_FLAGS_TRAITS_HPP
+#define NDN_CXX_MGMT_NFD_ROUTE_FLAGS_TRAITS_HPP
 
 #include "ndn-cxx/encoding/nfd-constants.hpp"
 
@@ -57,4 +57,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_ROUTE_FLAGS_TRAITS_HPP
+#endif // NDN_CXX_MGMT_NFD_ROUTE_FLAGS_TRAITS_HPP
diff --git a/ndn-cxx/mgmt/nfd/status-dataset.hpp b/ndn-cxx/mgmt/nfd/status-dataset.hpp
index d80cd40..d06950a 100644
--- a/ndn-cxx/mgmt/nfd/status-dataset.hpp
+++ b/ndn-cxx/mgmt/nfd/status-dataset.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_STATUS_DATASET_HPP
-#define NDN_MGMT_NFD_STATUS_DATASET_HPP
+#ifndef NDN_CXX_MGMT_NFD_STATUS_DATASET_HPP
+#define NDN_CXX_MGMT_NFD_STATUS_DATASET_HPP
 
 #include "ndn-cxx/name.hpp"
 #include "ndn-cxx/mgmt/nfd/forwarder-status.hpp"
@@ -256,4 +256,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_STATUS_DATASET_HPP
+#endif // NDN_CXX_MGMT_NFD_STATUS_DATASET_HPP
diff --git a/ndn-cxx/mgmt/nfd/strategy-choice.hpp b/ndn-cxx/mgmt/nfd/strategy-choice.hpp
index d6c71d4..efb3132 100644
--- a/ndn-cxx/mgmt/nfd/strategy-choice.hpp
+++ b/ndn-cxx/mgmt/nfd/strategy-choice.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_STRATEGY_CHOICE_HPP
-#define NDN_MGMT_NFD_STRATEGY_CHOICE_HPP
+#ifndef NDN_CXX_MGMT_NFD_STRATEGY_CHOICE_HPP
+#define NDN_CXX_MGMT_NFD_STRATEGY_CHOICE_HPP
 
 #include "ndn-cxx/encoding/block.hpp"
 #include "ndn-cxx/name.hpp"
@@ -100,4 +100,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_STRATEGY_CHOICE_HPP
+#endif // NDN_CXX_MGMT_NFD_STRATEGY_CHOICE_HPP
diff --git a/ndn-cxx/mgmt/status-dataset-context.hpp b/ndn-cxx/mgmt/status-dataset-context.hpp
index 2fb07f9..db86397 100644
--- a/ndn-cxx/mgmt/status-dataset-context.hpp
+++ b/ndn-cxx/mgmt/status-dataset-context.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_STATUS_DATASET_CONTEXT_HPP
-#define NDN_MGMT_STATUS_DATASET_CONTEXT_HPP
+#ifndef NDN_CXX_MGMT_STATUS_DATASET_CONTEXT_HPP
+#define NDN_CXX_MGMT_STATUS_DATASET_CONTEXT_HPP
 
 #include "ndn-cxx/data.hpp"
 #include "ndn-cxx/interest.hpp"
@@ -124,4 +124,4 @@
 } // namespace mgmt
 } // namespace ndn
 
-#endif // NDN_MGMT_STATUS_DATASET_CONTEXT_HPP
+#endif // NDN_CXX_MGMT_STATUS_DATASET_CONTEXT_HPP
diff --git a/ndn-cxx/name-component.hpp b/ndn-cxx/name-component.hpp
index 1022727..d1dc236 100644
--- a/ndn-cxx/name-component.hpp
+++ b/ndn-cxx/name-component.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_NAME_COMPONENT_HPP
-#define NDN_NAME_COMPONENT_HPP
+#ifndef NDN_CXX_NAME_COMPONENT_HPP
+#define NDN_CXX_NAME_COMPONENT_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 #include "ndn-cxx/encoding/block.hpp"
@@ -645,4 +645,4 @@
 } // namespace name
 } // namespace ndn
 
-#endif // NDN_NAME_COMPONENT_HPP
+#endif // NDN_CXX_NAME_COMPONENT_HPP
diff --git a/ndn-cxx/net/dns.hpp b/ndn-cxx/net/dns.hpp
index 660efcd..e3f8b7c 100644
--- a/ndn-cxx/net/dns.hpp
+++ b/ndn-cxx/net/dns.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_NET_DNS_HPP
-#define NDN_NET_DNS_HPP
+#ifndef NDN_CXX_NET_DNS_HPP
+#define NDN_CXX_NET_DNS_HPP
 
 #include "ndn-cxx/detail/asio-fwd.hpp"
 #include "ndn-cxx/util/time.hpp"
@@ -112,4 +112,4 @@
 } // namespace dns
 } // namespace ndn
 
-#endif // NDN_NET_DNS_HPP
+#endif // NDN_CXX_NET_DNS_HPP
diff --git a/ndn-cxx/net/ethernet.hpp b/ndn-cxx/net/ethernet.hpp
index f5485da..9d81cce 100644
--- a/ndn-cxx/net/ethernet.hpp
+++ b/ndn-cxx/net/ethernet.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2018 Regents of the University of California,
+ * Copyright (c) 2014-2021 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
@@ -25,8 +25,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_NET_ETHERNET_HPP
-#define NDN_NET_ETHERNET_HPP
+#ifndef NDN_CXX_NET_ETHERNET_HPP
+#define NDN_CXX_NET_ETHERNET_HPP
 
 #include <array>
 #include <cstdint>
@@ -122,4 +122,4 @@
 
 } // namespace std
 
-#endif // NDN_NET_ETHERNET_HPP
+#endif // NDN_CXX_NET_ETHERNET_HPP
diff --git a/ndn-cxx/net/face-uri.hpp b/ndn-cxx/net/face-uri.hpp
index aeb12c0..8194dad 100644
--- a/ndn-cxx/net/face-uri.hpp
+++ b/ndn-cxx/net/face-uri.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California,
+ * Copyright (c) 2013-2021 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
@@ -25,8 +25,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_NET_FACE_URI_HPP
-#define NDN_NET_FACE_URI_HPP
+#ifndef NDN_CXX_NET_FACE_URI_HPP
+#define NDN_CXX_NET_FACE_URI_HPP
 
 #include "ndn-cxx/detail/asio-fwd.hpp"
 #include "ndn-cxx/net/ethernet.hpp"
@@ -204,4 +204,4 @@
 
 } // namespace ndn
 
-#endif // NDN_NET_FACE_URI_HPP
+#endif // NDN_CXX_NET_FACE_URI_HPP
diff --git a/ndn-cxx/net/impl/link-type-helper.hpp b/ndn-cxx/net/impl/link-type-helper.hpp
index a1549f6..de4dfc6 100644
--- a/ndn-cxx/net/impl/link-type-helper.hpp
+++ b/ndn-cxx/net/impl/link-type-helper.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_NET_IMPL_LINK_TYPE_HELPER_HPP
-#define NDN_NET_IMPL_LINK_TYPE_HELPER_HPP
+#ifndef NDN_CXX_NET_IMPL_LINK_TYPE_HELPER_HPP
+#define NDN_CXX_NET_IMPL_LINK_TYPE_HELPER_HPP
 
 #include "ndn-cxx/encoding/nfd-constants.hpp"
 
@@ -38,4 +38,4 @@
 } // namespace net
 } // namespace ndn
 
-#endif // NDN_NET_IMPL_LINK_TYPE_HELPER_HPP
+#endif // NDN_CXX_NET_IMPL_LINK_TYPE_HELPER_HPP
diff --git a/ndn-cxx/net/impl/linux-if-constants.hpp b/ndn-cxx/net/impl/linux-if-constants.hpp
index 1bfece7..ab8a4cc 100644
--- a/ndn-cxx/net/impl/linux-if-constants.hpp
+++ b/ndn-cxx/net/impl/linux-if-constants.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,8 +21,8 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#ifndef NDN_NET_LINUX_IF_CONSTANTS_HPP
-#define NDN_NET_LINUX_IF_CONSTANTS_HPP
+#ifndef NDN_CXX_NET_LINUX_IF_CONSTANTS_HPP
+#define NDN_CXX_NET_LINUX_IF_CONSTANTS_HPP
 #ifdef __linux__
 
 #include <cstdint>
@@ -55,4 +55,4 @@
 } // namespace ndn
 
 #endif // __linux__
-#endif // NDN_NET_LINUX_IF_CONSTANTS_HPP
+#endif // NDN_CXX_NET_LINUX_IF_CONSTANTS_HPP
diff --git a/ndn-cxx/net/impl/netlink-message.hpp b/ndn-cxx/net/impl/netlink-message.hpp
index 913c164..d960b93 100644
--- a/ndn-cxx/net/impl/netlink-message.hpp
+++ b/ndn-cxx/net/impl/netlink-message.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,8 +21,8 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#ifndef NDN_NET_NETLINK_MESSAGE_HPP
-#define NDN_NET_NETLINK_MESSAGE_HPP
+#ifndef NDN_CXX_NET_NETLINK_MESSAGE_HPP
+#define NDN_CXX_NET_NETLINK_MESSAGE_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 #include "ndn-cxx/net/ethernet.hpp"
@@ -311,4 +311,4 @@
 } // namespace net
 } // namespace ndn
 
-#endif // NDN_NET_NETLINK_MESSAGE_HPP
+#endif // NDN_CXX_NET_NETLINK_MESSAGE_HPP
diff --git a/ndn-cxx/net/impl/netlink-socket.hpp b/ndn-cxx/net/impl/netlink-socket.hpp
index 46ff6bc..af10173 100644
--- a/ndn-cxx/net/impl/netlink-socket.hpp
+++ b/ndn-cxx/net/impl/netlink-socket.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,8 +21,8 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#ifndef NDN_NET_NETLINK_SOCKET_HPP
-#define NDN_NET_NETLINK_SOCKET_HPP
+#ifndef NDN_CXX_NET_NETLINK_SOCKET_HPP
+#define NDN_CXX_NET_NETLINK_SOCKET_HPP
 
 #include "ndn-cxx/net/network-monitor.hpp"
 #include "ndn-cxx/util/signal/signal.hpp"
@@ -156,4 +156,4 @@
 } // namespace net
 } // namespace ndn
 
-#endif // NDN_NET_NETLINK_SOCKET_HPP
+#endif // NDN_CXX_NET_NETLINK_SOCKET_HPP
diff --git a/ndn-cxx/net/impl/network-monitor-impl-netlink.hpp b/ndn-cxx/net/impl/network-monitor-impl-netlink.hpp
index 4bcc755..87dcf35 100644
--- a/ndn-cxx/net/impl/network-monitor-impl-netlink.hpp
+++ b/ndn-cxx/net/impl/network-monitor-impl-netlink.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,8 +21,8 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#ifndef NDN_NET_NETWORK_MONITOR_IMPL_NETLINK_HPP
-#define NDN_NET_NETWORK_MONITOR_IMPL_NETLINK_HPP
+#ifndef NDN_CXX_NET_NETWORK_MONITOR_IMPL_NETLINK_HPP
+#define NDN_CXX_NET_NETWORK_MONITOR_IMPL_NETLINK_HPP
 
 #include "ndn-cxx/detail/config.hpp"
 #include "ndn-cxx/net/network-monitor.hpp"
@@ -107,4 +107,4 @@
 } // namespace net
 } // namespace ndn
 
-#endif // NDN_NET_NETWORK_MONITOR_IMPL_NETLINK_HPP
+#endif // NDN_CXX_NET_NETWORK_MONITOR_IMPL_NETLINK_HPP
diff --git a/ndn-cxx/net/impl/network-monitor-impl-noop.hpp b/ndn-cxx/net/impl/network-monitor-impl-noop.hpp
index a8c7968..617f319 100644
--- a/ndn-cxx/net/impl/network-monitor-impl-noop.hpp
+++ b/ndn-cxx/net/impl/network-monitor-impl-noop.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,8 +21,8 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#ifndef NDN_NET_NETWORK_MONITOR_IMPL_NOOP_HPP
-#define NDN_NET_NETWORK_MONITOR_IMPL_NOOP_HPP
+#ifndef NDN_CXX_NET_NETWORK_MONITOR_IMPL_NOOP_HPP
+#define NDN_CXX_NET_NETWORK_MONITOR_IMPL_NOOP_HPP
 
 #include "ndn-cxx/net/network-monitor.hpp"
 
@@ -59,4 +59,4 @@
 } // namespace net
 } // namespace ndn
 
-#endif // NDN_NET_NETWORK_MONITOR_IMPL_NOOP_HPP
+#endif // NDN_CXX_NET_NETWORK_MONITOR_IMPL_NOOP_HPP
diff --git a/ndn-cxx/net/impl/network-monitor-impl-osx.hpp b/ndn-cxx/net/impl/network-monitor-impl-osx.hpp
index f3a4cdc..67a28f8 100644
--- a/ndn-cxx/net/impl/network-monitor-impl-osx.hpp
+++ b/ndn-cxx/net/impl/network-monitor-impl-osx.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_NET_NETWORK_MONITOR_IMPL_OSX_HPP
-#define NDN_NET_NETWORK_MONITOR_IMPL_OSX_HPP
+#ifndef NDN_CXX_NET_NETWORK_MONITOR_IMPL_OSX_HPP
+#define NDN_CXX_NET_NETWORK_MONITOR_IMPL_OSX_HPP
 
 #include "ndn-cxx/detail/config.hpp"
 #include "ndn-cxx/net/network-monitor.hpp"
@@ -114,4 +114,4 @@
 } // namespace net
 } // namespace ndn
 
-#endif // NDN_NET_NETWORK_MONITOR_IMPL_OSX_HPP
+#endif // NDN_CXX_NET_NETWORK_MONITOR_IMPL_OSX_HPP
diff --git a/ndn-cxx/net/network-address.hpp b/ndn-cxx/net/network-address.hpp
index 30fc148..6aca525 100644
--- a/ndn-cxx/net/network-address.hpp
+++ b/ndn-cxx/net/network-address.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,8 +21,8 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#ifndef NDN_NET_NETWORK_ADDRESS_HPP
-#define NDN_NET_NETWORK_ADDRESS_HPP
+#ifndef NDN_CXX_NET_NETWORK_ADDRESS_HPP
+#define NDN_CXX_NET_NETWORK_ADDRESS_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -129,4 +129,4 @@
 } // namespace net
 } // namespace ndn
 
-#endif // NDN_NET_NETWORK_ADDRESS_HPP
+#endif // NDN_CXX_NET_NETWORK_ADDRESS_HPP
diff --git a/ndn-cxx/net/network-interface.hpp b/ndn-cxx/net/network-interface.hpp
index 5044938..29277c9 100644
--- a/ndn-cxx/net/network-interface.hpp
+++ b/ndn-cxx/net/network-interface.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,8 +21,8 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#ifndef NDN_NET_NETWORK_INTERFACE_HPP
-#define NDN_NET_NETWORK_INTERFACE_HPP
+#ifndef NDN_CXX_NET_NETWORK_INTERFACE_HPP
+#define NDN_CXX_NET_NETWORK_INTERFACE_HPP
 
 #include "ndn-cxx/net/ethernet.hpp"
 #include "ndn-cxx/net/network-address.hpp"
@@ -252,4 +252,4 @@
 } // namespace net
 } // namespace ndn
 
-#endif // NDN_NET_NETWORK_INTERFACE_HPP
+#endif // NDN_CXX_NET_NETWORK_INTERFACE_HPP
diff --git a/ndn-cxx/net/network-monitor-stub.hpp b/ndn-cxx/net/network-monitor-stub.hpp
index 4bd6c47..fcfe536 100644
--- a/ndn-cxx/net/network-monitor-stub.hpp
+++ b/ndn-cxx/net/network-monitor-stub.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_NET_NETWORK_MONITOR_STUB_HPP
-#define NDN_NET_NETWORK_MONITOR_STUB_HPP
+#ifndef NDN_CXX_NET_NETWORK_MONITOR_STUB_HPP
+#define NDN_CXX_NET_NETWORK_MONITOR_STUB_HPP
 
 #include "ndn-cxx/net/network-monitor.hpp"
 
@@ -85,4 +85,4 @@
 } // namespace net
 } // namespace ndn
 
-#endif // NDN_NET_NETWORK_MONITOR_STUB_HPP
+#endif // NDN_CXX_NET_NETWORK_MONITOR_STUB_HPP
diff --git a/ndn-cxx/net/network-monitor.hpp b/ndn-cxx/net/network-monitor.hpp
index 84ef90c..f9dcc8e 100644
--- a/ndn-cxx/net/network-monitor.hpp
+++ b/ndn-cxx/net/network-monitor.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -22,8 +22,8 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#ifndef NDN_NET_NETWORK_MONITOR_HPP
-#define NDN_NET_NETWORK_MONITOR_HPP
+#ifndef NDN_CXX_NET_NETWORK_MONITOR_HPP
+#define NDN_CXX_NET_NETWORK_MONITOR_HPP
 
 #include "ndn-cxx/detail/asio-fwd.hpp"
 #include "ndn-cxx/net/network-interface.hpp"
@@ -165,4 +165,4 @@
 } // namespace net
 } // namespace ndn
 
-#endif // NDN_NET_NETWORK_MONITOR_HPP
+#endif // NDN_CXX_NET_NETWORK_MONITOR_HPP
diff --git a/ndn-cxx/security/additional-description.hpp b/ndn-cxx/security/additional-description.hpp
index 9fc42e7..45a2976 100644
--- a/ndn-cxx/security/additional-description.hpp
+++ b/ndn-cxx/security/additional-description.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_ADDITIONAL_DESCRIPTION_HPP
-#define NDN_SECURITY_ADDITIONAL_DESCRIPTION_HPP
+#ifndef NDN_CXX_SECURITY_ADDITIONAL_DESCRIPTION_HPP
+#define NDN_CXX_SECURITY_ADDITIONAL_DESCRIPTION_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 #include "ndn-cxx/encoding/block.hpp"
@@ -142,4 +142,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_ADDITIONAL_DESCRIPTION_HPP
+#endif // NDN_CXX_SECURITY_ADDITIONAL_DESCRIPTION_HPP
diff --git a/ndn-cxx/security/certificate-bundle-fetcher.hpp b/ndn-cxx/security/certificate-bundle-fetcher.hpp
index 5164b07..6e9d683 100644
--- a/ndn-cxx/security/certificate-bundle-fetcher.hpp
+++ b/ndn-cxx/security/certificate-bundle-fetcher.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_CERTIFICATE_BUNDLE_FETCHER_HPP
-#define NDN_SECURITY_CERTIFICATE_BUNDLE_FETCHER_HPP
+#ifndef NDN_CXX_SECURITY_CERTIFICATE_BUNDLE_FETCHER_HPP
+#define NDN_CXX_SECURITY_CERTIFICATE_BUNDLE_FETCHER_HPP
 
 #include "ndn-cxx/name.hpp"
 #include "ndn-cxx/tag.hpp"
@@ -148,4 +148,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_CERTIFICATE_BUNDLE_FETCHER_HPP
+#endif // NDN_CXX_SECURITY_CERTIFICATE_BUNDLE_FETCHER_HPP
diff --git a/ndn-cxx/security/certificate-cache.hpp b/ndn-cxx/security/certificate-cache.hpp
index d4af213..13e8d33 100644
--- a/ndn-cxx/security/certificate-cache.hpp
+++ b/ndn-cxx/security/certificate-cache.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_CERTIFICATE_CACHE_HPP
-#define NDN_SECURITY_CERTIFICATE_CACHE_HPP
+#ifndef NDN_CXX_SECURITY_CERTIFICATE_CACHE_HPP
+#define NDN_CXX_SECURITY_CERTIFICATE_CACHE_HPP
 
 #include "ndn-cxx/interest.hpp"
 #include "ndn-cxx/security/certificate.hpp"
@@ -145,4 +145,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_CERTIFICATE_CACHE_HPP
+#endif // NDN_CXX_SECURITY_CERTIFICATE_CACHE_HPP
diff --git a/ndn-cxx/security/certificate-fetcher-direct-fetch.hpp b/ndn-cxx/security/certificate-fetcher-direct-fetch.hpp
index db23afb..0ec8bb5 100644
--- a/ndn-cxx/security/certificate-fetcher-direct-fetch.hpp
+++ b/ndn-cxx/security/certificate-fetcher-direct-fetch.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_CERTIFICATE_FETCHER_DIRECT_FETCH_HPP
-#define NDN_SECURITY_CERTIFICATE_FETCHER_DIRECT_FETCH_HPP
+#ifndef NDN_CXX_SECURITY_CERTIFICATE_FETCHER_DIRECT_FETCH_HPP
+#define NDN_CXX_SECURITY_CERTIFICATE_FETCHER_DIRECT_FETCH_HPP
 
 #include "ndn-cxx/security/certificate-fetcher-from-network.hpp"
 
@@ -62,4 +62,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_CERTIFICATE_FETCHER_DIRECT_FETCH_HPP
+#endif // NDN_CXX_SECURITY_CERTIFICATE_FETCHER_DIRECT_FETCH_HPP
diff --git a/ndn-cxx/security/certificate-fetcher-from-network.hpp b/ndn-cxx/security/certificate-fetcher-from-network.hpp
index 8074e07..6074c66 100644
--- a/ndn-cxx/security/certificate-fetcher-from-network.hpp
+++ b/ndn-cxx/security/certificate-fetcher-from-network.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_CERTIFICATE_FETCHER_FROM_NETWORK_HPP
-#define NDN_SECURITY_CERTIFICATE_FETCHER_FROM_NETWORK_HPP
+#ifndef NDN_CXX_SECURITY_CERTIFICATE_FETCHER_FROM_NETWORK_HPP
+#define NDN_CXX_SECURITY_CERTIFICATE_FETCHER_FROM_NETWORK_HPP
 
 #include "ndn-cxx/security/certificate-fetcher.hpp"
 #include "ndn-cxx/util/scheduler.hpp"
@@ -87,4 +87,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_CERTIFICATE_FETCHER_FROM_NETWORK_HPP
+#endif // NDN_CXX_SECURITY_CERTIFICATE_FETCHER_FROM_NETWORK_HPP
diff --git a/ndn-cxx/security/certificate-fetcher-offline.hpp b/ndn-cxx/security/certificate-fetcher-offline.hpp
index 617f624..84412eb 100644
--- a/ndn-cxx/security/certificate-fetcher-offline.hpp
+++ b/ndn-cxx/security/certificate-fetcher-offline.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_CERTIFICATE_FETCHER_OFFLINE_HPP
-#define NDN_SECURITY_CERTIFICATE_FETCHER_OFFLINE_HPP
+#ifndef NDN_CXX_SECURITY_CERTIFICATE_FETCHER_OFFLINE_HPP
+#define NDN_CXX_SECURITY_CERTIFICATE_FETCHER_OFFLINE_HPP
 
 #include "ndn-cxx/security/certificate-fetcher.hpp"
 
@@ -43,4 +43,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_CERTIFICATE_FETCHER_OFFLINE_HPP
+#endif // NDN_CXX_SECURITY_CERTIFICATE_FETCHER_OFFLINE_HPP
diff --git a/ndn-cxx/security/certificate-fetcher.hpp b/ndn-cxx/security/certificate-fetcher.hpp
index b90d779..fa4b9eb 100644
--- a/ndn-cxx/security/certificate-fetcher.hpp
+++ b/ndn-cxx/security/certificate-fetcher.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_CERTIFICATE_FETCHER_HPP
-#define NDN_SECURITY_CERTIFICATE_FETCHER_HPP
+#ifndef NDN_CXX_SECURITY_CERTIFICATE_FETCHER_HPP
+#define NDN_CXX_SECURITY_CERTIFICATE_FETCHER_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -88,4 +88,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_CERTIFICATE_FETCHER_HPP
+#endif // NDN_CXX_SECURITY_CERTIFICATE_FETCHER_HPP
diff --git a/ndn-cxx/security/certificate-request.hpp b/ndn-cxx/security/certificate-request.hpp
index 4fd7992..d856a72 100644
--- a/ndn-cxx/security/certificate-request.hpp
+++ b/ndn-cxx/security/certificate-request.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_CERTIFICATE_REQUEST_HPP
-#define NDN_SECURITY_CERTIFICATE_REQUEST_HPP
+#ifndef NDN_CXX_SECURITY_CERTIFICATE_REQUEST_HPP
+#define NDN_CXX_SECURITY_CERTIFICATE_REQUEST_HPP
 
 #include "ndn-cxx/interest.hpp"
 
@@ -62,4 +62,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_CERTIFICATE_REQUEST_HPP
+#endif // NDN_CXX_SECURITY_CERTIFICATE_REQUEST_HPP
diff --git a/ndn-cxx/security/certificate-storage.hpp b/ndn-cxx/security/certificate-storage.hpp
index c06f49d..e3ce5cd 100644
--- a/ndn-cxx/security/certificate-storage.hpp
+++ b/ndn-cxx/security/certificate-storage.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_CERTIFICATE_STORAGE_HPP
-#define NDN_SECURITY_CERTIFICATE_STORAGE_HPP
+#ifndef NDN_CXX_SECURITY_CERTIFICATE_STORAGE_HPP
+#define NDN_CXX_SECURITY_CERTIFICATE_STORAGE_HPP
 
 #include "ndn-cxx/security/certificate.hpp"
 #include "ndn-cxx/security/certificate-cache.hpp"
@@ -140,4 +140,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_CERTIFICATE_STORAGE_HPP
+#endif // NDN_CXX_SECURITY_CERTIFICATE_STORAGE_HPP
diff --git a/ndn-cxx/security/certificate.hpp b/ndn-cxx/security/certificate.hpp
index c3ef869..a4f7894 100644
--- a/ndn-cxx/security/certificate.hpp
+++ b/ndn-cxx/security/certificate.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -22,8 +22,8 @@
  * @author Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
  */
 
-#ifndef NDN_SECURITY_CERTIFICATE_HPP
-#define NDN_SECURITY_CERTIFICATE_HPP
+#ifndef NDN_CXX_SECURITY_CERTIFICATE_HPP
+#define NDN_CXX_SECURITY_CERTIFICATE_HPP
 
 #include "ndn-cxx/data.hpp"
 
@@ -191,4 +191,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_CERTIFICATE_HPP
+#endif // NDN_CXX_SECURITY_CERTIFICATE_HPP
diff --git a/ndn-cxx/security/command-interest-signer.hpp b/ndn-cxx/security/command-interest-signer.hpp
index c4da552..bf41543 100644
--- a/ndn-cxx/security/command-interest-signer.hpp
+++ b/ndn-cxx/security/command-interest-signer.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_COMMAND_INTEREST_SIGNER_HPP
-#define NDN_SECURITY_COMMAND_INTEREST_SIGNER_HPP
+#ifndef NDN_CXX_SECURITY_COMMAND_INTEREST_SIGNER_HPP
+#define NDN_CXX_SECURITY_COMMAND_INTEREST_SIGNER_HPP
 
 #include "ndn-cxx/security/interest-signer.hpp"
 
@@ -37,4 +37,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_COMMAND_INTEREST_SIGNER_HPP
+#endif // NDN_CXX_SECURITY_COMMAND_INTEREST_SIGNER_HPP
diff --git a/ndn-cxx/security/impl/openssl.hpp b/ndn-cxx/security/impl/openssl.hpp
index 58dd1df..13a81d4 100644
--- a/ndn-cxx/security/impl/openssl.hpp
+++ b/ndn-cxx/security/impl/openssl.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_IMPL_OPENSSL_HPP
-#define NDN_SECURITY_IMPL_OPENSSL_HPP
+#ifndef NDN_CXX_SECURITY_IMPL_OPENSSL_HPP
+#define NDN_CXX_SECURITY_IMPL_OPENSSL_HPP
 
 // suppress deprecation warnings on macOS >= 10.7
 #if defined(__APPLE__) && defined(__clang__)
@@ -42,4 +42,4 @@
 #pragma clang diagnostic pop
 #endif
 
-#endif // NDN_SECURITY_IMPL_OPENSSL_HPP
+#endif // NDN_CXX_SECURITY_IMPL_OPENSSL_HPP
diff --git a/ndn-cxx/security/interest-signer.hpp b/ndn-cxx/security/interest-signer.hpp
index d7a120d..e1d252a 100644
--- a/ndn-cxx/security/interest-signer.hpp
+++ b/ndn-cxx/security/interest-signer.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_INTEREST_SIGNER_HPP
-#define NDN_SECURITY_INTEREST_SIGNER_HPP
+#ifndef NDN_CXX_SECURITY_INTEREST_SIGNER_HPP
+#define NDN_CXX_SECURITY_INTEREST_SIGNER_HPP
 
 #include "ndn-cxx/security/key-chain.hpp"
 
@@ -90,4 +90,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_INTEREST_SIGNER_HPP
+#endif // NDN_CXX_SECURITY_INTEREST_SIGNER_HPP
diff --git a/ndn-cxx/security/key-chain.hpp b/ndn-cxx/security/key-chain.hpp
index 123f1eb..8fe3dfe 100644
--- a/ndn-cxx/security/key-chain.hpp
+++ b/ndn-cxx/security/key-chain.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_KEY_CHAIN_HPP
-#define NDN_SECURITY_KEY_CHAIN_HPP
+#ifndef NDN_CXX_SECURITY_KEY_CHAIN_HPP
+#define NDN_CXX_SECURITY_KEY_CHAIN_HPP
 
 #include "ndn-cxx/interest.hpp"
 #include "ndn-cxx/security/certificate.hpp"
@@ -483,4 +483,4 @@
 
 } // namespace ndn
 
-#endif // NDN_SECURITY_KEY_CHAIN_HPP
+#endif // NDN_CXX_SECURITY_KEY_CHAIN_HPP
diff --git a/ndn-cxx/security/key-params.hpp b/ndn-cxx/security/key-params.hpp
index 4d424c4..0c657d6 100644
--- a/ndn-cxx/security/key-params.hpp
+++ b/ndn-cxx/security/key-params.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_KEY_PARAMS_HPP
-#define NDN_SECURITY_KEY_PARAMS_HPP
+#ifndef NDN_CXX_SECURITY_KEY_PARAMS_HPP
+#define NDN_CXX_SECURITY_KEY_PARAMS_HPP
 
 #include "ndn-cxx/security/security-common.hpp"
 #include "ndn-cxx/name-component.hpp"
@@ -310,4 +310,4 @@
 
 } // namespace ndn
 
-#endif // NDN_SECURITY_KEY_PARAMS_HPP
+#endif // NDN_CXX_SECURITY_KEY_PARAMS_HPP
diff --git a/ndn-cxx/security/pib/certificate-container.hpp b/ndn-cxx/security/pib/certificate-container.hpp
index 1f7e753..d9bcbb1 100644
--- a/ndn-cxx/security/pib/certificate-container.hpp
+++ b/ndn-cxx/security/pib/certificate-container.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_PIB_CERTIFICATE_CONTAINER_HPP
-#define NDN_SECURITY_PIB_CERTIFICATE_CONTAINER_HPP
+#ifndef NDN_CXX_SECURITY_PIB_CERTIFICATE_CONTAINER_HPP
+#define NDN_CXX_SECURITY_PIB_CERTIFICATE_CONTAINER_HPP
 
 #include "ndn-cxx/security/certificate.hpp"
 
@@ -164,4 +164,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_CERTIFICATE_CONTAINER_HPP
+#endif // NDN_CXX_SECURITY_PIB_CERTIFICATE_CONTAINER_HPP
diff --git a/ndn-cxx/security/pib/identity-container.hpp b/ndn-cxx/security/pib/identity-container.hpp
index b31dc2c..359e358 100644
--- a/ndn-cxx/security/pib/identity-container.hpp
+++ b/ndn-cxx/security/pib/identity-container.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_PIB_IDENTITY_CONTAINER_HPP
-#define NDN_SECURITY_PIB_IDENTITY_CONTAINER_HPP
+#ifndef NDN_CXX_SECURITY_PIB_IDENTITY_CONTAINER_HPP
+#define NDN_CXX_SECURITY_PIB_IDENTITY_CONTAINER_HPP
 
 #include "ndn-cxx/security/pib/identity.hpp"
 
@@ -171,4 +171,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_IDENTITY_CONTAINER_HPP
+#endif // NDN_CXX_SECURITY_PIB_IDENTITY_CONTAINER_HPP
diff --git a/ndn-cxx/security/pib/identity.hpp b/ndn-cxx/security/pib/identity.hpp
index 23a2940..968fb51 100644
--- a/ndn-cxx/security/pib/identity.hpp
+++ b/ndn-cxx/security/pib/identity.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_PIB_IDENTITY_HPP
-#define NDN_SECURITY_PIB_IDENTITY_HPP
+#ifndef NDN_CXX_SECURITY_PIB_IDENTITY_HPP
+#define NDN_CXX_SECURITY_PIB_IDENTITY_HPP
 
 #include "ndn-cxx/security/pib/key-container.hpp"
 
@@ -174,4 +174,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_IDENTITY_HPP
+#endif // NDN_CXX_SECURITY_PIB_IDENTITY_HPP
diff --git a/ndn-cxx/security/pib/impl/identity-impl.hpp b/ndn-cxx/security/pib/impl/identity-impl.hpp
index b78ec58..8d9a86d 100644
--- a/ndn-cxx/security/pib/impl/identity-impl.hpp
+++ b/ndn-cxx/security/pib/impl/identity-impl.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_PIB_IMPL_IDENTITY_IMPL_HPP
-#define NDN_SECURITY_PIB_IMPL_IDENTITY_IMPL_HPP
+#ifndef NDN_CXX_SECURITY_PIB_IMPL_IDENTITY_IMPL_HPP
+#define NDN_CXX_SECURITY_PIB_IMPL_IDENTITY_IMPL_HPP
 
 #include "ndn-cxx/security/pib/key-container.hpp"
 
@@ -136,4 +136,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_IMPL_IDENTITY_IMPL_HPP
+#endif // NDN_CXX_SECURITY_PIB_IMPL_IDENTITY_IMPL_HPP
diff --git a/ndn-cxx/security/pib/impl/key-impl.hpp b/ndn-cxx/security/pib/impl/key-impl.hpp
index 4448ec4..c95b5c6 100644
--- a/ndn-cxx/security/pib/impl/key-impl.hpp
+++ b/ndn-cxx/security/pib/impl/key-impl.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_PIB_IMPL_KEY_IMPL_HPP
-#define NDN_SECURITY_PIB_IMPL_KEY_IMPL_HPP
+#ifndef NDN_CXX_SECURITY_PIB_IMPL_KEY_IMPL_HPP
+#define NDN_CXX_SECURITY_PIB_IMPL_KEY_IMPL_HPP
 
 #include "ndn-cxx/security/security-common.hpp"
 #include "ndn-cxx/security/pib/certificate-container.hpp"
@@ -184,4 +184,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_IMPL_KEY_IMPL_HPP
+#endif // NDN_CXX_SECURITY_PIB_IMPL_KEY_IMPL_HPP
diff --git a/ndn-cxx/security/pib/impl/pib-memory.hpp b/ndn-cxx/security/pib/impl/pib-memory.hpp
index df3cb7a..110f720 100644
--- a/ndn-cxx/security/pib/impl/pib-memory.hpp
+++ b/ndn-cxx/security/pib/impl/pib-memory.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_PIB_IMPL_PIB_MEMORY_HPP
-#define NDN_SECURITY_PIB_IMPL_PIB_MEMORY_HPP
+#ifndef NDN_CXX_SECURITY_PIB_IMPL_PIB_MEMORY_HPP
+#define NDN_CXX_SECURITY_PIB_IMPL_PIB_MEMORY_HPP
 
 #include "ndn-cxx/security/pib/pib-impl.hpp"
 
@@ -145,4 +145,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_IMPL_PIB_MEMORY_HPP
+#endif // NDN_CXX_SECURITY_PIB_IMPL_PIB_MEMORY_HPP
diff --git a/ndn-cxx/security/pib/impl/pib-sqlite3.hpp b/ndn-cxx/security/pib/impl/pib-sqlite3.hpp
index ab80add..a6fd015 100644
--- a/ndn-cxx/security/pib/impl/pib-sqlite3.hpp
+++ b/ndn-cxx/security/pib/impl/pib-sqlite3.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITTY_PIB_IMPL_PIB_SQLITE3_HPP
-#define NDN_SECURITTY_PIB_IMPL_PIB_SQLITE3_HPP
+#ifndef NDN_CXX_SECURITTY_PIB_IMPL_PIB_SQLITE3_HPP
+#define NDN_CXX_SECURITTY_PIB_IMPL_PIB_SQLITE3_HPP
 
 #include "ndn-cxx/security/pib/pib-impl.hpp"
 
@@ -154,4 +154,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITTY_PIB_IMPL_PIB_SQLITE3_HPP
+#endif // NDN_CXX_SECURITTY_PIB_IMPL_PIB_SQLITE3_HPP
diff --git a/ndn-cxx/security/pib/key-container.hpp b/ndn-cxx/security/pib/key-container.hpp
index d84e362..616d88a 100644
--- a/ndn-cxx/security/pib/key-container.hpp
+++ b/ndn-cxx/security/pib/key-container.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_PIB_KEY_CONTAINER_HPP
-#define NDN_SECURITY_PIB_KEY_CONTAINER_HPP
+#ifndef NDN_CXX_SECURITY_PIB_KEY_CONTAINER_HPP
+#define NDN_CXX_SECURITY_PIB_KEY_CONTAINER_HPP
 
 #include "ndn-cxx/security/pib/key.hpp"
 
@@ -168,4 +168,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_KEY_CONTAINER_HPP
+#endif // NDN_CXX_SECURITY_PIB_KEY_CONTAINER_HPP
diff --git a/ndn-cxx/security/pib/key.hpp b/ndn-cxx/security/pib/key.hpp
index 6c129bd..ead7693 100644
--- a/ndn-cxx/security/pib/key.hpp
+++ b/ndn-cxx/security/pib/key.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_PIB_KEY_HPP
-#define NDN_SECURITY_PIB_KEY_HPP
+#ifndef NDN_CXX_SECURITY_PIB_KEY_HPP
+#define NDN_CXX_SECURITY_PIB_KEY_HPP
 
 #include "ndn-cxx/security/pib/certificate-container.hpp"
 #include "ndn-cxx/security/security-common.hpp"
@@ -220,4 +220,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_KEY_HPP
+#endif // NDN_CXX_SECURITY_PIB_KEY_HPP
diff --git a/ndn-cxx/security/pib/pib-impl.hpp b/ndn-cxx/security/pib/pib-impl.hpp
index b70d271..db3470a 100644
--- a/ndn-cxx/security/pib/pib-impl.hpp
+++ b/ndn-cxx/security/pib/pib-impl.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_PIB_PIB_IMPL_HPP
-#define NDN_SECURITY_PIB_PIB_IMPL_HPP
+#ifndef NDN_CXX_SECURITY_PIB_PIB_IMPL_HPP
+#define NDN_CXX_SECURITY_PIB_PIB_IMPL_HPP
 
 #include "ndn-cxx/security/pib/pib.hpp"
 #include "ndn-cxx/security/certificate.hpp"
@@ -280,4 +280,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_PIB_IMPL_HPP
+#endif // NDN_CXX_SECURITY_PIB_PIB_IMPL_HPP
diff --git a/ndn-cxx/security/pib/pib.hpp b/ndn-cxx/security/pib/pib.hpp
index 26862be..d30146c 100644
--- a/ndn-cxx/security/pib/pib.hpp
+++ b/ndn-cxx/security/pib/pib.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_PIB_PIB_HPP
-#define NDN_SECURITY_PIB_PIB_HPP
+#ifndef NDN_CXX_SECURITY_PIB_PIB_HPP
+#define NDN_CXX_SECURITY_PIB_PIB_HPP
 
 #include "ndn-cxx/security/pib/identity-container.hpp"
 
@@ -184,4 +184,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_PIB_HPP
+#endif // NDN_CXX_SECURITY_PIB_PIB_HPP
diff --git a/ndn-cxx/security/security-common.hpp b/ndn-cxx/security/security-common.hpp
index 925447a..046a97f 100644
--- a/ndn-cxx/security/security-common.hpp
+++ b/ndn-cxx/security/security-common.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_SECURITY_COMMON_HPP
-#define NDN_SECURITY_SECURITY_COMMON_HPP
+#ifndef NDN_CXX_SECURITY_SECURITY_COMMON_HPP
+#define NDN_CXX_SECURITY_SECURITY_COMMON_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -137,4 +137,4 @@
 
 } // namespace ndn
 
-#endif // NDN_SECURITY_SECURITY_COMMON_HPP
+#endif // NDN_CXX_SECURITY_SECURITY_COMMON_HPP
diff --git a/ndn-cxx/security/signing-info.hpp b/ndn-cxx/security/signing-info.hpp
index 1ac83fd..12bc713 100644
--- a/ndn-cxx/security/signing-info.hpp
+++ b/ndn-cxx/security/signing-info.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_SIGNING_INFO_HPP
-#define NDN_SECURITY_SIGNING_INFO_HPP
+#ifndef NDN_CXX_SECURITY_SIGNING_INFO_HPP
+#define NDN_CXX_SECURITY_SIGNING_INFO_HPP
 
 #include "ndn-cxx/name.hpp"
 #include "ndn-cxx/signature-info.hpp"
@@ -323,4 +323,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_SIGNING_INFO_HPP
+#endif // NDN_CXX_SECURITY_SIGNING_INFO_HPP
diff --git a/ndn-cxx/security/tpm/back-end.hpp b/ndn-cxx/security/tpm/back-end.hpp
index 2874bdd..057f5f2 100644
--- a/ndn-cxx/security/tpm/back-end.hpp
+++ b/ndn-cxx/security/tpm/back-end.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_TPM_BACK_END_HPP
-#define NDN_SECURITY_TPM_BACK_END_HPP
+#ifndef NDN_CXX_SECURITY_TPM_BACK_END_HPP
+#define NDN_CXX_SECURITY_TPM_BACK_END_HPP
 
 #include "ndn-cxx/security/tpm/tpm.hpp"
 
@@ -201,4 +201,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_TPM_BACK_END_HPP
+#endif // NDN_CXX_SECURITY_TPM_BACK_END_HPP
diff --git a/ndn-cxx/security/tpm/impl/back-end-file.hpp b/ndn-cxx/security/tpm/impl/back-end-file.hpp
index 2f956fe..b41e695 100644
--- a/ndn-cxx/security/tpm/impl/back-end-file.hpp
+++ b/ndn-cxx/security/tpm/impl/back-end-file.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_TPM_IMPL_BACK_END_FILE_HPP
-#define NDN_SECURITY_TPM_IMPL_BACK_END_FILE_HPP
+#ifndef NDN_CXX_SECURITY_TPM_IMPL_BACK_END_FILE_HPP
+#define NDN_CXX_SECURITY_TPM_IMPL_BACK_END_FILE_HPP
 
 #include "ndn-cxx/security/tpm/back-end.hpp"
 
@@ -99,4 +99,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_TPM_IMPL_BACK_END_FILE_HPP
+#endif // NDN_CXX_SECURITY_TPM_IMPL_BACK_END_FILE_HPP
diff --git a/ndn-cxx/security/tpm/impl/back-end-mem.hpp b/ndn-cxx/security/tpm/impl/back-end-mem.hpp
index b185ba3..b210369 100644
--- a/ndn-cxx/security/tpm/impl/back-end-mem.hpp
+++ b/ndn-cxx/security/tpm/impl/back-end-mem.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_TPM_IMPL_BACK_END_MEM_HPP
-#define NDN_SECURITY_TPM_IMPL_BACK_END_MEM_HPP
+#ifndef NDN_CXX_SECURITY_TPM_IMPL_BACK_END_MEM_HPP
+#define NDN_CXX_SECURITY_TPM_IMPL_BACK_END_MEM_HPP
 
 #include "ndn-cxx/security/tpm/back-end.hpp"
 
@@ -78,4 +78,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_TPM_IMPL_BACK_END_MEM_HPP
+#endif // NDN_CXX_SECURITY_TPM_IMPL_BACK_END_MEM_HPP
diff --git a/ndn-cxx/security/tpm/impl/back-end-osx.hpp b/ndn-cxx/security/tpm/impl/back-end-osx.hpp
index 326268b..a1a1f49 100644
--- a/ndn-cxx/security/tpm/impl/back-end-osx.hpp
+++ b/ndn-cxx/security/tpm/impl/back-end-osx.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_TPM_IMPL_BACK_END_OSX_HPP
-#define NDN_SECURITY_TPM_IMPL_BACK_END_OSX_HPP
+#ifndef NDN_CXX_SECURITY_TPM_IMPL_BACK_END_OSX_HPP
+#define NDN_CXX_SECURITY_TPM_IMPL_BACK_END_OSX_HPP
 
 #include "ndn-cxx/security/tpm/back-end.hpp"
 
@@ -113,4 +113,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_TPM_IMPL_BACK_END_OSX_HPP
+#endif // NDN_CXX_SECURITY_TPM_IMPL_BACK_END_OSX_HPP
diff --git a/ndn-cxx/security/tpm/impl/key-handle-mem.hpp b/ndn-cxx/security/tpm/impl/key-handle-mem.hpp
index 63a4785..b25015e 100644
--- a/ndn-cxx/security/tpm/impl/key-handle-mem.hpp
+++ b/ndn-cxx/security/tpm/impl/key-handle-mem.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_TPM_IMPL_KEY_HANDLE_MEM_HPP
-#define NDN_SECURITY_TPM_IMPL_KEY_HANDLE_MEM_HPP
+#ifndef NDN_CXX_SECURITY_TPM_IMPL_KEY_HANDLE_MEM_HPP
+#define NDN_CXX_SECURITY_TPM_IMPL_KEY_HANDLE_MEM_HPP
 
 #include "ndn-cxx/security/tpm/key-handle.hpp"
 
@@ -64,4 +64,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_TPM_IMPL_KEY_HANDLE_MEM_HPP
+#endif // NDN_CXX_SECURITY_TPM_IMPL_KEY_HANDLE_MEM_HPP
diff --git a/ndn-cxx/security/tpm/impl/key-handle-osx.hpp b/ndn-cxx/security/tpm/impl/key-handle-osx.hpp
index 23415d8..cd1bea4 100644
--- a/ndn-cxx/security/tpm/impl/key-handle-osx.hpp
+++ b/ndn-cxx/security/tpm/impl/key-handle-osx.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_TPM_IMPL_KEY_HANDLE_OSX_HPP
-#define NDN_SECURITY_TPM_IMPL_KEY_HANDLE_OSX_HPP
+#ifndef NDN_CXX_SECURITY_TPM_IMPL_KEY_HANDLE_OSX_HPP
+#define NDN_CXX_SECURITY_TPM_IMPL_KEY_HANDLE_OSX_HPP
 
 #include "ndn-cxx/security/tpm/key-handle.hpp"
 
@@ -65,4 +65,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_TPM_IMPL_KEY_HANDLE_OSX_HPP
+#endif // NDN_CXX_SECURITY_TPM_IMPL_KEY_HANDLE_OSX_HPP
diff --git a/ndn-cxx/security/tpm/impl/key-ref-osx.hpp b/ndn-cxx/security/tpm/impl/key-ref-osx.hpp
index 9833387..88345b2 100644
--- a/ndn-cxx/security/tpm/impl/key-ref-osx.hpp
+++ b/ndn-cxx/security/tpm/impl/key-ref-osx.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_TPM_IMPL_KEY_REF_OSX_HPP
-#define NDN_SECURITY_TPM_IMPL_KEY_REF_OSX_HPP
+#ifndef NDN_CXX_SECURITY_TPM_IMPL_KEY_REF_OSX_HPP
+#define NDN_CXX_SECURITY_TPM_IMPL_KEY_REF_OSX_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -42,4 +42,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_TPM_IMPL_KEY_REF_OSX_HPP
+#endif // NDN_CXX_SECURITY_TPM_IMPL_KEY_REF_OSX_HPP
diff --git a/ndn-cxx/security/tpm/key-handle.hpp b/ndn-cxx/security/tpm/key-handle.hpp
index c8ae068..962d20d 100644
--- a/ndn-cxx/security/tpm/key-handle.hpp
+++ b/ndn-cxx/security/tpm/key-handle.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_TPM_KEY_HANDLE_HPP
-#define NDN_SECURITY_TPM_KEY_HANDLE_HPP
+#ifndef NDN_CXX_SECURITY_TPM_KEY_HANDLE_HPP
+#define NDN_CXX_SECURITY_TPM_KEY_HANDLE_HPP
 
 #include "ndn-cxx/name.hpp"
 #include "ndn-cxx/security/security-common.hpp"
@@ -119,4 +119,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_TPM_KEY_HANDLE_HPP
+#endif // NDN_CXX_SECURITY_TPM_KEY_HANDLE_HPP
diff --git a/ndn-cxx/security/tpm/tpm.hpp b/ndn-cxx/security/tpm/tpm.hpp
index 25754b8..08400c6 100644
--- a/ndn-cxx/security/tpm/tpm.hpp
+++ b/ndn-cxx/security/tpm/tpm.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_TPM_TPM_HPP
-#define NDN_SECURITY_TPM_TPM_HPP
+#ifndef NDN_CXX_SECURITY_TPM_TPM_HPP
+#define NDN_CXX_SECURITY_TPM_TPM_HPP
 
 #include "ndn-cxx/name.hpp"
 #include "ndn-cxx/security/key-params.hpp"
@@ -279,4 +279,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_TPM_TPM_HPP
+#endif // NDN_CXX_SECURITY_TPM_TPM_HPP
diff --git a/ndn-cxx/security/trust-anchor-container.hpp b/ndn-cxx/security/trust-anchor-container.hpp
index d5dcc13..6db7d2e 100644
--- a/ndn-cxx/security/trust-anchor-container.hpp
+++ b/ndn-cxx/security/trust-anchor-container.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_TRUST_ANCHOR_CONTAINER_HPP
-#define NDN_SECURITY_TRUST_ANCHOR_CONTAINER_HPP
+#ifndef NDN_CXX_SECURITY_TRUST_ANCHOR_CONTAINER_HPP
+#define NDN_CXX_SECURITY_TRUST_ANCHOR_CONTAINER_HPP
 
 #include "ndn-cxx/interest.hpp"
 #include "ndn-cxx/security/certificate.hpp"
@@ -177,4 +177,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_TRUST_ANCHOR_CONTAINER_HPP
+#endif // NDN_CXX_SECURITY_TRUST_ANCHOR_CONTAINER_HPP
diff --git a/ndn-cxx/security/trust-anchor-group.hpp b/ndn-cxx/security/trust-anchor-group.hpp
index 3ea11a8..7c7198e 100644
--- a/ndn-cxx/security/trust-anchor-group.hpp
+++ b/ndn-cxx/security/trust-anchor-group.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_TRUST_ANCHOR_GROUP_HPP
-#define NDN_SECURITY_TRUST_ANCHOR_GROUP_HPP
+#ifndef NDN_CXX_SECURITY_TRUST_ANCHOR_GROUP_HPP
+#define NDN_CXX_SECURITY_TRUST_ANCHOR_GROUP_HPP
 
 #include "ndn-cxx/data.hpp"
 #include "ndn-cxx/security/certificate.hpp"
@@ -167,4 +167,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_TRUST_ANCHOR_GROUP_HPP
+#endif // NDN_CXX_SECURITY_TRUST_ANCHOR_GROUP_HPP
diff --git a/ndn-cxx/security/validation-callback.hpp b/ndn-cxx/security/validation-callback.hpp
index 703267a..23018eb 100644
--- a/ndn-cxx/security/validation-callback.hpp
+++ b/ndn-cxx/security/validation-callback.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATION_CALLBACK_HPP
-#define NDN_SECURITY_VALIDATION_CALLBACK_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATION_CALLBACK_HPP
+#define NDN_CXX_SECURITY_VALIDATION_CALLBACK_HPP
 
 #include "ndn-cxx/data.hpp"
 #include "ndn-cxx/interest.hpp"
@@ -55,4 +55,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATION_CALLBACK_HPP
+#endif // NDN_CXX_SECURITY_VALIDATION_CALLBACK_HPP
diff --git a/ndn-cxx/security/validation-error.hpp b/ndn-cxx/security/validation-error.hpp
index 5e5cd2c..2f8495e 100644
--- a/ndn-cxx/security/validation-error.hpp
+++ b/ndn-cxx/security/validation-error.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATION_ERROR_HPP
-#define NDN_SECURITY_VALIDATION_ERROR_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATION_ERROR_HPP
+#define NDN_CXX_SECURITY_VALIDATION_ERROR_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -90,4 +90,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATION_ERROR_HPP
+#endif // NDN_CXX_SECURITY_VALIDATION_ERROR_HPP
diff --git a/ndn-cxx/security/validation-policy-accept-all.hpp b/ndn-cxx/security/validation-policy-accept-all.hpp
index 6372e88..623a57f 100644
--- a/ndn-cxx/security/validation-policy-accept-all.hpp
+++ b/ndn-cxx/security/validation-policy-accept-all.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATION_POLICY_ACCEPT_ALL_HPP
-#define NDN_SECURITY_VALIDATION_POLICY_ACCEPT_ALL_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATION_POLICY_ACCEPT_ALL_HPP
+#define NDN_CXX_SECURITY_VALIDATION_POLICY_ACCEPT_ALL_HPP
 
 #include "ndn-cxx/security/validation-policy.hpp"
 
@@ -53,4 +53,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATION_POLICY_ACCEPT_ALL_HPP
+#endif // NDN_CXX_SECURITY_VALIDATION_POLICY_ACCEPT_ALL_HPP
diff --git a/ndn-cxx/security/validation-policy-command-interest.hpp b/ndn-cxx/security/validation-policy-command-interest.hpp
index e57e14f..34a0e9a 100644
--- a/ndn-cxx/security/validation-policy-command-interest.hpp
+++ b/ndn-cxx/security/validation-policy-command-interest.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATION_POLICY_COMMAND_INTEREST_HPP
-#define NDN_SECURITY_VALIDATION_POLICY_COMMAND_INTEREST_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATION_POLICY_COMMAND_INTEREST_HPP
+#define NDN_CXX_SECURITY_VALIDATION_POLICY_COMMAND_INTEREST_HPP
 
 #include "ndn-cxx/security/validation-policy.hpp"
 
@@ -156,4 +156,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATION_POLICY_COMMAND_INTEREST_HPP
+#endif // NDN_CXX_SECURITY_VALIDATION_POLICY_COMMAND_INTEREST_HPP
diff --git a/ndn-cxx/security/validation-policy-config.hpp b/ndn-cxx/security/validation-policy-config.hpp
index f910994..8008397 100644
--- a/ndn-cxx/security/validation-policy-config.hpp
+++ b/ndn-cxx/security/validation-policy-config.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATION_POLICY_CONFIG_HPP
-#define NDN_SECURITY_VALIDATION_POLICY_CONFIG_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATION_POLICY_CONFIG_HPP
+#define NDN_CXX_SECURITY_VALIDATION_POLICY_CONFIG_HPP
 
 #include "ndn-cxx/security/validation-policy.hpp"
 #include "ndn-cxx/security/validator-config/rule.hpp"
@@ -109,4 +109,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATION_POLICY_CONFIG_HPP
+#endif // NDN_CXX_SECURITY_VALIDATION_POLICY_CONFIG_HPP
diff --git a/ndn-cxx/security/validation-policy-signed-interest.hpp b/ndn-cxx/security/validation-policy-signed-interest.hpp
index 84553fc..3b8124a 100644
--- a/ndn-cxx/security/validation-policy-signed-interest.hpp
+++ b/ndn-cxx/security/validation-policy-signed-interest.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATION_POLICY_SIGNED_INTEREST_HPP
-#define NDN_SECURITY_VALIDATION_POLICY_SIGNED_INTEREST_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATION_POLICY_SIGNED_INTEREST_HPP
+#define NDN_CXX_SECURITY_VALIDATION_POLICY_SIGNED_INTEREST_HPP
 
 #include "ndn-cxx/security/validation-policy.hpp"
 
@@ -216,4 +216,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATION_POLICY_SIGNED_INTEREST_HPP
+#endif // NDN_CXX_SECURITY_VALIDATION_POLICY_SIGNED_INTEREST_HPP
diff --git a/ndn-cxx/security/validation-policy-simple-hierarchy.hpp b/ndn-cxx/security/validation-policy-simple-hierarchy.hpp
index 2cd6503..aa0b593 100644
--- a/ndn-cxx/security/validation-policy-simple-hierarchy.hpp
+++ b/ndn-cxx/security/validation-policy-simple-hierarchy.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATION_POLICY_SIMPLE_HIERARCHY_HPP
-#define NDN_SECURITY_VALIDATION_POLICY_SIMPLE_HIERARCHY_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATION_POLICY_SIMPLE_HIERARCHY_HPP
+#define NDN_CXX_SECURITY_VALIDATION_POLICY_SIMPLE_HIERARCHY_HPP
 
 #include "ndn-cxx/security/validation-policy.hpp"
 
@@ -47,4 +47,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATION_POLICY_SIMPLE_HIERARCHY_HPP
+#endif // NDN_CXX_SECURITY_VALIDATION_POLICY_SIMPLE_HIERARCHY_HPP
diff --git a/ndn-cxx/security/validation-policy.hpp b/ndn-cxx/security/validation-policy.hpp
index 95b1b42..f8410d3 100644
--- a/ndn-cxx/security/validation-policy.hpp
+++ b/ndn-cxx/security/validation-policy.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATION_POLICY_HPP
-#define NDN_SECURITY_VALIDATION_POLICY_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATION_POLICY_HPP
+#define NDN_CXX_SECURITY_VALIDATION_POLICY_HPP
 
 #include "ndn-cxx/data.hpp"
 #include "ndn-cxx/interest.hpp"
@@ -180,4 +180,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATION_POLICY_HPP
+#endif // NDN_CXX_SECURITY_VALIDATION_POLICY_HPP
diff --git a/ndn-cxx/security/validation-state.hpp b/ndn-cxx/security/validation-state.hpp
index ee538c4..739468c 100644
--- a/ndn-cxx/security/validation-state.hpp
+++ b/ndn-cxx/security/validation-state.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATION_STATE_HPP
-#define NDN_SECURITY_VALIDATION_STATE_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATION_STATE_HPP
+#define NDN_CXX_SECURITY_VALIDATION_STATE_HPP
 
 #include "ndn-cxx/detail/tag-host.hpp"
 #include "ndn-cxx/security/certificate.hpp"
@@ -256,4 +256,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATION_STATE_HPP
+#endif // NDN_CXX_SECURITY_VALIDATION_STATE_HPP
diff --git a/ndn-cxx/security/validator-config.hpp b/ndn-cxx/security/validator-config.hpp
index a5d6d51..8c2ae9e 100644
--- a/ndn-cxx/security/validator-config.hpp
+++ b/ndn-cxx/security/validator-config.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATOR_CONFIG_HPP
-#define NDN_SECURITY_VALIDATOR_CONFIG_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATOR_CONFIG_HPP
+#define NDN_CXX_SECURITY_VALIDATOR_CONFIG_HPP
 
 #include "ndn-cxx/security/validator.hpp"
 #include "ndn-cxx/security/validation-policy-command-interest.hpp"
@@ -75,4 +75,4 @@
 
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATOR_CONFIG_HPP
+#endif // NDN_CXX_SECURITY_VALIDATOR_CONFIG_HPP
diff --git a/ndn-cxx/security/validator-config/checker.hpp b/ndn-cxx/security/validator-config/checker.hpp
index 5adc407..3086ee7 100644
--- a/ndn-cxx/security/validator-config/checker.hpp
+++ b/ndn-cxx/security/validator-config/checker.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATOR_CONFIG_CHECKER_HPP
-#define NDN_SECURITY_VALIDATOR_CONFIG_CHECKER_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATOR_CONFIG_CHECKER_HPP
+#define NDN_CXX_SECURITY_VALIDATOR_CONFIG_CHECKER_HPP
 
 #include "ndn-cxx/name.hpp"
 #include "ndn-cxx/security/validator-config/common.hpp"
@@ -189,4 +189,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATOR_CONFIG_CHECKER_HPP
+#endif // NDN_CXX_SECURITY_VALIDATOR_CONFIG_CHECKER_HPP
diff --git a/ndn-cxx/security/validator-config/common.hpp b/ndn-cxx/security/validator-config/common.hpp
index 06aa516..93653ba 100644
--- a/ndn-cxx/security/validator-config/common.hpp
+++ b/ndn-cxx/security/validator-config/common.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,8 +21,8 @@
  * @author Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
  */
 
-#ifndef NDN_SECURITY_VALIDATOR_CONFIG_COMMON_HPP
-#define NDN_SECURITY_VALIDATOR_CONFIG_COMMON_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATOR_CONFIG_COMMON_HPP
+#define NDN_CXX_SECURITY_VALIDATOR_CONFIG_COMMON_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -46,4 +46,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATOR_CONFIG_COMMON_HPP
+#endif // NDN_CXX_SECURITY_VALIDATOR_CONFIG_COMMON_HPP
diff --git a/ndn-cxx/security/validator-config/filter.hpp b/ndn-cxx/security/validator-config/filter.hpp
index d852564..41113f7 100644
--- a/ndn-cxx/security/validator-config/filter.hpp
+++ b/ndn-cxx/security/validator-config/filter.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATOR_CONFIG_FILTER_HPP
-#define NDN_SECURITY_VALIDATOR_CONFIG_FILTER_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATOR_CONFIG_FILTER_HPP
+#define NDN_CXX_SECURITY_VALIDATOR_CONFIG_FILTER_HPP
 
 #include "ndn-cxx/data.hpp"
 #include "ndn-cxx/interest.hpp"
@@ -142,4 +142,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATOR_CONFIG_FILTER_HPP
+#endif // NDN_CXX_SECURITY_VALIDATOR_CONFIG_FILTER_HPP
diff --git a/ndn-cxx/security/validator-config/name-relation.hpp b/ndn-cxx/security/validator-config/name-relation.hpp
index 098e5ae..3f6c6a0 100644
--- a/ndn-cxx/security/validator-config/name-relation.hpp
+++ b/ndn-cxx/security/validator-config/name-relation.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATOR_CONFIG_NAME_RELATION_HPP
-#define NDN_SECURITY_VALIDATOR_CONFIG_NAME_RELATION_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATOR_CONFIG_NAME_RELATION_HPP
+#define NDN_CXX_SECURITY_VALIDATOR_CONFIG_NAME_RELATION_HPP
 
 #include "ndn-cxx/name.hpp"
 #include "ndn-cxx/security/validator-config/common.hpp"
@@ -57,4 +57,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATOR_CONFIG_NAME_RELATION_HPP
+#endif // NDN_CXX_SECURITY_VALIDATOR_CONFIG_NAME_RELATION_HPP
diff --git a/ndn-cxx/security/validator-config/rule.hpp b/ndn-cxx/security/validator-config/rule.hpp
index 65bfb5b..4d51fe8 100644
--- a/ndn-cxx/security/validator-config/rule.hpp
+++ b/ndn-cxx/security/validator-config/rule.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATOR_CONFIG_RULE_HPP
-#define NDN_SECURITY_VALIDATOR_CONFIG_RULE_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATOR_CONFIG_RULE_HPP
+#define NDN_CXX_SECURITY_VALIDATOR_CONFIG_RULE_HPP
 
 #include "ndn-cxx/security/validator-config/checker.hpp"
 #include "ndn-cxx/security/validator-config/filter.hpp"
@@ -114,4 +114,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATOR_CONFIG_RULE_HPP
+#endif // NDN_CXX_SECURITY_VALIDATOR_CONFIG_RULE_HPP
diff --git a/ndn-cxx/security/validator-null.hpp b/ndn-cxx/security/validator-null.hpp
index c1517cf..58fd1f8 100644
--- a/ndn-cxx/security/validator-null.hpp
+++ b/ndn-cxx/security/validator-null.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATOR_NULL_HPP
-#define NDN_SECURITY_VALIDATOR_NULL_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATOR_NULL_HPP
+#define NDN_CXX_SECURITY_VALIDATOR_NULL_HPP
 
 #include "ndn-cxx/security/validator.hpp"
 
@@ -44,4 +44,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATOR_NULL_HPP
+#endif // NDN_CXX_SECURITY_VALIDATOR_NULL_HPP
diff --git a/ndn-cxx/security/validator.hpp b/ndn-cxx/security/validator.hpp
index 214eda7..46712c7 100644
--- a/ndn-cxx/security/validator.hpp
+++ b/ndn-cxx/security/validator.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDATOR_HPP
-#define NDN_SECURITY_VALIDATOR_HPP
+#ifndef NDN_CXX_SECURITY_VALIDATOR_HPP
+#define NDN_CXX_SECURITY_VALIDATOR_HPP
 
 #include "ndn-cxx/security/certificate-fetcher.hpp"
 #include "ndn-cxx/security/certificate-request.hpp"
@@ -186,4 +186,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDATOR_HPP
+#endif // NDN_CXX_SECURITY_VALIDATOR_HPP
diff --git a/ndn-cxx/security/validity-period.hpp b/ndn-cxx/security/validity-period.hpp
index 7249ade..5f780fd 100644
--- a/ndn-cxx/security/validity-period.hpp
+++ b/ndn-cxx/security/validity-period.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VALIDITY_PERIOD_HPP
-#define NDN_SECURITY_VALIDITY_PERIOD_HPP
+#ifndef NDN_CXX_SECURITY_VALIDITY_PERIOD_HPP
+#define NDN_CXX_SECURITY_VALIDITY_PERIOD_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 #include "ndn-cxx/encoding/tlv.hpp"
@@ -139,4 +139,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VALIDITY_PERIOD_HPP
+#endif // NDN_CXX_SECURITY_VALIDITY_PERIOD_HPP
diff --git a/ndn-cxx/security/verification-helpers.hpp b/ndn-cxx/security/verification-helpers.hpp
index 2826999..8b96221 100644
--- a/ndn-cxx/security/verification-helpers.hpp
+++ b/ndn-cxx/security/verification-helpers.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_VERIFICATION_HELPERS_HPP
-#define NDN_SECURITY_VERIFICATION_HELPERS_HPP
+#ifndef NDN_CXX_SECURITY_VERIFICATION_HELPERS_HPP
+#define NDN_CXX_SECURITY_VERIFICATION_HELPERS_HPP
 
 #include "ndn-cxx/name.hpp"
 #include "ndn-cxx/security/security-common.hpp"
@@ -189,4 +189,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_VERIFICATION_HELPERS_HPP
+#endif // NDN_CXX_SECURITY_VERIFICATION_HELPERS_HPP
diff --git a/ndn-cxx/signature-info.hpp b/ndn-cxx/signature-info.hpp
index ad99258..eabf4cc 100644
--- a/ndn-cxx/signature-info.hpp
+++ b/ndn-cxx/signature-info.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SIGNATURE_INFO_HPP
-#define NDN_SIGNATURE_INFO_HPP
+#ifndef NDN_CXX_SIGNATURE_INFO_HPP
+#define NDN_CXX_SIGNATURE_INFO_HPP
 
 #include "ndn-cxx/key-locator.hpp"
 #include "ndn-cxx/security/validity-period.hpp"
@@ -257,4 +257,4 @@
 
 } // namespace ndn
 
-#endif // NDN_SIGNATURE_INFO_HPP
+#endif // NDN_CXX_SIGNATURE_INFO_HPP
diff --git a/ndn-cxx/tag.hpp b/ndn-cxx/tag.hpp
index 1a2db36..383d973 100644
--- a/ndn-cxx/tag.hpp
+++ b/ndn-cxx/tag.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TAG_HPP
-#define NDN_TAG_HPP
+#ifndef NDN_CXX_TAG_HPP
+#define NDN_CXX_TAG_HPP
 
 namespace ndn {
 
@@ -94,4 +94,4 @@
 
 } // namespace ndn
 
-#endif // NDN_TAG_HPP
+#endif // NDN_CXX_TAG_HPP
diff --git a/ndn-cxx/transport/detail/stream-transport-impl.hpp b/ndn-cxx/transport/detail/stream-transport-impl.hpp
index 97b796e..410e095 100644
--- a/ndn-cxx/transport/detail/stream-transport-impl.hpp
+++ b/ndn-cxx/transport/detail/stream-transport-impl.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TRANSPORT_DETAIL_STREAM_TRANSPORT_IMPL_HPP
-#define NDN_TRANSPORT_DETAIL_STREAM_TRANSPORT_IMPL_HPP
+#ifndef NDN_CXX_TRANSPORT_DETAIL_STREAM_TRANSPORT_IMPL_HPP
+#define NDN_CXX_TRANSPORT_DETAIL_STREAM_TRANSPORT_IMPL_HPP
 
 #include "ndn-cxx/transport/transport.hpp"
 
@@ -280,4 +280,4 @@
 } // namespace detail
 } // namespace ndn
 
-#endif // NDN_TRANSPORT_DETAIL_STREAM_TRANSPORT_IMPL_HPP
+#endif // NDN_CXX_TRANSPORT_DETAIL_STREAM_TRANSPORT_IMPL_HPP
diff --git a/ndn-cxx/transport/detail/stream-transport-with-resolver-impl.hpp b/ndn-cxx/transport/detail/stream-transport-with-resolver-impl.hpp
index a59e873..f8ebe31 100644
--- a/ndn-cxx/transport/detail/stream-transport-with-resolver-impl.hpp
+++ b/ndn-cxx/transport/detail/stream-transport-with-resolver-impl.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TRANSPORT_DETAIL_STREAM_TRANSPORT_WITH_RESOLVER_IMPL_HPP
-#define NDN_TRANSPORT_DETAIL_STREAM_TRANSPORT_WITH_RESOLVER_IMPL_HPP
+#ifndef NDN_CXX_TRANSPORT_DETAIL_STREAM_TRANSPORT_WITH_RESOLVER_IMPL_HPP
+#define NDN_CXX_TRANSPORT_DETAIL_STREAM_TRANSPORT_WITH_RESOLVER_IMPL_HPP
 
 #include "ndn-cxx/transport/detail/stream-transport-impl.hpp"
 
@@ -103,4 +103,4 @@
 } // namespace detail
 } // namespace ndn
 
-#endif // NDN_TRANSPORT_DETAIL_STREAM_TRANSPORT_WITH_RESOLVER_IMPL_HPP
+#endif // NDN_CXX_TRANSPORT_DETAIL_STREAM_TRANSPORT_WITH_RESOLVER_IMPL_HPP
diff --git a/ndn-cxx/transport/tcp-transport.hpp b/ndn-cxx/transport/tcp-transport.hpp
index a727f27..7cf2a3e 100644
--- a/ndn-cxx/transport/tcp-transport.hpp
+++ b/ndn-cxx/transport/tcp-transport.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TRANSPORT_TCP_TRANSPORT_HPP
-#define NDN_TRANSPORT_TCP_TRANSPORT_HPP
+#ifndef NDN_CXX_TRANSPORT_TCP_TRANSPORT_HPP
+#define NDN_CXX_TRANSPORT_TCP_TRANSPORT_HPP
 
 #include "ndn-cxx/transport/transport.hpp"
 #include "ndn-cxx/util/config-file.hpp"
@@ -89,4 +89,4 @@
 
 } // namespace ndn
 
-#endif // NDN_TRANSPORT_TCP_TRANSPORT_HPP
+#endif // NDN_CXX_TRANSPORT_TCP_TRANSPORT_HPP
diff --git a/ndn-cxx/transport/transport.hpp b/ndn-cxx/transport/transport.hpp
index 4f4d72b..71e8f99 100644
--- a/ndn-cxx/transport/transport.hpp
+++ b/ndn-cxx/transport/transport.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TRANSPORT_TRANSPORT_HPP
-#define NDN_TRANSPORT_TRANSPORT_HPP
+#ifndef NDN_CXX_TRANSPORT_TRANSPORT_HPP
+#define NDN_CXX_TRANSPORT_TRANSPORT_HPP
 
 #include "ndn-cxx/detail/asio-fwd.hpp"
 #include "ndn-cxx/detail/common.hpp"
@@ -118,4 +118,4 @@
 
 } // namespace ndn
 
-#endif // NDN_TRANSPORT_TRANSPORT_HPP
+#endif // NDN_CXX_TRANSPORT_TRANSPORT_HPP
diff --git a/ndn-cxx/transport/unix-transport.hpp b/ndn-cxx/transport/unix-transport.hpp
index d18dbe4..da19b4c 100644
--- a/ndn-cxx/transport/unix-transport.hpp
+++ b/ndn-cxx/transport/unix-transport.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TRANSPORT_UNIX_TRANSPORT_HPP
-#define NDN_TRANSPORT_UNIX_TRANSPORT_HPP
+#ifndef NDN_CXX_TRANSPORT_UNIX_TRANSPORT_HPP
+#define NDN_CXX_TRANSPORT_UNIX_TRANSPORT_HPP
 
 #include "ndn-cxx/transport/transport.hpp"
 #include "ndn-cxx/util/config-file.hpp"
@@ -84,4 +84,4 @@
 
 } // namespace ndn
 
-#endif // NDN_TRANSPORT_UNIX_TRANSPORT_HPP
+#endif // NDN_CXX_TRANSPORT_UNIX_TRANSPORT_HPP
diff --git a/ndn-cxx/util/backports.hpp b/ndn-cxx/util/backports.hpp
index e36cdaf..9150523 100644
--- a/ndn-cxx/util/backports.hpp
+++ b/ndn-cxx/util/backports.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_BACKPORTS_HPP
-#define NDN_UTIL_BACKPORTS_HPP
+#ifndef NDN_CXX_UTIL_BACKPORTS_HPP
+#define NDN_CXX_UTIL_BACKPORTS_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -168,4 +168,4 @@
 
 } // namespace ndn
 
-#endif // NDN_UTIL_BACKPORTS_HPP
+#endif // NDN_CXX_UTIL_BACKPORTS_HPP
diff --git a/ndn-cxx/util/concepts.hpp b/ndn-cxx/util/concepts.hpp
index 90269ec..24968fc 100644
--- a/ndn-cxx/util/concepts.hpp
+++ b/ndn-cxx/util/concepts.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2020 Regents of the University of California,
+ * Copyright (c) 2014-2021 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
@@ -25,8 +25,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_CONCEPTS_HPP
-#define NDN_UTIL_CONCEPTS_HPP
+#ifndef NDN_CXX_UTIL_CONCEPTS_HPP
+#define NDN_CXX_UTIL_CONCEPTS_HPP
 
 #include "ndn-cxx/encoding/block.hpp"
 #include "ndn-cxx/encoding/encoding-buffer.hpp"
@@ -149,4 +149,4 @@
                 #T " must be default-constructible"); \
   BOOST_CONCEPT_ASSERT((::ndn::detail::StlForwardIteratorConcept<T>))
 
-#endif // NDN_UTIL_CONCEPTS_HPP
+#endif // NDN_CXX_UTIL_CONCEPTS_HPP
diff --git a/ndn-cxx/util/config-file.hpp b/ndn-cxx/util/config-file.hpp
index 600e1cc..bdcb374 100644
--- a/ndn-cxx/util/config-file.hpp
+++ b/ndn-cxx/util/config-file.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MANAGEMENT_CONFIG_FILE_HPP
-#define NDN_MANAGEMENT_CONFIG_FILE_HPP
+#ifndef NDN_CXX_MANAGEMENT_CONFIG_FILE_HPP
+#define NDN_CXX_MANAGEMENT_CONFIG_FILE_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -125,4 +125,4 @@
 
 } // namespace ndn
 
-#endif // NDN_MANAGEMENT_CONFIG_FILE_HPP
+#endif // NDN_CXX_MANAGEMENT_CONFIG_FILE_HPP
diff --git a/ndn-cxx/util/dummy-client-face.hpp b/ndn-cxx/util/dummy-client-face.hpp
index e85b279..66f4e21 100644
--- a/ndn-cxx/util/dummy-client-face.hpp
+++ b/ndn-cxx/util/dummy-client-face.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_DUMMY_CLIENT_FACE_HPP
-#define NDN_UTIL_DUMMY_CLIENT_FACE_HPP
+#ifndef NDN_CXX_UTIL_DUMMY_CLIENT_FACE_HPP
+#define NDN_CXX_UTIL_DUMMY_CLIENT_FACE_HPP
 
 #include "ndn-cxx/face.hpp"
 #include "ndn-cxx/util/signal.hpp"
@@ -197,4 +197,4 @@
 } // namespace util
 } // namespace ndn
 
-#endif // NDN_UTIL_DUMMY_CLIENT_FACE_HPP
+#endif // NDN_CXX_UTIL_DUMMY_CLIENT_FACE_HPP
diff --git a/ndn-cxx/util/exception.hpp b/ndn-cxx/util/exception.hpp
index 1cdcc3b..a8cd326 100644
--- a/ndn-cxx/util/exception.hpp
+++ b/ndn-cxx/util/exception.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_EXCEPTION_HPP
-#define NDN_UTIL_EXCEPTION_HPP
+#ifndef NDN_CXX_UTIL_EXCEPTION_HPP
+#define NDN_CXX_UTIL_EXCEPTION_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -71,4 +71,4 @@
 #define NDN_THROW_NESTED(e) \
   NDN_THROW(e) << boost::errinfo_nested_exception(boost::current_exception())
 
-#endif // NDN_UTIL_EXCEPTION_HPP
+#endif // NDN_CXX_UTIL_EXCEPTION_HPP
diff --git a/ndn-cxx/util/impl/steady-timer.hpp b/ndn-cxx/util/impl/steady-timer.hpp
index b7a35b3..d4219a0 100644
--- a/ndn-cxx/util/impl/steady-timer.hpp
+++ b/ndn-cxx/util/impl/steady-timer.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_IMPL_STEADY_TIMER_HPP
-#define NDN_UTIL_IMPL_STEADY_TIMER_HPP
+#ifndef NDN_CXX_UTIL_IMPL_STEADY_TIMER_HPP
+#define NDN_CXX_UTIL_IMPL_STEADY_TIMER_HPP
 
 #include "ndn-cxx/util/time.hpp"
 
@@ -57,4 +57,4 @@
 } // namespace util
 } // namespace ndn
 
-#endif // NDN_UTIL_IMPL_STEADY_TIMER_HPP
+#endif // NDN_CXX_UTIL_IMPL_STEADY_TIMER_HPP
diff --git a/ndn-cxx/util/indented-stream.hpp b/ndn-cxx/util/indented-stream.hpp
index 7b1376c..7b05960 100644
--- a/ndn-cxx/util/indented-stream.hpp
+++ b/ndn-cxx/util/indented-stream.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_INDENTED_STREAM_HPP
-#define NDN_UTIL_INDENTED_STREAM_HPP
+#ifndef NDN_CXX_UTIL_INDENTED_STREAM_HPP
+#define NDN_CXX_UTIL_INDENTED_STREAM_HPP
 
 #include <ostream>
 #include <sstream>
@@ -79,4 +79,4 @@
 } // namespace util
 } // namespace ndn
 
-#endif // NDN_UTIL_INDENTED_STREAM_HPP
+#endif // NDN_CXX_UTIL_INDENTED_STREAM_HPP
diff --git a/ndn-cxx/util/io.hpp b/ndn-cxx/util/io.hpp
index 709fe5d..f032062 100644
--- a/ndn-cxx/util/io.hpp
+++ b/ndn-cxx/util/io.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_IO_HPP
-#define NDN_UTIL_IO_HPP
+#ifndef NDN_CXX_UTIL_IO_HPP
+#define NDN_CXX_UTIL_IO_HPP
 
 #include "ndn-cxx/encoding/block.hpp"
 #include "ndn-cxx/util/concepts.hpp"
@@ -183,4 +183,4 @@
 } // namespace io
 } // namespace ndn
 
-#endif // NDN_UTIL_IO_HPP
+#endif // NDN_CXX_UTIL_IO_HPP
diff --git a/ndn-cxx/util/logger.hpp b/ndn-cxx/util/logger.hpp
index 6196d0c..bdf1c07 100644
--- a/ndn-cxx/util/logger.hpp
+++ b/ndn-cxx/util/logger.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_LOGGER_HPP
-#define NDN_UTIL_LOGGER_HPP
+#ifndef NDN_CXX_UTIL_LOGGER_HPP
+#define NDN_CXX_UTIL_LOGGER_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -278,4 +278,4 @@
 
 #endif // HAVE_NDN_CXX_CUSTOM_LOGGER
 
-#endif // NDN_UTIL_LOGGER_HPP
+#endif // NDN_CXX_UTIL_LOGGER_HPP
diff --git a/ndn-cxx/util/logging.hpp b/ndn-cxx/util/logging.hpp
index ccb2196..71e170e 100644
--- a/ndn-cxx/util/logging.hpp
+++ b/ndn-cxx/util/logging.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_LOGGING_HPP
-#define NDN_UTIL_LOGGING_HPP
+#ifndef NDN_CXX_UTIL_LOGGING_HPP
+#define NDN_CXX_UTIL_LOGGING_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -222,4 +222,4 @@
 
 #endif // HAVE_NDN_CXX_CUSTOM_LOGGER
 
-#endif // NDN_UTIL_LOGGING_HPP
+#endif // NDN_CXX_UTIL_LOGGING_HPP
diff --git a/ndn-cxx/util/notification-stream.hpp b/ndn-cxx/util/notification-stream.hpp
index 3c10c74..c5a25e8 100644
--- a/ndn-cxx/util/notification-stream.hpp
+++ b/ndn-cxx/util/notification-stream.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_NOTIFICATION_STREAM_HPP
-#define NDN_UTIL_NOTIFICATION_STREAM_HPP
+#ifndef NDN_CXX_UTIL_NOTIFICATION_STREAM_HPP
+#define NDN_CXX_UTIL_NOTIFICATION_STREAM_HPP
 
 #include "ndn-cxx/face.hpp"
 #include "ndn-cxx/name.hpp"
@@ -76,4 +76,4 @@
 } // namespace util
 } // namespace ndn
 
-#endif // NDN_UTIL_NOTIFICATION_STREAM_HPP
+#endif // NDN_CXX_UTIL_NOTIFICATION_STREAM_HPP
diff --git a/ndn-cxx/util/notification-subscriber.hpp b/ndn-cxx/util/notification-subscriber.hpp
index 340eec7..fcd0ed9 100644
--- a/ndn-cxx/util/notification-subscriber.hpp
+++ b/ndn-cxx/util/notification-subscriber.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2019 Regents of the University of California,
+ * Copyright (c) 2014-2021 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
@@ -25,8 +25,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_NOTIFICATION_SUBSCRIBER_HPP
-#define NDN_UTIL_NOTIFICATION_SUBSCRIBER_HPP
+#ifndef NDN_CXX_UTIL_NOTIFICATION_SUBSCRIBER_HPP
+#define NDN_CXX_UTIL_NOTIFICATION_SUBSCRIBER_HPP
 
 #include "ndn-cxx/face.hpp"
 #include "ndn-cxx/util/concepts.hpp"
@@ -196,4 +196,4 @@
 } // namespace util
 } // namespace ndn
 
-#endif // NDN_UTIL_NOTIFICATION_SUBSCRIBER_HPP
+#endif // NDN_CXX_UTIL_NOTIFICATION_SUBSCRIBER_HPP
diff --git a/ndn-cxx/util/ostream-joiner.hpp b/ndn-cxx/util/ostream-joiner.hpp
index 8586bd9..8570102 100644
--- a/ndn-cxx/util/ostream-joiner.hpp
+++ b/ndn-cxx/util/ostream-joiner.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -24,8 +24,8 @@
  *  \sa https://en.cppreference.com/w/cpp/experimental/ostream_joiner
  */
 
-#ifndef NDN_UTIL_OSTREAM_JOINER_HPP
-#define NDN_UTIL_OSTREAM_JOINER_HPP
+#ifndef NDN_CXX_UTIL_OSTREAM_JOINER_HPP
+#define NDN_CXX_UTIL_OSTREAM_JOINER_HPP
 
 #include "ndn-cxx/util/backports.hpp"
 
@@ -122,4 +122,4 @@
 } // namespace ndn
 
 #endif // NDN_CXX_HAVE_EXPERIMENTAL_OSTREAM_JOINER
-#endif // NDN_UTIL_OSTREAM_JOINER_HPP
+#endif // NDN_CXX_UTIL_OSTREAM_JOINER_HPP
diff --git a/ndn-cxx/util/overload.hpp b/ndn-cxx/util/overload.hpp
index 228c684..b3af737 100644
--- a/ndn-cxx/util/overload.hpp
+++ b/ndn-cxx/util/overload.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_OVERLOAD_HPP
-#define NDN_UTIL_OVERLOAD_HPP
+#ifndef NDN_CXX_UTIL_OVERLOAD_HPP
+#define NDN_CXX_UTIL_OVERLOAD_HPP
 
 #include <boost/predef/compiler/gcc.h>
 #include <boost/version.hpp>
@@ -110,4 +110,4 @@
 } // namespace ndn
 
 #endif // BOOST_VERSION >= 106100
-#endif // NDN_UTIL_OVERLOAD_HPP
+#endif // NDN_CXX_UTIL_OVERLOAD_HPP
diff --git a/ndn-cxx/util/random.hpp b/ndn-cxx/util/random.hpp
index 9c69bd0..7061cd1 100644
--- a/ndn-cxx/util/random.hpp
+++ b/ndn-cxx/util/random.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_RANDOM_HPP
-#define NDN_UTIL_RANDOM_HPP
+#ifndef NDN_CXX_UTIL_RANDOM_HPP
+#define NDN_CXX_UTIL_RANDOM_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -87,4 +87,4 @@
 } // namespace random
 } // namespace ndn
 
-#endif // NDN_UTIL_RANDOM_HPP
+#endif // NDN_CXX_UTIL_RANDOM_HPP
diff --git a/ndn-cxx/util/scheduler.hpp b/ndn-cxx/util/scheduler.hpp
index 887cf97..ea8a0b8 100644
--- a/ndn-cxx/util/scheduler.hpp
+++ b/ndn-cxx/util/scheduler.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_SCHEDULER_HPP
-#define NDN_UTIL_SCHEDULER_HPP
+#ifndef NDN_CXX_UTIL_SCHEDULER_HPP
+#define NDN_CXX_UTIL_SCHEDULER_HPP
 
 #include "ndn-cxx/detail/asio-fwd.hpp"
 #include "ndn-cxx/detail/cancel-handle.hpp"
@@ -191,4 +191,4 @@
 
 } // namespace ndn
 
-#endif // NDN_UTIL_SCHEDULER_HPP
+#endif // NDN_CXX_UTIL_SCHEDULER_HPP
diff --git a/ndn-cxx/util/segment-fetcher.hpp b/ndn-cxx/util/segment-fetcher.hpp
index a35d69b..ea939be 100644
--- a/ndn-cxx/util/segment-fetcher.hpp
+++ b/ndn-cxx/util/segment-fetcher.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_SEGMENT_FETCHER_HPP
-#define NDN_UTIL_SEGMENT_FETCHER_HPP
+#ifndef NDN_CXX_UTIL_SEGMENT_FETCHER_HPP
+#define NDN_CXX_UTIL_SEGMENT_FETCHER_HPP
 
 #include "ndn-cxx/face.hpp"
 #include "ndn-cxx/security/validator.hpp"
@@ -336,4 +336,4 @@
 } // namespace util
 } // namespace ndn
 
-#endif // NDN_UTIL_SEGMENT_FETCHER_HPP
+#endif // NDN_CXX_UTIL_SEGMENT_FETCHER_HPP
diff --git a/ndn-cxx/util/sha256.hpp b/ndn-cxx/util/sha256.hpp
index 22bc253..5a42add 100644
--- a/ndn-cxx/util/sha256.hpp
+++ b/ndn-cxx/util/sha256.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_SHA256_HPP
-#define NDN_UTIL_SHA256_HPP
+#ifndef NDN_CXX_UTIL_SHA256_HPP
+#define NDN_CXX_UTIL_SHA256_HPP
 
 #include "ndn-cxx/encoding/block.hpp"
 #include "ndn-cxx/encoding/buffer-stream.hpp"
@@ -177,4 +177,4 @@
 } // namespace util
 } // namespace ndn
 
-#endif // NDN_UTIL_SHA256_HPP
+#endif // NDN_CXX_UTIL_SHA256_HPP
diff --git a/ndn-cxx/util/signal.hpp b/ndn-cxx/util/signal.hpp
index 520b5c7..a8daad2 100644
--- a/ndn-cxx/util/signal.hpp
+++ b/ndn-cxx/util/signal.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_SIGNAL_HPP
-#define NDN_UTIL_SIGNAL_HPP
+#ifndef NDN_CXX_UTIL_SIGNAL_HPP
+#define NDN_CXX_UTIL_SIGNAL_HPP
 
 #include "ndn-cxx/util/signal/signal.hpp"
 #include "ndn-cxx/util/signal/emit.hpp"
 #include "ndn-cxx/util/signal/connection.hpp"
 #include "ndn-cxx/util/signal/scoped-connection.hpp"
 
-#endif // NDN_UTIL_SIGNAL_HPP
+#endif // NDN_CXX_UTIL_SIGNAL_HPP
diff --git a/ndn-cxx/util/signal/connection.hpp b/ndn-cxx/util/signal/connection.hpp
index 01bce60..5eba960 100644
--- a/ndn-cxx/util/signal/connection.hpp
+++ b/ndn-cxx/util/signal/connection.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_SIGNAL_CONNECTION_HPP
-#define NDN_UTIL_SIGNAL_CONNECTION_HPP
+#ifndef NDN_CXX_UTIL_SIGNAL_CONNECTION_HPP
+#define NDN_CXX_UTIL_SIGNAL_CONNECTION_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -103,4 +103,4 @@
 } // namespace util
 } // namespace ndn
 
-#endif // NDN_UTIL_SIGNAL_CONNECTION_HPP
+#endif // NDN_CXX_UTIL_SIGNAL_CONNECTION_HPP
diff --git a/ndn-cxx/util/signal/emit.hpp b/ndn-cxx/util/signal/emit.hpp
index c073f1f..a12aaaa 100644
--- a/ndn-cxx/util/signal/emit.hpp
+++ b/ndn-cxx/util/signal/emit.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -30,8 +30,8 @@
  *    this->emitSignal(signalName, arg1, arg2);
  */
 
-#ifndef NDN_UTIL_SIGNAL_EMIT_HPP
-#define NDN_UTIL_SIGNAL_EMIT_HPP
+#ifndef NDN_CXX_UTIL_SIGNAL_EMIT_HPP
+#define NDN_CXX_UTIL_SIGNAL_EMIT_HPP
 
 namespace ndn {
 namespace util {
@@ -76,4 +76,4 @@
 #define emitSignal(...) \
   NDN_CXX_SIGNAL_EMIT(__VA_ARGS__, ::ndn::util::signal::DummyExtraArg())
 
-#endif // NDN_UTIL_SIGNAL_EMIT_HPP
+#endif // NDN_CXX_UTIL_SIGNAL_EMIT_HPP
diff --git a/ndn-cxx/util/signal/scoped-connection.hpp b/ndn-cxx/util/signal/scoped-connection.hpp
index df90271..9ecf5e6 100644
--- a/ndn-cxx/util/signal/scoped-connection.hpp
+++ b/ndn-cxx/util/signal/scoped-connection.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_SIGNAL_SCOPED_CONNECTION_HPP
-#define NDN_UTIL_SIGNAL_SCOPED_CONNECTION_HPP
+#ifndef NDN_CXX_UTIL_SIGNAL_SCOPED_CONNECTION_HPP
+#define NDN_CXX_UTIL_SIGNAL_SCOPED_CONNECTION_HPP
 
 #include "ndn-cxx/util/signal/connection.hpp"
 
@@ -99,4 +99,4 @@
 } // namespace util
 } // namespace ndn
 
-#endif // NDN_UTIL_SIGNAL_SCOPED_CONNECTION_HPP
+#endif // NDN_CXX_UTIL_SIGNAL_SCOPED_CONNECTION_HPP
diff --git a/ndn-cxx/util/signal/signal.hpp b/ndn-cxx/util/signal/signal.hpp
index b579fa9..4b0f8dc 100644
--- a/ndn-cxx/util/signal/signal.hpp
+++ b/ndn-cxx/util/signal/signal.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_SIGNAL_SIGNAL_HPP
-#define NDN_UTIL_SIGNAL_SIGNAL_HPP
+#ifndef NDN_CXX_UTIL_SIGNAL_SIGNAL_HPP
+#define NDN_CXX_UTIL_SIGNAL_SIGNAL_HPP
 
 #include "ndn-cxx/util/scope.hpp"
 #include "ndn-cxx/util/signal/connection.hpp"
@@ -254,4 +254,4 @@
 } // namespace util
 } // namespace ndn
 
-#endif // NDN_UTIL_SIGNAL_SIGNAL_HPP
+#endif // NDN_CXX_UTIL_SIGNAL_SIGNAL_HPP
diff --git a/ndn-cxx/util/sqlite3-statement.hpp b/ndn-cxx/util/sqlite3-statement.hpp
index 9705b05..b773c10 100644
--- a/ndn-cxx/util/sqlite3-statement.hpp
+++ b/ndn-cxx/util/sqlite3-statement.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_SQLITE3_STATEMENT_HPP
-#define NDN_UTIL_SQLITE3_STATEMENT_HPP
+#ifndef NDN_CXX_UTIL_SQLITE3_STATEMENT_HPP
+#define NDN_CXX_UTIL_SQLITE3_STATEMENT_HPP
 
 #include "ndn-cxx/encoding/block.hpp"
 
@@ -154,4 +154,4 @@
 } // namespace util
 } // namespace ndn
 
-#endif // NDN_UTIL_SQLITE3_STATEMENT_HPP
+#endif // NDN_CXX_UTIL_SQLITE3_STATEMENT_HPP
diff --git a/ndn-cxx/util/string-helper.hpp b/ndn-cxx/util/string-helper.hpp
index b923317..4a1d2a4 100644
--- a/ndn-cxx/util/string-helper.hpp
+++ b/ndn-cxx/util/string-helper.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_STRING_HELPER_HPP
-#define NDN_UTIL_STRING_HELPER_HPP
+#ifndef NDN_CXX_UTIL_STRING_HELPER_HPP
+#define NDN_CXX_UTIL_STRING_HELPER_HPP
 
 #include "ndn-cxx/encoding/buffer.hpp"
 
@@ -219,4 +219,4 @@
 
 } // namespace ndn
 
-#endif // NDN_UTIL_STRING_HELPER_HPP
+#endif // NDN_CXX_UTIL_STRING_HELPER_HPP
diff --git a/ndn-cxx/util/time-custom-clock.hpp b/ndn-cxx/util/time-custom-clock.hpp
index 935682f..99c5a61 100644
--- a/ndn-cxx/util/time-custom-clock.hpp
+++ b/ndn-cxx/util/time-custom-clock.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_TIME_CUSTOM_CLOCK_HPP
-#define NDN_UTIL_TIME_CUSTOM_CLOCK_HPP
+#ifndef NDN_CXX_UTIL_TIME_CUSTOM_CLOCK_HPP
+#define NDN_CXX_UTIL_TIME_CUSTOM_CLOCK_HPP
 
 #include "ndn-cxx/util/time.hpp"
 
@@ -66,4 +66,4 @@
 } // namespace time
 } // namespace ndn
 
-#endif // NDN_UTIL_TIME_CUSTOM_CLOCK_HPP
+#endif // NDN_CXX_UTIL_TIME_CUSTOM_CLOCK_HPP
diff --git a/ndn-cxx/util/time-unit-test-clock.hpp b/ndn-cxx/util/time-unit-test-clock.hpp
index f6dd6ca..b148e63 100644
--- a/ndn-cxx/util/time-unit-test-clock.hpp
+++ b/ndn-cxx/util/time-unit-test-clock.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_TIME_UNIT_TEST_CLOCK_HPP
-#define NDN_UTIL_TIME_UNIT_TEST_CLOCK_HPP
+#ifndef NDN_CXX_UTIL_TIME_UNIT_TEST_CLOCK_HPP
+#define NDN_CXX_UTIL_TIME_UNIT_TEST_CLOCK_HPP
 
 #include "ndn-cxx/util/time-custom-clock.hpp"
 
@@ -111,4 +111,4 @@
 } // namespace time
 } // namespace ndn
 
-#endif // NDN_UTIL_TIME_UNIT_TEST_CLOCK_HPP
+#endif // NDN_CXX_UTIL_TIME_UNIT_TEST_CLOCK_HPP
diff --git a/ndn-cxx/util/time.hpp b/ndn-cxx/util/time.hpp
index ec15272..1e7221f 100644
--- a/ndn-cxx/util/time.hpp
+++ b/ndn-cxx/util/time.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_UTIL_TIME_HPP
-#define NDN_UTIL_TIME_HPP
+#ifndef NDN_CXX_UTIL_TIME_HPP
+#define NDN_CXX_UTIL_TIME_HPP
 
 #include "ndn-cxx/detail/common.hpp"
 
@@ -354,4 +354,4 @@
 } // namespace chrono
 } // namespace boost
 
-#endif // NDN_UTIL_TIME_HPP
+#endif // NDN_CXX_UTIL_TIME_HPP
diff --git a/tests/test-home-fixture.hpp b/tests/test-home-fixture.hpp
index 68ffd50..af5e839 100644
--- a/tests/test-home-fixture.hpp
+++ b/tests/test-home-fixture.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_TEST_HOME_FIXTURE_HPP
-#define NDN_TESTS_TEST_HOME_FIXTURE_HPP
+#ifndef NDN_CXX_TESTS_TEST_HOME_FIXTURE_HPP
+#define NDN_CXX_TESTS_TEST_HOME_FIXTURE_HPP
 
 #include "ndn-cxx/security/key-chain.hpp"
 
@@ -125,4 +125,4 @@
 } // namespace tests
 } // namespace ndn
 
-#endif // NDN_TESTS_TEST_HOME_FIXTURE_HPP
+#endif // NDN_CXX_TESTS_TEST_HOME_FIXTURE_HPP
diff --git a/tests/unit/net/network-configuration-detector.hpp b/tests/unit/net/network-configuration-detector.hpp
index 015b2b8..5c0c34b 100644
--- a/tests/unit/net/network-configuration-detector.hpp
+++ b/tests/unit/net/network-configuration-detector.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_UNIT_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
-#define NDN_TESTS_UNIT_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
+#ifndef NDN_CXX_TESTS_UNIT_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
+#define NDN_CXX_TESTS_UNIT_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
 
 #define SKIP_IF_IPV4_UNAVAILABLE() \
   do { \
@@ -72,4 +72,4 @@
 } // namespace tests
 } // namespace ndn
 
-#endif // NDN_TESTS_UNIT_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
+#endif // NDN_CXX_TESTS_UNIT_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
diff --git a/tests/unit/security/tpm/back-end-wrapper-file.hpp b/tests/unit/security/tpm/back-end-wrapper-file.hpp
index 2689e07..2da77aa 100644
--- a/tests/unit/security/tpm/back-end-wrapper-file.hpp
+++ b/tests/unit/security/tpm/back-end-wrapper-file.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_SECURITY_TPM_BACK_END_WRAPPER_FILE_HPP
-#define NDN_TESTS_SECURITY_TPM_BACK_END_WRAPPER_FILE_HPP
+#ifndef NDN_CXX_TESTS_UNIT_SECURITY_TPM_BACK_END_WRAPPER_FILE_HPP
+#define NDN_CXX_TESTS_UNIT_SECURITY_TPM_BACK_END_WRAPPER_FILE_HPP
 
 #include "ndn-cxx/security/tpm/impl/back-end-file.hpp"
 
@@ -70,4 +70,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_TESTS_SECURITY_TPM_BACK_END_WRAPPER_FILE_HPP
+#endif // NDN_CXX_TESTS_UNIT_SECURITY_TPM_BACK_END_WRAPPER_FILE_HPP
diff --git a/tests/unit/security/tpm/back-end-wrapper-mem.hpp b/tests/unit/security/tpm/back-end-wrapper-mem.hpp
index 67dd7e0..8de2b12 100644
--- a/tests/unit/security/tpm/back-end-wrapper-mem.hpp
+++ b/tests/unit/security/tpm/back-end-wrapper-mem.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_SECURITY_TPM_BACK_END_WRAPPER_MEM_HPP
-#define NDN_TESTS_SECURITY_TPM_BACK_END_WRAPPER_MEM_HPP
+#ifndef NDN_CXX_TESTS_UNIT_SECURITY_TPM_BACK_END_WRAPPER_MEM_HPP
+#define NDN_CXX_TESTS_UNIT_SECURITY_TPM_BACK_END_WRAPPER_MEM_HPP
 
 #include "ndn-cxx/security/tpm/impl/back-end-mem.hpp"
 
@@ -61,4 +61,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_TESTS_SECURITY_TPM_BACK_END_WRAPPER_MEM_HPP
+#endif // NDN_CXX_TESTS_UNIT_SECURITY_TPM_BACK_END_WRAPPER_MEM_HPP
diff --git a/tests/unit/security/tpm/back-end-wrapper-osx.hpp b/tests/unit/security/tpm/back-end-wrapper-osx.hpp
index 124c897..c459c47 100644
--- a/tests/unit/security/tpm/back-end-wrapper-osx.hpp
+++ b/tests/unit/security/tpm/back-end-wrapper-osx.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_SECURITY_TPM_BACK_END_WRAPPER_OSX_HPP
-#define NDN_TESTS_SECURITY_TPM_BACK_END_WRAPPER_OSX_HPP
+#ifndef NDN_CXX_TESTS_UNIT_SECURITY_TPM_BACK_END_WRAPPER_OSX_HPP
+#define NDN_CXX_TESTS_UNIT_SECURITY_TPM_BACK_END_WRAPPER_OSX_HPP
 
 #include "ndn-cxx/security/tpm/impl/back-end-osx.hpp"
 #include "ndn-cxx/security/tpm/impl/key-handle-osx.hpp"
@@ -85,4 +85,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_TESTS_SECURITY_TPM_BACK_END_WRAPPER_OSX_HPP
+#endif // NDN_CXX_TESTS_UNIT_SECURITY_TPM_BACK_END_WRAPPER_OSX_HPP
diff --git a/tests/unit/test-home-env-saver.hpp b/tests/unit/test-home-env-saver.hpp
index 732c2d8..9a04605 100644
--- a/tests/unit/test-home-env-saver.hpp
+++ b/tests/unit/test-home-env-saver.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_UNIT_TEST_HOME_ENV_SAVER_HPP
-#define NDN_TESTS_UNIT_TEST_HOME_ENV_SAVER_HPP
+#ifndef NDN_CXX_TESTS_UNIT_TEST_HOME_ENV_SAVER_HPP
+#define NDN_CXX_TESTS_UNIT_TEST_HOME_ENV_SAVER_HPP
 
 #include <cstdlib>
 #include <string>
@@ -53,4 +53,4 @@
 } // namespace tests
 } // namespace ndn
 
-#endif // NDN_TESTS_UNIT_TEST_HOME_ENV_SAVER_HPP
+#endif // NDN_CXX_TESTS_UNIT_TEST_HOME_ENV_SAVER_HPP
diff --git a/tests/unit/util/simple-notification.hpp b/tests/unit/util/simple-notification.hpp
index 431b8c2..280045a 100644
--- a/tests/unit/util/simple-notification.hpp
+++ b/tests/unit/util/simple-notification.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2019 Regents of the University of California,
+ * Copyright (c) 2014-2021 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
@@ -25,8 +25,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_UNIT_UTIL_SIMPLE_NOTIFICATION_HPP
-#define NDN_TESTS_UNIT_UTIL_SIMPLE_NOTIFICATION_HPP
+#ifndef NDN_CXX_TESTS_UNIT_UTIL_SIMPLE_NOTIFICATION_HPP
+#define NDN_CXX_TESTS_UNIT_UTIL_SIMPLE_NOTIFICATION_HPP
 
 #include "ndn-cxx/encoding/encoding-buffer.hpp"
 
@@ -91,4 +91,4 @@
 } // namespace util
 } // namespace ndn
 
-#endif // NDN_TESTS_UNIT_UTIL_SIMPLE_NOTIFICATION_HPP
+#endif // NDN_CXX_TESTS_UNIT_UTIL_SIMPLE_NOTIFICATION_HPP
diff --git a/tools/ndnsec/accumulator.hpp b/tools/ndnsec/accumulator.hpp
index 7c08581..fb7f357 100644
--- a/tools/ndnsec/accumulator.hpp
+++ b/tools/ndnsec/accumulator.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TOOLS_NDNSEC_ACCUMULATOR_HPP
-#define NDN_TOOLS_NDNSEC_ACCUMULATOR_HPP
+#ifndef NDN_CXX_TOOLS_NDNSEC_ACCUMULATOR_HPP
+#define NDN_CXX_TOOLS_NDNSEC_ACCUMULATOR_HPP
 
 #include <boost/program_options/value_semantic.hpp>
 
@@ -165,4 +165,4 @@
 } // namespace ndnsec
 } // namespace ndn
 
-#endif // NDN_TOOLS_NDNSEC_ACCUMULATOR_HPP
+#endif // NDN_CXX_TOOLS_NDNSEC_ACCUMULATOR_HPP
diff --git a/tools/ndnsec/ndnsec-pch.hpp b/tools/ndnsec/ndnsec-pch.hpp
index ea537fa..c72b650 100644
--- a/tools/ndnsec/ndnsec-pch.hpp
+++ b/tools/ndnsec/ndnsec-pch.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TOOLS_NDNSEC_NDNSEC_PCH_HPP
-#define NDN_TOOLS_NDNSEC_NDNSEC_PCH_HPP
+#ifndef NDN_CXX_TOOLS_NDNSEC_NDNSEC_PCH_HPP
+#define NDN_CXX_TOOLS_NDNSEC_NDNSEC_PCH_HPP
 
 #include "util.hpp"
 
@@ -28,4 +28,4 @@
 
 #include <boost/asio/ip/tcp.hpp>
 
-#endif // NDN_TOOLS_NDNSEC_NDNSEC_PCH_HPP
+#endif // NDN_CXX_TOOLS_NDNSEC_NDNSEC_PCH_HPP
diff --git a/tools/ndnsec/ndnsec.hpp b/tools/ndnsec/ndnsec.hpp
index dd34dd9..bb773ea 100644
--- a/tools/ndnsec/ndnsec.hpp
+++ b/tools/ndnsec/ndnsec.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TOOLS_NDNSEC_NDNSEC_HPP
-#define NDN_TOOLS_NDNSEC_NDNSEC_HPP
+#ifndef NDN_CXX_TOOLS_NDNSEC_NDNSEC_HPP
+#define NDN_CXX_TOOLS_NDNSEC_NDNSEC_HPP
 
 namespace ndn {
 namespace ndnsec {
 
-// TODO convert to tool registry (may be)
+// TODO: convert to tool registry (maybe)
 
 int
 ndnsec_list(int argc, char** argv);
@@ -66,4 +66,4 @@
 } // namespace ndnsec
 } // namespace ndn
 
-#endif // NDN_TOOLS_NDNSEC_NDNSEC_HPP
+#endif // NDN_CXX_TOOLS_NDNSEC_NDNSEC_HPP
diff --git a/tools/ndnsec/util.hpp b/tools/ndnsec/util.hpp
index f069c34..8aed837 100644
--- a/tools/ndnsec/util.hpp
+++ b/tools/ndnsec/util.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TOOLS_NDNSEC_UTIL_HPP
-#define NDN_TOOLS_NDNSEC_UTIL_HPP
+#ifndef NDN_CXX_TOOLS_NDNSEC_UTIL_HPP
+#define NDN_CXX_TOOLS_NDNSEC_UTIL_HPP
 
 #include "ndn-cxx/security/key-chain.hpp"
 
@@ -67,4 +67,4 @@
 } // namespace ndnsec
 } // namespace ndn
 
-#endif // NDN_TOOLS_NDNSEC_UTIL_HPP
+#endif // NDN_CXX_TOOLS_NDNSEC_UTIL_HPP