diff --git a/docs/code-style.rst b/docs/code-style.rst
index 7071e1d..48984bb 100644
--- a/docs/code-style.rst
+++ b/docs/code-style.rst
@@ -432,7 +432,6 @@
 
         my-class.hpp, my-class.cpp
 
-
 2.2. Names representing types must be written in English in mixed case starting with upper case.
 
     .. code-block:: c++
@@ -544,7 +543,6 @@
           static std::string s_name;
         };
 
-
 2.11. Variables with a large scope should have long (explicit) names, variables with a small
 scope can have short names.
 
@@ -612,7 +610,6 @@
     The notation is taken from mathematics where it is an established convention for
     indicating a number of objects.
 
-
 2.18. The suffix ``Num`` or ``No`` should be used for variables representing an entity number.
 
     .. code-block:: c++
@@ -701,7 +698,6 @@
     hierarchy, then child classes should should define their own ``Error`` or
     ``Exception`` classes that are inherited from the parent's Error class.
 
-
 2.25. Functions (methods returning something) should be named after what they return and
 procedures (void methods) after what they do.
 
@@ -717,8 +713,8 @@
 
 3.2. Header files must contain an include guard.
 
-    For example, header file located in ``module/class-name.hpp`` or in
-    ``src/module/class-name.hpp`` should have header guard in the following form:
+    For example, a header file named ``module/class-name.hpp`` or
+    ``src/module/class-name.hpp`` should have a header guard in the following form:
 
     .. code-block:: c++
 
@@ -727,39 +723,43 @@
         ...
         #endif // APP_MODULE_CLASS_NAME_HPP
 
-    The name should follow the location of the file inside the source tree and prevents
-    naming conflicts.  Header guard should be prefixed with the application/library name
-    to avoid conflicts with other packaged and libraries.
+    The macro name should reflect the path of the header file relative to the root of the
+    source tree, in order to prevent naming conflicts. The header guard should be prefixed
+    with the application/library name to avoid conflicts with other packages and libraries.
 
-3.3. Header files which are in the same source distribution should be included in
-``"quotes"``, if possible with a path relative to the source file.  Header files for
-system and other external libraries should be included in ``<angle brackets>``.
+3.3. Include directives for system headers and other external libraries should use
+``<angle brackets>``. Header files in the same source code repository should be included
+using ``"quotes"``.
 
     .. code-block:: c++
 
+        #include "ndn-cxx/util/random.hpp"
+
         #include <string>
         #include <boost/lexical_cast.hpp>
 
-        #include "util/random.hpp"
+    All of a project's header files should be included with their path relative to
+    the project's source directory. The use of UNIX directory shortcuts ``.``
+    (the current directory) and ``..`` (the parent directory) is discouraged.
 
 3.4. Include statements should be grouped. Same-project headers should be included first.
 Leave an empty line between groups of include statements. Sort alphabetically within a group.
+For example, the include section of ``ndn-cxx/foo/bar.cpp`` may look like this:
 
     .. code-block:: c++
 
-        #include "detail/pending-interest.hpp"
-        #include "util/random.hpp"
+        #include "ndn-cxx/detail/pending-interest.hpp"
+        #include "ndn-cxx/util/random.hpp"
 
+        #include <cstdlib>
         #include <fstream>
         #include <iomanip>
 
         #include <boost/lexical_cast.hpp>
         #include <boost/regex.hpp>
 
-
 3.5. Types that are local to one file only can be declared inside that file.
 
-
 3.6. Implicit conversion is generally allowed.
 
     Implicit conversion between integer and floating point numbers can cause problems and
@@ -773,7 +773,6 @@
     ``const_cast`` instead where appropriate.  Use ``static_pointer_cast``,
     ``dynamic_pointer_cast``, ``const_pointer_cast`` when dealing with ``shared_ptr``.
 
-
 3.7. Variables should be initialized where they are declared.
 
     This ensures that variables are valid at any time. Sometimes it is impossible to
@@ -801,7 +800,6 @@
     * When the class is used only inside the compilation unit, e.g., when implementing pImpl
       idiom (aka Bridge pattern) or similar cases.
 
-
 3.9. C++ pointers and references should have their reference symbol next to the type rather
 than to the name.
 
diff --git a/docs/doxygen.conf.in b/docs/doxygen.conf.in
index 8cb8bcb..e353524 100644
--- a/docs/doxygen.conf.in
+++ b/docs/doxygen.conf.in
@@ -2031,7 +2031,7 @@
 # preprocessor.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           =
+INCLUDE_PATH           = ..
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
diff --git a/ndn-cxx/common-pch.hpp b/ndn-cxx/common-pch.hpp
index b03e490..ec7b86d 100644
--- a/ndn-cxx/common-pch.hpp
+++ b/ndn-cxx/common-pch.hpp
@@ -25,7 +25,7 @@
 // If the compiler supports precompiled headers, this header should be compiled
 // and included before anything else
 
-#include "common.hpp"
+#include "ndn-cxx/common.hpp"
 
 // STL headers to precompile
 #include <fstream>
diff --git a/ndn-cxx/common.hpp b/ndn-cxx/common.hpp
index d990d94..dcac126 100644
--- a/ndn-cxx/common.hpp
+++ b/ndn-cxx/common.hpp
@@ -28,7 +28,7 @@
 #ifndef NDN_COMMON_HPP
 #define NDN_COMMON_HPP
 
-#include "ndn-cxx-config.hpp"
+#include "ndn-cxx/config.hpp"
 
 // ndn-cxx specific macros declared in this and other headers must have NDN_CXX_ prefix
 // to avoid conflicts with other projects that include ndn-cxx headers.
@@ -120,6 +120,6 @@
 using boost::noncopyable;
 } // namespace ndn
 
-#include "util/backports.hpp"
+#include "ndn-cxx/util/backports.hpp"
 
 #endif // NDN_COMMON_HPP
diff --git a/ndn-cxx/data.cpp b/ndn-cxx/data.cpp
index e6104c9..e8e0841 100644
--- a/ndn-cxx/data.cpp
+++ b/ndn-cxx/data.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "data.hpp"
-#include "encoding/block-helpers.hpp"
-#include "util/sha256.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/util/sha256.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/data.hpp b/ndn-cxx/data.hpp
index 554c056..389d244 100644
--- a/ndn-cxx/data.hpp
+++ b/ndn-cxx/data.hpp
@@ -22,11 +22,11 @@
 #ifndef NDN_DATA_HPP
 #define NDN_DATA_HPP
 
-#include "meta-info.hpp"
-#include "name.hpp"
-#include "packet-base.hpp"
-#include "signature.hpp"
-#include "encoding/block.hpp"
+#include "ndn-cxx/meta-info.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/packet-base.hpp"
+#include "ndn-cxx/signature.hpp"
+#include "ndn-cxx/encoding/block.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/delegation-list.cpp b/ndn-cxx/delegation-list.cpp
index 279e036..33a9ad7 100644
--- a/ndn-cxx/delegation-list.cpp
+++ b/ndn-cxx/delegation-list.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "delegation-list.hpp"
+#include "ndn-cxx/delegation-list.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/delegation-list.hpp b/ndn-cxx/delegation-list.hpp
index 656a485..b4c4ad3 100644
--- a/ndn-cxx/delegation-list.hpp
+++ b/ndn-cxx/delegation-list.hpp
@@ -22,7 +22,8 @@
 #ifndef NDN_DELEGATION_LIST_HPP
 #define NDN_DELEGATION_LIST_HPP
 
-#include "delegation.hpp"
+#include "ndn-cxx/delegation.hpp"
+
 #include <initializer_list>
 
 namespace ndn {
diff --git a/ndn-cxx/delegation.cpp b/ndn-cxx/delegation.cpp
index 7cc8a5b..7af9f3e 100644
--- a/ndn-cxx/delegation.cpp
+++ b/ndn-cxx/delegation.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "delegation.hpp"
+#include "ndn-cxx/delegation.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/delegation.hpp b/ndn-cxx/delegation.hpp
index 1abea41..28558e0 100644
--- a/ndn-cxx/delegation.hpp
+++ b/ndn-cxx/delegation.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_DELEGATION_HPP
 #define NDN_DELEGATION_HPP
 
-#include "name.hpp"
+#include "ndn-cxx/name.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/detail/container-with-on-empty-signal.hpp b/ndn-cxx/detail/container-with-on-empty-signal.hpp
index 4ee314e..3f2399b 100644
--- a/ndn-cxx/detail/container-with-on-empty-signal.hpp
+++ b/ndn-cxx/detail/container-with-on-empty-signal.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_DETAIL_CONTAINER_WITH_ON_EMPTY_SIGNAL_HPP
 #define NDN_DETAIL_CONTAINER_WITH_ON_EMPTY_SIGNAL_HPP
 
-#include "../common.hpp"
-#include "../util/signal.hpp"
+#include "ndn-cxx/common.hpp"
+#include "ndn-cxx/util/signal.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/detail/face-impl.hpp b/ndn-cxx/detail/face-impl.hpp
index 147024d..5b97914 100644
--- a/ndn-cxx/detail/face-impl.hpp
+++ b/ndn-cxx/detail/face-impl.hpp
@@ -22,21 +22,21 @@
 #ifndef NDN_DETAIL_FACE_IMPL_HPP
 #define NDN_DETAIL_FACE_IMPL_HPP
 
-#include "../face.hpp"
-#include "container-with-on-empty-signal.hpp"
-#include "lp-field-tag.hpp"
-#include "pending-interest.hpp"
-#include "registered-prefix.hpp"
-#include "../lp/packet.hpp"
-#include "../lp/tags.hpp"
-#include "../mgmt/nfd/command-options.hpp"
-#include "../mgmt/nfd/controller.hpp"
-#include "../transport/tcp-transport.hpp"
-#include "../transport/unix-transport.hpp"
-#include "../util/config-file.hpp"
-#include "../util/logger.hpp"
-#include "../util/scheduler.hpp"
-#include "../util/signal.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/detail/container-with-on-empty-signal.hpp"
+#include "ndn-cxx/detail/lp-field-tag.hpp"
+#include "ndn-cxx/detail/pending-interest.hpp"
+#include "ndn-cxx/detail/registered-prefix.hpp"
+#include "ndn-cxx/lp/packet.hpp"
+#include "ndn-cxx/lp/tags.hpp"
+#include "ndn-cxx/mgmt/nfd/command-options.hpp"
+#include "ndn-cxx/mgmt/nfd/controller.hpp"
+#include "ndn-cxx/transport/tcp-transport.hpp"
+#include "ndn-cxx/transport/unix-transport.hpp"
+#include "ndn-cxx/util/config-file.hpp"
+#include "ndn-cxx/util/logger.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
+#include "ndn-cxx/util/signal.hpp"
 
 NDN_LOG_INIT(ndn.Face);
 // INFO level: prefix registration, etc.
diff --git a/ndn-cxx/detail/interest-filter-record.hpp b/ndn-cxx/detail/interest-filter-record.hpp
index b4b04a7..e84624e 100644
--- a/ndn-cxx/detail/interest-filter-record.hpp
+++ b/ndn-cxx/detail/interest-filter-record.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_DETAIL_INTEREST_FILTER_RECORD_HPP
 #define NDN_DETAIL_INTEREST_FILTER_RECORD_HPP
 
-#include "pending-interest.hpp"
+#include "ndn-cxx/detail/pending-interest.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/detail/lp-field-tag.hpp b/ndn-cxx/detail/lp-field-tag.hpp
index 8957a7d..d6a1146 100644
--- a/ndn-cxx/detail/lp-field-tag.hpp
+++ b/ndn-cxx/detail/lp-field-tag.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_DETAIL_LP_FIELD_TAG_HPP
 #define NDN_DETAIL_LP_FIELD_TAG_HPP
 
-#include "../lp/packet.hpp"
-#include "../lp/tags.hpp"
+#include "ndn-cxx/lp/packet.hpp"
+#include "ndn-cxx/lp/tags.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/detail/name-component-types.hpp b/ndn-cxx/detail/name-component-types.hpp
index 0f98920..a84ebdd 100644
--- a/ndn-cxx/detail/name-component-types.hpp
+++ b/ndn-cxx/detail/name-component-types.hpp
@@ -22,10 +22,9 @@
 #ifndef NDN_DETAIL_NAME_COMPONENT_TYPES_HPP
 #define NDN_DETAIL_NAME_COMPONENT_TYPES_HPP
 
-#include "../name-component.hpp"
-
-#include "../util/sha256.hpp"
-#include "../util/string-helper.hpp"
+#include "ndn-cxx/name-component.hpp"
+#include "ndn-cxx/util/sha256.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
 
 #include <array>
 #include <unordered_map>
diff --git a/ndn-cxx/detail/pending-interest.hpp b/ndn-cxx/detail/pending-interest.hpp
index a4f643f..7abd390 100644
--- a/ndn-cxx/detail/pending-interest.hpp
+++ b/ndn-cxx/detail/pending-interest.hpp
@@ -22,12 +22,11 @@
 #ifndef NDN_DETAIL_PENDING_INTEREST_HPP
 #define NDN_DETAIL_PENDING_INTEREST_HPP
 
-#include "../face.hpp"
-
-#include "../data.hpp"
-#include "../interest.hpp"
-#include "../lp/nack.hpp"
-#include "../util/scheduler-scoped-event-id.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/lp/nack.hpp"
+#include "ndn-cxx/util/scheduler-scoped-event-id.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/detail/registered-prefix.hpp b/ndn-cxx/detail/registered-prefix.hpp
index 1ea2aab..2d664d4 100644
--- a/ndn-cxx/detail/registered-prefix.hpp
+++ b/ndn-cxx/detail/registered-prefix.hpp
@@ -22,13 +22,10 @@
 #ifndef NDN_DETAIL_REGISTERED_PREFIX_HPP
 #define NDN_DETAIL_REGISTERED_PREFIX_HPP
 
-#include "../common.hpp"
-#include "../name.hpp"
-#include "../interest.hpp"
-
-#include "interest-filter-record.hpp"
-#include "mgmt/nfd/command-options.hpp"
-#include "mgmt/nfd/control-parameters.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/detail/interest-filter-record.hpp"
+#include "ndn-cxx/mgmt/nfd/command-options.hpp"
+#include "ndn-cxx/mgmt/nfd/control-parameters.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/encoding/block-helpers.cpp b/ndn-cxx/encoding/block-helpers.cpp
index 49fec54..e5a501f 100644
--- a/ndn-cxx/encoding/block-helpers.cpp
+++ b/ndn-cxx/encoding/block-helpers.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "block-helpers.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
 
 namespace ndn {
 namespace encoding {
diff --git a/ndn-cxx/encoding/block-helpers.hpp b/ndn-cxx/encoding/block-helpers.hpp
index 3c2d1e1..a8de879 100644
--- a/ndn-cxx/encoding/block-helpers.hpp
+++ b/ndn-cxx/encoding/block-helpers.hpp
@@ -22,9 +22,9 @@
 #ifndef NDN_ENCODING_BLOCK_HELPERS_HPP
 #define NDN_ENCODING_BLOCK_HELPERS_HPP
 
-#include "block.hpp"
-#include "encoding-buffer.hpp"
-#include "../util/concepts.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace encoding {
diff --git a/ndn-cxx/encoding/block.cpp b/ndn-cxx/encoding/block.cpp
index 31e6d22..e22822c 100644
--- a/ndn-cxx/encoding/block.cpp
+++ b/ndn-cxx/encoding/block.cpp
@@ -21,12 +21,12 @@
  * @author Alexander Afanasyev <http://lasr.cs.ucla.edu/afanasyev/index.html>
  */
 
-#include "block.hpp"
-#include "buffer-stream.hpp"
-#include "encoding-buffer.hpp"
-#include "tlv.hpp"
-#include "../security/transform.hpp"
-#include "../util/string-helper.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/encoding/tlv.hpp"
+#include "ndn-cxx/security/transform.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
 
 #include <boost/asio/buffer.hpp>
 #include <boost/range/adaptor/reversed.hpp>
diff --git a/ndn-cxx/encoding/block.hpp b/ndn-cxx/encoding/block.hpp
index 4bbb162..893d5b4 100644
--- a/ndn-cxx/encoding/block.hpp
+++ b/ndn-cxx/encoding/block.hpp
@@ -24,9 +24,9 @@
 #ifndef NDN_ENCODING_BLOCK_HPP
 #define NDN_ENCODING_BLOCK_HPP
 
-#include "buffer.hpp"
-#include "encoding-buffer-fwd.hpp"
-#include "tlv.hpp"
+#include "ndn-cxx/encoding/buffer.hpp"
+#include "ndn-cxx/encoding/encoding-buffer-fwd.hpp"
+#include "ndn-cxx/encoding/tlv.hpp"
 
 namespace boost {
 namespace asio {
diff --git a/ndn-cxx/encoding/buffer-stream.cpp b/ndn-cxx/encoding/buffer-stream.cpp
index dc46adc..bf363c5 100644
--- a/ndn-cxx/encoding/buffer-stream.cpp
+++ b/ndn-cxx/encoding/buffer-stream.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "buffer-stream.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
 
 namespace ndn {
 namespace detail {
diff --git a/ndn-cxx/encoding/buffer-stream.hpp b/ndn-cxx/encoding/buffer-stream.hpp
index 1eebbdf..bd865c0 100644
--- a/ndn-cxx/encoding/buffer-stream.hpp
+++ b/ndn-cxx/encoding/buffer-stream.hpp
@@ -24,7 +24,7 @@
 #ifndef NDN_ENCODING_BUFFER_STREAM_HPP
 #define NDN_ENCODING_BUFFER_STREAM_HPP
 
-#include "buffer.hpp"
+#include "ndn-cxx/encoding/buffer.hpp"
 
 #include <boost/iostreams/categories.hpp>
 #include <boost/iostreams/stream.hpp>
diff --git a/ndn-cxx/encoding/buffer.hpp b/ndn-cxx/encoding/buffer.hpp
index d695f1c..27131c1 100644
--- a/ndn-cxx/encoding/buffer.hpp
+++ b/ndn-cxx/encoding/buffer.hpp
@@ -24,7 +24,7 @@
 #ifndef NDN_ENCODING_BUFFER_HPP
 #define NDN_ENCODING_BUFFER_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 #include <vector>
 
diff --git a/ndn-cxx/encoding/encoder.cpp b/ndn-cxx/encoding/encoder.cpp
index 1fdddec..2323c26 100644
--- a/ndn-cxx/encoding/encoder.cpp
+++ b/ndn-cxx/encoding/encoder.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "encoder.hpp"
+#include "ndn-cxx/encoding/encoder.hpp"
 
 #include <boost/endian/conversion.hpp>
 
diff --git a/ndn-cxx/encoding/encoder.hpp b/ndn-cxx/encoding/encoder.hpp
index b253a8a..773d87a 100644
--- a/ndn-cxx/encoding/encoder.hpp
+++ b/ndn-cxx/encoding/encoder.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_ENCODING_ENCODER_HPP
 #define NDN_ENCODING_ENCODER_HPP
 
-#include "block.hpp"
+#include "ndn-cxx/encoding/block.hpp"
 
 namespace ndn {
 namespace encoding {
diff --git a/ndn-cxx/encoding/encoding-buffer-fwd.hpp b/ndn-cxx/encoding/encoding-buffer-fwd.hpp
index 8abcfbb..5f8a772 100644
--- a/ndn-cxx/encoding/encoding-buffer-fwd.hpp
+++ b/ndn-cxx/encoding/encoding-buffer-fwd.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_ENCODING_ENCODING_BUFFER_FWD_HPP
 #define NDN_ENCODING_ENCODING_BUFFER_FWD_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 namespace ndn {
 namespace encoding {
diff --git a/ndn-cxx/encoding/encoding-buffer.hpp b/ndn-cxx/encoding/encoding-buffer.hpp
index 1f21379..60b334b 100644
--- a/ndn-cxx/encoding/encoding-buffer.hpp
+++ b/ndn-cxx/encoding/encoding-buffer.hpp
@@ -22,9 +22,9 @@
 #ifndef NDN_ENCODING_ENCODING_BUFFER_HPP
 #define NDN_ENCODING_ENCODING_BUFFER_HPP
 
-#include "encoding-buffer-fwd.hpp"
-#include "encoder.hpp"
-#include "estimator.hpp"
+#include "ndn-cxx/encoding/encoding-buffer-fwd.hpp"
+#include "ndn-cxx/encoding/encoder.hpp"
+#include "ndn-cxx/encoding/estimator.hpp"
 
 namespace ndn {
 namespace encoding {
diff --git a/ndn-cxx/encoding/estimator.cpp b/ndn-cxx/encoding/estimator.cpp
index 0355646..bd1fc9a 100644
--- a/ndn-cxx/encoding/estimator.cpp
+++ b/ndn-cxx/encoding/estimator.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "estimator.hpp"
+#include "ndn-cxx/encoding/estimator.hpp"
 
 namespace ndn {
 namespace encoding {
diff --git a/ndn-cxx/encoding/estimator.hpp b/ndn-cxx/encoding/estimator.hpp
index 11f9e39..c564cb0 100644
--- a/ndn-cxx/encoding/estimator.hpp
+++ b/ndn-cxx/encoding/estimator.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_ENCODING_ESTIMATOR_HPP
 #define NDN_ENCODING_ESTIMATOR_HPP
 
-#include "block.hpp"
+#include "ndn-cxx/encoding/block.hpp"
 
 namespace ndn {
 namespace encoding {
diff --git a/ndn-cxx/encoding/nfd-constants.cpp b/ndn-cxx/encoding/nfd-constants.cpp
index 1b4e1ef..83d3122 100644
--- a/ndn-cxx/encoding/nfd-constants.cpp
+++ b/ndn-cxx/encoding/nfd-constants.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "nfd-constants.hpp"
-#include "util/string-helper.hpp"
+#include "ndn-cxx/encoding/nfd-constants.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/ndn-cxx/encoding/nfd-constants.hpp b/ndn-cxx/encoding/nfd-constants.hpp
index 0ec923d..2d0881f 100644
--- a/ndn-cxx/encoding/nfd-constants.hpp
+++ b/ndn-cxx/encoding/nfd-constants.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_ENCODING_NFD_CONSTANTS_HPP
 #define NDN_ENCODING_NFD_CONSTANTS_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/encoding/tlv-nfd.hpp b/ndn-cxx/encoding/tlv-nfd.hpp
index 6eff057..a891818 100644
--- a/ndn-cxx/encoding/tlv-nfd.hpp
+++ b/ndn-cxx/encoding/tlv-nfd.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_ENCODING_TLV_NFD_HPP
 #define NDN_ENCODING_TLV_NFD_HPP
 
-#include "tlv.hpp"
-#include "nfd-constants.hpp"
+#include "ndn-cxx/encoding/tlv.hpp"
+#include "ndn-cxx/encoding/nfd-constants.hpp"
 
 namespace ndn {
 namespace tlv {
diff --git a/ndn-cxx/encoding/tlv-security.hpp b/ndn-cxx/encoding/tlv-security.hpp
index 7625d0b..8b70a3e 100644
--- a/ndn-cxx/encoding/tlv-security.hpp
+++ b/ndn-cxx/encoding/tlv-security.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_ENCODING_TLV_SECURITY_HPP
 #define NDN_ENCODING_TLV_SECURITY_HPP
 
-#include "tlv.hpp"
+#include "ndn-cxx/encoding/tlv.hpp"
 
 namespace ndn {
 namespace tlv {
diff --git a/ndn-cxx/encoding/tlv.cpp b/ndn-cxx/encoding/tlv.cpp
index c210949..babaf3d 100644
--- a/ndn-cxx/encoding/tlv.cpp
+++ b/ndn-cxx/encoding/tlv.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "tlv.hpp"
+#include "ndn-cxx/encoding/tlv.hpp"
 
 namespace ndn {
 namespace tlv {
diff --git a/ndn-cxx/encoding/tlv.hpp b/ndn-cxx/encoding/tlv.hpp
index c105b70..2c206c6 100644
--- a/ndn-cxx/encoding/tlv.hpp
+++ b/ndn-cxx/encoding/tlv.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_ENCODING_TLV_HPP
 #define NDN_ENCODING_TLV_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 #include <cstring>
 #include <iterator>
diff --git a/ndn-cxx/exclude.cpp b/ndn-cxx/exclude.cpp
index 8d29629..a8a5cd4 100644
--- a/ndn-cxx/exclude.cpp
+++ b/ndn-cxx/exclude.cpp
@@ -21,8 +21,8 @@
  * @author Alexander Afanasyev <http://lasr.cs.ucla.edu/afanasyev/index.html>
  */
 
-#include "exclude.hpp"
-#include "encoding/block-helpers.hpp"
+#include "ndn-cxx/exclude.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
 
 #include <boost/range/adaptor/reversed.hpp>
 #include <sstream>
diff --git a/ndn-cxx/exclude.hpp b/ndn-cxx/exclude.hpp
index 6e720c8..118514e 100644
--- a/ndn-cxx/exclude.hpp
+++ b/ndn-cxx/exclude.hpp
@@ -24,8 +24,8 @@
 #ifndef NDN_EXCLUDE_HPP
 #define NDN_EXCLUDE_HPP
 
-#include "name-component.hpp"
-#include "encoding/encoding-buffer.hpp"
+#include "ndn-cxx/name-component.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
 
 #include <iterator>
 #include <map>
diff --git a/ndn-cxx/face.cpp b/ndn-cxx/face.cpp
index abdd93b..dd98273 100644
--- a/ndn-cxx/face.cpp
+++ b/ndn-cxx/face.cpp
@@ -19,14 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "face.hpp"
-#include "detail/face-impl.hpp"
-
-#include "encoding/tlv.hpp"
-#include "net/face-uri.hpp"
-#include "security/signing-helpers.hpp"
-#include "util/random.hpp"
-#include "util/time.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/detail/face-impl.hpp"
+#include "ndn-cxx/encoding/tlv.hpp"
+#include "ndn-cxx/net/face-uri.hpp"
+#include "ndn-cxx/security/signing-helpers.hpp"
+#include "ndn-cxx/util/random.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 // NDN_LOG_INIT(ndn.Face) is declared in face-impl.hpp
 
diff --git a/ndn-cxx/face.hpp b/ndn-cxx/face.hpp
index 4689b25..2711646 100644
--- a/ndn-cxx/face.hpp
+++ b/ndn-cxx/face.hpp
@@ -22,15 +22,14 @@
 #ifndef NDN_FACE_HPP
 #define NDN_FACE_HPP
 
-#include "data.hpp"
-#include "name.hpp"
-#include "interest.hpp"
-#include "interest-filter.hpp"
-#include "encoding/nfd-constants.hpp"
-#include "lp/nack.hpp"
-#include "net/asio-fwd.hpp"
-#include "security/key-chain.hpp"
-#include "security/signing-info.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/interest-filter.hpp"
+#include "ndn-cxx/encoding/nfd-constants.hpp"
+#include "ndn-cxx/lp/nack.hpp"
+#include "ndn-cxx/net/asio-fwd.hpp"
+#include "ndn-cxx/security/key-chain.hpp"
+#include "ndn-cxx/security/signing-info.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/ims/in-memory-storage-entry.cpp b/ndn-cxx/ims/in-memory-storage-entry.cpp
index 82fa9b0..6b380c0 100644
--- a/ndn-cxx/ims/in-memory-storage-entry.cpp
+++ b/ndn-cxx/ims/in-memory-storage-entry.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "in-memory-storage-entry.hpp"
+#include "ndn-cxx/ims/in-memory-storage-entry.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/ims/in-memory-storage-entry.hpp b/ndn-cxx/ims/in-memory-storage-entry.hpp
index 8002fca..c86e038 100644
--- a/ndn-cxx/ims/in-memory-storage-entry.hpp
+++ b/ndn-cxx/ims/in-memory-storage-entry.hpp
@@ -22,9 +22,9 @@
 #ifndef NDN_IMS_IN_MEMORY_STORAGE_ENTRY_HPP
 #define NDN_IMS_IN_MEMORY_STORAGE_ENTRY_HPP
 
-#include "../data.hpp"
-#include "../interest.hpp"
-#include "../util/scheduler-scoped-event-id.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/util/scheduler-scoped-event-id.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/ims/in-memory-storage-fifo.cpp b/ndn-cxx/ims/in-memory-storage-fifo.cpp
index 136f7b5..976170b 100644
--- a/ndn-cxx/ims/in-memory-storage-fifo.cpp
+++ b/ndn-cxx/ims/in-memory-storage-fifo.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "in-memory-storage-fifo.hpp"
+#include "ndn-cxx/ims/in-memory-storage-fifo.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/ims/in-memory-storage-fifo.hpp b/ndn-cxx/ims/in-memory-storage-fifo.hpp
index bbef50a..e66e0d9 100644
--- a/ndn-cxx/ims/in-memory-storage-fifo.hpp
+++ b/ndn-cxx/ims/in-memory-storage-fifo.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_IMS_IN_MEMORY_STORAGE_FIFO_HPP
 #define NDN_IMS_IN_MEMORY_STORAGE_FIFO_HPP
 
-#include "in-memory-storage.hpp"
+#include "ndn-cxx/ims/in-memory-storage.hpp"
 
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/hashed_index.hpp>
diff --git a/ndn-cxx/ims/in-memory-storage-lfu.cpp b/ndn-cxx/ims/in-memory-storage-lfu.cpp
index c0ffff0..2e5e333 100644
--- a/ndn-cxx/ims/in-memory-storage-lfu.cpp
+++ b/ndn-cxx/ims/in-memory-storage-lfu.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "in-memory-storage-lfu.hpp"
+#include "ndn-cxx/ims/in-memory-storage-lfu.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/ims/in-memory-storage-lfu.hpp b/ndn-cxx/ims/in-memory-storage-lfu.hpp
index 3b0531c..6582f57 100644
--- a/ndn-cxx/ims/in-memory-storage-lfu.hpp
+++ b/ndn-cxx/ims/in-memory-storage-lfu.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_IMS_IN_MEMORY_STORAGE_LFU_HPP
 #define NDN_IMS_IN_MEMORY_STORAGE_LFU_HPP
 
-#include "in-memory-storage.hpp"
+#include "ndn-cxx/ims/in-memory-storage.hpp"
 
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/hashed_index.hpp>
diff --git a/ndn-cxx/ims/in-memory-storage-lru.cpp b/ndn-cxx/ims/in-memory-storage-lru.cpp
index c3b0bc6..f80f854 100644
--- a/ndn-cxx/ims/in-memory-storage-lru.cpp
+++ b/ndn-cxx/ims/in-memory-storage-lru.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "in-memory-storage-lru.hpp"
+#include "ndn-cxx/ims/in-memory-storage-lru.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/ims/in-memory-storage-lru.hpp b/ndn-cxx/ims/in-memory-storage-lru.hpp
index 1f15648..c425ede 100644
--- a/ndn-cxx/ims/in-memory-storage-lru.hpp
+++ b/ndn-cxx/ims/in-memory-storage-lru.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_IMS_IN_MEMORY_STORAGE_LRU_HPP
 #define NDN_IMS_IN_MEMORY_STORAGE_LRU_HPP
 
-#include "in-memory-storage.hpp"
+#include "ndn-cxx/ims/in-memory-storage.hpp"
 
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/hashed_index.hpp>
diff --git a/ndn-cxx/ims/in-memory-storage-persistent.cpp b/ndn-cxx/ims/in-memory-storage-persistent.cpp
index dba17cf..bd3c195 100644
--- a/ndn-cxx/ims/in-memory-storage-persistent.cpp
+++ b/ndn-cxx/ims/in-memory-storage-persistent.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "in-memory-storage-persistent.hpp"
+#include "ndn-cxx/ims/in-memory-storage-persistent.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/ims/in-memory-storage-persistent.hpp b/ndn-cxx/ims/in-memory-storage-persistent.hpp
index 9b31e80..a7dda69 100644
--- a/ndn-cxx/ims/in-memory-storage-persistent.hpp
+++ b/ndn-cxx/ims/in-memory-storage-persistent.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_IMS_IN_MEMORY_STORAGE_PERSISTENT_HPP
 #define NDN_IMS_IN_MEMORY_STORAGE_PERSISTENT_HPP
 
-#include "in-memory-storage.hpp"
+#include "ndn-cxx/ims/in-memory-storage.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/ims/in-memory-storage.cpp b/ndn-cxx/ims/in-memory-storage.cpp
index cf5ca2d..b86dd22 100644
--- a/ndn-cxx/ims/in-memory-storage.cpp
+++ b/ndn-cxx/ims/in-memory-storage.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "in-memory-storage.hpp"
-#include "in-memory-storage-entry.hpp"
+#include "ndn-cxx/ims/in-memory-storage.hpp"
+#include "ndn-cxx/ims/in-memory-storage-entry.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/ims/in-memory-storage.hpp b/ndn-cxx/ims/in-memory-storage.hpp
index a962de2..25adfa8 100644
--- a/ndn-cxx/ims/in-memory-storage.hpp
+++ b/ndn-cxx/ims/in-memory-storage.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_IMS_IN_MEMORY_STORAGE_HPP
 #define NDN_IMS_IN_MEMORY_STORAGE_HPP
 
-#include "in-memory-storage-entry.hpp"
+#include "ndn-cxx/ims/in-memory-storage-entry.hpp"
 
 #include <iterator>
 #include <stack>
diff --git a/ndn-cxx/interest-filter.cpp b/ndn-cxx/interest-filter.cpp
index f2f34b9..a24e2d2 100644
--- a/ndn-cxx/interest-filter.cpp
+++ b/ndn-cxx/interest-filter.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "interest-filter.hpp"
-#include "util/regex/regex-pattern-list-matcher.hpp"
+#include "ndn-cxx/interest-filter.hpp"
+#include "ndn-cxx/util/regex/regex-pattern-list-matcher.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/interest-filter.hpp b/ndn-cxx/interest-filter.hpp
index 5eb088a..38f9b6b 100644
--- a/ndn-cxx/interest-filter.hpp
+++ b/ndn-cxx/interest-filter.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_INTEREST_FILTER_HPP
 #define NDN_INTEREST_FILTER_HPP
 
-#include "name.hpp"
+#include "ndn-cxx/name.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/interest.cpp b/ndn-cxx/interest.cpp
index 0e845e3..0cbc4ae 100644
--- a/ndn-cxx/interest.cpp
+++ b/ndn-cxx/interest.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "interest.hpp"
-#include "util/random.hpp"
-#include "data.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/util/random.hpp"
 
 #include <boost/scope_exit.hpp>
 
diff --git a/ndn-cxx/interest.hpp b/ndn-cxx/interest.hpp
index bde5c97..ffc5841 100644
--- a/ndn-cxx/interest.hpp
+++ b/ndn-cxx/interest.hpp
@@ -22,11 +22,12 @@
 #ifndef NDN_INTEREST_HPP
 #define NDN_INTEREST_HPP
 
-#include "delegation-list.hpp"
-#include "name.hpp"
-#include "packet-base.hpp"
-#include "selectors.hpp"
-#include "util/time.hpp"
+#include "ndn-cxx/delegation-list.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/packet-base.hpp"
+#include "ndn-cxx/selectors.hpp"
+#include "ndn-cxx/util/time.hpp"
+
 #include <boost/logic/tribool.hpp>
 
 namespace ndn {
diff --git a/ndn-cxx/key-locator.cpp b/ndn-cxx/key-locator.cpp
index ff455d1..453511e 100644
--- a/ndn-cxx/key-locator.cpp
+++ b/ndn-cxx/key-locator.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "key-locator.hpp"
-#include "encoding/block-helpers.hpp"
-#include "util/string-helper.hpp"
+#include "ndn-cxx/key-locator.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/key-locator.hpp b/ndn-cxx/key-locator.hpp
index fcf3360..3c7b487 100644
--- a/ndn-cxx/key-locator.hpp
+++ b/ndn-cxx/key-locator.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_KEY_LOCATOR_HPP
 #define NDN_KEY_LOCATOR_HPP
 
-#include "encoding/encoding-buffer.hpp"
-#include "name.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/link.cpp b/ndn-cxx/link.cpp
index 14da742..c1e056e 100644
--- a/ndn-cxx/link.cpp
+++ b/ndn-cxx/link.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "link.hpp"
+#include "ndn-cxx/link.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/link.hpp b/ndn-cxx/link.hpp
index b3e9bf2..bfe47fd 100644
--- a/ndn-cxx/link.hpp
+++ b/ndn-cxx/link.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_LINK_HPP
 #define NDN_LINK_HPP
 
-#include "data.hpp"
-#include "delegation-list.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/delegation-list.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/lp/cache-policy.cpp b/ndn-cxx/lp/cache-policy.cpp
index e5c3b8c..20d9662 100644
--- a/ndn-cxx/lp/cache-policy.cpp
+++ b/ndn-cxx/lp/cache-policy.cpp
@@ -21,8 +21,8 @@
  * @author Eric Newberry <enewberry@email.arizona.edu>
  */
 
-#include "cache-policy.hpp"
-#include "../encoding/block-helpers.hpp"
+#include "ndn-cxx/lp/cache-policy.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/ndn-cxx/lp/cache-policy.hpp b/ndn-cxx/lp/cache-policy.hpp
index f772101..4307ce1 100644
--- a/ndn-cxx/lp/cache-policy.hpp
+++ b/ndn-cxx/lp/cache-policy.hpp
@@ -24,8 +24,8 @@
 #ifndef NDN_CXX_LP_CACHE_POLICY_HPP
 #define NDN_CXX_LP_CACHE_POLICY_HPP
 
-#include "../encoding/encoding-buffer.hpp"
-#include "tlv.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/lp/tlv.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/ndn-cxx/lp/field-decl.hpp b/ndn-cxx/lp/field-decl.hpp
index d1c39f0..3d5931b 100644
--- a/ndn-cxx/lp/field-decl.hpp
+++ b/ndn-cxx/lp/field-decl.hpp
@@ -22,12 +22,12 @@
 #ifndef NDN_CXX_LP_FIELD_DECL_HPP
 #define NDN_CXX_LP_FIELD_DECL_HPP
 
-#include "empty-value.hpp"
-#include "field.hpp"
-#include "sequence.hpp"
-#include "tlv.hpp"
-#include "../encoding/block-helpers.hpp"
-#include "../util/concepts.hpp"
+#include "ndn-cxx/lp/empty-value.hpp"
+#include "ndn-cxx/lp/field.hpp"
+#include "ndn-cxx/lp/sequence.hpp"
+#include "ndn-cxx/lp/tlv.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 #include <boost/concept/requires.hpp>
 #include <boost/endian/conversion.hpp>
diff --git a/ndn-cxx/lp/field.hpp b/ndn-cxx/lp/field.hpp
index 113cf42..8bd46cb 100644
--- a/ndn-cxx/lp/field.hpp
+++ b/ndn-cxx/lp/field.hpp
@@ -22,9 +22,9 @@
 #ifndef NDN_CXX_LP_FIELD_HPP
 #define NDN_CXX_LP_FIELD_HPP
 
-#include "../common.hpp"
-#include "../encoding/encoding-buffer.hpp"
-#include "../util/concepts.hpp"
+#include "ndn-cxx/common.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/ndn-cxx/lp/fields.hpp b/ndn-cxx/lp/fields.hpp
index 9d27af2..5c25e64 100644
--- a/ndn-cxx/lp/fields.hpp
+++ b/ndn-cxx/lp/fields.hpp
@@ -22,11 +22,11 @@
 #ifndef NDN_CXX_LP_FIELDS_HPP
 #define NDN_CXX_LP_FIELDS_HPP
 
-#include "field-decl.hpp"
+#include "ndn-cxx/lp/field-decl.hpp"
 
-#include "cache-policy.hpp"
-#include "nack-header.hpp"
-#include "prefix-announcement-header.hpp"
+#include "ndn-cxx/lp/cache-policy.hpp"
+#include "ndn-cxx/lp/nack-header.hpp"
+#include "ndn-cxx/lp/prefix-announcement-header.hpp"
 
 #include <boost/mpl/set.hpp>
 
diff --git a/ndn-cxx/lp/nack-header.cpp b/ndn-cxx/lp/nack-header.cpp
index e593e54..9a123ff 100644
--- a/ndn-cxx/lp/nack-header.cpp
+++ b/ndn-cxx/lp/nack-header.cpp
@@ -21,7 +21,7 @@
  * @author Eric Newberry <enewberry@email.arizona.edu>
  */
 
-#include "nack-header.hpp"
+#include "ndn-cxx/lp/nack-header.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/ndn-cxx/lp/nack-header.hpp b/ndn-cxx/lp/nack-header.hpp
index cc03e4f..5e2525b 100644
--- a/ndn-cxx/lp/nack-header.hpp
+++ b/ndn-cxx/lp/nack-header.hpp
@@ -24,11 +24,9 @@
 #ifndef NDN_CXX_LP_NACK_HEADER_HPP
 #define NDN_CXX_LP_NACK_HEADER_HPP
 
-#include "../common.hpp"
-#include "../encoding/encoding-buffer.hpp"
-#include "../encoding/block-helpers.hpp"
-
-#include "tlv.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/lp/tlv.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/ndn-cxx/lp/nack.cpp b/ndn-cxx/lp/nack.cpp
index e89e5ce..f2d47b3 100644
--- a/ndn-cxx/lp/nack.cpp
+++ b/ndn-cxx/lp/nack.cpp
@@ -21,7 +21,7 @@
  * @author Eric Newberry <enewberry@email.arizona.edu>
  */
 
-#include "nack.hpp"
+#include "ndn-cxx/lp/nack.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/ndn-cxx/lp/nack.hpp b/ndn-cxx/lp/nack.hpp
index 530e2e9..db1f920 100644
--- a/ndn-cxx/lp/nack.hpp
+++ b/ndn-cxx/lp/nack.hpp
@@ -24,11 +24,9 @@
 #ifndef NDN_CXX_LP_NACK_HPP
 #define NDN_CXX_LP_NACK_HPP
 
-#include "../common.hpp"
-#include "../interest.hpp"
-#include "../packet-base.hpp"
-
-#include "nack-header.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/packet-base.hpp"
+#include "ndn-cxx/lp/nack-header.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/ndn-cxx/lp/packet.cpp b/ndn-cxx/lp/packet.cpp
index e5fc8f3..d3e2a1d 100644
--- a/ndn-cxx/lp/packet.cpp
+++ b/ndn-cxx/lp/packet.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "packet.hpp"
-#include "fields.hpp"
+#include "ndn-cxx/lp/packet.hpp"
+#include "ndn-cxx/lp/fields.hpp"
 
 #include <boost/bind.hpp>
 #include <boost/mpl/for_each.hpp>
diff --git a/ndn-cxx/lp/packet.hpp b/ndn-cxx/lp/packet.hpp
index 872af58..e515134 100644
--- a/ndn-cxx/lp/packet.hpp
+++ b/ndn-cxx/lp/packet.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_CXX_LP_PACKET_HPP
 #define NDN_CXX_LP_PACKET_HPP
 
-#include "fields.hpp"
+#include "ndn-cxx/lp/fields.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/ndn-cxx/lp/prefix-announcement-header.cpp b/ndn-cxx/lp/prefix-announcement-header.cpp
index 3396af6..5433099 100644
--- a/ndn-cxx/lp/prefix-announcement-header.cpp
+++ b/ndn-cxx/lp/prefix-announcement-header.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "prefix-announcement-header.hpp"
-#include "tlv.hpp"
+#include "ndn-cxx/lp/prefix-announcement-header.hpp"
+#include "ndn-cxx/lp/tlv.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/ndn-cxx/lp/prefix-announcement-header.hpp b/ndn-cxx/lp/prefix-announcement-header.hpp
index 1e36c07..89b59a6 100644
--- a/ndn-cxx/lp/prefix-announcement-header.hpp
+++ b/ndn-cxx/lp/prefix-announcement-header.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_CXX_LP_PREFIX_ANNOUNCEMENT_HEADER_HPP
 #define NDN_CXX_LP_PREFIX_ANNOUNCEMENT_HEADER_HPP
 
-#include "../prefix-announcement.hpp"
+#include "ndn-cxx/prefix-announcement.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/ndn-cxx/lp/sequence.hpp b/ndn-cxx/lp/sequence.hpp
index 64162bb..2974bad 100644
--- a/ndn-cxx/lp/sequence.hpp
+++ b/ndn-cxx/lp/sequence.hpp
@@ -24,7 +24,7 @@
 #ifndef NDN_CXX_LP_SEQUENCE_HPP
 #define NDN_CXX_LP_SEQUENCE_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/ndn-cxx/lp/tags.hpp b/ndn-cxx/lp/tags.hpp
index 3c7e4c0..9863700 100644
--- a/ndn-cxx/lp/tags.hpp
+++ b/ndn-cxx/lp/tags.hpp
@@ -22,10 +22,10 @@
 #ifndef NDN_CXX_LP_TAGS_HPP
 #define NDN_CXX_LP_TAGS_HPP
 
-#include "cache-policy.hpp"
-#include "empty-value.hpp"
-#include "prefix-announcement-header.hpp"
-#include "../tag.hpp"
+#include "ndn-cxx/lp/cache-policy.hpp"
+#include "ndn-cxx/lp/empty-value.hpp"
+#include "ndn-cxx/lp/prefix-announcement-header.hpp"
+#include "ndn-cxx/tag.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/ndn-cxx/meta-info.cpp b/ndn-cxx/meta-info.cpp
index 0c4852c..eca1f25 100644
--- a/ndn-cxx/meta-info.cpp
+++ b/ndn-cxx/meta-info.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "meta-info.hpp"
-#include "encoding/block-helpers.hpp"
-#include "encoding/encoding-buffer.hpp"
+#include "ndn-cxx/meta-info.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/meta-info.hpp b/ndn-cxx/meta-info.hpp
index 610d113..a5f6a44 100644
--- a/ndn-cxx/meta-info.hpp
+++ b/ndn-cxx/meta-info.hpp
@@ -22,10 +22,10 @@
 #ifndef NDN_META_INFO_HPP
 #define NDN_META_INFO_HPP
 
-#include "encoding/block.hpp"
-#include "encoding/encoding-buffer.hpp"
-#include "name-component.hpp"
-#include "util/time.hpp"
+#include "ndn-cxx/name-component.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 #include <list>
 
diff --git a/ndn-cxx/mgmt/control-parameters.hpp b/ndn-cxx/mgmt/control-parameters.hpp
index b365801..787c37a 100644
--- a/ndn-cxx/mgmt/control-parameters.hpp
+++ b/ndn-cxx/mgmt/control-parameters.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_MGMT_CONTROL_PARAMETERS_HPP
 #define NDN_MGMT_CONTROL_PARAMETERS_HPP
 
-#include "../encoding/block.hpp"
+#include "ndn-cxx/encoding/block.hpp"
 
 namespace ndn {
 namespace mgmt {
diff --git a/ndn-cxx/mgmt/control-response.cpp b/ndn-cxx/mgmt/control-response.cpp
index 48264de..d969d81 100644
--- a/ndn-cxx/mgmt/control-response.cpp
+++ b/ndn-cxx/mgmt/control-response.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "control-response.hpp"
-#include "../encoding/block-helpers.hpp"
-#include "../encoding/tlv-nfd.hpp"
+#include "ndn-cxx/mgmt/control-response.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/encoding/tlv-nfd.hpp"
 
 namespace ndn {
 namespace mgmt {
diff --git a/ndn-cxx/mgmt/control-response.hpp b/ndn-cxx/mgmt/control-response.hpp
index f37821f..d7c0e70 100644
--- a/ndn-cxx/mgmt/control-response.hpp
+++ b/ndn-cxx/mgmt/control-response.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_MGMT_CONTROL_RESPONSE_HPP
 #define NDN_MGMT_CONTROL_RESPONSE_HPP
 
-#include "../encoding/block.hpp"
+#include "ndn-cxx/encoding/block.hpp"
 
 namespace ndn {
 namespace mgmt {
diff --git a/ndn-cxx/mgmt/dispatcher.cpp b/ndn-cxx/mgmt/dispatcher.cpp
index 7352720..d17735f 100644
--- a/ndn-cxx/mgmt/dispatcher.cpp
+++ b/ndn-cxx/mgmt/dispatcher.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "dispatcher.hpp"
-#include "../lp/tags.hpp"
-#include "../util/logger.hpp"
+#include "ndn-cxx/mgmt/dispatcher.hpp"
+#include "ndn-cxx/lp/tags.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 NDN_LOG_INIT(ndn.mgmt.Dispatcher);
 
diff --git a/ndn-cxx/mgmt/dispatcher.hpp b/ndn-cxx/mgmt/dispatcher.hpp
index 6eca613..2ec308b 100644
--- a/ndn-cxx/mgmt/dispatcher.hpp
+++ b/ndn-cxx/mgmt/dispatcher.hpp
@@ -22,13 +22,13 @@
 #ifndef NDN_MGMT_DISPATCHER_HPP
 #define NDN_MGMT_DISPATCHER_HPP
 
-#include "../encoding/block.hpp"
-#include "../face.hpp"
-#include "../ims/in-memory-storage-fifo.hpp"
-#include "../security/key-chain.hpp"
-#include "control-response.hpp"
-#include "control-parameters.hpp"
-#include "status-dataset-context.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/ims/in-memory-storage-fifo.hpp"
+#include "ndn-cxx/mgmt/control-response.hpp"
+#include "ndn-cxx/mgmt/control-parameters.hpp"
+#include "ndn-cxx/mgmt/status-dataset-context.hpp"
+#include "ndn-cxx/security/key-chain.hpp"
 
 #include <unordered_map>
 
diff --git a/ndn-cxx/mgmt/nfd/channel-status.cpp b/ndn-cxx/mgmt/nfd/channel-status.cpp
index 121ec4c..6a79926 100644
--- a/ndn-cxx/mgmt/nfd/channel-status.cpp
+++ b/ndn-cxx/mgmt/nfd/channel-status.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "channel-status.hpp"
-#include "encoding/block-helpers.hpp"
-#include "encoding/tlv-nfd.hpp"
-#include "util/concepts.hpp"
+#include "ndn-cxx/mgmt/nfd/channel-status.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/encoding/tlv-nfd.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/channel-status.hpp b/ndn-cxx/mgmt/nfd/channel-status.hpp
index 9aab7ae..6b5eb8e 100644
--- a/ndn-cxx/mgmt/nfd/channel-status.hpp
+++ b/ndn-cxx/mgmt/nfd/channel-status.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_MGMT_NFD_CHANNEL_STATUS_HPP
 #define NDN_MGMT_NFD_CHANNEL_STATUS_HPP
 
-#include "../../encoding/block.hpp"
+#include "ndn-cxx/encoding/block.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/command-options.cpp b/ndn-cxx/mgmt/nfd/command-options.cpp
index 2eb1229..f0418c6 100644
--- a/ndn-cxx/mgmt/nfd/command-options.cpp
+++ b/ndn-cxx/mgmt/nfd/command-options.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "command-options.hpp"
+#include "ndn-cxx/mgmt/nfd/command-options.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/command-options.hpp b/ndn-cxx/mgmt/nfd/command-options.hpp
index b4e6bde..ca02a96 100644
--- a/ndn-cxx/mgmt/nfd/command-options.hpp
+++ b/ndn-cxx/mgmt/nfd/command-options.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_MGMT_NFD_COMMAND_OPTIONS_HPP
 #define NDN_MGMT_NFD_COMMAND_OPTIONS_HPP
 
-#include "../../security/signing-info.hpp"
+#include "ndn-cxx/security/signing-info.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/control-command.cpp b/ndn-cxx/mgmt/nfd/control-command.cpp
index f851bf1..c71d46c 100644
--- a/ndn-cxx/mgmt/nfd/control-command.cpp
+++ b/ndn-cxx/mgmt/nfd/control-command.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "control-command.hpp"
+#include "ndn-cxx/mgmt/nfd/control-command.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/control-command.hpp b/ndn-cxx/mgmt/nfd/control-command.hpp
index 90d7d38..054e000 100644
--- a/ndn-cxx/mgmt/nfd/control-command.hpp
+++ b/ndn-cxx/mgmt/nfd/control-command.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_MGMT_NFD_CONTROL_COMMAND_HPP
 #define NDN_MGMT_NFD_CONTROL_COMMAND_HPP
 
-#include "control-parameters.hpp"
+#include "ndn-cxx/mgmt/nfd/control-parameters.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/control-parameters.cpp b/ndn-cxx/mgmt/nfd/control-parameters.cpp
index 4d826ef..86ca846 100644
--- a/ndn-cxx/mgmt/nfd/control-parameters.cpp
+++ b/ndn-cxx/mgmt/nfd/control-parameters.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "control-parameters.hpp"
-#include "encoding/block-helpers.hpp"
-#include "encoding/tlv-nfd.hpp"
-#include "util/concepts.hpp"
-#include "util/string-helper.hpp"
+#include "ndn-cxx/mgmt/nfd/control-parameters.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/encoding/tlv-nfd.hpp"
+#include "ndn-cxx/util/concepts.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/control-parameters.hpp b/ndn-cxx/mgmt/nfd/control-parameters.hpp
index 77ca076..d23cc27 100644
--- a/ndn-cxx/mgmt/nfd/control-parameters.hpp
+++ b/ndn-cxx/mgmt/nfd/control-parameters.hpp
@@ -22,10 +22,10 @@
 #ifndef NDN_MGMT_NFD_CONTROL_PARAMETERS_HPP
 #define NDN_MGMT_NFD_CONTROL_PARAMETERS_HPP
 
-#include "../../encoding/nfd-constants.hpp"
-#include "../../name.hpp"
-#include "../../util/time.hpp"
-#include "../control-parameters.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/encoding/nfd-constants.hpp"
+#include "ndn-cxx/mgmt/control-parameters.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/control-response.hpp b/ndn-cxx/mgmt/nfd/control-response.hpp
index 076ff3e..6b6f5ff 100644
--- a/ndn-cxx/mgmt/nfd/control-response.hpp
+++ b/ndn-cxx/mgmt/nfd/control-response.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_MGMT_NFD_CONTROL_RESPONSE_HPP
 #define NDN_MGMT_NFD_CONTROL_RESPONSE_HPP
 
-#include "../control-response.hpp"
+#include "ndn-cxx/mgmt/control-response.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/controller.cpp b/ndn-cxx/mgmt/nfd/controller.cpp
index 05570fd..b211f3b 100644
--- a/ndn-cxx/mgmt/nfd/controller.cpp
+++ b/ndn-cxx/mgmt/nfd/controller.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "controller.hpp"
-#include "face.hpp"
-#include "security/v2/key-chain.hpp"
+#include "ndn-cxx/mgmt/nfd/controller.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/security/v2/key-chain.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/ndn-cxx/mgmt/nfd/controller.hpp b/ndn-cxx/mgmt/nfd/controller.hpp
index 422e7b7..5059a99 100644
--- a/ndn-cxx/mgmt/nfd/controller.hpp
+++ b/ndn-cxx/mgmt/nfd/controller.hpp
@@ -22,15 +22,15 @@
 #ifndef NDN_MGMT_NFD_CONTROLLER_HPP
 #define NDN_MGMT_NFD_CONTROLLER_HPP
 
-#include "control-command.hpp"
-#include "control-response.hpp"
-#include "status-dataset.hpp"
-#include "command-options.hpp"
-#include "../../security/command-interest-signer.hpp"
-#include "../../security/validator-null.hpp"
-#include "../../security/v2/key-chain.hpp"
-#include "../../security/v2/validator.hpp"
-#include "../../util/segment-fetcher.hpp"
+#include "ndn-cxx/mgmt/nfd/control-command.hpp"
+#include "ndn-cxx/mgmt/nfd/control-response.hpp"
+#include "ndn-cxx/mgmt/nfd/status-dataset.hpp"
+#include "ndn-cxx/mgmt/nfd/command-options.hpp"
+#include "ndn-cxx/security/command-interest-signer.hpp"
+#include "ndn-cxx/security/validator-null.hpp"
+#include "ndn-cxx/security/v2/key-chain.hpp"
+#include "ndn-cxx/security/v2/validator.hpp"
+#include "ndn-cxx/util/segment-fetcher.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/mgmt/nfd/cs-info.cpp b/ndn-cxx/mgmt/nfd/cs-info.cpp
index 8953103..77cf819 100644
--- a/ndn-cxx/mgmt/nfd/cs-info.cpp
+++ b/ndn-cxx/mgmt/nfd/cs-info.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "cs-info.hpp"
-#include "encoding/block-helpers.hpp"
-#include "encoding/encoding-buffer.hpp"
-#include "encoding/tlv-nfd.hpp"
-#include "util/concepts.hpp"
+#include "ndn-cxx/mgmt/nfd/cs-info.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/encoding/tlv-nfd.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/cs-info.hpp b/ndn-cxx/mgmt/nfd/cs-info.hpp
index 99c77fc..6a185ad 100644
--- a/ndn-cxx/mgmt/nfd/cs-info.hpp
+++ b/ndn-cxx/mgmt/nfd/cs-info.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_MGMT_NFD_CS_INFO_HPP
 #define NDN_MGMT_NFD_CS_INFO_HPP
 
-#include "../../encoding/block.hpp"
-#include "../../encoding/nfd-constants.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/encoding/nfd-constants.hpp"
 
 #include <bitset>
 
diff --git a/ndn-cxx/mgmt/nfd/face-event-notification.cpp b/ndn-cxx/mgmt/nfd/face-event-notification.cpp
index 1bc6b52..5ca888c 100644
--- a/ndn-cxx/mgmt/nfd/face-event-notification.cpp
+++ b/ndn-cxx/mgmt/nfd/face-event-notification.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "face-event-notification.hpp"
-#include "encoding/block-helpers.hpp"
-#include "encoding/encoding-buffer.hpp"
-#include "encoding/tlv-nfd.hpp"
-#include "util/concepts.hpp"
-#include "util/string-helper.hpp"
+#include "ndn-cxx/mgmt/nfd/face-event-notification.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/encoding/tlv-nfd.hpp"
+#include "ndn-cxx/util/concepts.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/face-event-notification.hpp b/ndn-cxx/mgmt/nfd/face-event-notification.hpp
index 77db59f..20ff0de 100644
--- a/ndn-cxx/mgmt/nfd/face-event-notification.hpp
+++ b/ndn-cxx/mgmt/nfd/face-event-notification.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_MGMT_NFD_FACE_EVENT_NOTIFICATION_HPP
 #define NDN_MGMT_NFD_FACE_EVENT_NOTIFICATION_HPP
 
-#include "face-traits.hpp"
+#include "ndn-cxx/mgmt/nfd/face-traits.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/face-monitor.cpp b/ndn-cxx/mgmt/nfd/face-monitor.cpp
index 85a3eca..b86802b 100644
--- a/ndn-cxx/mgmt/nfd/face-monitor.cpp
+++ b/ndn-cxx/mgmt/nfd/face-monitor.cpp
@@ -25,7 +25,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "face-monitor.hpp"
+#include "ndn-cxx/mgmt/nfd/face-monitor.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/face-monitor.hpp b/ndn-cxx/mgmt/nfd/face-monitor.hpp
index acc6f03..7c9639e 100644
--- a/ndn-cxx/mgmt/nfd/face-monitor.hpp
+++ b/ndn-cxx/mgmt/nfd/face-monitor.hpp
@@ -28,8 +28,8 @@
 #ifndef NDN_MGMT_NFD_FACE_MONITOR_HPP
 #define NDN_MGMT_NFD_FACE_MONITOR_HPP
 
-#include "../../util/notification-subscriber.hpp"
-#include "face-event-notification.hpp"
+#include "ndn-cxx/mgmt/nfd/face-event-notification.hpp"
+#include "ndn-cxx/util/notification-subscriber.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/face-query-filter.cpp b/ndn-cxx/mgmt/nfd/face-query-filter.cpp
index f4bac46..2a77ade 100644
--- a/ndn-cxx/mgmt/nfd/face-query-filter.cpp
+++ b/ndn-cxx/mgmt/nfd/face-query-filter.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "face-query-filter.hpp"
-#include "encoding/block-helpers.hpp"
-#include "encoding/tlv-nfd.hpp"
-#include "util/concepts.hpp"
+#include "ndn-cxx/mgmt/nfd/face-query-filter.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/encoding/tlv-nfd.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/face-query-filter.hpp b/ndn-cxx/mgmt/nfd/face-query-filter.hpp
index 96bd7b7..3ef6e80 100644
--- a/ndn-cxx/mgmt/nfd/face-query-filter.hpp
+++ b/ndn-cxx/mgmt/nfd/face-query-filter.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_MGMT_NFD_FACE_QUERY_FILTER_HPP
 #define NDN_MGMT_NFD_FACE_QUERY_FILTER_HPP
 
-#include "../../encoding/block.hpp"
-#include "../../encoding/nfd-constants.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/encoding/nfd-constants.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/face-status.cpp b/ndn-cxx/mgmt/nfd/face-status.cpp
index dc74eb1..a4acbab 100644
--- a/ndn-cxx/mgmt/nfd/face-status.cpp
+++ b/ndn-cxx/mgmt/nfd/face-status.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "face-status.hpp"
-#include "encoding/block-helpers.hpp"
-#include "encoding/encoding-buffer.hpp"
-#include "encoding/tlv-nfd.hpp"
-#include "util/concepts.hpp"
-#include "util/string-helper.hpp"
+#include "ndn-cxx/mgmt/nfd/face-status.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/encoding/tlv-nfd.hpp"
+#include "ndn-cxx/util/concepts.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/face-status.hpp b/ndn-cxx/mgmt/nfd/face-status.hpp
index 3de21fe..f1b9ddd 100644
--- a/ndn-cxx/mgmt/nfd/face-status.hpp
+++ b/ndn-cxx/mgmt/nfd/face-status.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_MGMT_NFD_FACE_STATUS_HPP
 #define NDN_MGMT_NFD_FACE_STATUS_HPP
 
-#include "face-traits.hpp"
-#include "../../util/time.hpp"
+#include "ndn-cxx/mgmt/nfd/face-traits.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/face-traits.hpp b/ndn-cxx/mgmt/nfd/face-traits.hpp
index dda9038..be07d16 100644
--- a/ndn-cxx/mgmt/nfd/face-traits.hpp
+++ b/ndn-cxx/mgmt/nfd/face-traits.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_MGMT_NFD_FACE_TRAITS_HPP
 #define NDN_MGMT_NFD_FACE_TRAITS_HPP
 
-#include "../../encoding/block.hpp"
-#include "../../encoding/nfd-constants.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/encoding/nfd-constants.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/fib-entry.cpp b/ndn-cxx/mgmt/nfd/fib-entry.cpp
index b3792c8..8989603 100644
--- a/ndn-cxx/mgmt/nfd/fib-entry.cpp
+++ b/ndn-cxx/mgmt/nfd/fib-entry.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "fib-entry.hpp"
-#include "encoding/block-helpers.hpp"
-#include "encoding/encoding-buffer.hpp"
-#include "encoding/tlv-nfd.hpp"
-#include "util/concepts.hpp"
+#include "ndn-cxx/mgmt/nfd/fib-entry.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/encoding/tlv-nfd.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 #include <boost/range/adaptor/reversed.hpp>
 
diff --git a/ndn-cxx/mgmt/nfd/fib-entry.hpp b/ndn-cxx/mgmt/nfd/fib-entry.hpp
index b68e21f..4a74de2 100644
--- a/ndn-cxx/mgmt/nfd/fib-entry.hpp
+++ b/ndn-cxx/mgmt/nfd/fib-entry.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_MGMT_NFD_FIB_ENTRY_HPP
 #define NDN_MGMT_NFD_FIB_ENTRY_HPP
 
-#include "../../encoding/block.hpp"
-#include "../../name.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/encoding/block.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/forwarder-status.cpp b/ndn-cxx/mgmt/nfd/forwarder-status.cpp
index fb583d8..067c5c5 100644
--- a/ndn-cxx/mgmt/nfd/forwarder-status.cpp
+++ b/ndn-cxx/mgmt/nfd/forwarder-status.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "forwarder-status.hpp"
-#include "encoding/block-helpers.hpp"
-#include "encoding/encoding-buffer.hpp"
-#include "encoding/tlv-nfd.hpp"
-#include "util/concepts.hpp"
+#include "ndn-cxx/mgmt/nfd/forwarder-status.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/encoding/tlv-nfd.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/forwarder-status.hpp b/ndn-cxx/mgmt/nfd/forwarder-status.hpp
index 0991e6c..9735337 100644
--- a/ndn-cxx/mgmt/nfd/forwarder-status.hpp
+++ b/ndn-cxx/mgmt/nfd/forwarder-status.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_MGMT_NFD_FORWARDER_STATUS_HPP
 #define NDN_MGMT_NFD_FORWARDER_STATUS_HPP
 
-#include "../../encoding/block.hpp"
-#include "../../util/time.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/rib-entry.cpp b/ndn-cxx/mgmt/nfd/rib-entry.cpp
index ac10aed..9486b6b 100644
--- a/ndn-cxx/mgmt/nfd/rib-entry.cpp
+++ b/ndn-cxx/mgmt/nfd/rib-entry.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "rib-entry.hpp"
-#include "encoding/block-helpers.hpp"
-#include "encoding/encoding-buffer.hpp"
-#include "encoding/tlv-nfd.hpp"
-#include "util/concepts.hpp"
-#include "util/string-helper.hpp"
+#include "ndn-cxx/mgmt/nfd/rib-entry.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/encoding/tlv-nfd.hpp"
+#include "ndn-cxx/util/concepts.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
 
 #include <boost/range/adaptor/reversed.hpp>
 
diff --git a/ndn-cxx/mgmt/nfd/rib-entry.hpp b/ndn-cxx/mgmt/nfd/rib-entry.hpp
index a04ffa1..a17daa1 100644
--- a/ndn-cxx/mgmt/nfd/rib-entry.hpp
+++ b/ndn-cxx/mgmt/nfd/rib-entry.hpp
@@ -22,10 +22,10 @@
 #ifndef NDN_MGMT_NFD_RIB_ENTRY_HPP
 #define NDN_MGMT_NFD_RIB_ENTRY_HPP
 
-#include "route-flags-traits.hpp"
-#include "../../encoding/block.hpp"
-#include "../../name.hpp"
-#include "../../util/time.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/mgmt/nfd/route-flags-traits.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/route-flags-traits.hpp b/ndn-cxx/mgmt/nfd/route-flags-traits.hpp
index 4e58ba7..8eff4c5 100644
--- a/ndn-cxx/mgmt/nfd/route-flags-traits.hpp
+++ b/ndn-cxx/mgmt/nfd/route-flags-traits.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_MGMT_NFD_ROUTE_FLAGS_TRAITS_HPP
 #define NDN_MGMT_NFD_ROUTE_FLAGS_TRAITS_HPP
 
-#include "../../encoding/nfd-constants.hpp"
+#include "ndn-cxx/encoding/nfd-constants.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/status-dataset.cpp b/ndn-cxx/mgmt/nfd/status-dataset.cpp
index 88ce648..4233181 100644
--- a/ndn-cxx/mgmt/nfd/status-dataset.cpp
+++ b/ndn-cxx/mgmt/nfd/status-dataset.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "status-dataset.hpp"
-#include "../../util/concepts.hpp"
+#include "ndn-cxx/mgmt/nfd/status-dataset.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/status-dataset.hpp b/ndn-cxx/mgmt/nfd/status-dataset.hpp
index c86155f..d80cd40 100644
--- a/ndn-cxx/mgmt/nfd/status-dataset.hpp
+++ b/ndn-cxx/mgmt/nfd/status-dataset.hpp
@@ -22,15 +22,15 @@
 #ifndef NDN_MGMT_NFD_STATUS_DATASET_HPP
 #define NDN_MGMT_NFD_STATUS_DATASET_HPP
 
-#include "../../name.hpp"
-#include "forwarder-status.hpp"
-#include "face-status.hpp"
-#include "face-query-filter.hpp"
-#include "channel-status.hpp"
-#include "fib-entry.hpp"
-#include "cs-info.hpp"
-#include "strategy-choice.hpp"
-#include "rib-entry.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/mgmt/nfd/forwarder-status.hpp"
+#include "ndn-cxx/mgmt/nfd/face-status.hpp"
+#include "ndn-cxx/mgmt/nfd/face-query-filter.hpp"
+#include "ndn-cxx/mgmt/nfd/channel-status.hpp"
+#include "ndn-cxx/mgmt/nfd/fib-entry.hpp"
+#include "ndn-cxx/mgmt/nfd/cs-info.hpp"
+#include "ndn-cxx/mgmt/nfd/strategy-choice.hpp"
+#include "ndn-cxx/mgmt/nfd/rib-entry.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/strategy-choice.cpp b/ndn-cxx/mgmt/nfd/strategy-choice.cpp
index aaa5924..1beb439 100644
--- a/ndn-cxx/mgmt/nfd/strategy-choice.cpp
+++ b/ndn-cxx/mgmt/nfd/strategy-choice.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "strategy-choice.hpp"
-#include "encoding/block-helpers.hpp"
-#include "encoding/encoding-buffer.hpp"
-#include "encoding/tlv-nfd.hpp"
-#include "util/concepts.hpp"
+#include "ndn-cxx/mgmt/nfd/strategy-choice.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/encoding/tlv-nfd.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/nfd/strategy-choice.hpp b/ndn-cxx/mgmt/nfd/strategy-choice.hpp
index d76d278..d6c71d4 100644
--- a/ndn-cxx/mgmt/nfd/strategy-choice.hpp
+++ b/ndn-cxx/mgmt/nfd/strategy-choice.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_MGMT_NFD_STRATEGY_CHOICE_HPP
 #define NDN_MGMT_NFD_STRATEGY_CHOICE_HPP
 
-#include "../../encoding/block.hpp"
-#include "../../name.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/name.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/ndn-cxx/mgmt/status-dataset-context.cpp b/ndn-cxx/mgmt/status-dataset-context.cpp
index c8671cd..2fe9356 100644
--- a/ndn-cxx/mgmt/status-dataset-context.cpp
+++ b/ndn-cxx/mgmt/status-dataset-context.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "status-dataset-context.hpp"
+#include "ndn-cxx/mgmt/status-dataset-context.hpp"
 
 namespace ndn {
 namespace mgmt {
diff --git a/ndn-cxx/mgmt/status-dataset-context.hpp b/ndn-cxx/mgmt/status-dataset-context.hpp
index 8cb80e6..2fb07f9 100644
--- a/ndn-cxx/mgmt/status-dataset-context.hpp
+++ b/ndn-cxx/mgmt/status-dataset-context.hpp
@@ -22,11 +22,11 @@
 #ifndef NDN_MGMT_STATUS_DATASET_CONTEXT_HPP
 #define NDN_MGMT_STATUS_DATASET_CONTEXT_HPP
 
-#include "../interest.hpp"
-#include "../data.hpp"
-#include "../util/time.hpp"
-#include "../encoding/encoding-buffer.hpp"
-#include "control-response.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/mgmt/control-response.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 namespace ndn {
 namespace mgmt {
diff --git a/ndn-cxx/name-component.cpp b/ndn-cxx/name-component.cpp
index 66cf247..f87aa16 100644
--- a/ndn-cxx/name-component.cpp
+++ b/ndn-cxx/name-component.cpp
@@ -23,8 +23,8 @@
  * @author Zhenkai Zhu <http://irl.cs.ucla.edu/~zhenkai/>
  */
 
-#include "name-component.hpp"
-#include "detail/name-component-types.hpp"
+#include "ndn-cxx/name-component.hpp"
+#include "ndn-cxx/detail/name-component-types.hpp"
 
 #include <cstdlib>
 #include <cstring>
diff --git a/ndn-cxx/name-component.hpp b/ndn-cxx/name-component.hpp
index 908efe1..411a6ec 100644
--- a/ndn-cxx/name-component.hpp
+++ b/ndn-cxx/name-component.hpp
@@ -22,10 +22,10 @@
 #ifndef NDN_NAME_COMPONENT_HPP
 #define NDN_NAME_COMPONENT_HPP
 
-#include "common.hpp"
-#include "encoding/block.hpp"
-#include "encoding/block-helpers.hpp"
-#include "util/time.hpp"
+#include "ndn-cxx/common.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 namespace ndn {
 namespace name {
diff --git a/ndn-cxx/name.cpp b/ndn-cxx/name.cpp
index bee3b04..4b63334 100644
--- a/ndn-cxx/name.cpp
+++ b/ndn-cxx/name.cpp
@@ -23,11 +23,10 @@
  * @author Zhenkai Zhu <http://irl.cs.ucla.edu/~zhenkai/>
  */
 
-#include "name.hpp"
-
-#include "encoding/block.hpp"
-#include "encoding/encoding-buffer.hpp"
-#include "util/time.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 #include <sstream>
 #include <boost/functional/hash.hpp>
diff --git a/ndn-cxx/name.hpp b/ndn-cxx/name.hpp
index ad986d7..9fa1343 100644
--- a/ndn-cxx/name.hpp
+++ b/ndn-cxx/name.hpp
@@ -26,7 +26,8 @@
 #ifndef NDN_NAME_HPP
 #define NDN_NAME_HPP
 
-#include "name-component.hpp"
+#include "ndn-cxx/name-component.hpp"
+
 #include <iterator>
 
 namespace ndn {
diff --git a/ndn-cxx/net/detail/link-type-helper-osx.mm b/ndn-cxx/net/detail/link-type-helper-osx.mm
index fe78151..9798696 100644
--- a/ndn-cxx/net/detail/link-type-helper-osx.mm
+++ b/ndn-cxx/net/detail/link-type-helper-osx.mm
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "link-type-helper.hpp"
+#include "ndn-cxx/net/detail/link-type-helper.hpp"
 
 #ifndef NDN_CXX_HAVE_OSX_FRAMEWORKS
 #error "This file should not be compiled ..."
diff --git a/ndn-cxx/net/detail/link-type-helper.cpp b/ndn-cxx/net/detail/link-type-helper.cpp
index 97c1f8c..b251d57 100644
--- a/ndn-cxx/net/detail/link-type-helper.cpp
+++ b/ndn-cxx/net/detail/link-type-helper.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "link-type-helper.hpp"
-#include "ndn-cxx-config.hpp"
+#include "ndn-cxx/net/detail/link-type-helper.hpp"
+#include "ndn-cxx/config.hpp"
 
 #ifdef NDN_CXX_HAVE_OSX_FRAMEWORKS
 // implemented in link-type-helper-osx.mm
diff --git a/ndn-cxx/net/detail/link-type-helper.hpp b/ndn-cxx/net/detail/link-type-helper.hpp
index 6c38c35..61f86d8 100644
--- a/ndn-cxx/net/detail/link-type-helper.hpp
+++ b/ndn-cxx/net/detail/link-type-helper.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_NET_DETAIL_LINK_TYPE_HELPER_HPP
 #define NDN_NET_DETAIL_LINK_TYPE_HELPER_HPP
 
-#include "../../encoding/nfd-constants.hpp"
+#include "ndn-cxx/encoding/nfd-constants.hpp"
 
 namespace ndn {
 namespace net {
diff --git a/ndn-cxx/net/detail/linux-if-constants.cpp b/ndn-cxx/net/detail/linux-if-constants.cpp
index c04c864..7420ecc 100644
--- a/ndn-cxx/net/detail/linux-if-constants.cpp
+++ b/ndn-cxx/net/detail/linux-if-constants.cpp
@@ -23,7 +23,7 @@
 
 #ifdef __linux__
 
-#include "linux-if-constants.hpp"
+#include "ndn-cxx/net/detail/linux-if-constants.hpp"
 
 #include <sys/socket.h>
 #include <linux/if.h>
diff --git a/ndn-cxx/net/detail/netlink-message.hpp b/ndn-cxx/net/detail/netlink-message.hpp
index 498bd24..7af4ec3 100644
--- a/ndn-cxx/net/detail/netlink-message.hpp
+++ b/ndn-cxx/net/detail/netlink-message.hpp
@@ -24,8 +24,8 @@
 #ifndef NDN_NET_NETLINK_MESSAGE_HPP
 #define NDN_NET_NETLINK_MESSAGE_HPP
 
-#include "../../common.hpp"
-#include "../ethernet.hpp"
+#include "ndn-cxx/common.hpp"
+#include "ndn-cxx/net/ethernet.hpp"
 
 #ifndef NDN_CXX_HAVE_NETLINK
 #error "This file should not be included ..."
diff --git a/ndn-cxx/net/detail/netlink-socket.cpp b/ndn-cxx/net/detail/netlink-socket.cpp
index c325737..6589d0d 100644
--- a/ndn-cxx/net/detail/netlink-socket.cpp
+++ b/ndn-cxx/net/detail/netlink-socket.cpp
@@ -21,10 +21,10 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#include "netlink-socket.hpp"
-#include "netlink-message.hpp"
-#include "../../util/logger.hpp"
-#include "../../util/time.hpp"
+#include "ndn-cxx/net/detail/netlink-socket.hpp"
+#include "ndn-cxx/net/detail/netlink-message.hpp"
+#include "ndn-cxx/util/logger.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 #include <cerrno>
 #include <linux/genetlink.h>
diff --git a/ndn-cxx/net/detail/netlink-socket.hpp b/ndn-cxx/net/detail/netlink-socket.hpp
index 080d169..c0fd66c 100644
--- a/ndn-cxx/net/detail/netlink-socket.hpp
+++ b/ndn-cxx/net/detail/netlink-socket.hpp
@@ -24,8 +24,8 @@
 #ifndef NDN_NET_NETLINK_SOCKET_HPP
 #define NDN_NET_NETLINK_SOCKET_HPP
 
-#include "../network-monitor.hpp"
-#include "../../util/signal/signal.hpp"
+#include "ndn-cxx/net/network-monitor.hpp"
+#include "ndn-cxx/util/signal/signal.hpp"
 
 #include <boost/asio/posix/stream_descriptor.hpp>
 #include <map>
diff --git a/ndn-cxx/net/detail/network-monitor-impl-netlink.cpp b/ndn-cxx/net/detail/network-monitor-impl-netlink.cpp
index e404322..17759b9 100644
--- a/ndn-cxx/net/detail/network-monitor-impl-netlink.cpp
+++ b/ndn-cxx/net/detail/network-monitor-impl-netlink.cpp
@@ -21,12 +21,12 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#include "network-monitor-impl-netlink.hpp"
-#include "linux-if-constants.hpp"
-#include "netlink-message.hpp"
-#include "../network-address.hpp"
-#include "../network-interface.hpp"
-#include "../../util/logger.hpp"
+#include "ndn-cxx/net/detail/network-monitor-impl-netlink.hpp"
+#include "ndn-cxx/net/detail/linux-if-constants.hpp"
+#include "ndn-cxx/net/detail/netlink-message.hpp"
+#include "ndn-cxx/net/network-address.hpp"
+#include "ndn-cxx/net/network-interface.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 #include <linux/if_addr.h>
 #include <linux/if_link.h>
diff --git a/ndn-cxx/net/detail/network-monitor-impl-netlink.hpp b/ndn-cxx/net/detail/network-monitor-impl-netlink.hpp
index 7870236..9416370 100644
--- a/ndn-cxx/net/detail/network-monitor-impl-netlink.hpp
+++ b/ndn-cxx/net/detail/network-monitor-impl-netlink.hpp
@@ -24,14 +24,14 @@
 #ifndef NDN_NET_NETWORK_MONITOR_IMPL_NETLINK_HPP
 #define NDN_NET_NETWORK_MONITOR_IMPL_NETLINK_HPP
 
-#include "ndn-cxx-config.hpp"
-#include "../network-monitor.hpp"
+#include "ndn-cxx/config.hpp"
+#include "ndn-cxx/net/network-monitor.hpp"
 
 #ifndef NDN_CXX_HAVE_NETLINK
 #error "This file should not be included ..."
 #endif
 
-#include "netlink-socket.hpp"
+#include "ndn-cxx/net/detail/netlink-socket.hpp"
 
 #include <map>
 
diff --git a/ndn-cxx/net/detail/network-monitor-impl-noop.hpp b/ndn-cxx/net/detail/network-monitor-impl-noop.hpp
index 5b1a00d..a8c7968 100644
--- a/ndn-cxx/net/detail/network-monitor-impl-noop.hpp
+++ b/ndn-cxx/net/detail/network-monitor-impl-noop.hpp
@@ -24,7 +24,7 @@
 #ifndef NDN_NET_NETWORK_MONITOR_IMPL_NOOP_HPP
 #define NDN_NET_NETWORK_MONITOR_IMPL_NOOP_HPP
 
-#include "../network-monitor.hpp"
+#include "ndn-cxx/net/network-monitor.hpp"
 
 namespace ndn {
 namespace net {
diff --git a/ndn-cxx/net/detail/network-monitor-impl-osx.cpp b/ndn-cxx/net/detail/network-monitor-impl-osx.cpp
index 507c3fd..d637b39 100644
--- a/ndn-cxx/net/detail/network-monitor-impl-osx.cpp
+++ b/ndn-cxx/net/detail/network-monitor-impl-osx.cpp
@@ -50,12 +50,11 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "network-monitor-impl-osx.hpp"
-
-#include "../network-address.hpp"
-#include "../../name.hpp"
-#include "../../util/cf-string-osx.hpp"
-#include "../../util/logger.hpp"
+#include "ndn-cxx/net/detail/network-monitor-impl-osx.hpp"
+#include "ndn-cxx/net/network-address.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/util/cf-string-osx.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 #include <ifaddrs.h>      // for getifaddrs()
 #include <net/if.h>       // for if_nametoindex()
diff --git a/ndn-cxx/net/detail/network-monitor-impl-osx.hpp b/ndn-cxx/net/detail/network-monitor-impl-osx.hpp
index 874f01a..cf9baad 100644
--- a/ndn-cxx/net/detail/network-monitor-impl-osx.hpp
+++ b/ndn-cxx/net/detail/network-monitor-impl-osx.hpp
@@ -22,16 +22,16 @@
 #ifndef NDN_NET_NETWORK_MONITOR_IMPL_OSX_HPP
 #define NDN_NET_NETWORK_MONITOR_IMPL_OSX_HPP
 
-#include "ndn-cxx-config.hpp"
-#include "../network-monitor.hpp"
+#include "ndn-cxx/config.hpp"
+#include "ndn-cxx/net/network-monitor.hpp"
 
 #ifndef NDN_CXX_HAVE_OSX_FRAMEWORKS
 #error "This file should not be included ..."
 #endif
 
-#include "../../util/cf-releaser-osx.hpp"
-#include "../../util/scheduler.hpp"
-#include "../../util/scheduler-scoped-event-id.hpp"
+#include "ndn-cxx/util/cf-releaser-osx.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
+#include "ndn-cxx/util/scheduler-scoped-event-id.hpp"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <SystemConfiguration/SystemConfiguration.h>
diff --git a/ndn-cxx/net/dns.cpp b/ndn-cxx/net/dns.cpp
index 1204451..d398117 100644
--- a/ndn-cxx/net/dns.cpp
+++ b/ndn-cxx/net/dns.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "dns.hpp"
-#include "../util/scheduler.hpp"
+#include "ndn-cxx/net/dns.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
 
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/ip/udp.hpp>
diff --git a/ndn-cxx/net/dns.hpp b/ndn-cxx/net/dns.hpp
index 9357613..050c277 100644
--- a/ndn-cxx/net/dns.hpp
+++ b/ndn-cxx/net/dns.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_NET_DNS_HPP
 #define NDN_NET_DNS_HPP
 
-#include "asio-fwd.hpp"
-#include "../util/time.hpp"
+#include "ndn-cxx/net/asio-fwd.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 #include <boost/asio/ip/address.hpp>
 
diff --git a/ndn-cxx/net/ethernet.cpp b/ndn-cxx/net/ethernet.cpp
index cfd4b9e..28f6929 100644
--- a/ndn-cxx/net/ethernet.cpp
+++ b/ndn-cxx/net/ethernet.cpp
@@ -25,7 +25,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "ethernet.hpp"
+#include "ndn-cxx/net/ethernet.hpp"
 
 #include <boost/functional/hash.hpp>
 
diff --git a/ndn-cxx/net/face-uri.cpp b/ndn-cxx/net/face-uri.cpp
index a0d6934..c1bbe8b 100644
--- a/ndn-cxx/net/face-uri.cpp
+++ b/ndn-cxx/net/face-uri.cpp
@@ -25,9 +25,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "face-uri.hpp"
-#include "dns.hpp"
-#include "util/string-helper.hpp"
+#include "ndn-cxx/net/face-uri.hpp"
+#include "ndn-cxx/net/dns.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/ndn-cxx/net/face-uri.hpp b/ndn-cxx/net/face-uri.hpp
index 75bb9a3..9ec50e5 100644
--- a/ndn-cxx/net/face-uri.hpp
+++ b/ndn-cxx/net/face-uri.hpp
@@ -28,9 +28,9 @@
 #ifndef NDN_NET_FACE_URI_HPP
 #define NDN_NET_FACE_URI_HPP
 
-#include "asio-fwd.hpp"
-#include "ethernet.hpp"
-#include "../util/time.hpp"
+#include "ndn-cxx/net/asio-fwd.hpp"
+#include "ndn-cxx/net/ethernet.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ip/udp.hpp>
diff --git a/ndn-cxx/net/network-address.cpp b/ndn-cxx/net/network-address.cpp
index 20e1d85..6f9d743 100644
--- a/ndn-cxx/net/network-address.cpp
+++ b/ndn-cxx/net/network-address.cpp
@@ -21,7 +21,7 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#include "network-address.hpp"
+#include "ndn-cxx/net/network-address.hpp"
 
 namespace ndn {
 namespace net {
diff --git a/ndn-cxx/net/network-address.hpp b/ndn-cxx/net/network-address.hpp
index f0e801a..2d3244f 100644
--- a/ndn-cxx/net/network-address.hpp
+++ b/ndn-cxx/net/network-address.hpp
@@ -24,7 +24,8 @@
 #ifndef NDN_NET_NETWORK_ADDRESS_HPP
 #define NDN_NET_NETWORK_ADDRESS_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
+
 #include <boost/asio/ip/address.hpp>
 
 namespace ndn {
diff --git a/ndn-cxx/net/network-interface.cpp b/ndn-cxx/net/network-interface.cpp
index b979769..84d783b 100644
--- a/ndn-cxx/net/network-interface.cpp
+++ b/ndn-cxx/net/network-interface.cpp
@@ -21,10 +21,10 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#include "network-interface.hpp"
-#include "detail/linux-if-constants.hpp"
-#include "../util/logger.hpp"
-#include "../util/string-helper.hpp"
+#include "ndn-cxx/net/network-interface.hpp"
+#include "ndn-cxx/net/detail/linux-if-constants.hpp"
+#include "ndn-cxx/util/logger.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
 
 #include <net/if.h>
 
diff --git a/ndn-cxx/net/network-interface.hpp b/ndn-cxx/net/network-interface.hpp
index 994756b..5044938 100644
--- a/ndn-cxx/net/network-interface.hpp
+++ b/ndn-cxx/net/network-interface.hpp
@@ -24,9 +24,10 @@
 #ifndef NDN_NET_NETWORK_INTERFACE_HPP
 #define NDN_NET_NETWORK_INTERFACE_HPP
 
-#include "ethernet.hpp"
-#include "network-address.hpp"
-#include "../util/signal.hpp"
+#include "ndn-cxx/net/ethernet.hpp"
+#include "ndn-cxx/net/network-address.hpp"
+#include "ndn-cxx/util/signal.hpp"
+
 #include <set>
 
 namespace ndn {
diff --git a/ndn-cxx/net/network-monitor-stub.cpp b/ndn-cxx/net/network-monitor-stub.cpp
index 636bc52..25f8563 100644
--- a/ndn-cxx/net/network-monitor-stub.cpp
+++ b/ndn-cxx/net/network-monitor-stub.cpp
@@ -22,8 +22,10 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#include "network-monitor-stub.hpp"
+#include "ndn-cxx/net/network-monitor-stub.hpp"
+
 #include <unordered_map>
+
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
 
diff --git a/ndn-cxx/net/network-monitor-stub.hpp b/ndn-cxx/net/network-monitor-stub.hpp
index 441d3a2..4bd6c47 100644
--- a/ndn-cxx/net/network-monitor-stub.hpp
+++ b/ndn-cxx/net/network-monitor-stub.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_NET_NETWORK_MONITOR_STUB_HPP
 #define NDN_NET_NETWORK_MONITOR_STUB_HPP
 
-#include "network-monitor.hpp"
+#include "ndn-cxx/net/network-monitor.hpp"
 
 namespace ndn {
 namespace net {
diff --git a/ndn-cxx/net/network-monitor.cpp b/ndn-cxx/net/network-monitor.cpp
index 57ef7f1..b1c1bd7 100644
--- a/ndn-cxx/net/network-monitor.cpp
+++ b/ndn-cxx/net/network-monitor.cpp
@@ -22,17 +22,16 @@
  * @author Davide Pesavento <davide.pesavento@lip6.fr>
  */
 
-#include "network-monitor.hpp"
-#include "ndn-cxx-config.hpp"
-#include "../util/logger.hpp"
+#include "ndn-cxx/net/network-monitor.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
-#include "detail/network-monitor-impl-noop.hpp"
-
+#include "ndn-cxx/config.hpp"
+#include "ndn-cxx/net/detail/network-monitor-impl-noop.hpp"
 #if defined(NDN_CXX_HAVE_OSX_FRAMEWORKS)
-#include "detail/network-monitor-impl-osx.hpp"
+#include "ndn-cxx/net/detail/network-monitor-impl-osx.hpp"
 #define NETWORK_MONITOR_IMPL_TYPE NetworkMonitorImplOsx
 #elif defined(NDN_CXX_HAVE_NETLINK)
-#include "detail/network-monitor-impl-netlink.hpp"
+#include "ndn-cxx/net/detail/network-monitor-impl-netlink.hpp"
 #define NETWORK_MONITOR_IMPL_TYPE NetworkMonitorImplNetlink
 #else
 #define NETWORK_MONITOR_IMPL_TYPE NetworkMonitorImplNoop
diff --git a/ndn-cxx/net/network-monitor.hpp b/ndn-cxx/net/network-monitor.hpp
index 5eddf1f..211ed30 100644
--- a/ndn-cxx/net/network-monitor.hpp
+++ b/ndn-cxx/net/network-monitor.hpp
@@ -25,8 +25,8 @@
 #ifndef NDN_NET_NETWORK_MONITOR_HPP
 #define NDN_NET_NETWORK_MONITOR_HPP
 
-#include "asio-fwd.hpp"
-#include "network-interface.hpp"
+#include "ndn-cxx/net/asio-fwd.hpp"
+#include "ndn-cxx/net/network-interface.hpp"
 
 #include <vector>
 
diff --git a/ndn-cxx/packet-base.cpp b/ndn-cxx/packet-base.cpp
index 31540c9..dd159a8 100644
--- a/ndn-cxx/packet-base.cpp
+++ b/ndn-cxx/packet-base.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "packet-base.hpp"
-#include "lp/tags.hpp"
+#include "ndn-cxx/packet-base.hpp"
+#include "ndn-cxx/lp/tags.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/packet-base.hpp b/ndn-cxx/packet-base.hpp
index f815de2..6eaf36a 100644
--- a/ndn-cxx/packet-base.hpp
+++ b/ndn-cxx/packet-base.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_PACKET_BASE_HPP
 #define NDN_PACKET_BASE_HPP
 
-#include "tag-host.hpp"
+#include "ndn-cxx/tag-host.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/prefix-announcement.cpp b/ndn-cxx/prefix-announcement.cpp
index 410d270..6381cf6 100644
--- a/ndn-cxx/prefix-announcement.cpp
+++ b/ndn-cxx/prefix-announcement.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "prefix-announcement.hpp"
-#include "encoding/tlv-nfd.hpp"
+#include "ndn-cxx/prefix-announcement.hpp"
+#include "ndn-cxx/encoding/tlv-nfd.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/ndn-cxx/prefix-announcement.hpp b/ndn-cxx/prefix-announcement.hpp
index 6c48015..7f6168f 100644
--- a/ndn-cxx/prefix-announcement.hpp
+++ b/ndn-cxx/prefix-announcement.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_CXX_PREFIX_ANNOUNCEMENT_HPP
 #define NDN_CXX_PREFIX_ANNOUNCEMENT_HPP
 
-#include "security/v2/key-chain.hpp"
+#include "ndn-cxx/security/v2/key-chain.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/security/command-interest-signer.cpp b/ndn-cxx/security/command-interest-signer.cpp
index d4cb33a..63d37c9 100644
--- a/ndn-cxx/security/command-interest-signer.cpp
+++ b/ndn-cxx/security/command-interest-signer.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "command-interest-signer.hpp"
-#include "../util/random.hpp"
+#include "ndn-cxx/security/command-interest-signer.hpp"
+#include "ndn-cxx/util/random.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/command-interest-signer.hpp b/ndn-cxx/security/command-interest-signer.hpp
index e170117..ab719ec 100644
--- a/ndn-cxx/security/command-interest-signer.hpp
+++ b/ndn-cxx/security/command-interest-signer.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_COMMAND_INTEREST_SIGNER_HPP
 #define NDN_SECURITY_COMMAND_INTEREST_SIGNER_HPP
 
-#include "v2/key-chain.hpp"
+#include "ndn-cxx/security/v2/key-chain.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/detail/openssl-helper.cpp b/ndn-cxx/security/detail/openssl-helper.cpp
index b5c9e5e..1a9a01d 100644
--- a/ndn-cxx/security/detail/openssl-helper.cpp
+++ b/ndn-cxx/security/detail/openssl-helper.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "openssl-helper.hpp"
+#include "ndn-cxx/security/detail/openssl-helper.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/detail/openssl-helper.hpp b/ndn-cxx/security/detail/openssl-helper.hpp
index 18ecd1d..6d3eff7 100644
--- a/ndn-cxx/security/detail/openssl-helper.hpp
+++ b/ndn-cxx/security/detail/openssl-helper.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_CXX_SECURITY_DETAIL_OPENSSL_HELPER_HPP
 #define NDN_CXX_SECURITY_DETAIL_OPENSSL_HELPER_HPP
 
-#include "openssl.hpp"
-#include "../security-common.hpp"
+#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/security-common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/digest-sha256.cpp b/ndn-cxx/security/digest-sha256.cpp
index cba1c04..36f6ae5 100644
--- a/ndn-cxx/security/digest-sha256.cpp
+++ b/ndn-cxx/security/digest-sha256.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "digest-sha256.hpp"
+#include "ndn-cxx/security/digest-sha256.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/security/digest-sha256.hpp b/ndn-cxx/security/digest-sha256.hpp
index d2276d6..5ed480c 100644
--- a/ndn-cxx/security/digest-sha256.hpp
+++ b/ndn-cxx/security/digest-sha256.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_DIGEST_SHA256_HPP
 #define NDN_SECURITY_DIGEST_SHA256_HPP
 
-#include "../signature.hpp"
+#include "ndn-cxx/signature.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/security/key-chain.hpp b/ndn-cxx/security/key-chain.hpp
index 63f410b..d82cc3b 100644
--- a/ndn-cxx/security/key-chain.hpp
+++ b/ndn-cxx/security/key-chain.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_CXX_SECURITY_KEY_CHAIN_HPP
 #define NDN_CXX_SECURITY_KEY_CHAIN_HPP
 
-#include "security-common.hpp"
-#include "v2/key-chain.hpp"
+#include "ndn-cxx/security/security-common.hpp"
+#include "ndn-cxx/security/v2/key-chain.hpp"
 
 #endif // NDN_CXX_SECURITY_KEY_CHAIN_HPP
diff --git a/ndn-cxx/security/key-params.cpp b/ndn-cxx/security/key-params.cpp
index 59bf26d..ec5325a 100644
--- a/ndn-cxx/security/key-params.cpp
+++ b/ndn-cxx/security/key-params.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "key-params.hpp"
+#include "ndn-cxx/security/key-params.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/security/key-params.hpp b/ndn-cxx/security/key-params.hpp
index 9b344cb..a7c52b4 100644
--- a/ndn-cxx/security/key-params.hpp
+++ b/ndn-cxx/security/key-params.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_SECURITY_KEY_PARAMS_HPP
 #define NDN_SECURITY_KEY_PARAMS_HPP
 
-#include "security-common.hpp"
-#include "../name-component.hpp"
+#include "ndn-cxx/security/security-common.hpp"
+#include "ndn-cxx/name-component.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/security/pib/certificate-container.cpp b/ndn-cxx/security/pib/certificate-container.cpp
index f3fe411..f275869 100644
--- a/ndn-cxx/security/pib/certificate-container.cpp
+++ b/ndn-cxx/security/pib/certificate-container.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "certificate-container.hpp"
-#include "pib-impl.hpp"
-#include "util/concepts.hpp"
+#include "ndn-cxx/security/pib/certificate-container.hpp"
+#include "ndn-cxx/security/pib/pib-impl.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/pib/certificate-container.hpp b/ndn-cxx/security/pib/certificate-container.hpp
index 1fb1c63..2ab7292 100644
--- a/ndn-cxx/security/pib/certificate-container.hpp
+++ b/ndn-cxx/security/pib/certificate-container.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_PIB_CERTIFICATE_CONTAINER_HPP
 #define NDN_SECURITY_PIB_CERTIFICATE_CONTAINER_HPP
 
-#include "../v2/certificate.hpp"
+#include "ndn-cxx/security/v2/certificate.hpp"
 
 #include <iterator>
 #include <set>
diff --git a/ndn-cxx/security/pib/detail/identity-impl.cpp b/ndn-cxx/security/pib/detail/identity-impl.cpp
index 3397534..3e27f69 100644
--- a/ndn-cxx/security/pib/detail/identity-impl.cpp
+++ b/ndn-cxx/security/pib/detail/identity-impl.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "identity-impl.hpp"
-#include "../pib-impl.hpp"
-#include "../pib.hpp"
+#include "ndn-cxx/security/pib/detail/identity-impl.hpp"
+#include "ndn-cxx/security/pib/pib-impl.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/pib/detail/identity-impl.hpp b/ndn-cxx/security/pib/detail/identity-impl.hpp
index f9c4d3f..57f3676 100644
--- a/ndn-cxx/security/pib/detail/identity-impl.hpp
+++ b/ndn-cxx/security/pib/detail/identity-impl.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_PIB_DETAIL_IDENTITY_IMPL_HPP
 #define NDN_SECURITY_PIB_DETAIL_IDENTITY_IMPL_HPP
 
-#include "../key-container.hpp"
+#include "ndn-cxx/security/pib/key-container.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/pib/detail/key-impl.cpp b/ndn-cxx/security/pib/detail/key-impl.cpp
index f36967d..bbdfcaa 100644
--- a/ndn-cxx/security/pib/detail/key-impl.cpp
+++ b/ndn-cxx/security/pib/detail/key-impl.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "key-impl.hpp"
-#include "../pib-impl.hpp"
-#include "../pib.hpp"
-#include "../../transform/public-key.hpp"
+#include "ndn-cxx/security/pib/detail/key-impl.hpp"
+#include "ndn-cxx/security/pib/pib-impl.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
+#include "ndn-cxx/security/transform/public-key.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/pib/detail/key-impl.hpp b/ndn-cxx/security/pib/detail/key-impl.hpp
index 12fcc48..619ff01 100644
--- a/ndn-cxx/security/pib/detail/key-impl.hpp
+++ b/ndn-cxx/security/pib/detail/key-impl.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_SECURITY_PIB_DETAIL_KEY_IMPL_HPP
 #define NDN_SECURITY_PIB_DETAIL_KEY_IMPL_HPP
 
-#include "../../security-common.hpp"
-#include "../certificate-container.hpp"
+#include "ndn-cxx/security/security-common.hpp"
+#include "ndn-cxx/security/pib/certificate-container.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/pib/identity-container.cpp b/ndn-cxx/security/pib/identity-container.cpp
index 0e4749f..dafa9a0 100644
--- a/ndn-cxx/security/pib/identity-container.cpp
+++ b/ndn-cxx/security/pib/identity-container.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "identity-container.hpp"
-#include "pib-impl.hpp"
-#include "detail/identity-impl.hpp"
-#include "util/concepts.hpp"
+#include "ndn-cxx/security/pib/identity-container.hpp"
+#include "ndn-cxx/security/pib/pib-impl.hpp"
+#include "ndn-cxx/security/pib/detail/identity-impl.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/pib/identity-container.hpp b/ndn-cxx/security/pib/identity-container.hpp
index 24bd5c3..b31dc2c 100644
--- a/ndn-cxx/security/pib/identity-container.hpp
+++ b/ndn-cxx/security/pib/identity-container.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_PIB_IDENTITY_CONTAINER_HPP
 #define NDN_SECURITY_PIB_IDENTITY_CONTAINER_HPP
 
-#include "identity.hpp"
+#include "ndn-cxx/security/pib/identity.hpp"
 
 #include <iterator>
 #include <set>
diff --git a/ndn-cxx/security/pib/identity.cpp b/ndn-cxx/security/pib/identity.cpp
index c46b683..131701a 100644
--- a/ndn-cxx/security/pib/identity.cpp
+++ b/ndn-cxx/security/pib/identity.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "identity.hpp"
-#include "detail/identity-impl.hpp"
+#include "ndn-cxx/security/pib/identity.hpp"
+#include "ndn-cxx/security/pib/detail/identity-impl.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/pib/identity.hpp b/ndn-cxx/security/pib/identity.hpp
index 34a41bb..23a2940 100644
--- a/ndn-cxx/security/pib/identity.hpp
+++ b/ndn-cxx/security/pib/identity.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_PIB_IDENTITY_HPP
 #define NDN_SECURITY_PIB_IDENTITY_HPP
 
-#include "key-container.hpp"
+#include "ndn-cxx/security/pib/key-container.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/pib/key-container.cpp b/ndn-cxx/security/pib/key-container.cpp
index ee47e37..043ec8a 100644
--- a/ndn-cxx/security/pib/key-container.cpp
+++ b/ndn-cxx/security/pib/key-container.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "key-container.hpp"
-#include "pib-impl.hpp"
-#include "detail/key-impl.hpp"
-#include "util/concepts.hpp"
+#include "ndn-cxx/security/pib/key-container.hpp"
+#include "ndn-cxx/security/pib/pib-impl.hpp"
+#include "ndn-cxx/security/pib/detail/key-impl.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/pib/key-container.hpp b/ndn-cxx/security/pib/key-container.hpp
index 6475cd2..d84e362 100644
--- a/ndn-cxx/security/pib/key-container.hpp
+++ b/ndn-cxx/security/pib/key-container.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_PIB_KEY_CONTAINER_HPP
 #define NDN_SECURITY_PIB_KEY_CONTAINER_HPP
 
-#include "key.hpp"
+#include "ndn-cxx/security/pib/key.hpp"
 
 #include <iterator>
 #include <set>
diff --git a/ndn-cxx/security/pib/key.cpp b/ndn-cxx/security/pib/key.cpp
index 8577768..055fb1a 100644
--- a/ndn-cxx/security/pib/key.cpp
+++ b/ndn-cxx/security/pib/key.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "key.hpp"
-#include "detail/key-impl.hpp"
-#include "../v2/certificate.hpp"
+#include "ndn-cxx/security/pib/key.hpp"
+#include "ndn-cxx/security/pib/detail/key-impl.hpp"
+#include "ndn-cxx/security/v2/certificate.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/pib/key.hpp b/ndn-cxx/security/pib/key.hpp
index 2f2d975..5848283 100644
--- a/ndn-cxx/security/pib/key.hpp
+++ b/ndn-cxx/security/pib/key.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_SECURITY_PIB_KEY_HPP
 #define NDN_SECURITY_PIB_KEY_HPP
 
-#include "certificate-container.hpp"
-#include "../security-common.hpp"
+#include "ndn-cxx/security/pib/certificate-container.hpp"
+#include "ndn-cxx/security/security-common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/pib/pib-impl.hpp b/ndn-cxx/security/pib/pib-impl.hpp
index ba72466..7d39ad4 100644
--- a/ndn-cxx/security/pib/pib-impl.hpp
+++ b/ndn-cxx/security/pib/pib-impl.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_SECURITY_PIB_PIB_IMPL_HPP
 #define NDN_SECURITY_PIB_PIB_IMPL_HPP
 
-#include "pib.hpp"
-#include "../v2/certificate.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
+#include "ndn-cxx/security/v2/certificate.hpp"
 
 #include <set>
 
diff --git a/ndn-cxx/security/pib/pib-memory.cpp b/ndn-cxx/security/pib/pib-memory.cpp
index 0756aec..7bf1952 100644
--- a/ndn-cxx/security/pib/pib-memory.cpp
+++ b/ndn-cxx/security/pib/pib-memory.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "pib-memory.hpp"
-#include "pib.hpp"
-#include "../security-common.hpp"
+#include "ndn-cxx/security/pib/pib-memory.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
+#include "ndn-cxx/security/security-common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/pib/pib-memory.hpp b/ndn-cxx/security/pib/pib-memory.hpp
index 5331c7f..a6f08db 100644
--- a/ndn-cxx/security/pib/pib-memory.hpp
+++ b/ndn-cxx/security/pib/pib-memory.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_PIB_PIB_MEMORY_HPP
 #define NDN_SECURITY_PIB_PIB_MEMORY_HPP
 
-#include "pib-impl.hpp"
+#include "ndn-cxx/security/pib/pib-impl.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/pib/pib-sqlite3.cpp b/ndn-cxx/security/pib/pib-sqlite3.cpp
index e14d7a4..ac6c552 100644
--- a/ndn-cxx/security/pib/pib-sqlite3.cpp
+++ b/ndn-cxx/security/pib/pib-sqlite3.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "pib-sqlite3.hpp"
-#include "pib.hpp"
-#include "../security-common.hpp"
-#include "../../util/sqlite3-statement.hpp"
+#include "ndn-cxx/security/pib/pib-sqlite3.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
+#include "ndn-cxx/security/security-common.hpp"
+#include "ndn-cxx/util/sqlite3-statement.hpp"
 
 #include <sqlite3.h>
 #include <boost/filesystem.hpp>
diff --git a/ndn-cxx/security/pib/pib-sqlite3.hpp b/ndn-cxx/security/pib/pib-sqlite3.hpp
index 30f0402..4e7f60b 100644
--- a/ndn-cxx/security/pib/pib-sqlite3.hpp
+++ b/ndn-cxx/security/pib/pib-sqlite3.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITTY_PIB_PIB_SQLITE3_HPP
 #define NDN_SECURITTY_PIB_PIB_SQLITE3_HPP
 
-#include "pib-impl.hpp"
+#include "ndn-cxx/security/pib/pib-impl.hpp"
 
 struct sqlite3;
 
diff --git a/ndn-cxx/security/pib/pib.cpp b/ndn-cxx/security/pib/pib.cpp
index 4fba641..ebf4256 100644
--- a/ndn-cxx/security/pib/pib.cpp
+++ b/ndn-cxx/security/pib/pib.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "pib.hpp"
-#include "pib-impl.hpp"
-#include "util/logger.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
+#include "ndn-cxx/security/pib/pib-impl.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/pib/pib.hpp b/ndn-cxx/security/pib/pib.hpp
index 3be9870..26862be 100644
--- a/ndn-cxx/security/pib/pib.hpp
+++ b/ndn-cxx/security/pib/pib.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_PIB_PIB_HPP
 #define NDN_SECURITY_PIB_PIB_HPP
 
-#include "identity-container.hpp"
+#include "ndn-cxx/security/pib/identity-container.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/safe-bag.cpp b/ndn-cxx/security/safe-bag.cpp
index 5d24859..b0d8abc 100644
--- a/ndn-cxx/security/safe-bag.cpp
+++ b/ndn-cxx/security/safe-bag.cpp
@@ -21,10 +21,10 @@
  * @author Zhiyi Zhang <dreamerbarrychang@gmail.com>
  */
 
-#include "safe-bag.hpp"
-#include "encoding/encoding-buffer.hpp"
-#include "encoding/tlv-security.hpp"
-#include "util/concepts.hpp"
+#include "ndn-cxx/security/safe-bag.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/encoding/tlv-security.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/safe-bag.hpp b/ndn-cxx/security/safe-bag.hpp
index 424a541..71877d9 100644
--- a/ndn-cxx/security/safe-bag.hpp
+++ b/ndn-cxx/security/safe-bag.hpp
@@ -20,14 +20,14 @@
  *
  * @author Zhiyi Zhang <dreamerbarrychang@gmail.com>
  */
+
 #ifndef NDN_CXX_SECURITY_SAFE_BAG_HPP
 #define NDN_CXX_SECURITY_SAFE_BAG_HPP
 
-#include "../common.hpp"
-#include "../data.hpp"
-#include "../encoding/block.hpp"
-#include "../encoding/buffer.hpp"
-#include "security-common.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/encoding/buffer.hpp"
+#include "ndn-cxx/security/security-common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/security-common.cpp b/ndn-cxx/security/security-common.cpp
index 1d0d4f2..dd20f6e 100644
--- a/ndn-cxx/security/security-common.cpp
+++ b/ndn-cxx/security/security-common.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security-common.hpp"
+#include "ndn-cxx/security/security-common.hpp"
 
 #include <ostream>
 
diff --git a/ndn-cxx/security/security-common.hpp b/ndn-cxx/security/security-common.hpp
index c2fa8f4..139656e 100644
--- a/ndn-cxx/security/security-common.hpp
+++ b/ndn-cxx/security/security-common.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_SECURITY_COMMON_HPP
 #define NDN_SECURITY_SECURITY_COMMON_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/security/signature-sha256-with-ecdsa.cpp b/ndn-cxx/security/signature-sha256-with-ecdsa.cpp
index a66c244..2fc526a 100644
--- a/ndn-cxx/security/signature-sha256-with-ecdsa.cpp
+++ b/ndn-cxx/security/signature-sha256-with-ecdsa.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "signature-sha256-with-ecdsa.hpp"
+#include "ndn-cxx/security/signature-sha256-with-ecdsa.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/security/signature-sha256-with-ecdsa.hpp b/ndn-cxx/security/signature-sha256-with-ecdsa.hpp
index 1f2da4f..5428825 100644
--- a/ndn-cxx/security/signature-sha256-with-ecdsa.hpp
+++ b/ndn-cxx/security/signature-sha256-with-ecdsa.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_SIGNATURE_SHA256_WITH_ECDSA_HPP
 #define NDN_SECURITY_SIGNATURE_SHA256_WITH_ECDSA_HPP
 
-#include "../signature.hpp"
+#include "ndn-cxx/signature.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/security/signature-sha256-with-rsa.cpp b/ndn-cxx/security/signature-sha256-with-rsa.cpp
index f182d92..9b2e678 100644
--- a/ndn-cxx/security/signature-sha256-with-rsa.cpp
+++ b/ndn-cxx/security/signature-sha256-with-rsa.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "signature-sha256-with-rsa.hpp"
+#include "ndn-cxx/security/signature-sha256-with-rsa.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/security/signature-sha256-with-rsa.hpp b/ndn-cxx/security/signature-sha256-with-rsa.hpp
index 2f0dd94..da79292 100644
--- a/ndn-cxx/security/signature-sha256-with-rsa.hpp
+++ b/ndn-cxx/security/signature-sha256-with-rsa.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_SIGNATURE_SHA256_WITH_RSA_HPP
 #define NDN_SECURITY_SIGNATURE_SHA256_WITH_RSA_HPP
 
-#include "../signature.hpp"
+#include "ndn-cxx/signature.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/security/signing-helpers.cpp b/ndn-cxx/security/signing-helpers.cpp
index 081b3a6..37851fa 100644
--- a/ndn-cxx/security/signing-helpers.cpp
+++ b/ndn-cxx/security/signing-helpers.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "signing-helpers.hpp"
+#include "ndn-cxx/security/signing-helpers.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/signing-helpers.hpp b/ndn-cxx/security/signing-helpers.hpp
index ad18d4d..cf052cc 100644
--- a/ndn-cxx/security/signing-helpers.hpp
+++ b/ndn-cxx/security/signing-helpers.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_CXX_SECURITY_SIGNING_HELPERS_HPP
 #define NDN_CXX_SECURITY_SIGNING_HELPERS_HPP
 
-#include "../common.hpp"
-#include "signing-info.hpp"
+#include "ndn-cxx/common.hpp"
+#include "ndn-cxx/security/signing-info.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/signing-info.cpp b/ndn-cxx/security/signing-info.cpp
index dba168b..ed760f0 100644
--- a/ndn-cxx/security/signing-info.cpp
+++ b/ndn-cxx/security/signing-info.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "signing-info.hpp"
+#include "ndn-cxx/security/signing-info.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/signing-info.hpp b/ndn-cxx/security/signing-info.hpp
index 4856a49..95a0955 100644
--- a/ndn-cxx/security/signing-info.hpp
+++ b/ndn-cxx/security/signing-info.hpp
@@ -22,11 +22,11 @@
 #ifndef NDN_SECURITY_SIGNING_INFO_HPP
 #define NDN_SECURITY_SIGNING_INFO_HPP
 
-#include "../name.hpp"
-#include "../signature-info.hpp"
-#include "pib/identity.hpp"
-#include "pib/key.hpp"
-#include "security-common.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/signature-info.hpp"
+#include "ndn-cxx/security/pib/identity.hpp"
+#include "ndn-cxx/security/pib/key.hpp"
+#include "ndn-cxx/security/security-common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/tpm/back-end-file.cpp b/ndn-cxx/security/tpm/back-end-file.cpp
index 12c1e37..6f1af3b 100644
--- a/ndn-cxx/security/tpm/back-end-file.cpp
+++ b/ndn-cxx/security/tpm/back-end-file.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "back-end-file.hpp"
-#include "key-handle-mem.hpp"
-#include "../transform.hpp"
-#include "../transform/private-key.hpp"
-#include "../../encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/tpm/back-end-file.hpp"
+#include "ndn-cxx/security/tpm/key-handle-mem.hpp"
+#include "ndn-cxx/security/transform.hpp"
+#include "ndn-cxx/security/transform/private-key.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
 
 #include <cstdlib>
 #include <fstream>
diff --git a/ndn-cxx/security/tpm/back-end-file.hpp b/ndn-cxx/security/tpm/back-end-file.hpp
index bf29644..658d12f 100644
--- a/ndn-cxx/security/tpm/back-end-file.hpp
+++ b/ndn-cxx/security/tpm/back-end-file.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_TPM_BACK_END_FILE_HPP
 #define NDN_SECURITY_TPM_BACK_END_FILE_HPP
 
-#include "back-end.hpp"
+#include "ndn-cxx/security/tpm/back-end.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/tpm/back-end-mem.cpp b/ndn-cxx/security/tpm/back-end-mem.cpp
index 2427229..c6ec080 100644
--- a/ndn-cxx/security/tpm/back-end-mem.cpp
+++ b/ndn-cxx/security/tpm/back-end-mem.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "back-end-mem.hpp"
-#include "key-handle-mem.hpp"
-#include "../transform/private-key.hpp"
-#include "../../encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/tpm/back-end-mem.hpp"
+#include "ndn-cxx/security/tpm/key-handle-mem.hpp"
+#include "ndn-cxx/security/transform/private-key.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
 
 #include <unordered_map>
 
diff --git a/ndn-cxx/security/tpm/back-end-mem.hpp b/ndn-cxx/security/tpm/back-end-mem.hpp
index 07ceb6e..5d1dd3e 100644
--- a/ndn-cxx/security/tpm/back-end-mem.hpp
+++ b/ndn-cxx/security/tpm/back-end-mem.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_TPM_BACK_END_MEM_HPP
 #define NDN_SECURITY_TPM_BACK_END_MEM_HPP
 
-#include "back-end.hpp"
+#include "ndn-cxx/security/tpm/back-end.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/tpm/back-end-osx.cpp b/ndn-cxx/security/tpm/back-end-osx.cpp
index daf5281..2f4688f 100644
--- a/ndn-cxx/security/tpm/back-end-osx.cpp
+++ b/ndn-cxx/security/tpm/back-end-osx.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "back-end-osx.hpp"
-#include "key-handle-osx.hpp"
-#include "tpm.hpp"
-#include "../transform/private-key.hpp"
-#include "../../encoding/buffer-stream.hpp"
-#include "../../util/cf-string-osx.hpp"
+#include "ndn-cxx/security/tpm/back-end-osx.hpp"
+#include "ndn-cxx/security/tpm/key-handle-osx.hpp"
+#include "ndn-cxx/security/tpm/tpm.hpp"
+#include "ndn-cxx/security/transform/private-key.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/util/cf-string-osx.hpp"
 
 #include <Security/Security.h>
 #include <cstring>
diff --git a/ndn-cxx/security/tpm/back-end-osx.hpp b/ndn-cxx/security/tpm/back-end-osx.hpp
index 0a7ba27..bbbc159 100644
--- a/ndn-cxx/security/tpm/back-end-osx.hpp
+++ b/ndn-cxx/security/tpm/back-end-osx.hpp
@@ -22,13 +22,13 @@
 #ifndef NDN_SECURITY_TPM_BACK_END_OSX_HPP
 #define NDN_SECURITY_TPM_BACK_END_OSX_HPP
 
-#include "back-end.hpp"
+#include "ndn-cxx/security/tpm/back-end.hpp"
 
 #ifndef NDN_CXX_HAVE_OSX_FRAMEWORKS
 #error "This file should not be compiled ..."
 #endif
 
-#include "key-ref-osx.hpp"
+#include "ndn-cxx/security/tpm/key-ref-osx.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/tpm/back-end.cpp b/ndn-cxx/security/tpm/back-end.cpp
index 22ccf76..83ae426 100644
--- a/ndn-cxx/security/tpm/back-end.cpp
+++ b/ndn-cxx/security/tpm/back-end.cpp
@@ -19,15 +19,15 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "back-end.hpp"
-#include "key-handle.hpp"
-#include "tpm.hpp"
-#include "../pib/key.hpp"
-#include "../transform/buffer-source.hpp"
-#include "../transform/digest-filter.hpp"
-#include "../transform/stream-sink.hpp"
-#include "../../encoding/buffer-stream.hpp"
-#include "../../util/random.hpp"
+#include "ndn-cxx/security/tpm/back-end.hpp"
+#include "ndn-cxx/security/tpm/key-handle.hpp"
+#include "ndn-cxx/security/tpm/tpm.hpp"
+#include "ndn-cxx/security/pib/key.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/digest-filter.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/util/random.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/tpm/back-end.hpp b/ndn-cxx/security/tpm/back-end.hpp
index 8bbfac5..ab570f2 100644
--- a/ndn-cxx/security/tpm/back-end.hpp
+++ b/ndn-cxx/security/tpm/back-end.hpp
@@ -22,9 +22,9 @@
 #ifndef NDN_SECURITY_TPM_BACK_END_HPP
 #define NDN_SECURITY_TPM_BACK_END_HPP
 
-#include "../key-params.hpp"
-#include "../../encoding/buffer.hpp"
-#include "../../name.hpp"
+#include "ndn-cxx/security/key-params.hpp"
+#include "ndn-cxx/encoding/buffer.hpp"
+#include "ndn-cxx/name.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/tpm/key-handle-mem.cpp b/ndn-cxx/security/tpm/key-handle-mem.cpp
index d04379b..486b412 100644
--- a/ndn-cxx/security/tpm/key-handle-mem.cpp
+++ b/ndn-cxx/security/tpm/key-handle-mem.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "key-handle-mem.hpp"
-#include "../transform/buffer-source.hpp"
-#include "../transform/private-key.hpp"
-#include "../transform/signer-filter.hpp"
-#include "../transform/stream-sink.hpp"
-#include "../../encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/tpm/key-handle-mem.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/private-key.hpp"
+#include "ndn-cxx/security/transform/signer-filter.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/tpm/key-handle-mem.hpp b/ndn-cxx/security/tpm/key-handle-mem.hpp
index c5baf27..97cce7a 100644
--- a/ndn-cxx/security/tpm/key-handle-mem.hpp
+++ b/ndn-cxx/security/tpm/key-handle-mem.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_TPM_KEY_HANDLE_MEM_HPP
 #define NDN_SECURITY_TPM_KEY_HANDLE_MEM_HPP
 
-#include "key-handle.hpp"
+#include "ndn-cxx/security/tpm/key-handle.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/tpm/key-handle-osx.cpp b/ndn-cxx/security/tpm/key-handle-osx.cpp
index 64e5c37..7172455 100644
--- a/ndn-cxx/security/tpm/key-handle-osx.cpp
+++ b/ndn-cxx/security/tpm/key-handle-osx.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "key-handle-osx.hpp"
-#include "back-end-osx.hpp"
+#include "ndn-cxx/security/tpm/key-handle-osx.hpp"
+#include "ndn-cxx/security/tpm/back-end-osx.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/tpm/key-handle-osx.hpp b/ndn-cxx/security/tpm/key-handle-osx.hpp
index 8b0e308..d4c73af 100644
--- a/ndn-cxx/security/tpm/key-handle-osx.hpp
+++ b/ndn-cxx/security/tpm/key-handle-osx.hpp
@@ -22,13 +22,13 @@
 #ifndef NDN_SECURITY_TPM_KEY_HANDLE_OSX_HPP
 #define NDN_SECURITY_TPM_KEY_HANDLE_OSX_HPP
 
-#include "key-handle.hpp"
+#include "ndn-cxx/security/tpm/key-handle.hpp"
 
 #ifndef NDN_CXX_HAVE_OSX_FRAMEWORKS
 #error "This file should not be compiled ..."
 #endif
 
-#include "key-ref-osx.hpp"
+#include "ndn-cxx/security/tpm/key-ref-osx.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/tpm/key-handle.cpp b/ndn-cxx/security/tpm/key-handle.cpp
index 9936574..1184450 100644
--- a/ndn-cxx/security/tpm/key-handle.cpp
+++ b/ndn-cxx/security/tpm/key-handle.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "key-handle.hpp"
+#include "ndn-cxx/security/tpm/key-handle.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/tpm/key-handle.hpp b/ndn-cxx/security/tpm/key-handle.hpp
index 3d55ca3..a47b5d0 100644
--- a/ndn-cxx/security/tpm/key-handle.hpp
+++ b/ndn-cxx/security/tpm/key-handle.hpp
@@ -22,9 +22,8 @@
 #ifndef NDN_SECURITY_TPM_KEY_HANDLE_HPP
 #define NDN_SECURITY_TPM_KEY_HANDLE_HPP
 
-#include "../../common.hpp"
-#include "../../name.hpp"
-#include "../security-common.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/security/security-common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/tpm/key-ref-osx.hpp b/ndn-cxx/security/tpm/key-ref-osx.hpp
index b901ea3..3a069ab 100644
--- a/ndn-cxx/security/tpm/key-ref-osx.hpp
+++ b/ndn-cxx/security/tpm/key-ref-osx.hpp
@@ -22,13 +22,13 @@
 #ifndef NDN_SECURITY_TPM_KEY_REF_OSX_HPP
 #define NDN_SECURITY_TPM_KEY_REF_OSX_HPP
 
-#include "../../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 #ifndef NDN_CXX_HAVE_OSX_FRAMEWORKS
 #error "This file should not be compiled ..."
 #endif
 
-#include "../../util/cf-releaser-osx.hpp"
+#include "ndn-cxx/util/cf-releaser-osx.hpp"
 #include <Security/Security.h>
 
 namespace ndn {
diff --git a/ndn-cxx/security/tpm/tpm.cpp b/ndn-cxx/security/tpm/tpm.cpp
index 20c6560..ecbf48f 100644
--- a/ndn-cxx/security/tpm/tpm.cpp
+++ b/ndn-cxx/security/tpm/tpm.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "tpm.hpp"
-#include "back-end.hpp"
-#include "../../encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/tpm/tpm.hpp"
+#include "ndn-cxx/security/tpm/back-end.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/tpm/tpm.hpp b/ndn-cxx/security/tpm/tpm.hpp
index 620a2cc..2c0f800 100644
--- a/ndn-cxx/security/tpm/tpm.hpp
+++ b/ndn-cxx/security/tpm/tpm.hpp
@@ -22,9 +22,9 @@
 #ifndef NDN_SECURITY_TPM_TPM_HPP
 #define NDN_SECURITY_TPM_TPM_HPP
 
-#include "key-handle.hpp"
-#include "../key-params.hpp"
-#include "../../name.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/security/key-params.hpp"
+#include "ndn-cxx/security/tpm/key-handle.hpp"
 
 #include <unordered_map>
 
diff --git a/ndn-cxx/security/transform.hpp b/ndn-cxx/security/transform.hpp
index 08b0ae5..c3d41a3 100644
--- a/ndn-cxx/security/transform.hpp
+++ b/ndn-cxx/security/transform.hpp
@@ -22,25 +22,25 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_HPP
 
-#include "transform/buffer-source.hpp"
-#include "transform/step-source.hpp"
-#include "transform/stream-source.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/step-source.hpp"
+#include "ndn-cxx/security/transform/stream-source.hpp"
 
-#include "transform/bool-sink.hpp"
-#include "transform/stream-sink.hpp"
+#include "ndn-cxx/security/transform/bool-sink.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
 
-#include "transform/base64-decode.hpp"
-#include "transform/base64-encode.hpp"
-#include "transform/hex-decode.hpp"
-#include "transform/hex-encode.hpp"
-#include "transform/strip-space.hpp"
+#include "ndn-cxx/security/transform/base64-decode.hpp"
+#include "ndn-cxx/security/transform/base64-encode.hpp"
+#include "ndn-cxx/security/transform/hex-decode.hpp"
+#include "ndn-cxx/security/transform/hex-encode.hpp"
+#include "ndn-cxx/security/transform/strip-space.hpp"
 
-#include "transform/block-cipher.hpp"
-#include "transform/digest-filter.hpp"
-#include "transform/hmac-filter.hpp"
-#include "transform/private-key.hpp"
-#include "transform/public-key.hpp"
-#include "transform/signer-filter.hpp"
-#include "transform/verifier-filter.hpp"
+#include "ndn-cxx/security/transform/block-cipher.hpp"
+#include "ndn-cxx/security/transform/digest-filter.hpp"
+#include "ndn-cxx/security/transform/hmac-filter.hpp"
+#include "ndn-cxx/security/transform/private-key.hpp"
+#include "ndn-cxx/security/transform/public-key.hpp"
+#include "ndn-cxx/security/transform/signer-filter.hpp"
+#include "ndn-cxx/security/transform/verifier-filter.hpp"
 
 #endif // NDN_CXX_SECURITY_TRANSFORM_HPP
diff --git a/ndn-cxx/security/transform/base64-decode.cpp b/ndn-cxx/security/transform/base64-decode.cpp
index 1a75acd..784621b 100644
--- a/ndn-cxx/security/transform/base64-decode.cpp
+++ b/ndn-cxx/security/transform/base64-decode.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "base64-decode.hpp"
-#include "../detail/openssl.hpp"
+#include "ndn-cxx/security/transform/base64-decode.hpp"
+#include "ndn-cxx/security/detail/openssl.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/base64-decode.hpp b/ndn-cxx/security/transform/base64-decode.hpp
index 47acaed..b7fdbe3 100644
--- a/ndn-cxx/security/transform/base64-decode.hpp
+++ b/ndn-cxx/security/transform/base64-decode.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_BASE64_DECODE_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_BASE64_DECODE_HPP
 
-#include "transform-base.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/base64-encode.cpp b/ndn-cxx/security/transform/base64-encode.cpp
index 554a7b8..9ff6600 100644
--- a/ndn-cxx/security/transform/base64-encode.cpp
+++ b/ndn-cxx/security/transform/base64-encode.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "base64-encode.hpp"
-#include "../detail/openssl.hpp"
+#include "ndn-cxx/security/transform/base64-encode.hpp"
+#include "ndn-cxx/security/detail/openssl.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/base64-encode.hpp b/ndn-cxx/security/transform/base64-encode.hpp
index f8874f5..145d36c 100644
--- a/ndn-cxx/security/transform/base64-encode.hpp
+++ b/ndn-cxx/security/transform/base64-encode.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_BASE64_ENCODE_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_BASE64_ENCODE_HPP
 
-#include "transform-base.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/block-cipher.cpp b/ndn-cxx/security/transform/block-cipher.cpp
index 748504e..cf3f66f 100644
--- a/ndn-cxx/security/transform/block-cipher.cpp
+++ b/ndn-cxx/security/transform/block-cipher.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "block-cipher.hpp"
-#include "../detail/openssl.hpp"
+#include "ndn-cxx/security/transform/block-cipher.hpp"
+#include "ndn-cxx/security/detail/openssl.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/ndn-cxx/security/transform/block-cipher.hpp b/ndn-cxx/security/transform/block-cipher.hpp
index 92b8140..3ea5ba5 100644
--- a/ndn-cxx/security/transform/block-cipher.hpp
+++ b/ndn-cxx/security/transform/block-cipher.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_BLOCK_CIPHER_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_BLOCK_CIPHER_HPP
 
-#include "transform-base.hpp"
-#include "../security-common.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
+#include "ndn-cxx/security/security-common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/bool-sink.cpp b/ndn-cxx/security/transform/bool-sink.cpp
index 02fddd3..0c702e7 100644
--- a/ndn-cxx/security/transform/bool-sink.cpp
+++ b/ndn-cxx/security/transform/bool-sink.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "bool-sink.hpp"
+#include "ndn-cxx/security/transform/bool-sink.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/bool-sink.hpp b/ndn-cxx/security/transform/bool-sink.hpp
index 9214cd0..c270543 100644
--- a/ndn-cxx/security/transform/bool-sink.hpp
+++ b/ndn-cxx/security/transform/bool-sink.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_BOOL_SINK_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_BOOL_SINK_HPP
 
-#include "transform-base.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/buffer-source.cpp b/ndn-cxx/security/transform/buffer-source.cpp
index dfa9651..95fd2d7 100644
--- a/ndn-cxx/security/transform/buffer-source.cpp
+++ b/ndn-cxx/security/transform/buffer-source.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "buffer-source.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/buffer-source.hpp b/ndn-cxx/security/transform/buffer-source.hpp
index 0fd0eb8..6119999 100644
--- a/ndn-cxx/security/transform/buffer-source.hpp
+++ b/ndn-cxx/security/transform/buffer-source.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_BUFFER_SOURCE_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_BUFFER_SOURCE_HPP
 
-#include "transform-base.hpp"
-#include "../../encoding/buffer.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
+#include "ndn-cxx/encoding/buffer.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/digest-filter.cpp b/ndn-cxx/security/transform/digest-filter.cpp
index e70660b..63b1901 100644
--- a/ndn-cxx/security/transform/digest-filter.cpp
+++ b/ndn-cxx/security/transform/digest-filter.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "digest-filter.hpp"
-#include "../detail/openssl-helper.hpp"
+#include "ndn-cxx/security/transform/digest-filter.hpp"
+#include "ndn-cxx/security/detail/openssl-helper.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/ndn-cxx/security/transform/digest-filter.hpp b/ndn-cxx/security/transform/digest-filter.hpp
index 2dcbeb0..4a26bf0 100644
--- a/ndn-cxx/security/transform/digest-filter.hpp
+++ b/ndn-cxx/security/transform/digest-filter.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_DIGEST_FILTER_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_DIGEST_FILTER_HPP
 
-#include "transform-base.hpp"
-#include "../security-common.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
+#include "ndn-cxx/security/security-common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/hex-decode.cpp b/ndn-cxx/security/transform/hex-decode.cpp
index 86bd3d4..0543319 100644
--- a/ndn-cxx/security/transform/hex-decode.cpp
+++ b/ndn-cxx/security/transform/hex-decode.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "hex-decode.hpp"
+#include "ndn-cxx/security/transform/hex-decode.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/hex-decode.hpp b/ndn-cxx/security/transform/hex-decode.hpp
index 7afe583..d57be64 100644
--- a/ndn-cxx/security/transform/hex-decode.hpp
+++ b/ndn-cxx/security/transform/hex-decode.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_HEX_DECODE_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_HEX_DECODE_HPP
 
-#include "transform-base.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/hex-encode.cpp b/ndn-cxx/security/transform/hex-encode.cpp
index 9c657f6..219e14e 100644
--- a/ndn-cxx/security/transform/hex-encode.cpp
+++ b/ndn-cxx/security/transform/hex-encode.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "hex-encode.hpp"
+#include "ndn-cxx/security/transform/hex-encode.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/hex-encode.hpp b/ndn-cxx/security/transform/hex-encode.hpp
index e5e6a86..a395616 100644
--- a/ndn-cxx/security/transform/hex-encode.hpp
+++ b/ndn-cxx/security/transform/hex-encode.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_HEX_ENCODE_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_HEX_ENCODE_HPP
 
-#include "transform-base.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/hmac-filter.cpp b/ndn-cxx/security/transform/hmac-filter.cpp
index c82898a..d81ab11 100644
--- a/ndn-cxx/security/transform/hmac-filter.cpp
+++ b/ndn-cxx/security/transform/hmac-filter.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "hmac-filter.hpp"
-#include "../detail/openssl-helper.hpp"
+#include "ndn-cxx/security/transform/hmac-filter.hpp"
+#include "ndn-cxx/security/detail/openssl-helper.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/ndn-cxx/security/transform/hmac-filter.hpp b/ndn-cxx/security/transform/hmac-filter.hpp
index 69b441d..f7f3304 100644
--- a/ndn-cxx/security/transform/hmac-filter.hpp
+++ b/ndn-cxx/security/transform/hmac-filter.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_HMAC_FILTER_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_HMAC_FILTER_HPP
 
-#include "transform-base.hpp"
-#include "../security-common.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
+#include "ndn-cxx/security/security-common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/private-key.cpp b/ndn-cxx/security/transform/private-key.cpp
index 1a6fc08..06faaea 100644
--- a/ndn-cxx/security/transform/private-key.cpp
+++ b/ndn-cxx/security/transform/private-key.cpp
@@ -19,15 +19,15 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "private-key.hpp"
-#include "base64-decode.hpp"
-#include "base64-encode.hpp"
-#include "buffer-source.hpp"
-#include "stream-sink.hpp"
-#include "stream-source.hpp"
-#include "../detail/openssl-helper.hpp"
-#include "../key-params.hpp"
-#include "../../encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/private-key.hpp"
+#include "ndn-cxx/security/transform/base64-decode.hpp"
+#include "ndn-cxx/security/transform/base64-encode.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
+#include "ndn-cxx/security/transform/stream-source.hpp"
+#include "ndn-cxx/security/detail/openssl-helper.hpp"
+#include "ndn-cxx/security/key-params.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <cstring>
diff --git a/ndn-cxx/security/transform/private-key.hpp b/ndn-cxx/security/transform/private-key.hpp
index e1af107..093efe2 100644
--- a/ndn-cxx/security/transform/private-key.hpp
+++ b/ndn-cxx/security/transform/private-key.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_PRIVATE_KEY_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_PRIVATE_KEY_HPP
 
-#include "../security-common.hpp"
-#include "../../encoding/buffer.hpp"
+#include "ndn-cxx/security/security-common.hpp"
+#include "ndn-cxx/encoding/buffer.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/security/transform/public-key.cpp b/ndn-cxx/security/transform/public-key.cpp
index 5a1142e..6ed5293 100644
--- a/ndn-cxx/security/transform/public-key.cpp
+++ b/ndn-cxx/security/transform/public-key.cpp
@@ -19,14 +19,14 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "public-key.hpp"
-#include "base64-decode.hpp"
-#include "base64-encode.hpp"
-#include "buffer-source.hpp"
-#include "stream-sink.hpp"
-#include "stream-source.hpp"
-#include "../detail/openssl-helper.hpp"
-#include "../../encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/public-key.hpp"
+#include "ndn-cxx/security/transform/base64-decode.hpp"
+#include "ndn-cxx/security/transform/base64-encode.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
+#include "ndn-cxx/security/transform/stream-source.hpp"
+#include "ndn-cxx/security/detail/openssl-helper.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
 
 #define ENSURE_PUBLIC_KEY_LOADED(key) \
   do { \
diff --git a/ndn-cxx/security/transform/public-key.hpp b/ndn-cxx/security/transform/public-key.hpp
index 41aeacb..29c584b 100644
--- a/ndn-cxx/security/transform/public-key.hpp
+++ b/ndn-cxx/security/transform/public-key.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_PUBLIC_KEY_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_PUBLIC_KEY_HPP
 
-#include "../security-common.hpp"
-#include "../../encoding/buffer.hpp"
+#include "ndn-cxx/security/security-common.hpp"
+#include "ndn-cxx/encoding/buffer.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/signer-filter.cpp b/ndn-cxx/security/transform/signer-filter.cpp
index e9bb48a..1e03754 100644
--- a/ndn-cxx/security/transform/signer-filter.cpp
+++ b/ndn-cxx/security/transform/signer-filter.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "signer-filter.hpp"
-#include "private-key.hpp"
-#include "../detail/openssl-helper.hpp"
+#include "ndn-cxx/security/transform/signer-filter.hpp"
+#include "ndn-cxx/security/transform/private-key.hpp"
+#include "ndn-cxx/security/detail/openssl-helper.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/ndn-cxx/security/transform/signer-filter.hpp b/ndn-cxx/security/transform/signer-filter.hpp
index 45fc351..8cb573b 100644
--- a/ndn-cxx/security/transform/signer-filter.hpp
+++ b/ndn-cxx/security/transform/signer-filter.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_SIGNER_FILTER_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_SIGNER_FILTER_HPP
 
-#include "transform-base.hpp"
-#include "../security-common.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
+#include "ndn-cxx/security/security-common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/step-source.cpp b/ndn-cxx/security/transform/step-source.cpp
index d334f0f..0ff004b 100644
--- a/ndn-cxx/security/transform/step-source.cpp
+++ b/ndn-cxx/security/transform/step-source.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "step-source.hpp"
+#include "ndn-cxx/security/transform/step-source.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/step-source.hpp b/ndn-cxx/security/transform/step-source.hpp
index 92e3060..a1e88c7 100644
--- a/ndn-cxx/security/transform/step-source.hpp
+++ b/ndn-cxx/security/transform/step-source.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_STEP_SOURCE_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_STEP_SOURCE_HPP
 
-#include "transform-base.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/stream-sink.cpp b/ndn-cxx/security/transform/stream-sink.cpp
index eda48ef..d8b25e7 100644
--- a/ndn-cxx/security/transform/stream-sink.cpp
+++ b/ndn-cxx/security/transform/stream-sink.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "stream-sink.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
 
 #include <ostream>
 
diff --git a/ndn-cxx/security/transform/stream-sink.hpp b/ndn-cxx/security/transform/stream-sink.hpp
index 5991854..856c66b 100644
--- a/ndn-cxx/security/transform/stream-sink.hpp
+++ b/ndn-cxx/security/transform/stream-sink.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_STREAM_SINK_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_STREAM_SINK_HPP
 
-#include "transform-base.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/stream-source.cpp b/ndn-cxx/security/transform/stream-source.cpp
index c0a63ae..f86ba99 100644
--- a/ndn-cxx/security/transform/stream-source.cpp
+++ b/ndn-cxx/security/transform/stream-source.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "stream-source.hpp"
+#include "ndn-cxx/security/transform/stream-source.hpp"
 
 #include <istream>
 #include <vector>
diff --git a/ndn-cxx/security/transform/stream-source.hpp b/ndn-cxx/security/transform/stream-source.hpp
index 513a53a..2e022ff 100644
--- a/ndn-cxx/security/transform/stream-source.hpp
+++ b/ndn-cxx/security/transform/stream-source.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_STREAM_SOURCE_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_STREAM_SOURCE_HPP
 
-#include "transform-base.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/strip-space.cpp b/ndn-cxx/security/transform/strip-space.cpp
index 4866f9b..3ce8ead 100644
--- a/ndn-cxx/security/transform/strip-space.cpp
+++ b/ndn-cxx/security/transform/strip-space.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "strip-space.hpp"
+#include "ndn-cxx/security/transform/strip-space.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/strip-space.hpp b/ndn-cxx/security/transform/strip-space.hpp
index a850cb6..3329547 100644
--- a/ndn-cxx/security/transform/strip-space.hpp
+++ b/ndn-cxx/security/transform/strip-space.hpp
@@ -22,7 +22,8 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_STRIP_SPACE_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_STRIP_SPACE_HPP
 
-#include "transform-base.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
+
 #include <bitset>
 #include <climits>
 
diff --git a/ndn-cxx/security/transform/transform-base.cpp b/ndn-cxx/security/transform/transform-base.cpp
index cfcb14c..571a557 100644
--- a/ndn-cxx/security/transform/transform-base.cpp
+++ b/ndn-cxx/security/transform/transform-base.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "transform-base.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/transform/transform-base.hpp b/ndn-cxx/security/transform/transform-base.hpp
index e138227..68aa429 100644
--- a/ndn-cxx/security/transform/transform-base.hpp
+++ b/ndn-cxx/security/transform/transform-base.hpp
@@ -22,7 +22,8 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_BASE_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_BASE_HPP
 
-#include "../../common.hpp"
+#include "ndn-cxx/common.hpp"
+
 #include <vector>
 
 namespace ndn {
diff --git a/ndn-cxx/security/transform/verifier-filter.cpp b/ndn-cxx/security/transform/verifier-filter.cpp
index f4b8e84..6ab96a8 100644
--- a/ndn-cxx/security/transform/verifier-filter.cpp
+++ b/ndn-cxx/security/transform/verifier-filter.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "verifier-filter.hpp"
-#include "public-key.hpp"
-#include "../detail/openssl-helper.hpp"
+#include "ndn-cxx/security/transform/verifier-filter.hpp"
+#include "ndn-cxx/security/transform/public-key.hpp"
+#include "ndn-cxx/security/detail/openssl-helper.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/ndn-cxx/security/transform/verifier-filter.hpp b/ndn-cxx/security/transform/verifier-filter.hpp
index 2b794a0..967921a 100644
--- a/ndn-cxx/security/transform/verifier-filter.hpp
+++ b/ndn-cxx/security/transform/verifier-filter.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_CXX_SECURITY_TRANSFORM_VERIFIER_FILTER_HPP
 #define NDN_CXX_SECURITY_TRANSFORM_VERIFIER_FILTER_HPP
 
-#include "transform-base.hpp"
-#include "../security-common.hpp"
+#include "ndn-cxx/security/transform/transform-base.hpp"
+#include "ndn-cxx/security/security-common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/additional-description.cpp b/ndn-cxx/security/v2/additional-description.cpp
index 233eecd..143ce2c 100644
--- a/ndn-cxx/security/v2/additional-description.cpp
+++ b/ndn-cxx/security/v2/additional-description.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "additional-description.hpp"
-#include "../../util/concepts.hpp"
-#include "../../encoding/block-helpers.hpp"
+#include "ndn-cxx/security/v2/additional-description.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/additional-description.hpp b/ndn-cxx/security/v2/additional-description.hpp
index 4372807..f019077 100644
--- a/ndn-cxx/security/v2/additional-description.hpp
+++ b/ndn-cxx/security/v2/additional-description.hpp
@@ -22,9 +22,10 @@
 #ifndef NDN_SECURITY_V2_ADDITIONAL_DESCRIPTION_HPP
 #define NDN_SECURITY_V2_ADDITIONAL_DESCRIPTION_HPP
 
-#include "../../common.hpp"
-#include "../../encoding/tlv.hpp"
-#include "../../encoding/block.hpp"
+#include "ndn-cxx/common.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/encoding/tlv.hpp"
+
 #include <map>
 
 namespace ndn {
diff --git a/ndn-cxx/security/v2/certificate-bundle-fetcher.cpp b/ndn-cxx/security/v2/certificate-bundle-fetcher.cpp
index 9375aa4..9972511 100644
--- a/ndn-cxx/security/v2/certificate-bundle-fetcher.cpp
+++ b/ndn-cxx/security/v2/certificate-bundle-fetcher.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "certificate-bundle-fetcher.hpp"
-#include "face.hpp"
-#include "util/logger.hpp"
+#include "ndn-cxx/security/v2/certificate-bundle-fetcher.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/certificate-bundle-fetcher.hpp b/ndn-cxx/security/v2/certificate-bundle-fetcher.hpp
index efb8aea..f14de46 100644
--- a/ndn-cxx/security/v2/certificate-bundle-fetcher.hpp
+++ b/ndn-cxx/security/v2/certificate-bundle-fetcher.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_V2_CERTIFICATE_BUNDLE_FETCHER_HPP
 #define NDN_SECURITY_V2_CERTIFICATE_BUNDLE_FETCHER_HPP
 
-#include "certificate-fetcher-from-network.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher-from-network.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/certificate-cache.cpp b/ndn-cxx/security/v2/certificate-cache.cpp
index 9726b7e..d92c16e 100644
--- a/ndn-cxx/security/v2/certificate-cache.cpp
+++ b/ndn-cxx/security/v2/certificate-cache.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "certificate-cache.hpp"
-#include "util/logger.hpp"
+#include "ndn-cxx/security/v2/certificate-cache.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/certificate-cache.hpp b/ndn-cxx/security/v2/certificate-cache.hpp
index 53157b4..435bdda 100644
--- a/ndn-cxx/security/v2/certificate-cache.hpp
+++ b/ndn-cxx/security/v2/certificate-cache.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_SECURITY_V2_CERTIFICATE_CACHE_HPP
 #define NDN_SECURITY_V2_CERTIFICATE_CACHE_HPP
 
-#include "../../interest.hpp"
-#include "certificate.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/security/v2/certificate.hpp"
 
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/ordered_index.hpp>
diff --git a/ndn-cxx/security/v2/certificate-fetcher-direct-fetch.cpp b/ndn-cxx/security/v2/certificate-fetcher-direct-fetch.cpp
index a155dad..2e6c8f8 100644
--- a/ndn-cxx/security/v2/certificate-fetcher-direct-fetch.cpp
+++ b/ndn-cxx/security/v2/certificate-fetcher-direct-fetch.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "certificate-fetcher-direct-fetch.hpp"
-#include "face.hpp"
-#include "lp/tags.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher-direct-fetch.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/lp/tags.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/certificate-fetcher-direct-fetch.hpp b/ndn-cxx/security/v2/certificate-fetcher-direct-fetch.hpp
index 62734ed..0ac93aa 100644
--- a/ndn-cxx/security/v2/certificate-fetcher-direct-fetch.hpp
+++ b/ndn-cxx/security/v2/certificate-fetcher-direct-fetch.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_V2_CERTIFICATE_FETCHER_DIRECT_FETCH_HPP
 #define NDN_SECURITY_V2_CERTIFICATE_FETCHER_DIRECT_FETCH_HPP
 
-#include "certificate-fetcher-from-network.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher-from-network.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/certificate-fetcher-from-network.cpp b/ndn-cxx/security/v2/certificate-fetcher-from-network.cpp
index 4337378..1aef91a 100644
--- a/ndn-cxx/security/v2/certificate-fetcher-from-network.cpp
+++ b/ndn-cxx/security/v2/certificate-fetcher-from-network.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "certificate-fetcher-from-network.hpp"
-#include "face.hpp"
-#include "util/logger.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher-from-network.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/certificate-fetcher-from-network.hpp b/ndn-cxx/security/v2/certificate-fetcher-from-network.hpp
index 8b5068d..4b570c3 100644
--- a/ndn-cxx/security/v2/certificate-fetcher-from-network.hpp
+++ b/ndn-cxx/security/v2/certificate-fetcher-from-network.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_SECURITY_V2_CERTIFICATE_FETCHER_FROM_NETWORK_HPP
 #define NDN_SECURITY_V2_CERTIFICATE_FETCHER_FROM_NETWORK_HPP
 
-#include "certificate-fetcher.hpp"
-#include "../../util/scheduler.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/security/v2/certificate-fetcher-offline.cpp b/ndn-cxx/security/v2/certificate-fetcher-offline.cpp
index a59c58b..589f9cd 100644
--- a/ndn-cxx/security/v2/certificate-fetcher-offline.cpp
+++ b/ndn-cxx/security/v2/certificate-fetcher-offline.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "certificate-fetcher-offline.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher-offline.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/certificate-fetcher-offline.hpp b/ndn-cxx/security/v2/certificate-fetcher-offline.hpp
index a46fa30..2cb7386 100644
--- a/ndn-cxx/security/v2/certificate-fetcher-offline.hpp
+++ b/ndn-cxx/security/v2/certificate-fetcher-offline.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_V2_CERTIFICATE_FETCHER_OFFLINE_HPP
 #define NDN_SECURITY_V2_CERTIFICATE_FETCHER_OFFLINE_HPP
 
-#include "certificate-fetcher.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/certificate-fetcher.cpp b/ndn-cxx/security/v2/certificate-fetcher.cpp
index f6dc148..672944f 100644
--- a/ndn-cxx/security/v2/certificate-fetcher.cpp
+++ b/ndn-cxx/security/v2/certificate-fetcher.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "certificate-fetcher.hpp"
-#include "util/logger.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/certificate-fetcher.hpp b/ndn-cxx/security/v2/certificate-fetcher.hpp
index 14c786f..4a29a79 100644
--- a/ndn-cxx/security/v2/certificate-fetcher.hpp
+++ b/ndn-cxx/security/v2/certificate-fetcher.hpp
@@ -22,9 +22,9 @@
 #ifndef NDN_SECURITY_V2_CERTIFICATE_FETCHER_HPP
 #define NDN_SECURITY_V2_CERTIFICATE_FETCHER_HPP
 
-#include "certificate-request.hpp"
-#include "certificate-storage.hpp"
-#include "validation-state.hpp"
+#include "ndn-cxx/security/v2/certificate-request.hpp"
+#include "ndn-cxx/security/v2/certificate-storage.hpp"
+#include "ndn-cxx/security/v2/validation-state.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/security/v2/certificate-request.hpp b/ndn-cxx/security/v2/certificate-request.hpp
index 543c46e..13859df 100644
--- a/ndn-cxx/security/v2/certificate-request.hpp
+++ b/ndn-cxx/security/v2/certificate-request.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_V2_CERTIFICATE_REQUEST_HPP
 #define NDN_SECURITY_V2_CERTIFICATE_REQUEST_HPP
 
-#include "../../interest.hpp"
+#include "ndn-cxx/interest.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/certificate-storage.cpp b/ndn-cxx/security/v2/certificate-storage.cpp
index a4d482e..e245f24 100644
--- a/ndn-cxx/security/v2/certificate-storage.cpp
+++ b/ndn-cxx/security/v2/certificate-storage.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "certificate-storage.hpp"
+#include "ndn-cxx/security/v2/certificate-storage.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/certificate-storage.hpp b/ndn-cxx/security/v2/certificate-storage.hpp
index 7289d47..412907a 100644
--- a/ndn-cxx/security/v2/certificate-storage.hpp
+++ b/ndn-cxx/security/v2/certificate-storage.hpp
@@ -22,9 +22,9 @@
 #ifndef NDN_SECURITY_V2_CERTIFICATE_STORAGE_HPP
 #define NDN_SECURITY_V2_CERTIFICATE_STORAGE_HPP
 
-#include "certificate.hpp"
-#include "certificate-cache.hpp"
-#include "trust-anchor-container.hpp"
+#include "ndn-cxx/security/v2/certificate.hpp"
+#include "ndn-cxx/security/v2/certificate-cache.hpp"
+#include "ndn-cxx/security/v2/trust-anchor-container.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/certificate.cpp b/ndn-cxx/security/v2/certificate.cpp
index ffb4cfd..03e40cf 100644
--- a/ndn-cxx/security/v2/certificate.cpp
+++ b/ndn-cxx/security/v2/certificate.cpp
@@ -22,11 +22,11 @@
  * @author Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
  */
 
-#include "certificate.hpp"
-#include "additional-description.hpp"
-#include "../../encoding/block-helpers.hpp"
-#include "../../util/indented-stream.hpp"
-#include "../transform.hpp"
+#include "ndn-cxx/security/v2/certificate.hpp"
+#include "ndn-cxx/security/v2/additional-description.hpp"
+#include "ndn-cxx/security/transform.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/util/indented-stream.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/certificate.hpp b/ndn-cxx/security/v2/certificate.hpp
index 1654934..12621ea 100644
--- a/ndn-cxx/security/v2/certificate.hpp
+++ b/ndn-cxx/security/v2/certificate.hpp
@@ -25,7 +25,7 @@
 #ifndef NDN_SECURITY_V2_CERTIFICATE_HPP
 #define NDN_SECURITY_V2_CERTIFICATE_HPP
 
-#include "../../data.hpp"
+#include "ndn-cxx/data.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/key-chain.cpp b/ndn-cxx/security/v2/key-chain.cpp
index cf61574..6ea29ca 100644
--- a/ndn-cxx/security/v2/key-chain.cpp
+++ b/ndn-cxx/security/v2/key-chain.cpp
@@ -19,28 +19,27 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "key-chain.hpp"
+#include "ndn-cxx/security/v2/key-chain.hpp"
 
-#include "../../util/config-file.hpp"
-#include "../../util/logger.hpp"
-#include "../../util/sha256.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/util/config-file.hpp"
+#include "ndn-cxx/util/logger.hpp"
+#include "ndn-cxx/util/sha256.hpp"
 
-#include "../pib/pib-sqlite3.hpp"
-#include "../pib/pib-memory.hpp"
+#include "ndn-cxx/security/pib/pib-memory.hpp"
+#include "ndn-cxx/security/pib/pib-sqlite3.hpp"
 
+#include "ndn-cxx/security/tpm/back-end-file.hpp"
+#include "ndn-cxx/security/tpm/back-end-mem.hpp"
 #ifdef NDN_CXX_HAVE_OSX_FRAMEWORKS
-#include "../tpm/back-end-osx.hpp"
+#include "ndn-cxx/security/tpm/back-end-osx.hpp"
 #endif // NDN_CXX_HAVE_OSX_FRAMEWORKS
 
-#include "../tpm/back-end-file.hpp"
-#include "../tpm/back-end-mem.hpp"
-
-#include "../transform/bool-sink.hpp"
-#include "../transform/buffer-source.hpp"
-#include "../transform/private-key.hpp"
-#include "../transform/public-key.hpp"
-#include "../transform/verifier-filter.hpp"
-#include "../../encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/bool-sink.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/private-key.hpp"
+#include "ndn-cxx/security/transform/public-key.hpp"
+#include "ndn-cxx/security/transform/verifier-filter.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/ndn-cxx/security/v2/key-chain.hpp b/ndn-cxx/security/v2/key-chain.hpp
index c4cbef4..298f14a 100644
--- a/ndn-cxx/security/v2/key-chain.hpp
+++ b/ndn-cxx/security/v2/key-chain.hpp
@@ -22,14 +22,14 @@
 #ifndef NDN_SECURITY_V2_KEY_CHAIN_HPP
 #define NDN_SECURITY_V2_KEY_CHAIN_HPP
 
-#include "../security-common.hpp"
-#include "certificate.hpp"
-#include "../key-params.hpp"
-#include "../pib/pib.hpp"
-#include "../safe-bag.hpp"
-#include "../signing-info.hpp"
-#include "../tpm/tpm.hpp"
-#include "../../interest.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/security/key-params.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
+#include "ndn-cxx/security/safe-bag.hpp"
+#include "ndn-cxx/security/security-common.hpp"
+#include "ndn-cxx/security/signing-info.hpp"
+#include "ndn-cxx/security/tpm/tpm.hpp"
+#include "ndn-cxx/security/v2/certificate.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/trust-anchor-container.cpp b/ndn-cxx/security/v2/trust-anchor-container.cpp
index 9137d6f..c6c5e63 100644
--- a/ndn-cxx/security/v2/trust-anchor-container.cpp
+++ b/ndn-cxx/security/v2/trust-anchor-container.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "trust-anchor-container.hpp"
+#include "ndn-cxx/security/v2/trust-anchor-container.hpp"
 
 #include <boost/filesystem.hpp>
 
diff --git a/ndn-cxx/security/v2/trust-anchor-container.hpp b/ndn-cxx/security/v2/trust-anchor-container.hpp
index 16151e9..48071e7 100644
--- a/ndn-cxx/security/v2/trust-anchor-container.hpp
+++ b/ndn-cxx/security/v2/trust-anchor-container.hpp
@@ -22,9 +22,9 @@
 #ifndef NDN_SECURITY_V2_TRUST_ANCHOR_CONTAINER_HPP
 #define NDN_SECURITY_V2_TRUST_ANCHOR_CONTAINER_HPP
 
-#include "trust-anchor-group.hpp"
-#include "certificate.hpp"
-#include "../../interest.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/security/v2/certificate.hpp"
+#include "ndn-cxx/security/v2/trust-anchor-group.hpp"
 
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/hashed_index.hpp>
diff --git a/ndn-cxx/security/v2/trust-anchor-group.cpp b/ndn-cxx/security/v2/trust-anchor-group.cpp
index 0c1d80d..54a4bb8 100644
--- a/ndn-cxx/security/v2/trust-anchor-group.cpp
+++ b/ndn-cxx/security/v2/trust-anchor-group.cpp
@@ -19,10 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "trust-anchor-group.hpp"
-
-#include "util/io.hpp"
-#include "util/logger.hpp"
+#include "ndn-cxx/security/v2/trust-anchor-group.hpp"
+#include "ndn-cxx/util/io.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/range/adaptor/map.hpp>
diff --git a/ndn-cxx/security/v2/trust-anchor-group.hpp b/ndn-cxx/security/v2/trust-anchor-group.hpp
index 3482a93..2afe3f5 100644
--- a/ndn-cxx/security/v2/trust-anchor-group.hpp
+++ b/ndn-cxx/security/v2/trust-anchor-group.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_SECURITY_V2_TRUST_ANCHOR_GROUP_HPP
 #define NDN_SECURITY_V2_TRUST_ANCHOR_GROUP_HPP
 
-#include "../../data.hpp"
-#include "certificate.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/security/v2/certificate.hpp"
 
 #include <boost/filesystem/path.hpp>
 #include <set>
diff --git a/ndn-cxx/security/v2/validation-callback.hpp b/ndn-cxx/security/v2/validation-callback.hpp
index d67e126..5ce1db1 100644
--- a/ndn-cxx/security/v2/validation-callback.hpp
+++ b/ndn-cxx/security/v2/validation-callback.hpp
@@ -22,10 +22,10 @@
 #ifndef NDN_SECURITY_V2_VALIDATION_CALLBACK_HPP
 #define NDN_SECURITY_V2_VALIDATION_CALLBACK_HPP
 
-#include "../../interest.hpp"
-#include "../../data.hpp"
-#include "../security-common.hpp"
-#include "validation-error.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/security/security-common.hpp"
+#include "ndn-cxx/security/v2/validation-error.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/validation-error.cpp b/ndn-cxx/security/v2/validation-error.cpp
index effb896..309d0c1 100644
--- a/ndn-cxx/security/v2/validation-error.cpp
+++ b/ndn-cxx/security/v2/validation-error.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "validation-error.hpp"
+#include "ndn-cxx/security/v2/validation-error.hpp"
 
 #include <ostream>
 
diff --git a/ndn-cxx/security/v2/validation-error.hpp b/ndn-cxx/security/v2/validation-error.hpp
index e146496..f45ee75 100644
--- a/ndn-cxx/security/v2/validation-error.hpp
+++ b/ndn-cxx/security/v2/validation-error.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_V2_VALIDATION_ERROR_HPP
 #define NDN_SECURITY_V2_VALIDATION_ERROR_HPP
 
-#include "../../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/validation-policy-accept-all.hpp b/ndn-cxx/security/v2/validation-policy-accept-all.hpp
index df508df..9ed54ab 100644
--- a/ndn-cxx/security/v2/validation-policy-accept-all.hpp
+++ b/ndn-cxx/security/v2/validation-policy-accept-all.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_V2_VALIDATION_POLICY_ACCEPT_ALL_HPP
 #define NDN_SECURITY_V2_VALIDATION_POLICY_ACCEPT_ALL_HPP
 
-#include "validation-policy.hpp"
+#include "ndn-cxx/security/v2/validation-policy.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/validation-policy-command-interest.cpp b/ndn-cxx/security/v2/validation-policy-command-interest.cpp
index 7e04bad..7a0d0a4 100644
--- a/ndn-cxx/security/v2/validation-policy-command-interest.cpp
+++ b/ndn-cxx/security/v2/validation-policy-command-interest.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "validation-policy-command-interest.hpp"
+#include "ndn-cxx/security/v2/validation-policy-command-interest.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/validation-policy-command-interest.hpp b/ndn-cxx/security/v2/validation-policy-command-interest.hpp
index 0630fa4..6ac35b8 100644
--- a/ndn-cxx/security/v2/validation-policy-command-interest.hpp
+++ b/ndn-cxx/security/v2/validation-policy-command-interest.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_V2_VALIDATION_POLICY_COMMAND_INTEREST_HPP
 #define NDN_SECURITY_V2_VALIDATION_POLICY_COMMAND_INTEREST_HPP
 
-#include "validation-policy.hpp"
+#include "ndn-cxx/security/v2/validation-policy.hpp"
 
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/ordered_index.hpp>
diff --git a/ndn-cxx/security/v2/validation-policy-config.cpp b/ndn-cxx/security/v2/validation-policy-config.cpp
index 763bef1..d3d0476 100644
--- a/ndn-cxx/security/v2/validation-policy-config.cpp
+++ b/ndn-cxx/security/v2/validation-policy-config.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "validation-policy-config.hpp"
-#include "validator.hpp"
-#include "../../util/io.hpp"
+#include "ndn-cxx/security/v2/validation-policy-config.hpp"
+#include "ndn-cxx/security/v2/validator.hpp"
+#include "ndn-cxx/util/io.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
diff --git a/ndn-cxx/security/v2/validation-policy-config.hpp b/ndn-cxx/security/v2/validation-policy-config.hpp
index d2ed69c..978fdaa 100644
--- a/ndn-cxx/security/v2/validation-policy-config.hpp
+++ b/ndn-cxx/security/v2/validation-policy-config.hpp
@@ -22,9 +22,9 @@
 #ifndef NDN_SECURITY_V2_VALIDATION_POLICY_CONFIG_HPP
 #define NDN_SECURITY_V2_VALIDATION_POLICY_CONFIG_HPP
 
-#include "validation-policy.hpp"
-#include "validator-config/rule.hpp"
-#include "validator-config/common.hpp"
+#include "ndn-cxx/security/v2/validation-policy.hpp"
+#include "ndn-cxx/security/v2/validator-config/rule.hpp"
+#include "ndn-cxx/security/v2/validator-config/common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/validation-policy-simple-hierarchy.cpp b/ndn-cxx/security/v2/validation-policy-simple-hierarchy.cpp
index e83c9bc..b026bbd 100644
--- a/ndn-cxx/security/v2/validation-policy-simple-hierarchy.cpp
+++ b/ndn-cxx/security/v2/validation-policy-simple-hierarchy.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "validation-policy-simple-hierarchy.hpp"
+#include "ndn-cxx/security/v2/validation-policy-simple-hierarchy.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/validation-policy-simple-hierarchy.hpp b/ndn-cxx/security/v2/validation-policy-simple-hierarchy.hpp
index c46b722..7908075 100644
--- a/ndn-cxx/security/v2/validation-policy-simple-hierarchy.hpp
+++ b/ndn-cxx/security/v2/validation-policy-simple-hierarchy.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_V2_VALIDATION_POLICY_SIMPLE_HIERARCHY_HPP
 #define NDN_SECURITY_V2_VALIDATION_POLICY_SIMPLE_HIERARCHY_HPP
 
-#include "validation-policy.hpp"
+#include "ndn-cxx/security/v2/validation-policy.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/validation-policy.cpp b/ndn-cxx/security/v2/validation-policy.cpp
index 0f609e1..8a235af 100644
--- a/ndn-cxx/security/v2/validation-policy.cpp
+++ b/ndn-cxx/security/v2/validation-policy.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "validation-policy.hpp"
-#include "../signing-info.hpp"
+#include "ndn-cxx/security/v2/validation-policy.hpp"
+#include "ndn-cxx/security/signing-info.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/validation-policy.hpp b/ndn-cxx/security/v2/validation-policy.hpp
index 6921984..c5b52c5 100644
--- a/ndn-cxx/security/v2/validation-policy.hpp
+++ b/ndn-cxx/security/v2/validation-policy.hpp
@@ -22,10 +22,10 @@
 #ifndef NDN_SECURITY_V2_VALIDATION_POLICY_HPP
 #define NDN_SECURITY_V2_VALIDATION_POLICY_HPP
 
-#include "certificate-request.hpp"
-#include "validation-state.hpp"
-#include "../../data.hpp"
-#include "../../interest.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/security/v2/certificate-request.hpp"
+#include "ndn-cxx/security/v2/validation-state.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/validation-state.cpp b/ndn-cxx/security/v2/validation-state.cpp
index 74b72fd..f6ee8d2 100644
--- a/ndn-cxx/security/v2/validation-state.cpp
+++ b/ndn-cxx/security/v2/validation-state.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "validation-state.hpp"
-#include "validator.hpp"
-#include "../verification-helpers.hpp"
-#include "util/logger.hpp"
+#include "ndn-cxx/security/v2/validation-state.hpp"
+#include "ndn-cxx/security/v2/validator.hpp"
+#include "ndn-cxx/security/verification-helpers.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/validation-state.hpp b/ndn-cxx/security/v2/validation-state.hpp
index 0f3c8bb..379382c 100644
--- a/ndn-cxx/security/v2/validation-state.hpp
+++ b/ndn-cxx/security/v2/validation-state.hpp
@@ -22,10 +22,10 @@
 #ifndef NDN_SECURITY_V2_VALIDATION_STATE_HPP
 #define NDN_SECURITY_V2_VALIDATION_STATE_HPP
 
-#include "../../tag-host.hpp"
-#include "validation-callback.hpp"
-#include "certificate.hpp"
-#include "../../util/signal.hpp"
+#include "ndn-cxx/tag-host.hpp"
+#include "ndn-cxx/security/v2/validation-callback.hpp"
+#include "ndn-cxx/security/v2/certificate.hpp"
+#include "ndn-cxx/util/signal.hpp"
 
 #include <list>
 #include <unordered_set>
diff --git a/ndn-cxx/security/v2/validator-config/checker.cpp b/ndn-cxx/security/v2/validator-config/checker.cpp
index 908e126..f39b8ef 100644
--- a/ndn-cxx/security/v2/validator-config/checker.cpp
+++ b/ndn-cxx/security/v2/validator-config/checker.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "checker.hpp"
-#include "security/v2/validation-state.hpp"
-#include "security/verification-helpers.hpp"
-#include "security/pib/key.hpp"
+#include "ndn-cxx/security/v2/validator-config/checker.hpp"
+#include "ndn-cxx/security/v2/validation-state.hpp"
+#include "ndn-cxx/security/verification-helpers.hpp"
+#include "ndn-cxx/security/pib/key.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/ndn-cxx/security/v2/validator-config/checker.hpp b/ndn-cxx/security/v2/validator-config/checker.hpp
index 6093c4e..fb9a169 100644
--- a/ndn-cxx/security/v2/validator-config/checker.hpp
+++ b/ndn-cxx/security/v2/validator-config/checker.hpp
@@ -22,10 +22,10 @@
 #ifndef NDN_SECURITY_V2_VALIDATOR_CONFIG_CHECKER_HPP
 #define NDN_SECURITY_V2_VALIDATOR_CONFIG_CHECKER_HPP
 
-#include "common.hpp"
-#include "name-relation.hpp"
-#include "../../../name.hpp"
-#include "../../../util/regex.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/security/v2/validator-config/common.hpp"
+#include "ndn-cxx/security/v2/validator-config/name-relation.hpp"
+#include "ndn-cxx/util/regex.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/validator-config/common.hpp b/ndn-cxx/security/v2/validator-config/common.hpp
index a46bf41..75d5cb7 100644
--- a/ndn-cxx/security/v2/validator-config/common.hpp
+++ b/ndn-cxx/security/v2/validator-config/common.hpp
@@ -24,7 +24,8 @@
 #ifndef NDN_SECURITY_V2_VALIDATOR_CONFIG_COMMON_HPP
 #define NDN_SECURITY_V2_VALIDATOR_CONFIG_COMMON_HPP
 
-#include "../../../common.hpp"
+#include "ndn-cxx/common.hpp"
+
 #include <boost/property_tree/ptree.hpp>
 
 namespace ndn {
diff --git a/ndn-cxx/security/v2/validator-config/filter.cpp b/ndn-cxx/security/v2/validator-config/filter.cpp
index d9032c8..f201498 100644
--- a/ndn-cxx/security/v2/validator-config/filter.cpp
+++ b/ndn-cxx/security/v2/validator-config/filter.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "filter.hpp"
+#include "ndn-cxx/security/v2/validator-config/filter.hpp"
 
-#include "data.hpp"
-#include "interest.hpp"
-#include "security/security-common.hpp"
-#include "util/regex.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/security/security-common.hpp"
+#include "ndn-cxx/util/regex.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/ndn-cxx/security/v2/validator-config/filter.hpp b/ndn-cxx/security/v2/validator-config/filter.hpp
index f9f9a7f..f5af85e 100644
--- a/ndn-cxx/security/v2/validator-config/filter.hpp
+++ b/ndn-cxx/security/v2/validator-config/filter.hpp
@@ -22,11 +22,11 @@
 #ifndef NDN_SECURITY_V2_VALIDATOR_CONFIG_FILTER_HPP
 #define NDN_SECURITY_V2_VALIDATOR_CONFIG_FILTER_HPP
 
-#include "common.hpp"
-#include "name-relation.hpp"
-#include "../../../interest.hpp"
-#include "../../../data.hpp"
-#include "../../../util/regex.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/security/v2/validator-config/common.hpp"
+#include "ndn-cxx/security/v2/validator-config/name-relation.hpp"
+#include "ndn-cxx/util/regex.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/validator-config/name-relation.cpp b/ndn-cxx/security/v2/validator-config/name-relation.cpp
index 96ee409..bd85ed2 100644
--- a/ndn-cxx/security/v2/validator-config/name-relation.cpp
+++ b/ndn-cxx/security/v2/validator-config/name-relation.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "name-relation.hpp"
+#include "ndn-cxx/security/v2/validator-config/name-relation.hpp"
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/ndn-cxx/security/v2/validator-config/name-relation.hpp b/ndn-cxx/security/v2/validator-config/name-relation.hpp
index 054e3ca..aa236df 100644
--- a/ndn-cxx/security/v2/validator-config/name-relation.hpp
+++ b/ndn-cxx/security/v2/validator-config/name-relation.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_SECURITY_V2_VALIDATOR_CONFIG_NAME_RELATION_HPP
 #define NDN_SECURITY_V2_VALIDATOR_CONFIG_NAME_RELATION_HPP
 
-#include "common.hpp"
-#include "../../../name.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/security/v2/validator-config/common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/validator-config/rule.cpp b/ndn-cxx/security/v2/validator-config/rule.cpp
index 2cc3124..e4e56cf 100644
--- a/ndn-cxx/security/v2/validator-config/rule.cpp
+++ b/ndn-cxx/security/v2/validator-config/rule.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "rule.hpp"
-#include "util/logger.hpp"
+#include "ndn-cxx/security/v2/validator-config/rule.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/ndn-cxx/security/v2/validator-config/rule.hpp b/ndn-cxx/security/v2/validator-config/rule.hpp
index 2f6deb7..53dc81c 100644
--- a/ndn-cxx/security/v2/validator-config/rule.hpp
+++ b/ndn-cxx/security/v2/validator-config/rule.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_SECURITY_V2_VALIDATOR_CONFIG_RULE_HPP
 #define NDN_SECURITY_V2_VALIDATOR_CONFIG_RULE_HPP
 
-#include "filter.hpp"
-#include "checker.hpp"
+#include "ndn-cxx/security/v2/validator-config/checker.hpp"
+#include "ndn-cxx/security/v2/validator-config/filter.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/validator.cpp b/ndn-cxx/security/v2/validator.cpp
index 24542bb..1219f4c 100644
--- a/ndn-cxx/security/v2/validator.cpp
+++ b/ndn-cxx/security/v2/validator.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "validator.hpp"
+#include "ndn-cxx/security/v2/validator.hpp"
 
-#include "face.hpp"
-#include "security/transform/public-key.hpp"
-#include "util/logger.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/security/transform/public-key.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/v2/validator.hpp b/ndn-cxx/security/v2/validator.hpp
index 9d77c83..04e0d95 100644
--- a/ndn-cxx/security/v2/validator.hpp
+++ b/ndn-cxx/security/v2/validator.hpp
@@ -22,12 +22,12 @@
 #ifndef NDN_SECURITY_V2_VALIDATOR_HPP
 #define NDN_SECURITY_V2_VALIDATOR_HPP
 
-#include "certificate-fetcher.hpp"
-#include "certificate-request.hpp"
-#include "certificate-storage.hpp"
-#include "validation-callback.hpp"
-#include "validation-policy.hpp"
-#include "validation-state.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher.hpp"
+#include "ndn-cxx/security/v2/certificate-request.hpp"
+#include "ndn-cxx/security/v2/certificate-storage.hpp"
+#include "ndn-cxx/security/v2/validation-callback.hpp"
+#include "ndn-cxx/security/v2/validation-policy.hpp"
+#include "ndn-cxx/security/v2/validation-state.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/security/validator-config.cpp b/ndn-cxx/security/validator-config.cpp
index 1ddd035..25e46eb 100644
--- a/ndn-cxx/security/validator-config.cpp
+++ b/ndn-cxx/security/validator-config.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "validator-config.hpp"
-#include "v2/certificate-fetcher-from-network.hpp"
+#include "ndn-cxx/security/validator-config.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher-from-network.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/validator-config.hpp b/ndn-cxx/security/validator-config.hpp
index c54ea48..c3d1586 100644
--- a/ndn-cxx/security/validator-config.hpp
+++ b/ndn-cxx/security/validator-config.hpp
@@ -22,9 +22,9 @@
 #ifndef NDN_SECURITY_VALIDATOR_CONFIG_HPP
 #define NDN_SECURITY_VALIDATOR_CONFIG_HPP
 
-#include "v2/validator.hpp"
-#include "v2/validation-policy-command-interest.hpp"
-#include "v2/validation-policy-config.hpp"
+#include "ndn-cxx/security/v2/validator.hpp"
+#include "ndn-cxx/security/v2/validation-policy-command-interest.hpp"
+#include "ndn-cxx/security/v2/validation-policy-config.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/validator-null.cpp b/ndn-cxx/security/validator-null.cpp
index 498f74f..4299d82 100644
--- a/ndn-cxx/security/validator-null.cpp
+++ b/ndn-cxx/security/validator-null.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "validator-null.hpp"
-#include "v2/validation-policy-accept-all.hpp"
-#include "v2/certificate-fetcher-offline.hpp"
+#include "ndn-cxx/security/validator-null.hpp"
+#include "ndn-cxx/security/v2/validation-policy-accept-all.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher-offline.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/validator-null.hpp b/ndn-cxx/security/validator-null.hpp
index a4edcc7..7ed55e8 100644
--- a/ndn-cxx/security/validator-null.hpp
+++ b/ndn-cxx/security/validator-null.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_VALIDATOR_NULL_HPP
 #define NDN_SECURITY_VALIDATOR_NULL_HPP
 
-#include "v2/validator.hpp"
+#include "ndn-cxx/security/v2/validator.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/validity-period.cpp b/ndn-cxx/security/validity-period.cpp
index 0cd4555..e928634 100644
--- a/ndn-cxx/security/validity-period.cpp
+++ b/ndn-cxx/security/validity-period.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "validity-period.hpp"
-#include "../encoding/block-helpers.hpp"
-#include "../util/concepts.hpp"
+#include "ndn-cxx/security/validity-period.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/validity-period.hpp b/ndn-cxx/security/validity-period.hpp
index ba05b7a..006e8e0 100644
--- a/ndn-cxx/security/validity-period.hpp
+++ b/ndn-cxx/security/validity-period.hpp
@@ -22,10 +22,10 @@
 #ifndef NDN_SECURITY_VALIDITY_PERIOD_HPP
 #define NDN_SECURITY_VALIDITY_PERIOD_HPP
 
-#include "../common.hpp"
-#include "../encoding/tlv.hpp"
-#include "../encoding/block.hpp"
-#include "../util/time.hpp"
+#include "ndn-cxx/common.hpp"
+#include "ndn-cxx/encoding/tlv.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/verification-helpers.cpp b/ndn-cxx/security/verification-helpers.cpp
index 887e6f0..bdd5a9c 100644
--- a/ndn-cxx/security/verification-helpers.cpp
+++ b/ndn-cxx/security/verification-helpers.cpp
@@ -19,20 +19,20 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "verification-helpers.hpp"
+#include "ndn-cxx/security/verification-helpers.hpp"
 
-#include "detail/openssl.hpp"
-#include "pib/key.hpp"
-#include "transform/bool-sink.hpp"
-#include "transform/buffer-source.hpp"
-#include "transform/digest-filter.hpp"
-#include "transform/public-key.hpp"
-#include "transform/stream-sink.hpp"
-#include "transform/verifier-filter.hpp"
-#include "v2/certificate.hpp"
-#include "../data.hpp"
-#include "../interest.hpp"
-#include "../encoding/buffer-stream.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/pib/key.hpp"
+#include "ndn-cxx/security/transform/bool-sink.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/digest-filter.hpp"
+#include "ndn-cxx/security/transform/public-key.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
+#include "ndn-cxx/security/transform/verifier-filter.hpp"
+#include "ndn-cxx/security/v2/certificate.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/ndn-cxx/security/verification-helpers.hpp b/ndn-cxx/security/verification-helpers.hpp
index c17318c..75bb00a 100644
--- a/ndn-cxx/security/verification-helpers.hpp
+++ b/ndn-cxx/security/verification-helpers.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SECURITY_VERIFICATION_HELPERS_HPP
 #define NDN_SECURITY_VERIFICATION_HELPERS_HPP
 
-#include "security-common.hpp"
+#include "ndn-cxx/security/security-common.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/selectors.cpp b/ndn-cxx/selectors.cpp
index 0ba0ad2..e1b4722 100644
--- a/ndn-cxx/selectors.cpp
+++ b/ndn-cxx/selectors.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "selectors.hpp"
-#include "encoding/encoding-buffer.hpp"
-#include "encoding/block-helpers.hpp"
+#include "ndn-cxx/selectors.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/selectors.hpp b/ndn-cxx/selectors.hpp
index e3cb6e4..12b09f2 100644
--- a/ndn-cxx/selectors.hpp
+++ b/ndn-cxx/selectors.hpp
@@ -22,9 +22,8 @@
 #ifndef NDN_SELECTORS_HPP
 #define NDN_SELECTORS_HPP
 
-#include "common.hpp"
-#include "key-locator.hpp"
-#include "exclude.hpp"
+#include "ndn-cxx/exclude.hpp"
+#include "ndn-cxx/key-locator.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/signature-info.cpp b/ndn-cxx/signature-info.cpp
index cc59bd2..fe372c2 100644
--- a/ndn-cxx/signature-info.cpp
+++ b/ndn-cxx/signature-info.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "signature-info.hpp"
-#include "encoding/block-helpers.hpp"
-#include "util/concepts.hpp"
+#include "ndn-cxx/signature-info.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/signature-info.hpp b/ndn-cxx/signature-info.hpp
index 1a6eeb7..7cfc248 100644
--- a/ndn-cxx/signature-info.hpp
+++ b/ndn-cxx/signature-info.hpp
@@ -22,8 +22,9 @@
 #ifndef NDN_SIGNATURE_INFO_HPP
 #define NDN_SIGNATURE_INFO_HPP
 
-#include "key-locator.hpp"
-#include "security/validity-period.hpp"
+#include "ndn-cxx/key-locator.hpp"
+#include "ndn-cxx/security/validity-period.hpp"
+
 #include <list>
 
 namespace ndn {
diff --git a/ndn-cxx/signature.cpp b/ndn-cxx/signature.cpp
index 3e9433b..c537c60 100644
--- a/ndn-cxx/signature.cpp
+++ b/ndn-cxx/signature.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "signature.hpp"
+#include "ndn-cxx/signature.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/signature.hpp b/ndn-cxx/signature.hpp
index 1c051c8..c9e8030 100644
--- a/ndn-cxx/signature.hpp
+++ b/ndn-cxx/signature.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_SIGNATURE_HPP
 #define NDN_SIGNATURE_HPP
 
-#include "signature-info.hpp"
+#include "ndn-cxx/signature-info.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/tag-host.hpp b/ndn-cxx/tag-host.hpp
index 0d3b914..ebfea50 100644
--- a/ndn-cxx/tag-host.hpp
+++ b/ndn-cxx/tag-host.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_TAG_HOST_HPP
 #define NDN_TAG_HOST_HPP
 
-#include "common.hpp"
-#include "tag.hpp"
+#include "ndn-cxx/common.hpp"
+#include "ndn-cxx/tag.hpp"
 
 #include <map>
 
diff --git a/ndn-cxx/transport/stream-transport-impl.hpp b/ndn-cxx/transport/stream-transport-impl.hpp
index d2c232b..a36e6da 100644
--- a/ndn-cxx/transport/stream-transport-impl.hpp
+++ b/ndn-cxx/transport/stream-transport-impl.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_TRANSPORT_STREAM_TRANSPORT_IMPL_HPP
 #define NDN_TRANSPORT_STREAM_TRANSPORT_IMPL_HPP
 
-#include "transport.hpp"
+#include "ndn-cxx/transport/transport.hpp"
 
 #include <boost/asio/deadline_timer.hpp>
 #include <boost/asio/write.hpp>
diff --git a/ndn-cxx/transport/stream-transport-with-resolver-impl.hpp b/ndn-cxx/transport/stream-transport-with-resolver-impl.hpp
index 6e14c56..ec17ddb 100644
--- a/ndn-cxx/transport/stream-transport-with-resolver-impl.hpp
+++ b/ndn-cxx/transport/stream-transport-with-resolver-impl.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_TRANSPORT_STREAM_TRANSPORT_WITH_RESOLVER_IMPL_HPP
 #define NDN_TRANSPORT_STREAM_TRANSPORT_WITH_RESOLVER_IMPL_HPP
 
-#include "stream-transport-impl.hpp"
+#include "ndn-cxx/transport/stream-transport-impl.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/transport/tcp-transport.cpp b/ndn-cxx/transport/tcp-transport.cpp
index 1f8f0c0..34bcf28 100644
--- a/ndn-cxx/transport/tcp-transport.cpp
+++ b/ndn-cxx/transport/tcp-transport.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "tcp-transport.hpp"
-#include "stream-transport-with-resolver-impl.hpp"
-#include "net/face-uri.hpp"
-#include "util/logger.hpp"
+#include "ndn-cxx/transport/tcp-transport.hpp"
+#include "ndn-cxx/transport/stream-transport-with-resolver-impl.hpp"
+#include "ndn-cxx/net/face-uri.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 NDN_LOG_INIT(ndn.TcpTransport);
 // DEBUG level: connect, close, pause, resume.
diff --git a/ndn-cxx/transport/tcp-transport.hpp b/ndn-cxx/transport/tcp-transport.hpp
index 11aa182..01d369c 100644
--- a/ndn-cxx/transport/tcp-transport.hpp
+++ b/ndn-cxx/transport/tcp-transport.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_TRANSPORT_TCP_TRANSPORT_HPP
 #define NDN_TRANSPORT_TCP_TRANSPORT_HPP
 
-#include "transport.hpp"
-#include "../util/config-file.hpp"
+#include "ndn-cxx/transport/transport.hpp"
+#include "ndn-cxx/util/config-file.hpp"
 
 #include <boost/asio/ip/tcp.hpp>
 
diff --git a/ndn-cxx/transport/transport.cpp b/ndn-cxx/transport/transport.cpp
index cb290e2..b6dac08 100644
--- a/ndn-cxx/transport/transport.cpp
+++ b/ndn-cxx/transport/transport.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "transport.hpp"
+#include "ndn-cxx/transport/transport.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/transport/transport.hpp b/ndn-cxx/transport/transport.hpp
index fb557d9..ef0283e 100644
--- a/ndn-cxx/transport/transport.hpp
+++ b/ndn-cxx/transport/transport.hpp
@@ -22,9 +22,9 @@
 #ifndef NDN_TRANSPORT_TRANSPORT_HPP
 #define NDN_TRANSPORT_TRANSPORT_HPP
 
-#include "../common.hpp"
-#include "../encoding/block.hpp"
-#include "../net/asio-fwd.hpp"
+#include "ndn-cxx/common.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/net/asio-fwd.hpp"
 
 #include <boost/system/error_code.hpp>
 
diff --git a/ndn-cxx/transport/unix-transport.cpp b/ndn-cxx/transport/unix-transport.cpp
index cb0c1bf..a107997 100644
--- a/ndn-cxx/transport/unix-transport.cpp
+++ b/ndn-cxx/transport/unix-transport.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "unix-transport.hpp"
-#include "stream-transport-impl.hpp"
+#include "ndn-cxx/transport/unix-transport.hpp"
+#include "ndn-cxx/transport/stream-transport-impl.hpp"
 
-#include "../face.hpp"
-#include "net/face-uri.hpp"
-#include "util/logger.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/net/face-uri.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 NDN_LOG_INIT(ndn.UnixTransport);
 // DEBUG level: connect, close, pause, resume.
diff --git a/ndn-cxx/transport/unix-transport.hpp b/ndn-cxx/transport/unix-transport.hpp
index f8fe383..c78b015 100644
--- a/ndn-cxx/transport/unix-transport.hpp
+++ b/ndn-cxx/transport/unix-transport.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_TRANSPORT_UNIX_TRANSPORT_HPP
 #define NDN_TRANSPORT_UNIX_TRANSPORT_HPP
 
-#include "transport.hpp"
-#include "../util/config-file.hpp"
+#include "ndn-cxx/transport/transport.hpp"
+#include "ndn-cxx/util/config-file.hpp"
 
 #include <boost/asio/local/stream_protocol.hpp>
 
diff --git a/ndn-cxx/util/backports-ostream-joiner.hpp b/ndn-cxx/util/backports-ostream-joiner.hpp
index b52bac6..a05e841 100644
--- a/ndn-cxx/util/backports-ostream-joiner.hpp
+++ b/ndn-cxx/util/backports-ostream-joiner.hpp
@@ -27,7 +27,7 @@
 #ifndef NDN_UTIL_BACKPORTS_OSTREAM_JOINER_HPP
 #define NDN_UTIL_BACKPORTS_OSTREAM_JOINER_HPP
 
-#include "backports.hpp"
+#include "ndn-cxx/util/backports.hpp"
 
 #if NDN_CXX_HAS_INCLUDE(<experimental/iterator>)
 #  include <experimental/iterator>
diff --git a/ndn-cxx/util/backports.hpp b/ndn-cxx/util/backports.hpp
index bb0c462..9278546 100644
--- a/ndn-cxx/util/backports.hpp
+++ b/ndn-cxx/util/backports.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_UTIL_BACKPORTS_HPP
 #define NDN_UTIL_BACKPORTS_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 #ifdef __has_cpp_attribute
 #  define NDN_CXX_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
@@ -48,10 +48,10 @@
 #  define NDN_CXX_FALLTHROUGH ((void)0)
 #endif
 
-#include "backports-ostream-joiner.hpp"
-#include "nonstd/any.hpp"
-#include "nonstd/optional.hpp"
-#include "nonstd/variant.hpp"
+#include "ndn-cxx/util/backports-ostream-joiner.hpp"
+#include "ndn-cxx/util/nonstd/any.hpp"
+#include "ndn-cxx/util/nonstd/optional.hpp"
+#include "ndn-cxx/util/nonstd/variant.hpp"
 
 #ifndef NDN_CXX_HAVE_STD_TO_STRING
 #include <boost/lexical_cast.hpp>
diff --git a/ndn-cxx/util/cf-releaser-osx.hpp b/ndn-cxx/util/cf-releaser-osx.hpp
index 8d7d577..8987ab8 100644
--- a/ndn-cxx/util/cf-releaser-osx.hpp
+++ b/ndn-cxx/util/cf-releaser-osx.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_UTIL_CF_RELEASER_OSX_HPP
 #define NDN_UTIL_CF_RELEASER_OSX_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 #ifndef NDN_CXX_HAVE_OSX_FRAMEWORKS
 #error "This file should not be included ..."
diff --git a/ndn-cxx/util/cf-string-osx.cpp b/ndn-cxx/util/cf-string-osx.cpp
index a0d3814..2592a7f 100644
--- a/ndn-cxx/util/cf-string-osx.cpp
+++ b/ndn-cxx/util/cf-string-osx.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "cf-string-osx.hpp"
+#include "ndn-cxx/util/cf-string-osx.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/ndn-cxx/util/cf-string-osx.hpp b/ndn-cxx/util/cf-string-osx.hpp
index c44fed4..73f7f91 100644
--- a/ndn-cxx/util/cf-string-osx.hpp
+++ b/ndn-cxx/util/cf-string-osx.hpp
@@ -22,13 +22,13 @@
 #ifndef NDN_UTIL_CF_STRING_OSX_HPP
 #define NDN_UTIL_CF_STRING_OSX_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 #ifndef NDN_CXX_HAVE_OSX_FRAMEWORKS
 #error "This file should not be included ..."
 #endif
 
-#include "cf-releaser-osx.hpp"
+#include "ndn-cxx/util/cf-releaser-osx.hpp"
 
 /**
  * @file
diff --git a/ndn-cxx/util/concepts.hpp b/ndn-cxx/util/concepts.hpp
index e68be91..5509ed3 100644
--- a/ndn-cxx/util/concepts.hpp
+++ b/ndn-cxx/util/concepts.hpp
@@ -28,8 +28,8 @@
 #ifndef NDN_UTIL_CONCEPTS_HPP
 #define NDN_UTIL_CONCEPTS_HPP
 
-#include "../encoding/block.hpp"
-#include "../encoding/encoding-buffer.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
 
 #include <boost/concept/usage.hpp>
 #include <boost/type_traits/has_equal_to.hpp>
diff --git a/ndn-cxx/util/config-file.cpp b/ndn-cxx/util/config-file.cpp
index e921ec6..b057ded 100644
--- a/ndn-cxx/util/config-file.cpp
+++ b/ndn-cxx/util/config-file.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "config-file.hpp"
+#include "ndn-cxx/util/config-file.hpp"
 
 #include <boost/property_tree/ini_parser.hpp>
 #include <boost/filesystem.hpp>
@@ -29,19 +29,15 @@
 ConfigFile::ConfigFile()
   : m_path(findConfigFile())
 {
-  if (open())
-    {
-      parse();
-      close();
-    }
+  if (open()) {
+    parse();
+    close();
+  }
 }
 
 ConfigFile::~ConfigFile()
 {
-  if (m_input.is_open())
-    {
-      m_input.close();
-    }
+  close();
 }
 
 boost::filesystem::path
@@ -50,95 +46,81 @@
   using namespace boost::filesystem;
 
 #ifdef NDN_CXX_HAVE_TESTS
-  if (std::getenv("TEST_HOME"))
-    {
-      path testHome(std::getenv("TEST_HOME"));
-      testHome /= ".ndn/client.conf";
-      if (exists(testHome))
-        {
-          return absolute(testHome);
-        }
+  if (std::getenv("TEST_HOME")) {
+    path testHome(std::getenv("TEST_HOME"));
+    testHome /= ".ndn/client.conf";
+    if (exists(testHome)) {
+      return absolute(testHome);
     }
+  }
 #endif // NDN_CXX_HAVE_TESTS
 
-  if (std::getenv("HOME"))
-    {
-      path home(std::getenv("HOME"));
-      home /= ".ndn/client.conf";
-      if (exists(home))
-        {
-          return absolute(home);
-        }
+  if (std::getenv("HOME")) {
+    path home(std::getenv("HOME"));
+    home /= ".ndn/client.conf";
+    if (exists(home)) {
+      return absolute(home);
     }
+  }
 
 #ifdef NDN_CXX_SYSCONFDIR
   path sysconfdir(NDN_CXX_SYSCONFDIR);
   sysconfdir /= "ndn/client.conf";
-
-  if (exists(sysconfdir))
-    {
-      return absolute(sysconfdir);
-    }
+  if (exists(sysconfdir)) {
+    return absolute(sysconfdir);
+  }
 #endif // NDN_CXX_SYSCONFDIR
 
   path etc("/etc/ndn/client.conf");
-  if (exists(etc))
-    {
-      return absolute(etc);
-    }
+  if (exists(etc)) {
+    return absolute(etc);
+  }
 
-  return path();
+  return {};
 }
 
 bool
 ConfigFile::open()
 {
-  if (m_path.empty())
-    {
-      return false;
-    }
+  if (m_path.empty()) {
+    return false;
+  }
 
   m_input.open(m_path.c_str());
-  if (!m_input.good() || !m_input.is_open())
-    {
-      return false;
-    }
+  if (!m_input.good() || !m_input.is_open()) {
+    return false;
+  }
   return true;
 }
 
 void
 ConfigFile::close()
 {
-  if (m_input.is_open())
-    {
-      m_input.close();
-    }
+  if (m_input.is_open()) {
+    m_input.close();
+  }
 }
 
 const ConfigFile::Parsed&
 ConfigFile::parse()
 {
-  if (m_path.empty())
-    {
-      BOOST_THROW_EXCEPTION(Error("Failed to locate configuration file for parsing"));
-    }
-  else if (!m_input.is_open() && !open())
-    {
-      BOOST_THROW_EXCEPTION(Error("Failed to open configuration file for parsing"));
-    }
+  if (m_path.empty()) {
+    BOOST_THROW_EXCEPTION(Error("Failed to locate configuration file for parsing"));
+  }
+  if (!m_input.is_open() && !open()) {
+    BOOST_THROW_EXCEPTION(Error("Failed to open configuration file for parsing"));
+  }
 
-  try
-    {
-      boost::property_tree::read_ini(m_input, m_config);
-    }
-  catch (boost::property_tree::ini_parser_error& error)
-    {
-      std::stringstream msg;
-      msg << "Failed to parse configuration file";
-      msg << " " << m_path;
-      msg << " " << error.message() << " line " << error.line();
-      BOOST_THROW_EXCEPTION(Error(msg.str()));
-    }
+  try {
+    boost::property_tree::read_ini(m_input, m_config);
+  }
+  catch (const boost::property_tree::ini_parser_error& error) {
+    std::ostringstream msg;
+    msg << "Failed to parse configuration file";
+    msg << " " << m_path;
+    msg << " " << error.message() << " line " << error.line();
+    BOOST_THROW_EXCEPTION(Error(msg.str()));
+  }
   return m_config;
 }
 
diff --git a/ndn-cxx/util/config-file.hpp b/ndn-cxx/util/config-file.hpp
index 65e4e7d..4351d00 100644
--- a/ndn-cxx/util/config-file.hpp
+++ b/ndn-cxx/util/config-file.hpp
@@ -22,12 +22,12 @@
 #ifndef NDN_MANAGEMENT_CONFIG_FILE_HPP
 #define NDN_MANAGEMENT_CONFIG_FILE_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 #include <fstream>
 
-#include <boost/property_tree/ptree.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/property_tree/ptree.hpp>
 
 namespace ndn {
 
@@ -48,7 +48,6 @@
 class ConfigFile : noncopyable
 {
 public:
-
   class Error : public std::runtime_error
   {
   public:
@@ -73,7 +72,6 @@
   getParsedConfiguration() const;
 
 private:
-
   bool
   open();
 
@@ -104,7 +102,6 @@
    *
    * @return path to preferred configuration (according to above order) or empty path on failure
    */
-
   boost::filesystem::path
   findConfigFile();
 
@@ -128,5 +125,4 @@
 
 } // namespace ndn
 
-
 #endif // NDN_MANAGEMENT_CONFIG_FILE_HPP
diff --git a/ndn-cxx/util/detail/steady-timer.hpp b/ndn-cxx/util/detail/steady-timer.hpp
index 4fb4e27..1f7d958 100644
--- a/ndn-cxx/util/detail/steady-timer.hpp
+++ b/ndn-cxx/util/detail/steady-timer.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_UTIL_DETAIL_STEADY_TIMER_HPP
 #define NDN_UTIL_DETAIL_STEADY_TIMER_HPP
 
-#include "../time.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/asio/wait_traits.hpp>
diff --git a/ndn-cxx/util/dummy-client-face.cpp b/ndn-cxx/util/dummy-client-face.cpp
index 657fc02..4451bc6 100644
--- a/ndn-cxx/util/dummy-client-face.cpp
+++ b/ndn-cxx/util/dummy-client-face.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "dummy-client-face.hpp"
-#include "../detail/lp-field-tag.hpp"
-#include "../lp/packet.hpp"
-#include "../lp/tags.hpp"
-#include "../mgmt/nfd/controller.hpp"
-#include "../mgmt/nfd/control-response.hpp"
-#include "../transport/transport.hpp"
+#include "ndn-cxx/util/dummy-client-face.hpp"
+#include "ndn-cxx/detail/lp-field-tag.hpp"
+#include "ndn-cxx/lp/packet.hpp"
+#include "ndn-cxx/lp/tags.hpp"
+#include "ndn-cxx/mgmt/nfd/controller.hpp"
+#include "ndn-cxx/mgmt/nfd/control-response.hpp"
+#include "ndn-cxx/transport/transport.hpp"
 
 #include <boost/asio/io_service.hpp>
 
diff --git a/ndn-cxx/util/dummy-client-face.hpp b/ndn-cxx/util/dummy-client-face.hpp
index 9f6c2b6..e85b279 100644
--- a/ndn-cxx/util/dummy-client-face.hpp
+++ b/ndn-cxx/util/dummy-client-face.hpp
@@ -22,9 +22,9 @@
 #ifndef NDN_UTIL_DUMMY_CLIENT_FACE_HPP
 #define NDN_UTIL_DUMMY_CLIENT_FACE_HPP
 
-#include "../face.hpp"
-#include "signal.hpp"
-#include "../security/key-chain.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/util/signal.hpp"
+#include "ndn-cxx/security/key-chain.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/ndn-cxx/util/indented-stream.cpp b/ndn-cxx/util/indented-stream.cpp
index 946dd30..ba78f33 100644
--- a/ndn-cxx/util/indented-stream.cpp
+++ b/ndn-cxx/util/indented-stream.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "indented-stream.hpp"
+#include "ndn-cxx/util/indented-stream.hpp"
 
 #include <vector>
 
diff --git a/ndn-cxx/util/io.cpp b/ndn-cxx/util/io.cpp
index 3a39bd0..6f8484e 100644
--- a/ndn-cxx/util/io.cpp
+++ b/ndn-cxx/util/io.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "io.hpp"
-#include "../encoding/buffer-stream.hpp"
-#include "../security/transform.hpp"
+#include "ndn-cxx/util/io.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform.hpp"
 
 namespace ndn {
 namespace io {
diff --git a/ndn-cxx/util/io.hpp b/ndn-cxx/util/io.hpp
index 5d457fc..9b2d04a 100644
--- a/ndn-cxx/util/io.hpp
+++ b/ndn-cxx/util/io.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_UTIL_IO_HPP
 #define NDN_UTIL_IO_HPP
 
-#include "concepts.hpp"
-#include "../encoding/block.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 #include <fstream>
 
diff --git a/ndn-cxx/util/logger.cpp b/ndn-cxx/util/logger.cpp
index 8c752d3..b8a0b43 100644
--- a/ndn-cxx/util/logger.cpp
+++ b/ndn-cxx/util/logger.cpp
@@ -19,10 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "logger.hpp"
-
-#include "logging.hpp"
-#include "time.hpp"
+#include "ndn-cxx/util/logger.hpp"
+#include "ndn-cxx/util/logging.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 #include <cinttypes> // for PRIdLEAST64
 #include <cstdlib>   // for std::abs()
diff --git a/ndn-cxx/util/logger.hpp b/ndn-cxx/util/logger.hpp
index 75d86b4..72c10c4 100644
--- a/ndn-cxx/util/logger.hpp
+++ b/ndn-cxx/util/logger.hpp
@@ -22,10 +22,10 @@
 #ifndef NDN_UTIL_LOGGER_HPP
 #define NDN_UTIL_LOGGER_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 #ifdef HAVE_NDN_CXX_CUSTOM_LOGGER
-#include "ndn-cxx-custom-logger.hpp"
+#include "ndn-cxx/util/custom-logger.hpp"
 #else
 
 #include <boost/log/common.hpp>
diff --git a/ndn-cxx/util/logging.cpp b/ndn-cxx/util/logging.cpp
index 9513bfb..e913c15 100644
--- a/ndn-cxx/util/logging.cpp
+++ b/ndn-cxx/util/logging.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "logging.hpp"
-#include "logger.hpp"
+#include "ndn-cxx/util/logging.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 #include <boost/log/expressions.hpp>
 #include <boost/range/adaptor/map.hpp>
diff --git a/ndn-cxx/util/logging.hpp b/ndn-cxx/util/logging.hpp
index 8fc6342..22d949f 100644
--- a/ndn-cxx/util/logging.hpp
+++ b/ndn-cxx/util/logging.hpp
@@ -22,10 +22,10 @@
 #ifndef NDN_UTIL_LOGGING_HPP
 #define NDN_UTIL_LOGGING_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 #ifdef HAVE_NDN_CXX_CUSTOM_LOGGER
-#include "ndn-cxx-custom-logging.hpp"
+#include "ndn-cxx/util/custom-logging.hpp"
 #else
 
 #include <boost/log/sinks.hpp>
diff --git a/ndn-cxx/util/notification-stream.hpp b/ndn-cxx/util/notification-stream.hpp
index 5dcf25a..4dc5862 100644
--- a/ndn-cxx/util/notification-stream.hpp
+++ b/ndn-cxx/util/notification-stream.hpp
@@ -28,10 +28,10 @@
 #ifndef NDN_UTIL_NOTIFICATION_STREAM_HPP
 #define NDN_UTIL_NOTIFICATION_STREAM_HPP
 
-#include "concepts.hpp"
-#include "../face.hpp"
-#include "../name.hpp"
-#include "../security/v2/key-chain.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/security/v2/key-chain.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/ndn-cxx/util/notification-subscriber.cpp b/ndn-cxx/util/notification-subscriber.cpp
index 8efc7a1..da5089b 100644
--- a/ndn-cxx/util/notification-subscriber.cpp
+++ b/ndn-cxx/util/notification-subscriber.cpp
@@ -25,8 +25,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "notification-subscriber.hpp"
-#include "random.hpp"
+#include "ndn-cxx/util/notification-subscriber.hpp"
+#include "ndn-cxx/util/random.hpp"
 
 #include <cmath>
 
diff --git a/ndn-cxx/util/notification-subscriber.hpp b/ndn-cxx/util/notification-subscriber.hpp
index 3560743..ffa37a9 100644
--- a/ndn-cxx/util/notification-subscriber.hpp
+++ b/ndn-cxx/util/notification-subscriber.hpp
@@ -28,12 +28,12 @@
 #ifndef NDN_UTIL_NOTIFICATION_SUBSCRIBER_HPP
 #define NDN_UTIL_NOTIFICATION_SUBSCRIBER_HPP
 
-#include "../face.hpp"
-#include "signal.hpp"
-#include "concepts.hpp"
-#include "time.hpp"
-#include "scheduler.hpp"
-#include "scheduler-scoped-event-id.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/util/concepts.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
+#include "ndn-cxx/util/scheduler-scoped-event-id.hpp"
+#include "ndn-cxx/util/signal.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/ndn-cxx/util/random.cpp b/ndn-cxx/util/random.cpp
index bb20e81..c40347a 100644
--- a/ndn-cxx/util/random.cpp
+++ b/ndn-cxx/util/random.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "random.hpp"
-#include "../security/detail/openssl.hpp"
+#include "ndn-cxx/util/random.hpp"
+#include "ndn-cxx/security/detail/openssl.hpp"
 
 #include <random>
 
diff --git a/ndn-cxx/util/random.hpp b/ndn-cxx/util/random.hpp
index 058b71b..c619615 100644
--- a/ndn-cxx/util/random.hpp
+++ b/ndn-cxx/util/random.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_UTIL_RANDOM_HPP
 #define NDN_UTIL_RANDOM_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 namespace ndn {
 namespace random {
diff --git a/ndn-cxx/util/regex.hpp b/ndn-cxx/util/regex.hpp
index 96a97df..4f8d7dd 100644
--- a/ndn-cxx/util/regex.hpp
+++ b/ndn-cxx/util/regex.hpp
@@ -24,7 +24,7 @@
 #ifndef NDN_UTIL_REGEX_HPP
 #define NDN_UTIL_REGEX_HPP
 
-#include "regex/regex-top-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-top-matcher.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/util/regex/regex-backref-manager.cpp b/ndn-cxx/util/regex/regex-backref-manager.cpp
index 09126f6..ff69e21 100644
--- a/ndn-cxx/util/regex/regex-backref-manager.cpp
+++ b/ndn-cxx/util/regex/regex-backref-manager.cpp
@@ -21,7 +21,7 @@
  * @author Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
  */
 
-#include "regex-backref-manager.hpp"
+#include "ndn-cxx/util/regex/regex-backref-manager.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/util/regex/regex-backref-manager.hpp b/ndn-cxx/util/regex/regex-backref-manager.hpp
index 1896680..f855728 100644
--- a/ndn-cxx/util/regex/regex-backref-manager.hpp
+++ b/ndn-cxx/util/regex/regex-backref-manager.hpp
@@ -24,7 +24,7 @@
 #ifndef NDN_UTIL_REGEX_REGEX_BACKREF_MANAGER_HPP
 #define NDN_UTIL_REGEX_REGEX_BACKREF_MANAGER_HPP
 
-#include "../../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 #include <vector>
 
diff --git a/ndn-cxx/util/regex/regex-backref-matcher.cpp b/ndn-cxx/util/regex/regex-backref-matcher.cpp
index fda4c01..0a95c32 100644
--- a/ndn-cxx/util/regex/regex-backref-matcher.cpp
+++ b/ndn-cxx/util/regex/regex-backref-matcher.cpp
@@ -21,8 +21,8 @@
  * @author Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
  */
 
-#include "regex-backref-matcher.hpp"
-#include "regex-pattern-list-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-backref-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-pattern-list-matcher.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/util/regex/regex-backref-matcher.hpp b/ndn-cxx/util/regex/regex-backref-matcher.hpp
index 6fcf8a2..30ededd 100644
--- a/ndn-cxx/util/regex/regex-backref-matcher.hpp
+++ b/ndn-cxx/util/regex/regex-backref-matcher.hpp
@@ -24,7 +24,7 @@
 #ifndef NDN_UTIL_REGEX_REGEX_BACKREF_MATCHER_HPP
 #define NDN_UTIL_REGEX_REGEX_BACKREF_MATCHER_HPP
 
-#include "regex-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-matcher.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/util/regex/regex-component-matcher.cpp b/ndn-cxx/util/regex/regex-component-matcher.cpp
index 2c6da84..037710d 100644
--- a/ndn-cxx/util/regex/regex-component-matcher.cpp
+++ b/ndn-cxx/util/regex/regex-component-matcher.cpp
@@ -21,8 +21,8 @@
  * @author Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
  */
 
-#include "regex-component-matcher.hpp"
-#include "regex-pseudo-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-component-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-pseudo-matcher.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/util/regex/regex-component-matcher.hpp b/ndn-cxx/util/regex/regex-component-matcher.hpp
index f00b183..c0b1a3e 100644
--- a/ndn-cxx/util/regex/regex-component-matcher.hpp
+++ b/ndn-cxx/util/regex/regex-component-matcher.hpp
@@ -24,7 +24,7 @@
 #ifndef NDN_UTIL_REGEX_REGEX_COMPONENT_MATCHER_HPP
 #define NDN_UTIL_REGEX_REGEX_COMPONENT_MATCHER_HPP
 
-#include "regex-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-matcher.hpp"
 
 #include <regex>
 
diff --git a/ndn-cxx/util/regex/regex-component-set-matcher.cpp b/ndn-cxx/util/regex/regex-component-set-matcher.cpp
index c014f28..a1b0747 100644
--- a/ndn-cxx/util/regex/regex-component-set-matcher.cpp
+++ b/ndn-cxx/util/regex/regex-component-set-matcher.cpp
@@ -21,8 +21,8 @@
  * @author Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
  */
 
-#include "regex-component-set-matcher.hpp"
-#include "regex-component-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-component-set-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-component-matcher.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/util/regex/regex-component-set-matcher.hpp b/ndn-cxx/util/regex/regex-component-set-matcher.hpp
index 014a919..2aacbca 100644
--- a/ndn-cxx/util/regex/regex-component-set-matcher.hpp
+++ b/ndn-cxx/util/regex/regex-component-set-matcher.hpp
@@ -24,7 +24,7 @@
 #ifndef NDN_UTIL_REGEX_REGEX_COMPONENT_SET_MATCHER_HPP
 #define NDN_UTIL_REGEX_REGEX_COMPONENT_SET_MATCHER_HPP
 
-#include "regex-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-matcher.hpp"
 
 #include <vector>
 
diff --git a/ndn-cxx/util/regex/regex-matcher.cpp b/ndn-cxx/util/regex/regex-matcher.cpp
index 5f2d075..39fe715 100644
--- a/ndn-cxx/util/regex/regex-matcher.cpp
+++ b/ndn-cxx/util/regex/regex-matcher.cpp
@@ -21,7 +21,7 @@
  * @author Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
  */
 
-#include "regex-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-matcher.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/util/regex/regex-matcher.hpp b/ndn-cxx/util/regex/regex-matcher.hpp
index 74ef1ce..6cc0dbc 100644
--- a/ndn-cxx/util/regex/regex-matcher.hpp
+++ b/ndn-cxx/util/regex/regex-matcher.hpp
@@ -24,8 +24,8 @@
 #ifndef NDN_UTIL_REGEX_REGEX_MATCHER_HPP
 #define NDN_UTIL_REGEX_REGEX_MATCHER_HPP
 
-#include "regex-backref-manager.hpp"
-#include "../../name.hpp"
+#include "ndn-cxx/util/regex/regex-backref-manager.hpp"
+#include "ndn-cxx/name.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/util/regex/regex-pattern-list-matcher.cpp b/ndn-cxx/util/regex/regex-pattern-list-matcher.cpp
index 45da38f..1923875 100644
--- a/ndn-cxx/util/regex/regex-pattern-list-matcher.cpp
+++ b/ndn-cxx/util/regex/regex-pattern-list-matcher.cpp
@@ -21,9 +21,9 @@
  * @author Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
  */
 
-#include "regex-pattern-list-matcher.hpp"
-#include "regex-backref-matcher.hpp"
-#include "regex-repeat-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-pattern-list-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-backref-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-repeat-matcher.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/util/regex/regex-pattern-list-matcher.hpp b/ndn-cxx/util/regex/regex-pattern-list-matcher.hpp
index 44ccd8d..f814dee 100644
--- a/ndn-cxx/util/regex/regex-pattern-list-matcher.hpp
+++ b/ndn-cxx/util/regex/regex-pattern-list-matcher.hpp
@@ -24,7 +24,7 @@
 #ifndef NDN_UTIL_REGEX_REGEX_PATTERN_LIST_MATCHER_HPP
 #define NDN_UTIL_REGEX_REGEX_PATTERN_LIST_MATCHER_HPP
 
-#include "regex-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-matcher.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/util/regex/regex-pseudo-matcher.cpp b/ndn-cxx/util/regex/regex-pseudo-matcher.cpp
index de7cb84..fc5e951 100644
--- a/ndn-cxx/util/regex/regex-pseudo-matcher.cpp
+++ b/ndn-cxx/util/regex/regex-pseudo-matcher.cpp
@@ -21,7 +21,7 @@
  * @author Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
  */
 
-#include "regex-pseudo-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-pseudo-matcher.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/util/regex/regex-pseudo-matcher.hpp b/ndn-cxx/util/regex/regex-pseudo-matcher.hpp
index 1d880f5..4317027 100644
--- a/ndn-cxx/util/regex/regex-pseudo-matcher.hpp
+++ b/ndn-cxx/util/regex/regex-pseudo-matcher.hpp
@@ -24,7 +24,7 @@
 #ifndef NDN_UTIL_REGEX_REGEX_PSEUDO_MATCHER_HPP
 #define NDN_UTIL_REGEX_REGEX_PSEUDO_MATCHER_HPP
 
-#include "regex-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-matcher.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/util/regex/regex-repeat-matcher.cpp b/ndn-cxx/util/regex/regex-repeat-matcher.cpp
index 0fdc543..882991a 100644
--- a/ndn-cxx/util/regex/regex-repeat-matcher.cpp
+++ b/ndn-cxx/util/regex/regex-repeat-matcher.cpp
@@ -21,9 +21,9 @@
  * @author Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
  */
 
-#include "regex-repeat-matcher.hpp"
-#include "regex-backref-matcher.hpp"
-#include "regex-component-set-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-repeat-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-backref-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-component-set-matcher.hpp"
 
 #include <cstdlib>
 #include <regex>
diff --git a/ndn-cxx/util/regex/regex-repeat-matcher.hpp b/ndn-cxx/util/regex/regex-repeat-matcher.hpp
index 3a7f0d9..5e92edb 100644
--- a/ndn-cxx/util/regex/regex-repeat-matcher.hpp
+++ b/ndn-cxx/util/regex/regex-repeat-matcher.hpp
@@ -24,7 +24,7 @@
 #ifndef NDN_UTIL_REGEX_REGEX_REPEAT_MATCHER_HPP
 #define NDN_UTIL_REGEX_REGEX_REPEAT_MATCHER_HPP
 
-#include "regex-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-matcher.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/util/regex/regex-top-matcher.cpp b/ndn-cxx/util/regex/regex-top-matcher.cpp
index 3514951..e2c4209 100644
--- a/ndn-cxx/util/regex/regex-top-matcher.cpp
+++ b/ndn-cxx/util/regex/regex-top-matcher.cpp
@@ -21,10 +21,10 @@
  * @author Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
  */
 
-#include "regex-top-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-top-matcher.hpp"
 
-#include "regex-backref-manager.hpp"
-#include "regex-pattern-list-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-backref-manager.hpp"
+#include "ndn-cxx/util/regex/regex-pattern-list-matcher.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/ndn-cxx/util/regex/regex-top-matcher.hpp b/ndn-cxx/util/regex/regex-top-matcher.hpp
index 90a1842..f580a31 100644
--- a/ndn-cxx/util/regex/regex-top-matcher.hpp
+++ b/ndn-cxx/util/regex/regex-top-matcher.hpp
@@ -24,7 +24,7 @@
 #ifndef NDN_UTIL_REGEX_REGEX_TOP_MATCHER_HPP
 #define NDN_UTIL_REGEX_REGEX_TOP_MATCHER_HPP
 
-#include "regex-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-matcher.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/util/rtt-estimator.cpp b/ndn-cxx/util/rtt-estimator.cpp
index f79b6e4..75fed28 100644
--- a/ndn-cxx/util/rtt-estimator.cpp
+++ b/ndn-cxx/util/rtt-estimator.cpp
@@ -23,7 +23,7 @@
  * @author Chavoosh Ghasemi
  */
 
-#include "rtt-estimator.hpp"
+#include "ndn-cxx/util/rtt-estimator.hpp"
 
 #include <cmath>
 #include <limits>
diff --git a/ndn-cxx/util/rtt-estimator.hpp b/ndn-cxx/util/rtt-estimator.hpp
index 4cf5586..71f49f4 100644
--- a/ndn-cxx/util/rtt-estimator.hpp
+++ b/ndn-cxx/util/rtt-estimator.hpp
@@ -26,9 +26,8 @@
 #ifndef NDN_CXX_UTIL_RTT_ESTIMATOR_HPP
 #define NDN_CXX_UTIL_RTT_ESTIMATOR_HPP
 
-#include "../common.hpp"
-#include "signal.hpp"
-#include "time.hpp"
+#include "ndn-cxx/util/signal.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/ndn-cxx/util/scheduler-scoped-event-id.cpp b/ndn-cxx/util/scheduler-scoped-event-id.cpp
index d83fa4c..d33678a 100644
--- a/ndn-cxx/util/scheduler-scoped-event-id.cpp
+++ b/ndn-cxx/util/scheduler-scoped-event-id.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "scheduler-scoped-event-id.hpp"
+#include "ndn-cxx/util/scheduler-scoped-event-id.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/ndn-cxx/util/scheduler-scoped-event-id.hpp b/ndn-cxx/util/scheduler-scoped-event-id.hpp
index 703a745..87372c0 100644
--- a/ndn-cxx/util/scheduler-scoped-event-id.hpp
+++ b/ndn-cxx/util/scheduler-scoped-event-id.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_UTIL_SCHEDULER_SCOPED_EVENT_ID_HPP
 #define NDN_UTIL_SCHEDULER_SCOPED_EVENT_ID_HPP
 
-#include "scheduler.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/ndn-cxx/util/scheduler.cpp b/ndn-cxx/util/scheduler.cpp
index 9e52b25..9b94566 100644
--- a/ndn-cxx/util/scheduler.cpp
+++ b/ndn-cxx/util/scheduler.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "scheduler.hpp"
-#include "detail/steady-timer.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
+#include "ndn-cxx/util/detail/steady-timer.hpp"
 
 #include <boost/scope_exit.hpp>
 
diff --git a/ndn-cxx/util/scheduler.hpp b/ndn-cxx/util/scheduler.hpp
index bd4467a..9a2d542 100644
--- a/ndn-cxx/util/scheduler.hpp
+++ b/ndn-cxx/util/scheduler.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_UTIL_SCHEDULER_HPP
 #define NDN_UTIL_SCHEDULER_HPP
 
-#include "time.hpp"
-#include "../net/asio-fwd.hpp"
+#include "ndn-cxx/net/asio-fwd.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 #include <boost/system/error_code.hpp>
 #include <set>
diff --git a/ndn-cxx/util/segment-fetcher.cpp b/ndn-cxx/util/segment-fetcher.cpp
index 24ddad9..01419c1 100644
--- a/ndn-cxx/util/segment-fetcher.cpp
+++ b/ndn-cxx/util/segment-fetcher.cpp
@@ -25,11 +25,11 @@
  * @author Chavoosh Ghasemi
  */
 
-#include "segment-fetcher.hpp"
-#include "../name-component.hpp"
-#include "../encoding/buffer-stream.hpp"
-#include "../lp/nack.hpp"
-#include "../lp/nack-header.hpp"
+#include "ndn-cxx/util/segment-fetcher.hpp"
+#include "ndn-cxx/name-component.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/lp/nack.hpp"
+#include "ndn-cxx/lp/nack-header.hpp"
 
 #include <boost/asio/io_service.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/ndn-cxx/util/segment-fetcher.hpp b/ndn-cxx/util/segment-fetcher.hpp
index 889027f..ca2e3a8 100644
--- a/ndn-cxx/util/segment-fetcher.hpp
+++ b/ndn-cxx/util/segment-fetcher.hpp
@@ -28,11 +28,11 @@
 #ifndef NDN_UTIL_SEGMENT_FETCHER_HPP
 #define NDN_UTIL_SEGMENT_FETCHER_HPP
 
-#include "../face.hpp"
-#include "../security/v2/validator.hpp"
-#include "rtt-estimator.hpp"
-#include "scheduler.hpp"
-#include "signal.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/security/v2/validator.hpp"
+#include "ndn-cxx/util/rtt-estimator.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
+#include "ndn-cxx/util/signal.hpp"
 
 #include <queue>
 
diff --git a/ndn-cxx/util/sha256.cpp b/ndn-cxx/util/sha256.cpp
index 0f66122..bf4b448 100644
--- a/ndn-cxx/util/sha256.cpp
+++ b/ndn-cxx/util/sha256.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "sha256.hpp"
-#include "string-helper.hpp"
-#include "../security/detail/openssl.hpp"
-#include "../security/transform/digest-filter.hpp"
-#include "../security/transform/stream-sink.hpp"
-#include "../security/transform/stream-source.hpp"
+#include "ndn-cxx/util/sha256.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
+#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/transform/digest-filter.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
+#include "ndn-cxx/security/transform/stream-source.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/ndn-cxx/util/sha256.hpp b/ndn-cxx/util/sha256.hpp
index 7df5ead..22bc253 100644
--- a/ndn-cxx/util/sha256.hpp
+++ b/ndn-cxx/util/sha256.hpp
@@ -22,9 +22,9 @@
 #ifndef NDN_UTIL_SHA256_HPP
 #define NDN_UTIL_SHA256_HPP
 
-#include "../encoding/block.hpp"
-#include "../encoding/buffer-stream.hpp"
-#include "../security/transform/step-source.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/step-source.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/ndn-cxx/util/signal.hpp b/ndn-cxx/util/signal.hpp
index 5c20385..520b5c7 100644
--- a/ndn-cxx/util/signal.hpp
+++ b/ndn-cxx/util/signal.hpp
@@ -22,9 +22,9 @@
 #ifndef NDN_UTIL_SIGNAL_HPP
 #define NDN_UTIL_SIGNAL_HPP
 
-#include "signal/signal.hpp"
-#include "signal/emit.hpp"
-#include "signal/connection.hpp"
-#include "signal/scoped-connection.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
diff --git a/ndn-cxx/util/signal/connection.cpp b/ndn-cxx/util/signal/connection.cpp
index 1d93326..94d3cbd 100644
--- a/ndn-cxx/util/signal/connection.cpp
+++ b/ndn-cxx/util/signal/connection.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "connection.hpp"
+#include "ndn-cxx/util/signal/connection.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/ndn-cxx/util/signal/connection.hpp b/ndn-cxx/util/signal/connection.hpp
index 528dcba..f7fe803 100644
--- a/ndn-cxx/util/signal/connection.hpp
+++ b/ndn-cxx/util/signal/connection.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_UTIL_SIGNAL_CONNECTION_HPP
 #define NDN_UTIL_SIGNAL_CONNECTION_HPP
 
-#include "../../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/ndn-cxx/util/signal/scoped-connection.cpp b/ndn-cxx/util/signal/scoped-connection.cpp
index 7a231b0..1a843b1 100644
--- a/ndn-cxx/util/signal/scoped-connection.cpp
+++ b/ndn-cxx/util/signal/scoped-connection.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "scoped-connection.hpp"
+#include "ndn-cxx/util/signal/scoped-connection.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/ndn-cxx/util/signal/scoped-connection.hpp b/ndn-cxx/util/signal/scoped-connection.hpp
index f352be0..df90271 100644
--- a/ndn-cxx/util/signal/scoped-connection.hpp
+++ b/ndn-cxx/util/signal/scoped-connection.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_UTIL_SIGNAL_SCOPED_CONNECTION_HPP
 #define NDN_UTIL_SIGNAL_SCOPED_CONNECTION_HPP
 
-#include "connection.hpp"
+#include "ndn-cxx/util/signal/connection.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/ndn-cxx/util/signal/signal.hpp b/ndn-cxx/util/signal/signal.hpp
index 6eab994..0de476a 100644
--- a/ndn-cxx/util/signal/signal.hpp
+++ b/ndn-cxx/util/signal/signal.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_UTIL_SIGNAL_SIGNAL_HPP
 #define NDN_UTIL_SIGNAL_SIGNAL_HPP
 
-#include "connection.hpp"
+#include "ndn-cxx/util/signal/connection.hpp"
 
 #include <list>
 
diff --git a/ndn-cxx/util/sqlite3-statement.cpp b/ndn-cxx/util/sqlite3-statement.cpp
index 597da37..1b2e9eb 100644
--- a/ndn-cxx/util/sqlite3-statement.cpp
+++ b/ndn-cxx/util/sqlite3-statement.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "sqlite3-statement.hpp"
+#include "ndn-cxx/util/sqlite3-statement.hpp"
 
 #include <sqlite3.h>
 
diff --git a/ndn-cxx/util/sqlite3-statement.hpp b/ndn-cxx/util/sqlite3-statement.hpp
index eb2cb16..9705b05 100644
--- a/ndn-cxx/util/sqlite3-statement.hpp
+++ b/ndn-cxx/util/sqlite3-statement.hpp
@@ -22,8 +22,7 @@
 #ifndef NDN_UTIL_SQLITE3_STATEMENT_HPP
 #define NDN_UTIL_SQLITE3_STATEMENT_HPP
 
-#include "../encoding/block.hpp"
-#include <string>
+#include "ndn-cxx/encoding/block.hpp"
 
 struct sqlite3;
 struct sqlite3_stmt;
diff --git a/ndn-cxx/util/string-helper.cpp b/ndn-cxx/util/string-helper.cpp
index abfacbe..184458d 100644
--- a/ndn-cxx/util/string-helper.cpp
+++ b/ndn-cxx/util/string-helper.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "string-helper.hpp"
-#include "../encoding/buffer.hpp"
-#include "../encoding/buffer-stream.hpp"
-#include "../security/transform/buffer-source.hpp"
-#include "../security/transform/hex-decode.hpp"
-#include "../security/transform/hex-encode.hpp"
-#include "../security/transform/stream-sink.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
+#include "ndn-cxx/encoding/buffer.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/hex-decode.hpp"
+#include "ndn-cxx/security/transform/hex-encode.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
 
 #include <sstream>
 
diff --git a/ndn-cxx/util/string-helper.hpp b/ndn-cxx/util/string-helper.hpp
index a34fdb7..05320c0 100644
--- a/ndn-cxx/util/string-helper.hpp
+++ b/ndn-cxx/util/string-helper.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_UTIL_STRING_HELPER_HPP
 #define NDN_UTIL_STRING_HELPER_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 namespace ndn {
 
diff --git a/ndn-cxx/util/time-custom-clock.hpp b/ndn-cxx/util/time-custom-clock.hpp
index 43d525c..935682f 100644
--- a/ndn-cxx/util/time-custom-clock.hpp
+++ b/ndn-cxx/util/time-custom-clock.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_UTIL_TIME_CUSTOM_CLOCK_HPP
 #define NDN_UTIL_TIME_CUSTOM_CLOCK_HPP
 
-#include "time.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 namespace ndn {
 namespace time {
diff --git a/ndn-cxx/util/time-unit-test-clock.cpp b/ndn-cxx/util/time-unit-test-clock.cpp
index 0e34756..526e7ef 100644
--- a/ndn-cxx/util/time-unit-test-clock.cpp
+++ b/ndn-cxx/util/time-unit-test-clock.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "time-unit-test-clock.hpp"
-#include "detail/steady-timer.hpp"
+#include "ndn-cxx/util/time-unit-test-clock.hpp"
+#include "ndn-cxx/util/detail/steady-timer.hpp"
 
 #include <chrono>
 #include <thread>
diff --git a/ndn-cxx/util/time-unit-test-clock.hpp b/ndn-cxx/util/time-unit-test-clock.hpp
index 0c6b90f..f6dd6ca 100644
--- a/ndn-cxx/util/time-unit-test-clock.hpp
+++ b/ndn-cxx/util/time-unit-test-clock.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_UTIL_TIME_UNIT_TEST_CLOCK_HPP
 #define NDN_UTIL_TIME_UNIT_TEST_CLOCK_HPP
 
-#include "time-custom-clock.hpp"
+#include "ndn-cxx/util/time-custom-clock.hpp"
 
 namespace ndn {
 namespace time {
diff --git a/ndn-cxx/util/time.cpp b/ndn-cxx/util/time.cpp
index 64b43e3..a7a0cdb 100644
--- a/ndn-cxx/util/time.cpp
+++ b/ndn-cxx/util/time.cpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "time.hpp"
-#include "time-custom-clock.hpp"
+#include "ndn-cxx/util/time.hpp"
+#include "ndn-cxx/util/time-custom-clock.hpp"
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <sstream>
diff --git a/ndn-cxx/util/time.hpp b/ndn-cxx/util/time.hpp
index 9d5f8bb..29e813f 100644
--- a/ndn-cxx/util/time.hpp
+++ b/ndn-cxx/util/time.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_UTIL_TIME_HPP
 #define NDN_UTIL_TIME_HPP
 
-#include "../common.hpp"
+#include "ndn-cxx/common.hpp"
 
 #include <boost/asio/wait_traits.hpp>
 #include <boost/chrono.hpp>
diff --git a/tests/boost-test.hpp b/tests/boost-test.hpp
index 1d21b3f..51e0973 100644
--- a/tests/boost-test.hpp
+++ b/tests/boost-test.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-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -26,8 +26,7 @@
 #pragma GCC system_header
 #pragma clang system_header
 
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/output_test_stream.hpp>
-#include <boost/concept_check.hpp>
 
 #endif // NDN_TESTS_BOOST_TEST_HPP
diff --git a/tests/identity-management-fixture.cpp b/tests/identity-management-fixture.cpp
index 79d5eb2..781b2a1 100644
--- a/tests/identity-management-fixture.cpp
+++ b/tests/identity-management-fixture.cpp
@@ -19,9 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "identity-management-fixture.hpp"
-#include "util/io.hpp"
-#include "security/v2/additional-description.hpp"
+#include "tests/identity-management-fixture.hpp"
+
+#include "ndn-cxx/security/v2/additional-description.hpp"
+#include "ndn-cxx/util/io.hpp"
 
 #include <boost/filesystem.hpp>
 
diff --git a/tests/identity-management-fixture.hpp b/tests/identity-management-fixture.hpp
index 53b68f5..ba42ca3 100644
--- a/tests/identity-management-fixture.hpp
+++ b/tests/identity-management-fixture.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-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -22,11 +22,10 @@
 #ifndef NDN_TESTS_IDENTITY_MANAGEMENT_FIXTURE_HPP
 #define NDN_TESTS_IDENTITY_MANAGEMENT_FIXTURE_HPP
 
-#include "security/v2/key-chain.hpp"
-#include "security/signing-helpers.hpp"
+#include "ndn-cxx/security/v2/key-chain.hpp"
+#include "ndn-cxx/security/signing-helpers.hpp"
 
-#include "boost-test.hpp"
-#include "test-home-fixture.hpp"
+#include "tests/test-home-fixture.hpp"
 
 #include <vector>
 
@@ -62,7 +61,8 @@
    * @return name of the created self-signed certificate
    */
   security::Identity
-  addIdentity(const Name& identityName, const KeyParams& params = security::v2::KeyChain::getDefaultKeyParams());
+  addIdentity(const Name& identityName,
+              const KeyParams& params = security::v2::KeyChain::getDefaultKeyParams());
 
   /**
    *  @brief Save identity certificate to a file
diff --git a/tests/integrated/default-can-be-prefix-0.cpp b/tests/integrated/default-can-be-prefix-0.cpp
index 8be2c4f..77a3042 100644
--- a/tests/integrated/default-can-be-prefix-0.cpp
+++ b/tests/integrated/default-can-be-prefix-0.cpp
@@ -19,13 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
 #define BOOST_TEST_MODULE ndn-cxx Integrated Tests (DefaultCanBePrefix=0)
+#include "tests/boost-test.hpp"
 
-#include "interest.hpp"
-
-#include "boost-test.hpp"
+#include "ndn-cxx/interest.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/integrated/default-can-be-prefix-1.cpp b/tests/integrated/default-can-be-prefix-1.cpp
index e2071e1..f2f6a52 100644
--- a/tests/integrated/default-can-be-prefix-1.cpp
+++ b/tests/integrated/default-can-be-prefix-1.cpp
@@ -19,13 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
 #define BOOST_TEST_MODULE ndn-cxx Integrated Tests (DefaultCanBePrefix=1)
+#include "tests/boost-test.hpp"
 
-#include "interest.hpp"
-
-#include "boost-test.hpp"
+#include "ndn-cxx/interest.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/integrated/default-can-be-prefix-unset.cpp b/tests/integrated/default-can-be-prefix-unset.cpp
index 88375da..0498eae 100644
--- a/tests/integrated/default-can-be-prefix-unset.cpp
+++ b/tests/integrated/default-can-be-prefix-unset.cpp
@@ -19,13 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
 #define BOOST_TEST_MODULE ndn-cxx Integrated Tests (DefaultCanBePrefix=unset)
+#include "tests/boost-test.hpp"
 
-#include "interest.hpp"
-
-#include "boost-test.hpp"
+#include "ndn-cxx/interest.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/integrated/encoding-benchmark.cpp b/tests/integrated/encoding-benchmark.cpp
index d18fa29..8f503a0 100644
--- a/tests/integrated/encoding-benchmark.cpp
+++ b/tests/integrated/encoding-benchmark.cpp
@@ -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-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,14 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
 #define BOOST_TEST_MODULE ndn-cxx Encoding Benchmark
+#include "tests/boost-test.hpp"
 
-#include "encoding/tlv.hpp"
-
-#include "boost-test.hpp"
-#include "timed-execute.hpp"
+#include "ndn-cxx/encoding/tlv.hpp"
+#include "tests/integrated/timed-execute.hpp"
 
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/tests/integrated/face.cpp b/tests/integrated/face.cpp
index adbe314..99d5a20 100644
--- a/tests/integrated/face.cpp
+++ b/tests/integrated/face.cpp
@@ -19,23 +19,22 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
 #define BOOST_TEST_MODULE ndn-cxx Integrated Tests (Face)
+#include "tests/boost-test.hpp"
 
-#include "face.hpp"
-#include "transport/tcp-transport.hpp"
-#include "transport/unix-transport.hpp"
-#include "util/scheduler.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/transport/tcp-transport.hpp"
+#include "ndn-cxx/transport/unix-transport.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
 
-#include "boost-test.hpp"
-#include "identity-management-fixture.hpp"
-#include "make-interest-data.hpp"
+#include "tests/identity-management-fixture.hpp"
+#include "tests/make-interest-data.hpp"
 
 #include <stdio.h>
-#include <thread>
-#include <mutex>
 #include <condition_variable>
+#include <mutex>
+#include <thread>
+
 #include <boost/mpl/vector.hpp>
 
 namespace ndn {
diff --git a/tests/integrated/network-monitor.cpp b/tests/integrated/network-monitor.cpp
index 45cb57b..4c4467b 100644
--- a/tests/integrated/network-monitor.cpp
+++ b/tests/integrated/network-monitor.cpp
@@ -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-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,19 +19,16 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
 #define BOOST_TEST_MODULE ndn-cxx Integrated Tests (Network Monitor)
+#include "tests/boost-test.hpp"
 
-#include "net/network-monitor.hpp"
+#include "ndn-cxx/net/network-monitor.hpp"
 
-#include "net/network-address.hpp"
-#include "net/network-interface.hpp"
-#include "net/detail/link-type-helper.hpp"
-#include "util/string-helper.hpp"
-#include "util/time.hpp"
-
-#include "boost-test.hpp"
+#include "ndn-cxx/net/network-address.hpp"
+#include "ndn-cxx/net/network-interface.hpp"
+#include "ndn-cxx/net/detail/link-type-helper.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 #include <boost/asio/io_service.hpp>
 #include <iostream>
diff --git a/tests/integrated/scheduler-benchmark.cpp b/tests/integrated/scheduler-benchmark.cpp
index b861f04..9bc4600 100644
--- a/tests/integrated/scheduler-benchmark.cpp
+++ b/tests/integrated/scheduler-benchmark.cpp
@@ -19,14 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
 #define BOOST_TEST_MODULE ndn-cxx Scheduler Benchmark
+#include "tests/boost-test.hpp"
 
-#include "util/scheduler.hpp"
-
-#include "boost-test.hpp"
-#include "timed-execute.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
+#include "tests/integrated/timed-execute.hpp"
 
 #include <boost/asio/io_service.hpp>
 #include <iostream>
diff --git a/tests/integrated/timed-execute.hpp b/tests/integrated/timed-execute.hpp
index 7f71e72..83767a1 100644
--- a/tests/integrated/timed-execute.hpp
+++ b/tests/integrated/timed-execute.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-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -22,7 +22,7 @@
 #ifndef NDN_TESTS_INTEGRATED_TIMED_EXECUTE_HPP
 #define NDN_TESTS_INTEGRATED_TIMED_EXECUTE_HPP
 
-#include "util/time.hpp"
+#include "ndn-cxx/util/time.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/integrated/wscript b/tests/integrated/wscript
index 21327a9..73158d8 100644
--- a/tests/integrated/wscript
+++ b/tests/integrated/wscript
@@ -8,5 +8,5 @@
         bld.program(name='test-%s' % name,
                     target=name,
                     source=[test],
-                    use='tests-base',
+                    use='tests-common',
                     install_path=None)
diff --git a/tests/make-interest-data.cpp b/tests/make-interest-data.cpp
index 4f66268..76b2f44 100644
--- a/tests/make-interest-data.cpp
+++ b/tests/make-interest-data.cpp
@@ -19,8 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "make-interest-data.hpp"
-#include "security/signature-sha256-with-rsa.hpp"
+#include "tests/make-interest-data.hpp"
+
+#include "ndn-cxx/security/signature-sha256-with-rsa.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/make-interest-data.hpp b/tests/make-interest-data.hpp
index a703263..b9a9aec 100644
--- a/tests/make-interest-data.hpp
+++ b/tests/make-interest-data.hpp
@@ -22,10 +22,10 @@
 #ifndef NDN_TESTS_MAKE_INTEREST_DATA_HPP
 #define NDN_TESTS_MAKE_INTEREST_DATA_HPP
 
-#include "interest.hpp"
-#include "data.hpp"
-#include "link.hpp"
-#include "lp/nack.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/link.hpp"
+#include "ndn-cxx/lp/nack.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/test-home-fixture.hpp b/tests/test-home-fixture.hpp
index 8bc1fd1..38fd3f1 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-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,16 +19,17 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_KEY_CHAIN_FIXTURE_HPP
-#define NDN_TESTS_KEY_CHAIN_FIXTURE_HPP
+#ifndef NDN_TESTS_TEST_HOME_FIXTURE_HPP
+#define NDN_TESTS_TEST_HOME_FIXTURE_HPP
 
-#include "security/v2/key-chain.hpp"
+#include "ndn-cxx/security/v2/key-chain.hpp"
 
-#include "boost-test.hpp"
-
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
+#include <cstdlib>
 #include <fstream>
+#include <initializer_list>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/filesystem.hpp>
 
 namespace ndn {
 namespace tests {
@@ -46,11 +47,11 @@
   PibDirFixture()
     : m_pibDir(Path().PATH)
   {
-    if (getenv("NDN_CLIENT_PIB") != nullptr) {
-      m_oldPib = getenv("NDN_CLIENT_PIB");
+    if (std::getenv("NDN_CLIENT_PIB") != nullptr) {
+      m_oldPib = std::getenv("NDN_CLIENT_PIB");
     }
-    if (getenv("NDN_CLIENT_TPM") != nullptr) {
-      m_oldTpm = getenv("NDN_CLIENT_TPM");
+    if (std::getenv("NDN_CLIENT_TPM") != nullptr) {
+      m_oldTpm = std::getenv("NDN_CLIENT_TPM");
     }
 
     /// @todo Consider change to an in-memory PIB/TPM
@@ -61,14 +62,14 @@
   ~PibDirFixture()
   {
     if (!m_oldPib.empty()) {
-      setenv("NDN_CLIENT_PIB", m_oldPib.c_str(), true);
+      setenv("NDN_CLIENT_PIB", m_oldPib.data(), true);
     }
     else {
       unsetenv("NDN_CLIENT_PIB");
     }
 
     if (!m_oldTpm.empty()) {
-      setenv("NDN_CLIENT_TPM", m_oldTpm.c_str(), true);
+      setenv("NDN_CLIENT_TPM", m_oldTpm.data(), true);
     }
     else {
       unsetenv("NDN_CLIENT_TPM");
@@ -105,7 +106,7 @@
   }
 
   void
-  createClientConf(std::initializer_list<std::string> lines)
+  createClientConf(std::initializer_list<std::string> lines) const
   {
     boost::filesystem::create_directories(boost::filesystem::path(this->m_pibDir) / ".ndn");
     std::ofstream of((boost::filesystem::path(this->m_pibDir) / ".ndn" / "client.conf").c_str());
@@ -124,4 +125,4 @@
 } // namespace tests
 } // namespace ndn
 
-#endif // NDN_TESTS_KEY_CHAIN_FIXTURE_HPP
+#endif // NDN_TESTS_TEST_HOME_FIXTURE_HPP
diff --git a/tests/boost-multi-log-formatter.hpp b/tests/unit/boost-multi-log-formatter.hpp
similarity index 95%
rename from tests/boost-multi-log-formatter.hpp
rename to tests/unit/boost-multi-log-formatter.hpp
index ae37416..59e850e 100644
--- a/tests/boost-multi-log-formatter.hpp
+++ b/tests/unit/boost-multi-log-formatter.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2015 Regents of the University of California.
+/*
+ * Copyright (c) 2015-2018 Regents of the University of California.
  *
  * Based on work by Martin Ba (http://stackoverflow.com/a/26718189)
  *
@@ -8,8 +8,8 @@
  * (See http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef NDN_TESTS_BOOST_MULTI_LOG_FORMATTER_HPP
-#define NDN_TESTS_BOOST_MULTI_LOG_FORMATTER_HPP
+#ifndef NDN_TESTS_UNIT_BOOST_MULTI_LOG_FORMATTER_HPP
+#define NDN_TESTS_UNIT_BOOST_MULTI_LOG_FORMATTER_HPP
 
 #include <boost/version.hpp>
 
@@ -211,4 +211,4 @@
 } // namespace unit_test
 } // namespace boost
 
-#endif // NDN_TESTS_BOOST_MULTI_LOG_FORMATTER_HPP
+#endif // NDN_TESTS_UNIT_BOOST_MULTI_LOG_FORMATTER_HPP
diff --git a/tests/unit/data.t.cpp b/tests/unit/data.t.cpp
index 0d91005..08a5cef 100644
--- a/tests/unit/data.t.cpp
+++ b/tests/unit/data.t.cpp
@@ -19,19 +19,19 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "data.hpp"
-#include "encoding/buffer-stream.hpp"
-#include "security/signature-sha256-with-rsa.hpp"
-#include "security/transform/private-key.hpp"
-#include "security/transform/public-key.hpp"
-#include "security/transform/signer-filter.hpp"
-#include "security/transform/step-source.hpp"
-#include "security/transform/stream-sink.hpp"
-#include "security/verification-helpers.hpp"
-#include "util/sha256.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/signature-sha256-with-rsa.hpp"
+#include "ndn-cxx/security/transform/private-key.hpp"
+#include "ndn-cxx/security/transform/public-key.hpp"
+#include "ndn-cxx/security/transform/signer-filter.hpp"
+#include "ndn-cxx/security/transform/step-source.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
+#include "ndn-cxx/security/verification-helpers.hpp"
+#include "ndn-cxx/util/sha256.hpp"
 
-#include "boost-test.hpp"
-#include "identity-management-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/identity-management-fixture.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit/delegation-list.t.cpp b/tests/unit/delegation-list.t.cpp
index e2aada8..0831dca 100644
--- a/tests/unit/delegation-list.t.cpp
+++ b/tests/unit/delegation-list.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "delegation-list.hpp"
+#include "ndn-cxx/delegation-list.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit/delegation.t.cpp b/tests/unit/delegation.t.cpp
index 6cf03dd..9f23e89 100644
--- a/tests/unit/delegation.t.cpp
+++ b/tests/unit/delegation.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "delegation.hpp"
+#include "ndn-cxx/delegation.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/dummy-validator.hpp b/tests/unit/dummy-validator.hpp
similarity index 89%
rename from tests/dummy-validator.hpp
rename to tests/unit/dummy-validator.hpp
index 255c2ce..aab9114 100644
--- a/tests/dummy-validator.hpp
+++ b/tests/unit/dummy-validator.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-2018 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_TESTS_DUMMY_VALIDATOR_HPP
-#define NDN_TESTS_DUMMY_VALIDATOR_HPP
+#ifndef NDN_TESTS_UNIT_DUMMY_VALIDATOR_HPP
+#define NDN_TESTS_UNIT_DUMMY_VALIDATOR_HPP
 
-#include "security/v2/validator.hpp"
-#include "security/v2/validation-policy.hpp"
-#include "security/v2/certificate-fetcher-offline.hpp"
+#include "ndn-cxx/security/v2/validator.hpp"
+#include "ndn-cxx/security/v2/validation-policy.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher-offline.hpp"
 
 namespace ndn {
 namespace tests {
@@ -91,10 +91,10 @@
   function<bool(const Name&)> m_decide;
 };
 
-
 class DummyValidator : public security::v2::Validator
 {
 public:
+  explicit
   DummyValidator(bool shouldAccept = true)
     : security::v2::Validator(make_unique<DummyValidationPolicy>(shouldAccept),
                               make_unique<security::v2::CertificateFetcherOffline>())
@@ -111,4 +111,4 @@
 } // namespace tests
 } // namespace ndn
 
-#endif // NDN_TESTS_DUMMY_VALIDATOR_HPP
+#endif // NDN_TESTS_UNIT_DUMMY_VALIDATOR_HPP
diff --git a/tests/unit/encoding/block-helpers.t.cpp b/tests/unit/encoding/block-helpers.t.cpp
index 5b9711d..c44be84 100644
--- a/tests/unit/encoding/block-helpers.t.cpp
+++ b/tests/unit/encoding/block-helpers.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "encoding/block-helpers.hpp"
-#include "name.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
+#include "ndn-cxx/name.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace encoding {
diff --git a/tests/unit/encoding/block.t.cpp b/tests/unit/encoding/block.t.cpp
index a3459e7..dd7e3b0 100644
--- a/tests/unit/encoding/block.t.cpp
+++ b/tests/unit/encoding/block.t.cpp
@@ -19,10 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "encoding/block.hpp"
-#include "encoding/block-helpers.hpp"
+#include "ndn-cxx/encoding/block.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+
 #include <boost/lexical_cast.hpp>
 #include <cstring>
 #include <sstream>
diff --git a/tests/unit/encoding/buffer-stream.t.cpp b/tests/unit/encoding/buffer-stream.t.cpp
index 9c95b2c..9418f8c 100644
--- a/tests/unit/encoding/buffer-stream.t.cpp
+++ b/tests/unit/encoding/buffer-stream.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "encoding/buffer-stream.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/encoding/encoder.t.cpp b/tests/unit/encoding/encoder.t.cpp
index 47cf8e4..3f5fe8e 100644
--- a/tests/unit/encoding/encoder.t.cpp
+++ b/tests/unit/encoding/encoder.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "encoding/encoder.hpp"
+#include "ndn-cxx/encoding/encoder.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace encoding {
diff --git a/tests/unit/encoding/encoding-buffer.t.cpp b/tests/unit/encoding/encoding-buffer.t.cpp
index 646024b..c0997b4 100644
--- a/tests/unit/encoding/encoding-buffer.t.cpp
+++ b/tests/unit/encoding/encoding-buffer.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "encoding/encoding-buffer.hpp"
-#include "encoding/block.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
+#include "ndn-cxx/encoding/block.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/encoding/estimator.t.cpp b/tests/unit/encoding/estimator.t.cpp
index 8ab4399..f5e4392 100644
--- a/tests/unit/encoding/estimator.t.cpp
+++ b/tests/unit/encoding/estimator.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "encoding/estimator.hpp"
+#include "ndn-cxx/encoding/estimator.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace encoding {
diff --git a/tests/unit/encoding/nfd-constants.t.cpp b/tests/unit/encoding/nfd-constants.t.cpp
index af9997b..e87f391 100644
--- a/tests/unit/encoding/nfd-constants.t.cpp
+++ b/tests/unit/encoding/nfd-constants.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "encoding/nfd-constants.hpp"
+#include "ndn-cxx/encoding/nfd-constants.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <sstream>
diff --git a/tests/unit/encoding/tlv.t.cpp b/tests/unit/encoding/tlv.t.cpp
index a82ffbe..8c73267 100644
--- a/tests/unit/encoding/tlv.t.cpp
+++ b/tests/unit/encoding/tlv.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "encoding/tlv.hpp"
-#include "encoding/buffer.hpp"
+#include "ndn-cxx/encoding/tlv.hpp"
+#include "ndn-cxx/encoding/buffer.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <array>
 #include <deque>
diff --git a/tests/unit/exclude.t.cpp b/tests/unit/exclude.t.cpp
index da93a85..d9e4379 100644
--- a/tests/unit/exclude.t.cpp
+++ b/tests/unit/exclude.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "exclude.hpp"
-#include "util/sha256.hpp"
+#include "ndn-cxx/exclude.hpp"
+#include "ndn-cxx/util/sha256.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/tests/unit/face.t.cpp b/tests/unit/face.t.cpp
index 3f2b82a..6f7bb17 100644
--- a/tests/unit/face.t.cpp
+++ b/tests/unit/face.t.cpp
@@ -19,17 +19,16 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "face.hpp"
-#include "lp/tags.hpp"
-#include "transport/tcp-transport.hpp"
-#include "transport/unix-transport.hpp"
-#include "util/dummy-client-face.hpp"
-#include "util/scheduler.hpp"
+#include "ndn-cxx/face.hpp"
+#include "ndn-cxx/lp/tags.hpp"
+#include "ndn-cxx/transport/tcp-transport.hpp"
+#include "ndn-cxx/transport/unix-transport.hpp"
+#include "ndn-cxx/util/dummy-client-face.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
 
-#include "boost-test.hpp"
-#include "make-interest-data.hpp"
-#include "identity-management-time-fixture.hpp"
-#include "test-home-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/identity-management-time-fixture.hpp b/tests/unit/identity-management-time-fixture.hpp
index cafa9c6..6bff890 100644
--- a/tests/unit/identity-management-time-fixture.hpp
+++ b/tests/unit/identity-management-time-fixture.hpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_UNIT_TESTS_IDENTITY_MANAGEMENT_TIME_FIXTURE_HPP
-#define NDN_TESTS_UNIT_TESTS_IDENTITY_MANAGEMENT_TIME_FIXTURE_HPP
+#ifndef NDN_TESTS_UNIT_IDENTITY_MANAGEMENT_TIME_FIXTURE_HPP
+#define NDN_TESTS_UNIT_IDENTITY_MANAGEMENT_TIME_FIXTURE_HPP
 
-#include "identity-management-fixture.hpp"
-#include "unit-test-time-fixture.hpp"
+#include "tests/identity-management-fixture.hpp"
+#include "tests/unit/unit-test-time-fixture.hpp"
 
 namespace ndn {
 namespace tests {
@@ -36,4 +36,4 @@
 } // namespace tests
 } // namespace ndn
 
-#endif // NDN_TESTS_UNIT_TESTS_IDENTITY_MANAGEMENT_TIME_FIXTURE_HPP
+#endif // NDN_TESTS_UNIT_IDENTITY_MANAGEMENT_TIME_FIXTURE_HPP
diff --git a/tests/unit/ims/in-memory-storage-fifo.t.cpp b/tests/unit/ims/in-memory-storage-fifo.t.cpp
index 00cde40..b188797 100644
--- a/tests/unit/ims/in-memory-storage-fifo.t.cpp
+++ b/tests/unit/ims/in-memory-storage-fifo.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "ims/in-memory-storage-fifo.hpp"
+#include "ndn-cxx/ims/in-memory-storage-fifo.hpp"
 
-#include "boost-test.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/ims/in-memory-storage-lfu.t.cpp b/tests/unit/ims/in-memory-storage-lfu.t.cpp
index ef58ce7..8756856 100644
--- a/tests/unit/ims/in-memory-storage-lfu.t.cpp
+++ b/tests/unit/ims/in-memory-storage-lfu.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "ims/in-memory-storage-lfu.hpp"
+#include "ndn-cxx/ims/in-memory-storage-lfu.hpp"
 
-#include "boost-test.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/ims/in-memory-storage-lru.t.cpp b/tests/unit/ims/in-memory-storage-lru.t.cpp
index 9058d66..aeeb846 100644
--- a/tests/unit/ims/in-memory-storage-lru.t.cpp
+++ b/tests/unit/ims/in-memory-storage-lru.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "ims/in-memory-storage-lru.hpp"
+#include "ndn-cxx/ims/in-memory-storage-lru.hpp"
 
-#include "boost-test.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/ims/in-memory-storage-persistent.t.cpp b/tests/unit/ims/in-memory-storage-persistent.t.cpp
index d63061f..3758cc2 100644
--- a/tests/unit/ims/in-memory-storage-persistent.t.cpp
+++ b/tests/unit/ims/in-memory-storage-persistent.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "ims/in-memory-storage-persistent.hpp"
+#include "ndn-cxx/ims/in-memory-storage-persistent.hpp"
 
-#include "boost-test.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/ims/in-memory-storage.t.cpp b/tests/unit/ims/in-memory-storage.t.cpp
index d955d72..0cb4278 100644
--- a/tests/unit/ims/in-memory-storage.t.cpp
+++ b/tests/unit/ims/in-memory-storage.t.cpp
@@ -19,17 +19,17 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "ims/in-memory-storage.hpp"
-#include "ims/in-memory-storage-fifo.hpp"
-#include "ims/in-memory-storage-lfu.hpp"
-#include "ims/in-memory-storage-lru.hpp"
-#include "ims/in-memory-storage-persistent.hpp"
-#include "security/signature-sha256-with-rsa.hpp"
-#include "util/sha256.hpp"
+#include "ndn-cxx/ims/in-memory-storage.hpp"
+#include "ndn-cxx/ims/in-memory-storage-fifo.hpp"
+#include "ndn-cxx/ims/in-memory-storage-lfu.hpp"
+#include "ndn-cxx/ims/in-memory-storage-lru.hpp"
+#include "ndn-cxx/ims/in-memory-storage-persistent.hpp"
+#include "ndn-cxx/security/signature-sha256-with-rsa.hpp"
+#include "ndn-cxx/util/sha256.hpp"
 
-#include "boost-test.hpp"
-#include "make-interest-data.hpp"
-#include "../unit-test-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
+#include "tests/unit/unit-test-time-fixture.hpp"
 
 #include <boost/mpl/vector.hpp>
 
diff --git a/tests/unit/interest-filter.t.cpp b/tests/unit/interest-filter.t.cpp
index 96f4ae9..100429c 100644
--- a/tests/unit/interest-filter.t.cpp
+++ b/tests/unit/interest-filter.t.cpp
@@ -19,15 +19,15 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "interest-filter.hpp"
-#include "data.hpp"
-#include "encoding/buffer-stream.hpp"
-#include "security/signature-sha256-with-rsa.hpp"
-#include "security/digest-sha256.hpp"
-#include "util/dummy-client-face.hpp"
+#include "ndn-cxx/interest-filter.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/signature-sha256-with-rsa.hpp"
+#include "ndn-cxx/security/digest-sha256.hpp"
+#include "ndn-cxx/util/dummy-client-face.hpp"
 
-#include "boost-test.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/interest.t.cpp b/tests/unit/interest.t.cpp
index 16e2ba2..ef646bb 100644
--- a/tests/unit/interest.t.cpp
+++ b/tests/unit/interest.t.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "interest.hpp"
-#include "data.hpp"
-#include "security/digest-sha256.hpp"
-#include "security/signature-sha256-with-rsa.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/security/digest-sha256.hpp"
+#include "ndn-cxx/security/signature-sha256-with-rsa.hpp"
 
-#include "boost-test.hpp"
-#include "identity-management-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/identity-management-fixture.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/key-locator.t.cpp b/tests/unit/key-locator.t.cpp
index ce3c6ae..94d263e 100644
--- a/tests/unit/key-locator.t.cpp
+++ b/tests/unit/key-locator.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "key-locator.hpp"
-#include "encoding/block-helpers.hpp"
+#include "ndn-cxx/key-locator.hpp"
+#include "ndn-cxx/encoding/block-helpers.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit/link.t.cpp b/tests/unit/link.t.cpp
index 347fb67..ef85f9f 100644
--- a/tests/unit/link.t.cpp
+++ b/tests/unit/link.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "link.hpp"
+#include "ndn-cxx/link.hpp"
 
-#include "boost-test.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/lp/cache-policy.t.cpp b/tests/unit/lp/cache-policy.t.cpp
index 6f1050d..78c1548 100644
--- a/tests/unit/lp/cache-policy.t.cpp
+++ b/tests/unit/lp/cache-policy.t.cpp
@@ -21,9 +21,9 @@
  * @author Eric Newberry <enewberry@email.arizona.edu>
  */
 
-#include "lp/cache-policy.hpp"
+#include "ndn-cxx/lp/cache-policy.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/tests/unit/lp/nack-header.t.cpp b/tests/unit/lp/nack-header.t.cpp
index 0645f40..4670608 100644
--- a/tests/unit/lp/nack-header.t.cpp
+++ b/tests/unit/lp/nack-header.t.cpp
@@ -21,9 +21,9 @@
  * @author Eric Newberry <enewberry@email.arizona.edu>
  */
 
-#include "lp/nack-header.hpp"
+#include "ndn-cxx/lp/nack-header.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/tests/unit/lp/nack.t.cpp b/tests/unit/lp/nack.t.cpp
index 436a649..ef30de1 100644
--- a/tests/unit/lp/nack.t.cpp
+++ b/tests/unit/lp/nack.t.cpp
@@ -21,9 +21,9 @@
  * @author Eric Newberry <enewberry@email.arizona.edu>
  */
 
-#include "lp/nack.hpp"
+#include "ndn-cxx/lp/nack.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/tests/unit/lp/packet.t.cpp b/tests/unit/lp/packet.t.cpp
index 1583772..6e10b11 100644
--- a/tests/unit/lp/packet.t.cpp
+++ b/tests/unit/lp/packet.t.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "lp/packet.hpp"
-#include "prefix-announcement.hpp"
-#include "security/signature-sha256-with-rsa.hpp"
+#include "ndn-cxx/lp/packet.hpp"
+#include "ndn-cxx/prefix-announcement.hpp"
+#include "ndn-cxx/security/signature-sha256-with-rsa.hpp"
 
-#include "boost-test.hpp"
-#include "identity-management-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/identity-management-fixture.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/tests/unit/lp/prefix-announcement-header.t.cpp b/tests/unit/lp/prefix-announcement-header.t.cpp
index 38a75f3..fb57ded 100644
--- a/tests/unit/lp/prefix-announcement-header.t.cpp
+++ b/tests/unit/lp/prefix-announcement-header.t.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "lp/prefix-announcement-header.hpp"
-#include "lp/tlv.hpp"
-#include "security/signature-sha256-with-rsa.hpp"
+#include "ndn-cxx/lp/prefix-announcement-header.hpp"
+#include "ndn-cxx/lp/tlv.hpp"
+#include "ndn-cxx/security/signature-sha256-with-rsa.hpp"
 
-#include "boost-test.hpp"
-#include "identity-management-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/identity-management-fixture.hpp"
 
 namespace ndn {
 namespace lp {
diff --git a/tests/main.cpp b/tests/unit/main.cpp
similarity index 93%
rename from tests/main.cpp
rename to tests/unit/main.cpp
index cf03e21..cb54695 100644
--- a/tests/main.cpp
+++ b/tests/unit/main.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,20 +19,18 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#define BOOST_TEST_MODULE ndn-cxx Tests
-#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_ALTERNATIVE_INIT_API
+#define BOOST_TEST_MODULE ndn-cxx Unit Tests
 
 #include <boost/version.hpp>
 
 #if BOOST_VERSION >= 106200
 // Boost.Test v3.3 (Boost 1.62) natively supports multi-logger output
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #else
+#define BOOST_TEST_ALTERNATIVE_INIT_API
 #define BOOST_TEST_NO_MAIN
-#include "boost-test.hpp"
-
-#include "boost-multi-log-formatter.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/boost-multi-log-formatter.hpp"
 
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
diff --git a/tests/unit/meta-info.t.cpp b/tests/unit/meta-info.t.cpp
index 2a2dac3..e6ad757 100644
--- a/tests/unit/meta-info.t.cpp
+++ b/tests/unit/meta-info.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "meta-info.hpp"
-#include "data.hpp"
+#include "ndn-cxx/meta-info.hpp"
+#include "ndn-cxx/data.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/mgmt/control-response.t.cpp b/tests/unit/mgmt/control-response.t.cpp
index 86aa780..74b1b03 100644
--- a/tests/unit/mgmt/control-response.t.cpp
+++ b/tests/unit/mgmt/control-response.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/control-response.hpp"
+#include "ndn-cxx/mgmt/control-response.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace mgmt {
diff --git a/tests/unit/mgmt/dispatcher.t.cpp b/tests/unit/mgmt/dispatcher.t.cpp
index c75af4d..c24f9cf 100644
--- a/tests/unit/mgmt/dispatcher.t.cpp
+++ b/tests/unit/mgmt/dispatcher.t.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/dispatcher.hpp"
-#include "mgmt/nfd/control-parameters.hpp"
-#include "util/dummy-client-face.hpp"
+#include "ndn-cxx/mgmt/dispatcher.hpp"
+#include "ndn-cxx/mgmt/nfd/control-parameters.hpp"
+#include "ndn-cxx/util/dummy-client-face.hpp"
 
-#include "boost-test.hpp"
-#include "make-interest-data.hpp"
-#include "../identity-management-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
 
 namespace ndn {
 namespace mgmt {
diff --git a/tests/unit/mgmt/nfd/channel-status.t.cpp b/tests/unit/mgmt/nfd/channel-status.t.cpp
index b3afde8..9b1a4fa 100644
--- a/tests/unit/mgmt/nfd/channel-status.t.cpp
+++ b/tests/unit/mgmt/nfd/channel-status.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/nfd/channel-status.hpp"
+#include "ndn-cxx/mgmt/nfd/channel-status.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit/mgmt/nfd/command-options.t.cpp b/tests/unit/mgmt/nfd/command-options.t.cpp
index e8fe76e..d41c512 100644
--- a/tests/unit/mgmt/nfd/command-options.t.cpp
+++ b/tests/unit/mgmt/nfd/command-options.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/nfd/command-options.hpp"
-#include "security/signing-helpers.hpp"
+#include "ndn-cxx/mgmt/nfd/command-options.hpp"
+#include "ndn-cxx/security/signing-helpers.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/tests/unit/mgmt/nfd/control-command.t.cpp b/tests/unit/mgmt/nfd/control-command.t.cpp
index 4db3752..97c67ac 100644
--- a/tests/unit/mgmt/nfd/control-command.t.cpp
+++ b/tests/unit/mgmt/nfd/control-command.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/nfd/control-command.hpp"
+#include "ndn-cxx/mgmt/nfd/control-command.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/tests/unit/mgmt/nfd/control-parameters.t.cpp b/tests/unit/mgmt/nfd/control-parameters.t.cpp
index 6030060..b098529 100644
--- a/tests/unit/mgmt/nfd/control-parameters.t.cpp
+++ b/tests/unit/mgmt/nfd/control-parameters.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/nfd/control-parameters.hpp"
+#include "ndn-cxx/mgmt/nfd/control-parameters.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/tests/unit/mgmt/nfd/controller-fixture.hpp b/tests/unit/mgmt/nfd/controller-fixture.hpp
index 0d14296..bc42e20 100644
--- a/tests/unit/mgmt/nfd/controller-fixture.hpp
+++ b/tests/unit/mgmt/nfd/controller-fixture.hpp
@@ -19,16 +19,15 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_MGMT_NFD_CONTROLLER_FIXTURE_HPP
-#define NDN_TESTS_MGMT_NFD_CONTROLLER_FIXTURE_HPP
+#ifndef NDN_TESTS_UNIT_MGMT_NFD_CONTROLLER_FIXTURE_HPP
+#define NDN_TESTS_UNIT_MGMT_NFD_CONTROLLER_FIXTURE_HPP
 
-#include "mgmt/nfd/controller.hpp"
-#include "util/dummy-client-face.hpp"
-#include "security/v2/certificate-fetcher-offline.hpp"
+#include "ndn-cxx/mgmt/nfd/controller.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher-offline.hpp"
+#include "ndn-cxx/util/dummy-client-face.hpp"
 
-#include "boost-test.hpp"
-#include "dummy-validator.hpp"
-#include "../../identity-management-time-fixture.hpp"
+#include "tests/unit/dummy-validator.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
 
 namespace ndn {
 namespace nfd {
@@ -87,4 +86,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_TESTS_MGMT_NFD_CONTROLLER_FIXTURE_HPP
+#endif // NDN_TESTS_UNIT_MGMT_NFD_CONTROLLER_FIXTURE_HPP
diff --git a/tests/unit/mgmt/nfd/controller.t.cpp b/tests/unit/mgmt/nfd/controller.t.cpp
index e9a3c4f..01ff767 100644
--- a/tests/unit/mgmt/nfd/controller.t.cpp
+++ b/tests/unit/mgmt/nfd/controller.t.cpp
@@ -19,11 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/nfd/controller.hpp"
-#include "mgmt/nfd/control-response.hpp"
+#include "ndn-cxx/mgmt/nfd/controller.hpp"
+#include "ndn-cxx/mgmt/nfd/control-response.hpp"
 
-#include "controller-fixture.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
+#include "tests/unit/mgmt/nfd/controller-fixture.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/tests/unit/mgmt/nfd/cs-info.t.cpp b/tests/unit/mgmt/nfd/cs-info.t.cpp
index 46a0ed3..9c1999c 100644
--- a/tests/unit/mgmt/nfd/cs-info.t.cpp
+++ b/tests/unit/mgmt/nfd/cs-info.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/nfd/cs-info.hpp"
+#include "ndn-cxx/mgmt/nfd/cs-info.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit/mgmt/nfd/face-event-notification.t.cpp b/tests/unit/mgmt/nfd/face-event-notification.t.cpp
index 4da762b..3354a1b 100644
--- a/tests/unit/mgmt/nfd/face-event-notification.t.cpp
+++ b/tests/unit/mgmt/nfd/face-event-notification.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/nfd/face-event-notification.hpp"
+#include "ndn-cxx/mgmt/nfd/face-event-notification.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit/mgmt/nfd/face-query-filter.t.cpp b/tests/unit/mgmt/nfd/face-query-filter.t.cpp
index 3b9b2a2..3b32ac8 100644
--- a/tests/unit/mgmt/nfd/face-query-filter.t.cpp
+++ b/tests/unit/mgmt/nfd/face-query-filter.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/nfd/face-query-filter.hpp"
+#include "ndn-cxx/mgmt/nfd/face-query-filter.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit/mgmt/nfd/face-status.t.cpp b/tests/unit/mgmt/nfd/face-status.t.cpp
index 0ed7aca..a4ad4ac 100644
--- a/tests/unit/mgmt/nfd/face-status.t.cpp
+++ b/tests/unit/mgmt/nfd/face-status.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/nfd/face-status.hpp"
+#include "ndn-cxx/mgmt/nfd/face-status.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit/mgmt/nfd/fib-entry.t.cpp b/tests/unit/mgmt/nfd/fib-entry.t.cpp
index fa7ec69..2a84f67 100644
--- a/tests/unit/mgmt/nfd/fib-entry.t.cpp
+++ b/tests/unit/mgmt/nfd/fib-entry.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/nfd/fib-entry.hpp"
+#include "ndn-cxx/mgmt/nfd/fib-entry.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit/mgmt/nfd/forwarder-status.t.cpp b/tests/unit/mgmt/nfd/forwarder-status.t.cpp
index b2c3d48..f899ce9 100644
--- a/tests/unit/mgmt/nfd/forwarder-status.t.cpp
+++ b/tests/unit/mgmt/nfd/forwarder-status.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/nfd/forwarder-status.hpp"
+#include "ndn-cxx/mgmt/nfd/forwarder-status.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit/mgmt/nfd/rib-entry.t.cpp b/tests/unit/mgmt/nfd/rib-entry.t.cpp
index f2ab51a..950a196 100644
--- a/tests/unit/mgmt/nfd/rib-entry.t.cpp
+++ b/tests/unit/mgmt/nfd/rib-entry.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/nfd/rib-entry.hpp"
+#include "ndn-cxx/mgmt/nfd/rib-entry.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit/mgmt/nfd/status-dataset.t.cpp b/tests/unit/mgmt/nfd/status-dataset.t.cpp
index a436de0..1af98e9 100644
--- a/tests/unit/mgmt/nfd/status-dataset.t.cpp
+++ b/tests/unit/mgmt/nfd/status-dataset.t.cpp
@@ -19,11 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/nfd/status-dataset.hpp"
-#include "mgmt/nfd/controller.hpp"
+#include "ndn-cxx/mgmt/nfd/status-dataset.hpp"
+#include "ndn-cxx/mgmt/nfd/controller.hpp"
 
-#include "controller-fixture.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
+#include "tests/unit/mgmt/nfd/controller-fixture.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/tests/unit/mgmt/nfd/strategy-choice.t.cpp b/tests/unit/mgmt/nfd/strategy-choice.t.cpp
index 9996541..1d8329b 100644
--- a/tests/unit/mgmt/nfd/strategy-choice.t.cpp
+++ b/tests/unit/mgmt/nfd/strategy-choice.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/nfd/strategy-choice.hpp"
+#include "ndn-cxx/mgmt/nfd/strategy-choice.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit/mgmt/status-dataset-context.t.cpp b/tests/unit/mgmt/status-dataset-context.t.cpp
index 34e6fc1..6ea594e 100644
--- a/tests/unit/mgmt/status-dataset-context.t.cpp
+++ b/tests/unit/mgmt/status-dataset-context.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "mgmt/status-dataset-context.hpp"
+#include "ndn-cxx/mgmt/status-dataset-context.hpp"
 
-#include "boost-test.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
 
 namespace ndn {
 namespace mgmt {
diff --git a/tests/unit/name-component.t.cpp b/tests/unit/name-component.t.cpp
index 031ccb8..78613f1 100644
--- a/tests/unit/name-component.t.cpp
+++ b/tests/unit/name-component.t.cpp
@@ -19,11 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "name-component.hpp"
-#include "name.hpp"
-#include "util/string-helper.hpp"
+#include "ndn-cxx/name-component.hpp"
+#include "ndn-cxx/name.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/mpl/vector.hpp>
 
diff --git a/tests/unit/name.t.cpp b/tests/unit/name.t.cpp
index 1e0aa1d..a560678 100644
--- a/tests/unit/name.t.cpp
+++ b/tests/unit/name.t.cpp
@@ -19,9 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "name.hpp"
+#include "ndn-cxx/name.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+
 #include <unordered_map>
 
 namespace ndn {
diff --git a/tests/unit/ndebug.t.cpp b/tests/unit/ndebug.t.cpp
index b7219c2..7f1bb5a 100644
--- a/tests/unit/ndebug.t.cpp
+++ b/tests/unit/ndebug.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "common.hpp"
+#include "ndn-cxx/common.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/net/collect-netifs.cpp b/tests/unit/net/collect-netifs.cpp
index ca8e6ef..eeaec20 100644
--- a/tests/unit/net/collect-netifs.cpp
+++ b/tests/unit/net/collect-netifs.cpp
@@ -25,8 +25,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "collect-netifs.hpp"
-#include "net/network-monitor.hpp"
+#include "tests/unit/net/collect-netifs.hpp"
+#include "ndn-cxx/net/network-monitor.hpp"
 
 #include <boost/asio/io_service.hpp>
 
diff --git a/tests/unit/net/collect-netifs.hpp b/tests/unit/net/collect-netifs.hpp
index 322e323..b941abf 100644
--- a/tests/unit/net/collect-netifs.hpp
+++ b/tests/unit/net/collect-netifs.hpp
@@ -25,11 +25,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NFD_TESTS_UNIT_TESTS_NET_COLLECT_NETIFS_HPP
-#define NFD_TESTS_UNIT_TESTS_NET_COLLECT_NETIFS_HPP
+#ifndef NDN_TESTS_UNIT_NET_COLLECT_NETIFS_HPP
+#define NDN_TESTS_UNIT_NET_COLLECT_NETIFS_HPP
 
-#include "common.hpp"
-#include "net/network-interface.hpp"
+#include "ndn-cxx/net/network-interface.hpp"
 
 #include <vector>
 
@@ -49,4 +48,4 @@
 } // namespace net
 } // namespace ndn
 
-#endif // NFD_TESTS_UNIT_TESTS_NET_COLLECT_NETIFS_HPP
+#endif // NDN_TESTS_UNIT_NET_COLLECT_NETIFS_HPP
diff --git a/tests/unit/net/dns.t.cpp b/tests/unit/net/dns.t.cpp
index e4afa8e..db834c0 100644
--- a/tests/unit/net/dns.t.cpp
+++ b/tests/unit/net/dns.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "net/dns.hpp"
+#include "ndn-cxx/net/dns.hpp"
 
-#include "boost-test.hpp"
-#include "network-configuration-detector.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/net/network-configuration-detector.hpp"
 
 #include <boost/asio/io_service.hpp>
 
diff --git a/tests/unit/net/ethernet.t.cpp b/tests/unit/net/ethernet.t.cpp
index 4f76dbb..162170b 100644
--- a/tests/unit/net/ethernet.t.cpp
+++ b/tests/unit/net/ethernet.t.cpp
@@ -25,9 +25,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "net/ethernet.hpp"
+#include "ndn-cxx/net/ethernet.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/net/face-uri.t.cpp b/tests/unit/net/face-uri.t.cpp
index 71d76b1..2b99470 100644
--- a/tests/unit/net/face-uri.t.cpp
+++ b/tests/unit/net/face-uri.t.cpp
@@ -25,11 +25,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "net/face-uri.hpp"
+#include "ndn-cxx/net/face-uri.hpp"
 
-#include "boost-test.hpp"
-#include "collect-netifs.hpp"
-#include "network-configuration-detector.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/net/collect-netifs.hpp"
+#include "tests/unit/net/network-configuration-detector.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/net/network-configuration-detector.cpp b/tests/unit/net/network-configuration-detector.cpp
index 3e4f128..84e1244 100644
--- a/tests/unit/net/network-configuration-detector.cpp
+++ b/tests/unit/net/network-configuration-detector.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "network-configuration-detector.hpp"
+#include "tests/unit/net/network-configuration-detector.hpp"
 
-#include <boost/asio/ip/address.hpp>
-#include <boost/asio/ip/udp.hpp>
-#include <boost/asio/ip/basic_resolver.hpp>
 #include <boost/asio/io_service.hpp>
+#include <boost/asio/ip/address.hpp>
+#include <boost/asio/ip/basic_resolver.hpp>
+#include <boost/asio/ip/udp.hpp>
 #include <boost/range/iterator_range_core.hpp>
 
 namespace ndn {
diff --git a/tests/unit/net/network-configuration-detector.hpp b/tests/unit/net/network-configuration-detector.hpp
index 58715c8..015b2b8 100644
--- a/tests/unit/net/network-configuration-detector.hpp
+++ b/tests/unit/net/network-configuration-detector.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
-#define NDN_TESTS_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
+#ifndef NDN_TESTS_UNIT_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
+#define NDN_TESTS_UNIT_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
 
 #define SKIP_IF_IPV4_UNAVAILABLE() \
   do { \
@@ -72,4 +72,4 @@
 } // namespace tests
 } // namespace ndn
 
-#endif // NDN_TESTS_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
+#endif // NDN_TESTS_UNIT_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
diff --git a/tests/unit/net/network-monitor-stub.t.cpp b/tests/unit/net/network-monitor-stub.t.cpp
index 8fbf3eb..453a510 100644
--- a/tests/unit/net/network-monitor-stub.t.cpp
+++ b/tests/unit/net/network-monitor-stub.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "net/network-monitor-stub.hpp"
+#include "ndn-cxx/net/network-monitor-stub.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace net {
diff --git a/tests/unit/net/network-monitor.t.cpp b/tests/unit/net/network-monitor.t.cpp
index b522ee6..132d0db 100644
--- a/tests/unit/net/network-monitor.t.cpp
+++ b/tests/unit/net/network-monitor.t.cpp
@@ -19,9 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "net/network-monitor.hpp"
+#include "ndn-cxx/net/network-monitor.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+
 #include <boost/asio/io_service.hpp>
 
 namespace ndn {
diff --git a/tests/unit/packet-base.t.cpp b/tests/unit/packet-base.t.cpp
index 8b4dfa2..d541512 100644
--- a/tests/unit/packet-base.t.cpp
+++ b/tests/unit/packet-base.t.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "packet-base.hpp"
+#include "ndn-cxx/packet-base.hpp"
+#include "ndn-cxx/interest.hpp"
+#include "ndn-cxx/lp/tags.hpp"
 
-#include "../boost-test.hpp"
-#include "interest.hpp"
-#include "lp/tags.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/prefix-announcement.t.cpp b/tests/unit/prefix-announcement.t.cpp
index fa69eb3..31449e4 100644
--- a/tests/unit/prefix-announcement.t.cpp
+++ b/tests/unit/prefix-announcement.t.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "prefix-announcement.hpp"
-#include "encoding/tlv-nfd.hpp"
+#include "ndn-cxx/prefix-announcement.hpp"
+#include "ndn-cxx/encoding/tlv-nfd.hpp"
 
-#include "boost-test.hpp"
-#include "identity-management-fixture.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/identity-management-fixture.hpp"
+#include "tests/make-interest-data.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/security/command-interest-signer.t.cpp b/tests/unit/security/command-interest-signer.t.cpp
index 784a209..fe85ba8 100644
--- a/tests/unit/security/command-interest-signer.t.cpp
+++ b/tests/unit/security/command-interest-signer.t.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/command-interest-signer.hpp"
-#include "security/signing-helpers.hpp"
+#include "ndn-cxx/security/command-interest-signer.hpp"
+#include "ndn-cxx/security/signing-helpers.hpp"
 
-#include "boost-test.hpp"
-#include "../identity-management-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/digest-sha256.t.cpp b/tests/unit/security/digest-sha256.t.cpp
index 7c1d236..d3fcf4a 100644
--- a/tests/unit/security/digest-sha256.t.cpp
+++ b/tests/unit/security/digest-sha256.t.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/digest-sha256.hpp"
-#include "security/verification-helpers.hpp"
-#include "util/sha256.hpp"
-#include "util/string-helper.hpp"
+#include "ndn-cxx/security/digest-sha256.hpp"
+#include "ndn-cxx/security/verification-helpers.hpp"
+#include "ndn-cxx/util/sha256.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
 
-#include "identity-management-fixture.hpp"
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/identity-management-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/key-params.t.cpp b/tests/unit/security/key-params.t.cpp
index 991c346..0fc6cd5 100644
--- a/tests/unit/security/key-params.t.cpp
+++ b/tests/unit/security/key-params.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/key-params.hpp"
+#include "ndn-cxx/security/key-params.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/tests/unit/security/pib/certificate-container.t.cpp b/tests/unit/security/pib/certificate-container.t.cpp
index 6614531..f34c0fe 100644
--- a/tests/unit/security/pib/certificate-container.t.cpp
+++ b/tests/unit/security/pib/certificate-container.t.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/pib/certificate-container.hpp"
-#include "security/pib/pib.hpp"
-#include "security/pib/pib-memory.hpp"
+#include "ndn-cxx/security/pib/certificate-container.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
+#include "ndn-cxx/security/pib/pib-memory.hpp"
 
-#include "boost-test.hpp"
-#include "pib-data-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/pib/pib-data-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/pib/detail/identity-impl.t.cpp b/tests/unit/security/pib/detail/identity-impl.t.cpp
index 209a6b6..e3243e3 100644
--- a/tests/unit/security/pib/detail/identity-impl.t.cpp
+++ b/tests/unit/security/pib/detail/identity-impl.t.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/pib/detail/identity-impl.hpp"
-#include "security/pib/pib.hpp"
-#include "security/pib/pib-memory.hpp"
+#include "ndn-cxx/security/pib/detail/identity-impl.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
+#include "ndn-cxx/security/pib/pib-memory.hpp"
 
-#include "boost-test.hpp"
-#include "../pib-data-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/pib/pib-data-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/pib/detail/key-impl.t.cpp b/tests/unit/security/pib/detail/key-impl.t.cpp
index 517ea60..ea9499c 100644
--- a/tests/unit/security/pib/detail/key-impl.t.cpp
+++ b/tests/unit/security/pib/detail/key-impl.t.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/pib/detail/key-impl.hpp"
-#include "security/pib/pib.hpp"
-#include "security/pib/pib-memory.hpp"
-#include "../pib-data-fixture.hpp"
+#include "ndn-cxx/security/pib/detail/key-impl.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
+#include "ndn-cxx/security/pib/pib-memory.hpp"
 
-#include "boost-test.hpp"
-#include "identity-management-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/identity-management-fixture.hpp"
+#include "tests/unit/security/pib/pib-data-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/pib/identity-container.t.cpp b/tests/unit/security/pib/identity-container.t.cpp
index e821970..fbce528 100644
--- a/tests/unit/security/pib/identity-container.t.cpp
+++ b/tests/unit/security/pib/identity-container.t.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/pib/identity-container.hpp"
-#include "security/pib/pib.hpp"
-#include "security/pib/pib-memory.hpp"
+#include "ndn-cxx/security/pib/identity-container.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
+#include "ndn-cxx/security/pib/pib-memory.hpp"
 
-#include "boost-test.hpp"
-#include "pib-data-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/pib/pib-data-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/pib/identity.t.cpp b/tests/unit/security/pib/identity.t.cpp
index d10c7bf..5e2f28a 100644
--- a/tests/unit/security/pib/identity.t.cpp
+++ b/tests/unit/security/pib/identity.t.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/pib/identity.hpp"
-#include "security/pib/pib.hpp"
-#include "security/pib/pib-memory.hpp"
-#include "security/pib/detail/identity-impl.hpp"
+#include "ndn-cxx/security/pib/identity.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
+#include "ndn-cxx/security/pib/pib-memory.hpp"
+#include "ndn-cxx/security/pib/detail/identity-impl.hpp"
 
-#include "boost-test.hpp"
-#include "pib-data-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/pib/pib-data-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/pib/key-container.t.cpp b/tests/unit/security/pib/key-container.t.cpp
index 2afd3e2..ce5b6ab 100644
--- a/tests/unit/security/pib/key-container.t.cpp
+++ b/tests/unit/security/pib/key-container.t.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/pib/key-container.hpp"
-#include "security/pib/pib.hpp"
-#include "security/pib/pib-memory.hpp"
+#include "ndn-cxx/security/pib/key-container.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
+#include "ndn-cxx/security/pib/pib-memory.hpp"
 
-#include "boost-test.hpp"
-#include "pib-data-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/pib/pib-data-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/pib/key.t.cpp b/tests/unit/security/pib/key.t.cpp
index 3c5d207..86f7dfa 100644
--- a/tests/unit/security/pib/key.t.cpp
+++ b/tests/unit/security/pib/key.t.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/pib/key.hpp"
-#include "security/pib/pib.hpp"
-#include "security/pib/pib-memory.hpp"
-#include "security/pib/detail/key-impl.hpp"
+#include "ndn-cxx/security/pib/key.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
+#include "ndn-cxx/security/pib/pib-memory.hpp"
+#include "ndn-cxx/security/pib/detail/key-impl.hpp"
 
-#include "boost-test.hpp"
-#include "pib-data-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/pib/pib-data-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/pib/pib-data-fixture.cpp b/tests/unit/security/pib/pib-data-fixture.cpp
index 91e5b34..d2ddd10 100644
--- a/tests/unit/security/pib/pib-data-fixture.cpp
+++ b/tests/unit/security/pib/pib-data-fixture.cpp
@@ -19,12 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "pib-data-fixture.hpp"
-#include "../../identity-management-time-fixture.hpp"
+#include "tests/unit/security/pib/pib-data-fixture.hpp"
 
-// #include "security/pib/pib-memory.hpp"
-// #include "security/tpm/tpm.hpp"
-// #include "security/tpm/back-end-mem.hpp"
+// #include "ndn-cxx/security/pib/pib-memory.hpp"
+// #include "ndn-cxx/security/tpm/tpm.hpp"
+// #include "ndn-cxx/security/tpm/back-end-mem.hpp"
 // #include <fstream>
 
 namespace ndn {
diff --git a/tests/unit/security/pib/pib-data-fixture.hpp b/tests/unit/security/pib/pib-data-fixture.hpp
index 2328702..21af850 100644
--- a/tests/unit/security/pib/pib-data-fixture.hpp
+++ b/tests/unit/security/pib/pib-data-fixture.hpp
@@ -19,12 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_SECURITY_PIB_DATA_FIXTURE_HPP
-#define NDN_TESTS_SECURITY_PIB_DATA_FIXTURE_HPP
+#ifndef NDN_TESTS_UNIT_SECURITY_PIB_DATA_FIXTURE_HPP
+#define NDN_TESTS_UNIT_SECURITY_PIB_DATA_FIXTURE_HPP
 
-#include "security/v2/certificate.hpp"
-
-#include "boost-test.hpp"
+#include "ndn-cxx/security/v2/certificate.hpp"
 
 namespace ndn {
 namespace security {
@@ -63,4 +61,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_TESTS_SECURITY_PIB_DATA_FIXTURE_HPP
+#endif // NDN_TESTS_UNIT_SECURITY_PIB_DATA_FIXTURE_HPP
diff --git a/tests/unit/security/pib/pib-impl.t.cpp b/tests/unit/security/pib/pib-impl.t.cpp
index 6094b0e..a1f2e47 100644
--- a/tests/unit/security/pib/pib-impl.t.cpp
+++ b/tests/unit/security/pib/pib-impl.t.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/pib/pib-memory.hpp"
-#include "security/pib/pib-sqlite3.hpp"
-#include "security/pib/pib.hpp"
-#include "security/security-common.hpp"
+#include "ndn-cxx/security/pib/pib-memory.hpp"
+#include "ndn-cxx/security/pib/pib-sqlite3.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
+#include "ndn-cxx/security/security-common.hpp"
 
-#include "boost-test.hpp"
-#include "pib-data-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/pib/pib-data-fixture.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/mpl/list.hpp>
diff --git a/tests/unit/security/pib/pib-memory.t.cpp b/tests/unit/security/pib/pib-memory.t.cpp
index 72b0db8..0f8caef 100644
--- a/tests/unit/security/pib/pib-memory.t.cpp
+++ b/tests/unit/security/pib/pib-memory.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/pib/pib-memory.hpp"
+#include "ndn-cxx/security/pib/pib-memory.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/pib/pib-sqlite3.t.cpp b/tests/unit/security/pib/pib-sqlite3.t.cpp
index b46cb50..5b27d29 100644
--- a/tests/unit/security/pib/pib-sqlite3.t.cpp
+++ b/tests/unit/security/pib/pib-sqlite3.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/pib/pib-sqlite3.hpp"
+#include "ndn-cxx/security/pib/pib-sqlite3.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/pib/pib.t.cpp b/tests/unit/security/pib/pib.t.cpp
index 0ce5afc..29787e2 100644
--- a/tests/unit/security/pib/pib.t.cpp
+++ b/tests/unit/security/pib/pib.t.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/pib/pib.hpp"
-#include "security/pib/pib-memory.hpp"
+#include "ndn-cxx/security/pib/pib.hpp"
+#include "ndn-cxx/security/pib/pib-memory.hpp"
 
-#include "boost-test.hpp"
-#include "pib-data-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/pib/pib-data-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/safe-bag.t.cpp b/tests/unit/security/safe-bag.t.cpp
index 0423c69..d59cdef 100644
--- a/tests/unit/security/safe-bag.t.cpp
+++ b/tests/unit/security/safe-bag.t.cpp
@@ -21,9 +21,9 @@
  * @author Zhiyi Zhang <dreamerbarrychang@gmail.com>
  */
 
-#include "security/safe-bag.hpp"
+#include "ndn-cxx/security/safe-bag.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/signature-sha256-with-ecdsa.t.cpp b/tests/unit/security/signature-sha256-with-ecdsa.t.cpp
index 2f90302..abf15a2 100644
--- a/tests/unit/security/signature-sha256-with-ecdsa.t.cpp
+++ b/tests/unit/security/signature-sha256-with-ecdsa.t.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/signature-sha256-with-ecdsa.hpp"
-#include "security/verification-helpers.hpp"
-#include "util/scheduler.hpp"
+#include "ndn-cxx/security/signature-sha256-with-ecdsa.hpp"
+#include "ndn-cxx/security/verification-helpers.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
 
-#include "boost-test.hpp"
-#include "../identity-management-time-fixture.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/signature-sha256-with-rsa.t.cpp b/tests/unit/security/signature-sha256-with-rsa.t.cpp
index 7de3774..3fca552 100644
--- a/tests/unit/security/signature-sha256-with-rsa.t.cpp
+++ b/tests/unit/security/signature-sha256-with-rsa.t.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/signature-sha256-with-rsa.hpp"
-#include "security/verification-helpers.hpp"
-#include "util/scheduler.hpp"
+#include "ndn-cxx/security/signature-sha256-with-rsa.hpp"
+#include "ndn-cxx/security/verification-helpers.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
 
-#include "boost-test.hpp"
-#include "../identity-management-time-fixture.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/signing-helpers.t.cpp b/tests/unit/security/signing-helpers.t.cpp
index af2c568..f9a51b2 100644
--- a/tests/unit/security/signing-helpers.t.cpp
+++ b/tests/unit/security/signing-helpers.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/signing-helpers.hpp"
+#include "ndn-cxx/security/signing-helpers.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/signing-info.t.cpp b/tests/unit/security/signing-info.t.cpp
index fc6f627..816cb52 100644
--- a/tests/unit/security/signing-info.t.cpp
+++ b/tests/unit/security/signing-info.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/signing-info.hpp"
+#include "ndn-cxx/security/signing-info.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <sstream>
diff --git a/tests/unit/security/tpm/back-end-wrapper-file.hpp b/tests/unit/security/tpm/back-end-wrapper-file.hpp
index dabd6d3..89c58d0 100644
--- a/tests/unit/security/tpm/back-end-wrapper-file.hpp
+++ b/tests/unit/security/tpm/back-end-wrapper-file.hpp
@@ -22,7 +22,8 @@
 #ifndef NDN_TESTS_SECURITY_TPM_BACK_END_WRAPPER_FILE_HPP
 #define NDN_TESTS_SECURITY_TPM_BACK_END_WRAPPER_FILE_HPP
 
-#include "security/tpm/back-end-file.hpp"
+#include "ndn-cxx/security/tpm/back-end-file.hpp"
+
 #include <boost/filesystem.hpp>
 
 namespace ndn {
diff --git a/tests/unit/security/tpm/back-end-wrapper-mem.hpp b/tests/unit/security/tpm/back-end-wrapper-mem.hpp
index ddf629b..a8b44fc 100644
--- a/tests/unit/security/tpm/back-end-wrapper-mem.hpp
+++ b/tests/unit/security/tpm/back-end-wrapper-mem.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_TESTS_SECURITY_TPM_BACK_END_WRAPPER_MEM_HPP
 #define NDN_TESTS_SECURITY_TPM_BACK_END_WRAPPER_MEM_HPP
 
-#include "security/tpm/back-end-mem.hpp"
+#include "ndn-cxx/security/tpm/back-end-mem.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/tpm/back-end-wrapper-osx.hpp b/tests/unit/security/tpm/back-end-wrapper-osx.hpp
index 6d7d35b..cc582d1 100644
--- a/tests/unit/security/tpm/back-end-wrapper-osx.hpp
+++ b/tests/unit/security/tpm/back-end-wrapper-osx.hpp
@@ -22,8 +22,8 @@
 #ifndef NDN_TESTS_SECURITY_TPM_BACK_END_WRAPPER_OSX_HPP
 #define NDN_TESTS_SECURITY_TPM_BACK_END_WRAPPER_OSX_HPP
 
-#include "security/tpm/back-end-osx.hpp"
-#include "security/tpm/key-handle-osx.hpp"
+#include "ndn-cxx/security/tpm/back-end-osx.hpp"
+#include "ndn-cxx/security/tpm/key-handle-osx.hpp"
 
 #include <cstdlib>
 
diff --git a/tests/unit/security/tpm/back-end.t.cpp b/tests/unit/security/tpm/back-end.t.cpp
index 5512ebd..4d39fbb 100644
--- a/tests/unit/security/tpm/back-end.t.cpp
+++ b/tests/unit/security/tpm/back-end.t.cpp
@@ -19,25 +19,25 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/tpm/back-end.hpp"
+#include "ndn-cxx/security/tpm/back-end.hpp"
 
-#include "encoding/buffer-stream.hpp"
-#include "security/pib/key.hpp"
-#include "security/tpm/key-handle.hpp"
-#include "security/tpm/tpm.hpp"
-#include "security/transform/bool-sink.hpp"
-#include "security/transform/buffer-source.hpp"
-#include "security/transform/private-key.hpp"
-#include "security/transform/public-key.hpp"
-#include "security/transform/verifier-filter.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/pib/key.hpp"
+#include "ndn-cxx/security/tpm/key-handle.hpp"
+#include "ndn-cxx/security/tpm/tpm.hpp"
+#include "ndn-cxx/security/transform/bool-sink.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/private-key.hpp"
+#include "ndn-cxx/security/transform/public-key.hpp"
+#include "ndn-cxx/security/transform/verifier-filter.hpp"
 
-#include "back-end-wrapper-file.hpp"
-#include "back-end-wrapper-mem.hpp"
+#include "tests/unit/security/tpm/back-end-wrapper-file.hpp"
+#include "tests/unit/security/tpm/back-end-wrapper-mem.hpp"
 #ifdef NDN_CXX_HAVE_OSX_FRAMEWORKS
-#include "back-end-wrapper-osx.hpp"
+#include "tests/unit/security/tpm/back-end-wrapper-osx.hpp"
 #endif // NDN_CXX_HAVE_OSX_FRAMEWORKS
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <boost/mpl/vector.hpp>
 #include <set>
diff --git a/tests/unit/security/transform.t.cpp b/tests/unit/security/transform.t.cpp
index 1d55464..07958cd 100644
--- a/tests/unit/security/transform.t.cpp
+++ b/tests/unit/security/transform.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform.hpp"
+#include "ndn-cxx/security/transform.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/transform/base64-decode.t.cpp b/tests/unit/security/transform/base64-decode.t.cpp
index ecaa17c..93d09c2 100644
--- a/tests/unit/security/transform/base64-decode.t.cpp
+++ b/tests/unit/security/transform/base64-decode.t.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/base64-decode.hpp"
-#include "security/transform/buffer-source.hpp"
-#include "security/transform/step-source.hpp"
-#include "security/transform/stream-sink.hpp"
-#include "encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/base64-decode.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/step-source.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/transform/base64-encode.t.cpp b/tests/unit/security/transform/base64-encode.t.cpp
index d52ac0b..228f214 100644
--- a/tests/unit/security/transform/base64-encode.t.cpp
+++ b/tests/unit/security/transform/base64-encode.t.cpp
@@ -19,13 +19,14 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/base64-encode.hpp"
-#include "security/transform/buffer-source.hpp"
-#include "security/transform/step-source.hpp"
-#include "security/transform/stream-sink.hpp"
-#include "encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/base64-encode.hpp"
 
-#include "boost-test.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/step-source.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
+
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/transform/block-cipher.t.cpp b/tests/unit/security/transform/block-cipher.t.cpp
index 379093d..12b20bb 100644
--- a/tests/unit/security/transform/block-cipher.t.cpp
+++ b/tests/unit/security/transform/block-cipher.t.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/block-cipher.hpp"
+#include "ndn-cxx/security/transform/block-cipher.hpp"
 
-#include "encoding/buffer-stream.hpp"
-#include "security/transform/buffer-source.hpp"
-#include "security/transform/stream-sink.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/transform/bool-sink.t.cpp b/tests/unit/security/transform/bool-sink.t.cpp
index 2ce633f..f287e1c 100644
--- a/tests/unit/security/transform/bool-sink.t.cpp
+++ b/tests/unit/security/transform/bool-sink.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/bool-sink.hpp"
+#include "ndn-cxx/security/transform/bool-sink.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/transform/buffer-source.t.cpp b/tests/unit/security/transform/buffer-source.t.cpp
index cb7e7f4..80b9d8d 100644
--- a/tests/unit/security/transform/buffer-source.t.cpp
+++ b/tests/unit/security/transform/buffer-source.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/buffer-source.hpp"
-#include "security/transform/stream-sink.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/transform/digest-filter.t.cpp b/tests/unit/security/transform/digest-filter.t.cpp
index 5c0aaca..67ccc4c 100644
--- a/tests/unit/security/transform/digest-filter.t.cpp
+++ b/tests/unit/security/transform/digest-filter.t.cpp
@@ -19,15 +19,15 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/digest-filter.hpp"
+#include "ndn-cxx/security/transform/digest-filter.hpp"
 
-#include "encoding/buffer-stream.hpp"
-#include "security/detail/openssl.hpp"
-#include "security/transform/buffer-source.hpp"
-#include "security/transform/step-source.hpp"
-#include "security/transform/stream-sink.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/detail/openssl.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/step-source.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/transform/hex-decode.t.cpp b/tests/unit/security/transform/hex-decode.t.cpp
index 3c05ab4..bd2e880 100644
--- a/tests/unit/security/transform/hex-decode.t.cpp
+++ b/tests/unit/security/transform/hex-decode.t.cpp
@@ -19,13 +19,14 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/hex-decode.hpp"
-#include "security/transform/buffer-source.hpp"
-#include "security/transform/step-source.hpp"
-#include "security/transform/stream-sink.hpp"
-#include "encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/hex-decode.hpp"
 
-#include "boost-test.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/step-source.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
+
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/transform/hex-encode.t.cpp b/tests/unit/security/transform/hex-encode.t.cpp
index 26f6321..791fdd7 100644
--- a/tests/unit/security/transform/hex-encode.t.cpp
+++ b/tests/unit/security/transform/hex-encode.t.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/hex-encode.hpp"
-#include "security/transform/buffer-source.hpp"
-#include "security/transform/step-source.hpp"
-#include "security/transform/stream-sink.hpp"
-#include "encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/hex-encode.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/step-source.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/transform/hmac-filter.t.cpp b/tests/unit/security/transform/hmac-filter.t.cpp
index 1ed5e25..650c024 100644
--- a/tests/unit/security/transform/hmac-filter.t.cpp
+++ b/tests/unit/security/transform/hmac-filter.t.cpp
@@ -19,14 +19,14 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/hmac-filter.hpp"
+#include "ndn-cxx/security/transform/hmac-filter.hpp"
 
-#include "encoding/buffer-stream.hpp"
-#include "security/transform/buffer-source.hpp"
-#include "security/transform/step-source.hpp"
-#include "security/transform/stream-sink.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/step-source.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/transform/private-key.t.cpp b/tests/unit/security/transform/private-key.t.cpp
index ee956f9..0cef079 100644
--- a/tests/unit/security/transform/private-key.t.cpp
+++ b/tests/unit/security/transform/private-key.t.cpp
@@ -19,13 +19,14 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/private-key.hpp"
+#include "ndn-cxx/security/transform/private-key.hpp"
 
-#include "encoding/buffer-stream.hpp"
-#include "security/key-params.hpp"
-#include "security/transform.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/key-params.hpp"
+#include "ndn-cxx/security/transform.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+
 #include <boost/mpl/vector.hpp>
 
 #include <sstream>
diff --git a/tests/unit/security/transform/public-key.t.cpp b/tests/unit/security/transform/public-key.t.cpp
index f9d3304..ae234b3 100644
--- a/tests/unit/security/transform/public-key.t.cpp
+++ b/tests/unit/security/transform/public-key.t.cpp
@@ -19,12 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/public-key.hpp"
+#include "ndn-cxx/security/transform/public-key.hpp"
 
-#include "encoding/buffer-stream.hpp"
-#include "security/transform.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+
 #include <boost/mpl/vector.hpp>
 
 #include <sstream>
diff --git a/tests/unit/security/transform/signer-filter.t.cpp b/tests/unit/security/transform/signer-filter.t.cpp
index 51a98f0..aa6f6e3 100644
--- a/tests/unit/security/transform/signer-filter.t.cpp
+++ b/tests/unit/security/transform/signer-filter.t.cpp
@@ -19,16 +19,16 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/signer-filter.hpp"
+#include "ndn-cxx/security/transform/signer-filter.hpp"
 
-#include "encoding/buffer-stream.hpp"
-#include "security/transform/base64-decode.hpp"
-#include "security/transform/buffer-source.hpp"
-#include "security/transform/private-key.hpp"
-#include "security/transform/stream-sink.hpp"
-#include "security/verification-helpers.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/base64-decode.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/private-key.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
+#include "ndn-cxx/security/verification-helpers.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/transform/step-source.t.cpp b/tests/unit/security/transform/step-source.t.cpp
index 43c6655..d8aae47 100644
--- a/tests/unit/security/transform/step-source.t.cpp
+++ b/tests/unit/security/transform/step-source.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/step-source.hpp"
-#include "security/transform/stream-sink.hpp"
+#include "ndn-cxx/security/transform/step-source.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <sstream>
 
diff --git a/tests/unit/security/transform/stream-sink.t.cpp b/tests/unit/security/transform/stream-sink.t.cpp
index 753ea35..4704b01 100644
--- a/tests/unit/security/transform/stream-sink.t.cpp
+++ b/tests/unit/security/transform/stream-sink.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/stream-sink.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/transform/stream-source.t.cpp b/tests/unit/security/transform/stream-source.t.cpp
index ae385b1..1446bc9 100644
--- a/tests/unit/security/transform/stream-source.t.cpp
+++ b/tests/unit/security/transform/stream-source.t.cpp
@@ -19,10 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/stream-source.hpp"
-#include "security/transform/stream-sink.hpp"
+#include "ndn-cxx/security/transform/stream-source.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+
 #include <boost/mpl/integral_c.hpp>
 #include <boost/mpl/vector.hpp>
 
diff --git a/tests/unit/security/transform/strip-space.t.cpp b/tests/unit/security/transform/strip-space.t.cpp
index db8fa84..29c2e7e 100644
--- a/tests/unit/security/transform/strip-space.t.cpp
+++ b/tests/unit/security/transform/strip-space.t.cpp
@@ -19,12 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/strip-space.hpp"
-#include "security/transform/step-source.hpp"
-#include "security/transform/stream-sink.hpp"
-#include "encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/strip-space.hpp"
 
-#include "boost-test.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/step-source.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
+
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/transform/verifier-filter.t.cpp b/tests/unit/security/transform/verifier-filter.t.cpp
index 1b74690..ef38276 100644
--- a/tests/unit/security/transform/verifier-filter.t.cpp
+++ b/tests/unit/security/transform/verifier-filter.t.cpp
@@ -19,18 +19,18 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/transform/verifier-filter.hpp"
+#include "ndn-cxx/security/transform/verifier-filter.hpp"
 
-#include "encoding/buffer-stream.hpp"
-#include "security/transform/base64-decode.hpp"
-#include "security/transform/bool-sink.hpp"
-#include "security/transform/buffer-source.hpp"
-#include "security/transform/private-key.hpp"
-#include "security/transform/public-key.hpp"
-#include "security/transform/signer-filter.hpp"
-#include "security/transform/stream-sink.hpp"
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/transform/base64-decode.hpp"
+#include "ndn-cxx/security/transform/bool-sink.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/private-key.hpp"
+#include "ndn-cxx/security/transform/public-key.hpp"
+#include "ndn-cxx/security/transform/signer-filter.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/v2/additional-description.t.cpp b/tests/unit/security/v2/additional-description.t.cpp
index 7ceee8c..2ed09f9 100644
--- a/tests/unit/security/v2/additional-description.t.cpp
+++ b/tests/unit/security/v2/additional-description.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/additional-description.hpp"
+#include "ndn-cxx/security/v2/additional-description.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/v2/certificate-bundle-fetcher.t.cpp b/tests/unit/security/v2/certificate-bundle-fetcher.t.cpp
index d2e0565..cd96300 100644
--- a/tests/unit/security/v2/certificate-bundle-fetcher.t.cpp
+++ b/tests/unit/security/v2/certificate-bundle-fetcher.t.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/certificate-bundle-fetcher.hpp"
-#include "security/v2/validation-policy-simple-hierarchy.hpp"
-#include "util/regex/regex-pattern-list-matcher.hpp"
-#include "lp/nack.hpp"
+#include "ndn-cxx/security/v2/certificate-bundle-fetcher.hpp"
+#include "ndn-cxx/security/v2/validation-policy-simple-hierarchy.hpp"
+#include "ndn-cxx/util/regex/regex-pattern-list-matcher.hpp"
+#include "ndn-cxx/lp/nack.hpp"
 
-#include "boost-test.hpp"
-#include "validator-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/v2/validator-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/v2/certificate-cache.t.cpp b/tests/unit/security/v2/certificate-cache.t.cpp
index 4ae3505..faeb667 100644
--- a/tests/unit/security/v2/certificate-cache.t.cpp
+++ b/tests/unit/security/v2/certificate-cache.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/certificate-cache.hpp"
+#include "ndn-cxx/security/v2/certificate-cache.hpp"
 
-#include "../../identity-management-time-fixture.hpp"
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/v2/certificate-fetcher-direct-fetch.t.cpp b/tests/unit/security/v2/certificate-fetcher-direct-fetch.t.cpp
index 68fe6b1..e2d543c 100644
--- a/tests/unit/security/v2/certificate-fetcher-direct-fetch.t.cpp
+++ b/tests/unit/security/v2/certificate-fetcher-direct-fetch.t.cpp
@@ -19,16 +19,16 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/certificate-fetcher-direct-fetch.hpp"
-#include "security/v2/validation-policy-simple-hierarchy.hpp"
-#include "lp/nack.hpp"
-#include "lp/tags.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher-direct-fetch.hpp"
+#include "ndn-cxx/security/v2/validation-policy-simple-hierarchy.hpp"
+#include "ndn-cxx/lp/nack.hpp"
+#include "ndn-cxx/lp/tags.hpp"
 
-#include "boost-test.hpp"
-#include "validator-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/v2/validator-fixture.hpp"
 
-#include <boost/range/adaptor/strided.hpp>
 #include <boost/range/adaptor/sliced.hpp>
+#include <boost/range/adaptor/strided.hpp>
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/v2/certificate-fetcher-from-network.t.cpp b/tests/unit/security/v2/certificate-fetcher-from-network.t.cpp
index 5a6b395..a7b1388 100644
--- a/tests/unit/security/v2/certificate-fetcher-from-network.t.cpp
+++ b/tests/unit/security/v2/certificate-fetcher-from-network.t.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/certificate-fetcher-from-network.hpp"
-#include "security/v2/validation-policy-simple-hierarchy.hpp"
-#include "lp/nack.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher-from-network.hpp"
+#include "ndn-cxx/security/v2/validation-policy-simple-hierarchy.hpp"
+#include "ndn-cxx/lp/nack.hpp"
 
-#include "boost-test.hpp"
-#include "validator-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/v2/validator-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/v2/certificate-fetcher-offline.t.cpp b/tests/unit/security/v2/certificate-fetcher-offline.t.cpp
index 102a308..bdf61c6 100644
--- a/tests/unit/security/v2/certificate-fetcher-offline.t.cpp
+++ b/tests/unit/security/v2/certificate-fetcher-offline.t.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/certificate-fetcher-offline.hpp"
-#include "security/v2/validation-policy-simple-hierarchy.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher-offline.hpp"
+#include "ndn-cxx/security/v2/validation-policy-simple-hierarchy.hpp"
 
-#include "boost-test.hpp"
-#include "validator-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/v2/validator-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/v2/certificate.t.cpp b/tests/unit/security/v2/certificate.t.cpp
index e677aed..9d04b6d 100644
--- a/tests/unit/security/v2/certificate.t.cpp
+++ b/tests/unit/security/v2/certificate.t.cpp
@@ -21,10 +21,10 @@
  * @author Zhiyi Zhang <dreamerbarrychang@gmail.com>
  */
 
-#include "security/v2/certificate.hpp"
+#include "ndn-cxx/security/v2/certificate.hpp"
 
-#include "boost-test.hpp"
-#include "../../unit-test-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/unit-test-time-fixture.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/tests/unit/security/v2/key-chain.t.cpp b/tests/unit/security/v2/key-chain.t.cpp
index 649ef7b..8f5844b 100644
--- a/tests/unit/security/v2/key-chain.t.cpp
+++ b/tests/unit/security/v2/key-chain.t.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/key-chain.hpp"
-#include "security/signing-helpers.hpp"
-#include "security/verification-helpers.hpp"
+#include "ndn-cxx/security/v2/key-chain.hpp"
+#include "ndn-cxx/security/signing-helpers.hpp"
+#include "ndn-cxx/security/verification-helpers.hpp"
 
-#include "boost-test.hpp"
-#include "identity-management-fixture.hpp"
-#include "../../test-home-env-saver.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/identity-management-fixture.hpp"
+#include "tests/unit/test-home-env-saver.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/v2/trust-anchor-container.t.cpp b/tests/unit/security/v2/trust-anchor-container.t.cpp
index efd6ca3..6430db8 100644
--- a/tests/unit/security/v2/trust-anchor-container.t.cpp
+++ b/tests/unit/security/v2/trust-anchor-container.t.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/trust-anchor-container.hpp"
-#include "util/io.hpp"
+#include "ndn-cxx/security/v2/trust-anchor-container.hpp"
+#include "ndn-cxx/util/io.hpp"
 
-#include "../../identity-management-time-fixture.hpp"
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
 
 #include <boost/filesystem.hpp>
 
diff --git a/tests/unit/security/v2/validation-error.t.cpp b/tests/unit/security/v2/validation-error.t.cpp
index 1db3aac..21821ee 100644
--- a/tests/unit/security/v2/validation-error.t.cpp
+++ b/tests/unit/security/v2/validation-error.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/validation-error.hpp"
+#include "ndn-cxx/security/v2/validation-error.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit/security/v2/validation-policy-accept-all.t.cpp b/tests/unit/security/v2/validation-policy-accept-all.t.cpp
index 61466d6..9d7d927 100644
--- a/tests/unit/security/v2/validation-policy-accept-all.t.cpp
+++ b/tests/unit/security/v2/validation-policy-accept-all.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/validation-policy-accept-all.hpp"
+#include "ndn-cxx/security/v2/validation-policy-accept-all.hpp"
 
-#include "boost-test.hpp"
-#include "validator-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/v2/validator-fixture.hpp"
 
 #include <boost/mpl/vector.hpp>
 
diff --git a/tests/unit/security/v2/validation-policy-command-interest.t.cpp b/tests/unit/security/v2/validation-policy-command-interest.t.cpp
index 7bd42ea..a061a27 100644
--- a/tests/unit/security/v2/validation-policy-command-interest.t.cpp
+++ b/tests/unit/security/v2/validation-policy-command-interest.t.cpp
@@ -19,15 +19,15 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/validation-policy-command-interest.hpp"
-#include "security/v2/validation-policy-simple-hierarchy.hpp"
-#include "security/v2/validation-policy-accept-all.hpp"
-#include "security/command-interest-signer.hpp"
-#include "security/signing-helpers.hpp"
+#include "ndn-cxx/security/v2/validation-policy-command-interest.hpp"
+#include "ndn-cxx/security/v2/validation-policy-simple-hierarchy.hpp"
+#include "ndn-cxx/security/v2/validation-policy-accept-all.hpp"
+#include "ndn-cxx/security/command-interest-signer.hpp"
+#include "ndn-cxx/security/signing-helpers.hpp"
 
-#include "boost-test.hpp"
-#include "validator-fixture.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
+#include "tests/unit/security/v2/validator-fixture.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/mpl/vector.hpp>
diff --git a/tests/unit/security/v2/validation-policy-config.t.cpp b/tests/unit/security/v2/validation-policy-config.t.cpp
index cca3e7a..9d33a1f 100644
--- a/tests/unit/security/v2/validation-policy-config.t.cpp
+++ b/tests/unit/security/v2/validation-policy-config.t.cpp
@@ -19,16 +19,16 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/validation-policy-config.hpp"
-#include "security/transform/base64-encode.hpp"
-#include "security/transform/buffer-source.hpp"
-#include "security/transform/stream-sink.hpp"
-#include "util/logger.hpp"
-#include "util/io.hpp"
+#include "ndn-cxx/security/v2/validation-policy-config.hpp"
+#include "ndn-cxx/security/transform/base64-encode.hpp"
+#include "ndn-cxx/security/transform/buffer-source.hpp"
+#include "ndn-cxx/security/transform/stream-sink.hpp"
+#include "ndn-cxx/util/logger.hpp"
+#include "ndn-cxx/util/io.hpp"
 
-#include "boost-test.hpp"
-#include "validator-config/common.hpp"
-#include "validator-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/v2/validator-config/common.hpp"
+#include "tests/unit/security/v2/validator-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/v2/validation-policy-simple-hierarchy.t.cpp b/tests/unit/security/v2/validation-policy-simple-hierarchy.t.cpp
index 8661ac5..96f936e 100644
--- a/tests/unit/security/v2/validation-policy-simple-hierarchy.t.cpp
+++ b/tests/unit/security/v2/validation-policy-simple-hierarchy.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/validation-policy-simple-hierarchy.hpp"
+#include "ndn-cxx/security/v2/validation-policy-simple-hierarchy.hpp"
 
-#include "boost-test.hpp"
-#include "validator-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/v2/validator-fixture.hpp"
 
 #include <boost/mpl/vector.hpp>
 
diff --git a/tests/unit/security/v2/validator-config/checker.t.cpp b/tests/unit/security/v2/validator-config/checker.t.cpp
index 2170908..a1138ea 100644
--- a/tests/unit/security/v2/validator-config/checker.t.cpp
+++ b/tests/unit/security/v2/validator-config/checker.t.cpp
@@ -19,15 +19,14 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/validator-config/checker.hpp"
-#include "security/command-interest-signer.hpp"
-#include "security/v2/validation-policy.hpp"
-#include "security/v2/validation-state.hpp"
+#include "ndn-cxx/security/v2/validator-config/checker.hpp"
+#include "ndn-cxx/security/command-interest-signer.hpp"
+#include "ndn-cxx/security/v2/validation-policy.hpp"
+#include "ndn-cxx/security/v2/validation-state.hpp"
 
-#include "boost-test.hpp"
-#include "common.hpp"
-#include "identity-management-fixture.hpp"
-#include "../validator-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/v2/validator-fixture.hpp"
+#include "tests/unit/security/v2/validator-config/common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/v2/validator-config/common.hpp b/tests/unit/security/v2/validator-config/common.hpp
index 231e8eb..1083eb5 100644
--- a/tests/unit/security/v2/validator-config/common.hpp
+++ b/tests/unit/security/v2/validator-config/common.hpp
@@ -22,6 +22,8 @@
 #ifndef NDN_TESTS_SECURITY_V2_VALIDATOR_CONFIG_COMMON_HPP
 #define NDN_TESTS_SECURITY_V2_VALIDATOR_CONFIG_COMMON_HPP
 
+#include "ndn-cxx/security/v2/validator-config/common.hpp"
+
 #include <boost/property_tree/info_parser.hpp>
 
 namespace ndn {
diff --git a/tests/unit/security/v2/validator-config/filter.t.cpp b/tests/unit/security/v2/validator-config/filter.t.cpp
index fbd1264..d02d745 100644
--- a/tests/unit/security/v2/validator-config/filter.t.cpp
+++ b/tests/unit/security/v2/validator-config/filter.t.cpp
@@ -19,12 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/validator-config/filter.hpp"
-#include "security/command-interest-signer.hpp"
+#include "ndn-cxx/security/v2/validator-config/filter.hpp"
+#include "ndn-cxx/security/command-interest-signer.hpp"
 
-#include "boost-test.hpp"
-#include "common.hpp"
-#include "identity-management-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/identity-management-fixture.hpp"
+#include "tests/unit/security/v2/validator-config/common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/v2/validator-config/name-relation.t.cpp b/tests/unit/security/v2/validator-config/name-relation.t.cpp
index 157b55a..ff23348 100644
--- a/tests/unit/security/v2/validator-config/name-relation.t.cpp
+++ b/tests/unit/security/v2/validator-config/name-relation.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/validator-config/name-relation.hpp"
+#include "ndn-cxx/security/v2/validator-config/name-relation.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/tests/unit/security/v2/validator-config/rule.t.cpp b/tests/unit/security/v2/validator-config/rule.t.cpp
index bb78dfe..558ffb4 100644
--- a/tests/unit/security/v2/validator-config/rule.t.cpp
+++ b/tests/unit/security/v2/validator-config/rule.t.cpp
@@ -19,12 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/validator-config/rule.hpp"
+#include "ndn-cxx/security/v2/validator-config/rule.hpp"
 
-#include "boost-test.hpp"
-#include "common.hpp"
-#include "identity-management-fixture.hpp"
-#include "../validator-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/v2/validator-fixture.hpp"
+#include "tests/unit/security/v2/validator-config/common.hpp"
 
 #include <boost/mpl/vector_c.hpp>
 
diff --git a/tests/unit/security/v2/validator-fixture.hpp b/tests/unit/security/v2/validator-fixture.hpp
index c9a5763..5bd195e 100644
--- a/tests/unit/security/v2/validator-fixture.hpp
+++ b/tests/unit/security/v2/validator-fixture.hpp
@@ -19,14 +19,15 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_SECURITY_V2_VALIDATOR_FIXTURE_HPP
-#define NDN_TESTS_SECURITY_V2_VALIDATOR_FIXTURE_HPP
+#ifndef NDN_TESTS_UNIT_SECURITY_V2_VALIDATOR_FIXTURE_HPP
+#define NDN_TESTS_UNIT_SECURITY_V2_VALIDATOR_FIXTURE_HPP
 
-#include "security/v2/validator.hpp"
-#include "security/v2/certificate-fetcher-from-network.hpp"
-#include "util/dummy-client-face.hpp"
+#include "ndn-cxx/security/v2/validator.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher-from-network.hpp"
+#include "ndn-cxx/util/dummy-client-face.hpp"
 
-#include "../../identity-management-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
 
 #include <boost/lexical_cast.hpp>
 
@@ -180,4 +181,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_TESTS_SECURITY_V2_VALIDATOR_FIXTURE_HPP
+#endif // NDN_TESTS_UNIT_SECURITY_V2_VALIDATOR_FIXTURE_HPP
diff --git a/tests/unit/security/v2/validator.t.cpp b/tests/unit/security/v2/validator.t.cpp
index ff33984..934492f 100644
--- a/tests/unit/security/v2/validator.t.cpp
+++ b/tests/unit/security/v2/validator.t.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/v2/validator.hpp"
-#include "security/v2/validation-policy-simple-hierarchy.hpp"
+#include "ndn-cxx/security/v2/validator.hpp"
+#include "ndn-cxx/security/v2/validation-policy-simple-hierarchy.hpp"
 
-#include "boost-test.hpp"
-#include "validator-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/security/v2/validator-fixture.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/validator-config.t.cpp b/tests/unit/security/validator-config.t.cpp
index 3e49d24..06e66b0 100644
--- a/tests/unit/security/validator-config.t.cpp
+++ b/tests/unit/security/validator-config.t.cpp
@@ -19,14 +19,14 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/validator-config.hpp"
-#include "security/command-interest-signer.hpp"
-#include "security/v2/certificate-fetcher-offline.hpp"
-#include "util/dummy-client-face.hpp"
+#include "ndn-cxx/security/validator-config.hpp"
+#include "ndn-cxx/security/command-interest-signer.hpp"
+#include "ndn-cxx/security/v2/certificate-fetcher-offline.hpp"
+#include "ndn-cxx/util/dummy-client-face.hpp"
 
-#include "boost-test.hpp"
-#include "identity-management-fixture.hpp"
-#include "v2/validator-config/common.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/identity-management-fixture.hpp"
+#include "tests/unit/security/v2/validator-config/common.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/validator-null.t.cpp b/tests/unit/security/validator-null.t.cpp
index 69cef48..103f8f7 100644
--- a/tests/unit/security/validator-null.t.cpp
+++ b/tests/unit/security/validator-null.t.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/validator-null.hpp"
+#include "ndn-cxx/security/validator-null.hpp"
 
-#include "boost-test.hpp"
-#include "identity-management-fixture.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/identity-management-fixture.hpp"
+#include "tests/make-interest-data.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit/security/validity-period.t.cpp b/tests/unit/security/validity-period.t.cpp
index 14d2a0f..768e774 100644
--- a/tests/unit/security/validity-period.t.cpp
+++ b/tests/unit/security/validity-period.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/validity-period.hpp"
+#include "ndn-cxx/security/validity-period.hpp"
 
-#include "boost-test.hpp"
-#include "../unit-test-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/unit-test-time-fixture.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/tests/unit/security/verification-helpers.t.cpp b/tests/unit/security/verification-helpers.t.cpp
index d06580a..c7854a5 100644
--- a/tests/unit/security/verification-helpers.t.cpp
+++ b/tests/unit/security/verification-helpers.t.cpp
@@ -19,13 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "security/verification-helpers.hpp"
-#include "security/transform/public-key.hpp"
-// #include "util/string-helper.hpp"
+#include "ndn-cxx/security/verification-helpers.hpp"
+#include "ndn-cxx/security/transform/public-key.hpp"
+// #include "ndn-cxx/util/string-helper.hpp"
 
-#include "boost-test.hpp"
-#include "identity-management-fixture.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/identity-management-fixture.hpp"
+#include "tests/make-interest-data.hpp"
 
 #include <boost/mpl/list.hpp>
 
diff --git a/tests/unit/selectors.t.cpp b/tests/unit/selectors.t.cpp
index 202fd71..f64631c 100644
--- a/tests/unit/selectors.t.cpp
+++ b/tests/unit/selectors.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "selectors.hpp"
+#include "ndn-cxx/selectors.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/signature-info.t.cpp b/tests/unit/signature-info.t.cpp
index f5cf102..2702282 100644
--- a/tests/unit/signature-info.t.cpp
+++ b/tests/unit/signature-info.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "signature-info.hpp"
+#include "ndn-cxx/signature-info.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit/signature.t.cpp b/tests/unit/signature.t.cpp
index e4d8eff..0650b03 100644
--- a/tests/unit/signature.t.cpp
+++ b/tests/unit/signature.t.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "signature.hpp"
-#include "security/digest-sha256.hpp"
-#include "security/signature-sha256-with-rsa.hpp"
+#include "ndn-cxx/signature.hpp"
+#include "ndn-cxx/security/digest-sha256.hpp"
+#include "ndn-cxx/security/signature-sha256-with-rsa.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/tag-host.t.cpp b/tests/unit/tag-host.t.cpp
index 432fc74..b9192ed 100644
--- a/tests/unit/tag-host.t.cpp
+++ b/tests/unit/tag-host.t.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "tag-host.hpp"
-#include "data.hpp"
-#include "interest.hpp"
+#include "ndn-cxx/tag-host.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/interest.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <boost/mpl/vector.hpp>
 
diff --git a/tests/unit/tag.t.cpp b/tests/unit/tag.t.cpp
index 9e5a20d..0cbae22 100644
--- a/tests/unit/tag.t.cpp
+++ b/tests/unit/tag.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "tag.hpp"
+#include "ndn-cxx/tag.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/test-home-env-saver.hpp b/tests/unit/test-home-env-saver.hpp
index dc3d956..732c2d8 100644
--- a/tests/unit/test-home-env-saver.hpp
+++ b/tests/unit/test-home-env-saver.hpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_UNIT_TESTS_TEST_HOME_ENV_SAVER_HPP
-#define NDN_TESTS_UNIT_TESTS_TEST_HOME_ENV_SAVER_HPP
+#ifndef NDN_TESTS_UNIT_TEST_HOME_ENV_SAVER_HPP
+#define NDN_TESTS_UNIT_TEST_HOME_ENV_SAVER_HPP
 
-#include <string>
 #include <cstdlib>
+#include <string>
 
 namespace ndn {
 namespace tests {
@@ -41,7 +41,7 @@
   ~TestHomeEnvSaver()
   {
     if (!m_HOME.empty())
-      setenv("TEST_HOME", m_HOME.c_str(), 1);
+      setenv("TEST_HOME", m_HOME.data(), 1);
     else
       unsetenv("TEST_HOME");
   }
@@ -53,4 +53,4 @@
 } // namespace tests
 } // namespace ndn
 
-#endif // NDN_TESTS_UNIT_TESTS_TEST_HOME_ENV_SAVER_HPP
+#endif // NDN_TESTS_UNIT_TEST_HOME_ENV_SAVER_HPP
diff --git a/tests/unit/transport/tcp-transport.t.cpp b/tests/unit/transport/tcp-transport.t.cpp
index 02bd9c3..991bf1c 100644
--- a/tests/unit/transport/tcp-transport.t.cpp
+++ b/tests/unit/transport/tcp-transport.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "transport/tcp-transport.hpp"
-#include "transport-fixture.hpp"
+#include "ndn-cxx/transport/tcp-transport.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/transport/transport-fixture.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/transport/transport-fixture.hpp b/tests/unit/transport/transport-fixture.hpp
index d25bb94..6c84fd1 100644
--- a/tests/unit/transport/transport-fixture.hpp
+++ b/tests/unit/transport/transport-fixture.hpp
@@ -19,11 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/config-file.hpp"
-#include "../test-home-env-saver.hpp"
+#ifndef NDN_TESTS_UNIT_TRANSPORT_TRANSPORT_FIXTURE_HPP
+#define NDN_TESTS_UNIT_TRANSPORT_TRANSPORT_FIXTURE_HPP
 
-#ifndef NDN_TESTS_UNIT_TESTS_TRANSPORT_FIXTURE_HPP
-#define NDN_TESTS_UNIT_TESTS_TRANSPORT_FIXTURE_HPP
+#include "ndn-cxx/util/config-file.hpp"
+
+#include "tests/unit/test-home-env-saver.hpp"
 
 namespace ndn {
 namespace tests {
@@ -45,4 +46,4 @@
 } // namespace tests
 } // namespace ndn
 
-#endif // NDN_TESTS_UNIT_TESTS_TRANSPORT_FIXTURE_HPP
+#endif // NDN_TESTS_UNIT_TRANSPORT_TRANSPORT_FIXTURE_HPP
diff --git a/tests/unit/transport/unix-transport.t.cpp b/tests/unit/transport/unix-transport.t.cpp
index f60f9d7..41c46b9 100644
--- a/tests/unit/transport/unix-transport.t.cpp
+++ b/tests/unit/transport/unix-transport.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "transport/unix-transport.hpp"
-#include "transport-fixture.hpp"
+#include "ndn-cxx/transport/unix-transport.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/transport/transport-fixture.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/unit-test-time-fixture.hpp b/tests/unit/unit-test-time-fixture.hpp
index b177145..fcbaa77 100644
--- a/tests/unit/unit-test-time-fixture.hpp
+++ b/tests/unit/unit-test-time-fixture.hpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_UNIT_TESTS_UNIT_TEST_TIME_FIXTURE_HPP
-#define NDN_TESTS_UNIT_TESTS_UNIT_TEST_TIME_FIXTURE_HPP
+#ifndef NDN_TESTS_UNIT_UNIT_TEST_TIME_FIXTURE_HPP
+#define NDN_TESTS_UNIT_UNIT_TEST_TIME_FIXTURE_HPP
 
-#include "util/time-unit-test-clock.hpp"
+#include "ndn-cxx/util/time-unit-test-clock.hpp"
 
 #include <boost/asio/io_service.hpp>
 
@@ -103,4 +103,4 @@
 } // namespace tests
 } // namespace ndn
 
-#endif // NDN_TESTS_UNIT_TESTS_UNIT_TEST_TIME_FIXTURE_HPP
+#endif // NDN_TESTS_UNIT_UNIT_TEST_TIME_FIXTURE_HPP
diff --git a/tests/unit/util/backports.t.cpp b/tests/unit/util/backports.t.cpp
index 7a124e0..6ff2c4c 100644
--- a/tests/unit/util/backports.t.cpp
+++ b/tests/unit/util/backports.t.cpp
@@ -19,10 +19,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/backports.hpp"
+#include "ndn-cxx/util/backports.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+
 #include <numeric>
+#include <boost/test/output_test_stream.hpp>
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/util/concepts.t.cpp b/tests/unit/util/concepts.t.cpp
index 3141ec5..997f86a 100644
--- a/tests/unit/util/concepts.t.cpp
+++ b/tests/unit/util/concepts.t.cpp
@@ -25,7 +25,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/concepts.hpp"
+#include "ndn-cxx/util/concepts.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/util/config-file.t.cpp b/tests/unit/util/config-file.t.cpp
index 658018b..78b80be 100644
--- a/tests/unit/util/config-file.t.cpp
+++ b/tests/unit/util/config-file.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/config-file.hpp"
-#include "../test-home-env-saver.hpp"
+#include "ndn-cxx/util/config-file.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/test-home-env-saver.hpp"
 
 #include <cstdlib>
 
diff --git a/tests/unit/util/dummy-client-face.t.cpp b/tests/unit/util/dummy-client-face.t.cpp
index aed8cd6..acd6297 100644
--- a/tests/unit/util/dummy-client-face.t.cpp
+++ b/tests/unit/util/dummy-client-face.t.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/dummy-client-face.hpp"
+#include "ndn-cxx/util/dummy-client-face.hpp"
 
-#include "boost-test.hpp"
-#include "../identity-management-time-fixture.hpp"
-#include "make-interest-data.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/indented-stream.t.cpp b/tests/unit/util/indented-stream.t.cpp
index e450c4a..b3edaf8 100644
--- a/tests/unit/util/indented-stream.t.cpp
+++ b/tests/unit/util/indented-stream.t.cpp
@@ -19,9 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/indented-stream.hpp"
+#include "ndn-cxx/util/indented-stream.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+
+#include <boost/test/output_test_stream.hpp>
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/io.t.cpp b/tests/unit/util/io.t.cpp
index 1b46bca..052e149 100644
--- a/tests/unit/util/io.t.cpp
+++ b/tests/unit/util/io.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/io.hpp"
+#include "ndn-cxx/util/io.hpp"
 
-#include "boost-test.hpp"
-#include "identity-management-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/identity-management-fixture.hpp"
 
 #include <boost/filesystem.hpp>
 
diff --git a/tests/unit/util/log-filter-module.cpp b/tests/unit/util/log-filter-module.cpp
index cf3b628..ab55728 100644
--- a/tests/unit/util/log-filter-module.cpp
+++ b/tests/unit/util/log-filter-module.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/logger.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 NDN_LOG_INIT(fm.FilterModule);
 
diff --git a/tests/unit/util/log-module1.cpp b/tests/unit/util/log-module1.cpp
index 2099a75..4f71102 100644
--- a/tests/unit/util/log-module1.cpp
+++ b/tests/unit/util/log-module1.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/logger.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 NDN_LOG_INIT(Module1);
 
diff --git a/tests/unit/util/log-module2.cpp b/tests/unit/util/log-module2.cpp
index 273165d..994e142 100644
--- a/tests/unit/util/log-module2.cpp
+++ b/tests/unit/util/log-module2.cpp
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/logger.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
 NDN_LOG_INIT(Module2);
 
diff --git a/tests/unit/util/logger.t.cpp b/tests/unit/util/logger.t.cpp
index cc48425..ad742bb 100644
--- a/tests/unit/util/logger.t.cpp
+++ b/tests/unit/util/logger.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/logger.hpp"
-#include "util/logging.hpp"
+#include "ndn-cxx/util/logger.hpp"
+#include "ndn-cxx/util/logging.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/logging.t.cpp b/tests/unit/util/logging.t.cpp
index b431a05..fd867d2 100644
--- a/tests/unit/util/logging.t.cpp
+++ b/tests/unit/util/logging.t.cpp
@@ -19,11 +19,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/logging.hpp"
-#include "util/logger.hpp"
+#include "ndn-cxx/util/logging.hpp"
+#include "ndn-cxx/util/logger.hpp"
 
-#include "../unit-test-time-fixture.hpp"
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/unit-test-time-fixture.hpp"
+
+#include <boost/test/output_test_stream.hpp>
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/notification-stream.t.cpp b/tests/unit/util/notification-stream.t.cpp
index 3721091..ada10c5 100644
--- a/tests/unit/util/notification-stream.t.cpp
+++ b/tests/unit/util/notification-stream.t.cpp
@@ -25,12 +25,12 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/notification-stream.hpp"
-#include "util/dummy-client-face.hpp"
+#include "ndn-cxx/util/notification-stream.hpp"
+#include "ndn-cxx/util/dummy-client-face.hpp"
 
-#include "boost-test.hpp"
-#include "simple-notification.hpp"
-#include "../identity-management-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
+#include "tests/unit/util/simple-notification.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/notification-subscriber.t.cpp b/tests/unit/util/notification-subscriber.t.cpp
index 886e651..820532d 100644
--- a/tests/unit/util/notification-subscriber.t.cpp
+++ b/tests/unit/util/notification-subscriber.t.cpp
@@ -25,13 +25,13 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/notification-subscriber.hpp"
-#include "util/dummy-client-face.hpp"
+#include "ndn-cxx/util/notification-subscriber.hpp"
+#include "ndn-cxx/util/dummy-client-face.hpp"
 
-#include "boost-test.hpp"
-#include "make-interest-data.hpp"
-#include "simple-notification.hpp"
-#include "../identity-management-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
+#include "tests/unit/util/simple-notification.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/placeholders.t.cpp b/tests/unit/util/placeholders.t.cpp
index 0dc8c70..16dece5 100644
--- a/tests/unit/util/placeholders.t.cpp
+++ b/tests/unit/util/placeholders.t.cpp
@@ -22,11 +22,11 @@
 // Bug 2109 test case
 
 // interest.hpp includes common.hpp; common.hpp shouldn't be used from external program
-#include "interest.hpp"
+#include "ndn-cxx/interest.hpp"
 
 // util/config-file.hpp indirectly includes <boost/property_tree/ptree.hpp>
 // which in turn imports Boost placeholders
-#include "util/config-file.hpp"
+#include "ndn-cxx/util/config-file.hpp"
 
 // It's intentional to write "using namespace",
 // to simulate an external program linked against ndn-cxx.
diff --git a/tests/unit/util/placeholders2.t.cpp b/tests/unit/util/placeholders2.t.cpp
index 187daa9..d8b8c93 100644
--- a/tests/unit/util/placeholders2.t.cpp
+++ b/tests/unit/util/placeholders2.t.cpp
@@ -22,7 +22,7 @@
 // Bug 2109 test case
 
 // interest.hpp includes common.hpp; common.hpp shouldn't be used from external program
-#include "interest.hpp"
+#include "ndn-cxx/interest.hpp"
 
 #include <boost/bind.hpp>
 
diff --git a/tests/unit/util/random.t.cpp b/tests/unit/util/random.t.cpp
index e830f7b..ee55f9e 100644
--- a/tests/unit/util/random.t.cpp
+++ b/tests/unit/util/random.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/random.hpp"
-#include "security/detail/openssl.hpp"
+#include "ndn-cxx/util/random.hpp"
+#include "ndn-cxx/security/detail/openssl.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <boost/mpl/vector.hpp>
 #include <cmath>
diff --git a/tests/unit/util/regex.t.cpp b/tests/unit/util/regex.t.cpp
index 777defb..2804cc4 100644
--- a/tests/unit/util/regex.t.cpp
+++ b/tests/unit/util/regex.t.cpp
@@ -21,16 +21,16 @@
  * @author Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
  */
 
-#include "util/regex.hpp"
-#include "util/regex/regex-backref-manager.hpp"
-#include "util/regex/regex-backref-matcher.hpp"
-#include "util/regex/regex-component-matcher.hpp"
-#include "util/regex/regex-component-set-matcher.hpp"
-#include "util/regex/regex-pattern-list-matcher.hpp"
-#include "util/regex/regex-repeat-matcher.hpp"
-#include "util/regex/regex-top-matcher.hpp"
+#include "ndn-cxx/util/regex.hpp"
+#include "ndn-cxx/util/regex/regex-backref-manager.hpp"
+#include "ndn-cxx/util/regex/regex-backref-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-component-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-component-set-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-pattern-list-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-repeat-matcher.hpp"
+#include "ndn-cxx/util/regex/regex-top-matcher.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit/util/scheduler.t.cpp b/tests/unit/util/scheduler.t.cpp
index 05380f3..5cd9f89 100644
--- a/tests/unit/util/scheduler.t.cpp
+++ b/tests/unit/util/scheduler.t.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/scheduler.hpp"
-#include "util/scheduler-scoped-event-id.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
+#include "ndn-cxx/util/scheduler-scoped-event-id.hpp"
 
-#include "boost-test.hpp"
-#include "../unit-test-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/unit-test-time-fixture.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/tests/unit/util/segment-fetcher.t.cpp b/tests/unit/util/segment-fetcher.t.cpp
index d52fa08..22aa0b7 100644
--- a/tests/unit/util/segment-fetcher.t.cpp
+++ b/tests/unit/util/segment-fetcher.t.cpp
@@ -19,16 +19,16 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/segment-fetcher.hpp"
+#include "ndn-cxx/util/segment-fetcher.hpp"
 
-#include "data.hpp"
-#include "lp/nack.hpp"
-#include "util/dummy-client-face.hpp"
+#include "ndn-cxx/data.hpp"
+#include "ndn-cxx/lp/nack.hpp"
+#include "ndn-cxx/util/dummy-client-face.hpp"
 
-#include "boost-test.hpp"
-#include "dummy-validator.hpp"
-#include "make-interest-data.hpp"
-#include "../identity-management-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/make-interest-data.hpp"
+#include "tests/unit/dummy-validator.hpp"
+#include "tests/unit/identity-management-time-fixture.hpp"
 
 #include <set>
 
diff --git a/tests/unit/util/sha256.t.cpp b/tests/unit/util/sha256.t.cpp
index 094f5f6..f6e0ec3 100644
--- a/tests/unit/util/sha256.t.cpp
+++ b/tests/unit/util/sha256.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/sha256.hpp"
-#include "util/string-helper.hpp"
+#include "ndn-cxx/util/sha256.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <boost/endian/conversion.hpp>
 #include <sstream>
diff --git a/tests/unit/util/signal.t.cpp b/tests/unit/util/signal.t.cpp
index c319f64..de22534 100644
--- a/tests/unit/util/signal.t.cpp
+++ b/tests/unit/util/signal.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/signal.hpp"
+#include "ndn-cxx/util/signal.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/simple-notification.hpp b/tests/unit/util/simple-notification.hpp
index 9e0d4ed..ac81f5f 100644
--- a/tests/unit/util/simple-notification.hpp
+++ b/tests/unit/util/simple-notification.hpp
@@ -25,12 +25,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_TESTS_UNIT_TESTS_UTIL_SIMPLE_NOTIFICATION_HPP
-#define NDN_TESTS_UNIT_TESTS_UTIL_SIMPLE_NOTIFICATION_HPP
+#ifndef NDN_TESTS_UNIT_UTIL_SIMPLE_NOTIFICATION_HPP
+#define NDN_TESTS_UNIT_UTIL_SIMPLE_NOTIFICATION_HPP
 
-#include "common.hpp"
-
-#include "encoding/encoding-buffer.hpp"
+#include "ndn-cxx/encoding/encoding-buffer.hpp"
 
 namespace ndn {
 namespace util {
@@ -93,4 +91,4 @@
 } // namespace util
 } // namespace ndn
 
-#endif // NDN_TESTS_UNIT_TESTS_UTIL_SIMPLE_NOTIFICATION_HPP
+#endif // NDN_TESTS_UNIT_UTIL_SIMPLE_NOTIFICATION_HPP
diff --git a/tests/unit/util/sqlite3-statement.t.cpp b/tests/unit/util/sqlite3-statement.t.cpp
index 13171c5..c5ee8b6 100644
--- a/tests/unit/util/sqlite3-statement.t.cpp
+++ b/tests/unit/util/sqlite3-statement.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/sqlite3-statement.hpp"
+#include "ndn-cxx/util/sqlite3-statement.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <boost/filesystem.hpp>
 #include <cstring>
diff --git a/tests/unit/util/string-helper.t.cpp b/tests/unit/util/string-helper.t.cpp
index 0456a35..ae89ba7 100644
--- a/tests/unit/util/string-helper.t.cpp
+++ b/tests/unit/util/string-helper.t.cpp
@@ -19,13 +19,14 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/string-helper.hpp"
-#include "encoding/buffer.hpp"
+#include "ndn-cxx/util/string-helper.hpp"
+#include "ndn-cxx/encoding/buffer.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <cctype>
 #include <cstring>
+#include <boost/test/output_test_stream.hpp>
 
 namespace ndn {
 namespace util {
diff --git a/tests/unit/util/time-unit-test-clock.t.cpp b/tests/unit/util/time-unit-test-clock.t.cpp
index dd8346a..c47bdda 100644
--- a/tests/unit/util/time-unit-test-clock.t.cpp
+++ b/tests/unit/util/time-unit-test-clock.t.cpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/time-unit-test-clock.hpp"
-#include "util/scheduler.hpp"
+#include "ndn-cxx/util/time-unit-test-clock.hpp"
+#include "ndn-cxx/util/scheduler.hpp"
 
-#include "boost-test.hpp"
-#include "../unit-test-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/unit-test-time-fixture.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <thread>
diff --git a/tests/unit/util/time.t.cpp b/tests/unit/util/time.t.cpp
index a60e2d9..6ed55d5 100644
--- a/tests/unit/util/time.t.cpp
+++ b/tests/unit/util/time.t.cpp
@@ -19,9 +19,9 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "util/time.hpp"
+#include "ndn-cxx/util/time.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <thread>
 
diff --git a/tests/unit/version.t.cpp b/tests/unit/version.t.cpp
index 7fdb50d..61a701c 100644
--- a/tests/unit/version.t.cpp
+++ b/tests/unit/version.t.cpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "version.hpp"
-#include "common.hpp"
+#include "ndn-cxx/version.hpp"
+#include "ndn-cxx/common.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 #include <stdio.h>
 
diff --git a/tests/unit/wscript b/tests/unit/wscript
new file mode 100644
index 0000000..bc7ce0f
--- /dev/null
+++ b/tests/unit/wscript
@@ -0,0 +1,29 @@
+# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+top = '../..'
+
+def build(bld):
+    configPath = 'UNIT_TEST_CONFIG_PATH="%s"' % bld.bldnode.make_node('tmp-files')
+
+    # unit test objects
+    srcFiles = bld.path.ant_glob('**/*.cpp', excl=['main.cpp',
+                                                   '**/*-osx.t.cpp',
+                                                   '**/*-sqlite3.t.cpp'])
+
+    if bld.env['HAVE_OSX_FRAMEWORKS']:
+        srcFiles += bld.path.ant_glob('**/*-osx.t.cpp')
+
+    # In case we want to make it optional later
+    srcFiles += bld.path.ant_glob('**/*-sqlite3.t.cpp')
+
+    bld.objects(target='unit-tests-objects',
+                source=srcFiles,
+                use='tests-common',
+                defines=[configPath])
+
+    # unit test binary
+    bld.program(target='../../unit-tests',
+                name='unit-tests',
+                source=['main.cpp'],
+                use='unit-tests-objects',
+                install_path=None)
diff --git a/tests/wscript b/tests/wscript
index 22e0416..bc540ee 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -4,36 +4,11 @@
 
 def build(bld):
     # common objects that can be shared between unit and integrated tests
-    bld.objects(target='tests-base',
+    bld.objects(target='tests-common',
                 features='pch',
-                source=bld.path.ant_glob('*.cpp', excl=['main.cpp']),
+                source=bld.path.ant_glob('*.cpp'),
                 headers=['../ndn-cxx/common-pch.hpp', 'boost-test.hpp'],
-                includes='.',
-                export_includes='.',
                 use='ndn-cxx BOOST')
 
-    config_path = 'UNIT_TEST_CONFIG_PATH="%s"' % bld.bldnode.make_node('tmp-files')
-
-    # unit test objects
-    src = bld.path.ant_glob('unit/**/*.cpp', excl=['**/*-osx.t.cpp',
-                                                   '**/*-sqlite3.t.cpp'])
-
-    if bld.env['HAVE_OSX_FRAMEWORKS']:
-        src += bld.path.ant_glob('unit/**/*-osx.t.cpp')
-
-    # In case we want to make it optional later
-    src += bld.path.ant_glob('unit/**/*-sqlite3.t.cpp')
-
-    bld.objects(target='unit-tests-objects',
-                source=src,
-                use='tests-base',
-                defines=[config_path])
-
-    # unit test app
-    bld.program(target='../unit-tests',
-                name='unit-tests',
-                source='main.cpp',
-                use='unit-tests-objects',
-                install_path=None)
-
     bld.recurse('integrated')
+    bld.recurse('unit')
diff --git a/tools/ndnsec/list.cpp b/tools/ndnsec/list.cpp
index 336a574..ec38f6e 100644
--- a/tools/ndnsec/list.cpp
+++ b/tools/ndnsec/list.cpp
@@ -22,7 +22,7 @@
 #include "ndnsec.hpp"
 #include "util.hpp"
 
-#include <ndn-cxx/util/indented-stream.hpp>
+#include "ndn-cxx/util/indented-stream.hpp"
 
 namespace ndn {
 namespace ndnsec {
diff --git a/tools/ndnsec/main.cpp b/tools/ndnsec/main.cpp
index 0db6d54..d2bc281 100644
--- a/tools/ndnsec/main.cpp
+++ b/tools/ndnsec/main.cpp
@@ -22,8 +22,8 @@
 #include "ndnsec.hpp"
 #include "util.hpp"
 
-#include <ndn-cxx/util/logger.hpp>
-#include <ndn-cxx/version.hpp>
+#include "ndn-cxx/util/logger.hpp"
+#include "ndn-cxx/version.hpp"
 
 #include <boost/exception/get_error_info.hpp>
 
diff --git a/tools/ndnsec/util.cpp b/tools/ndnsec/util.cpp
index b97e934..f5069e7 100644
--- a/tools/ndnsec/util.cpp
+++ b/tools/ndnsec/util.cpp
@@ -21,7 +21,7 @@
 
 #include "util.hpp"
 
-#include <ndn-cxx/security/detail/openssl.hpp>
+#include "ndn-cxx/security/detail/openssl.hpp"
 
 namespace ndn {
 namespace ndnsec {
diff --git a/tools/ndnsec/util.hpp b/tools/ndnsec/util.hpp
index 65b88e7..8ea6976 100644
--- a/tools/ndnsec/util.hpp
+++ b/tools/ndnsec/util.hpp
@@ -22,11 +22,11 @@
 #ifndef NDN_TOOLS_NDNSEC_UTIL_HPP
 #define NDN_TOOLS_NDNSEC_UTIL_HPP
 
-#include <ndn-cxx/encoding/buffer-stream.hpp>
-#include <ndn-cxx/security/key-chain.hpp>
-#include <ndn-cxx/security/transform.hpp>
-#include <ndn-cxx/security/v2/additional-description.hpp>
-#include <ndn-cxx/util/io.hpp>
+#include "ndn-cxx/encoding/buffer-stream.hpp"
+#include "ndn-cxx/security/key-chain.hpp"
+#include "ndn-cxx/security/transform.hpp"
+#include "ndn-cxx/security/v2/additional-description.hpp"
+#include "ndn-cxx/util/io.hpp"
 
 #include <fstream>
 #include <iostream>
diff --git a/tools/wscript b/tools/wscript
index 57066f0..29b8536 100644
--- a/tools/wscript
+++ b/tools/wscript
@@ -33,19 +33,16 @@
             srcObjects = 'tool-%s-objects' % name
             bld.objects(target=srcObjects,
                         source=srcFiles,
-                        use='ndn-cxx',
-                        includes=name)
+                        use='ndn-cxx')
             testableObjects.append(srcObjects)
 
         bld.program(name='tool-%s' % name,
                     target='../bin/%s' % name,
                     source=[mainFile],
-                    use='ndn-cxx ' + srcObjects,
-                    includes=name)
+                    use='ndn-cxx ' + srcObjects)
 
     bld.objects(target='tools-objects',
                 source=[],
-                export_includes='.',
                 use=testableObjects)
 
     # Tool wrappers
diff --git a/wscript b/wscript
index 2b0fe1e..5f62e82 100644
--- a/wscript
+++ b/wscript
@@ -139,7 +139,7 @@
     # config file will contain all defines that were added using conf.define('xxx'...)
     # Everything that was added directly to conf.env['DEFINES'] will not appear in the
     # config file and will be added using compiler directives in the command line.
-    conf.write_config_header('ndn-cxx/ndn-cxx-config.hpp', define_prefix='NDN_CXX_')
+    conf.write_config_header('ndn-cxx/config.hpp', define_prefix='NDN_CXX_')
 
 def build(bld):
     version(bld)
@@ -164,7 +164,7 @@
             target='ndn-cxx-mm-objects',
             source=bld.path.ant_glob('ndn-cxx/**/*-osx.mm'),
             use='BOOST PTHREAD OSX_COREFOUNDATION OSX_SECURITY OSX_SYSTEMCONFIGURATION OSX_FOUNDATION OSX_COREWLAN',
-            includes='. ndn-cxx')
+            includes='.')
 
     libndn_cxx = dict(
         target='ndn-cxx',
@@ -175,8 +175,8 @@
         features='pch',
         headers='ndn-cxx/common-pch.hpp',
         use='ndn-cxx-mm-objects version BOOST OPENSSL SQLITE3 RT PTHREAD',
-        includes='. ndn-cxx',
-        export_includes='. ndn-cxx',
+        includes='.',
+        export_includes='.',
         install_path='${LIBDIR}')
 
     if bld.env['HAVE_OSX_FRAMEWORKS']:
@@ -267,7 +267,7 @@
     bld.install_files(bld.env['INCLUDEDIR'], headers, relative_trick=True)
 
     bld.install_files('%s/ndn-cxx' % bld.env['INCLUDEDIR'],
-                      bld.path.find_resource('ndn-cxx/ndn-cxx-config.hpp'))
+                      bld.path.find_resource('ndn-cxx/config.hpp'))
 
     bld.install_files('%s/ndn-cxx' % bld.env['INCLUDEDIR'],
                       bld.path.find_resource('ndn-cxx/version.hpp'))