diff --git a/tests/unit-tests/action-log.t.cpp b/tests/unit-tests/action-log.t.cpp
index 86eb059..63b69c6 100644
--- a/tests/unit-tests/action-log.t.cpp
+++ b/tests/unit-tests/action-log.t.cpp
@@ -22,8 +22,8 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "logging.h"
-#include "action-log.h"
+#include "logging.hpp"
+#include "action-log.hpp"
 
 #include <unistd.h>
 #include <iostream>
diff --git a/tests/unit-tests/dispatcher.t.cpp b/tests/unit-tests/dispatcher.t.cpp
index b5c023b..f06a6d2 100644
--- a/tests/unit-tests/dispatcher.t.cpp
+++ b/tests/unit-tests/dispatcher.t.cpp
@@ -19,9 +19,9 @@
  *          Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include "ndnx-wrapper.h"
-#include "logging.h"
-#include "dispatcher.h"
+#include "ccnx-wrapper.hpp"
+#include "logging.hpp"
+#include "dispatcher.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/filesystem.hpp>
diff --git a/tests/unit-tests/fetch-manager.t.cpp b/tests/unit-tests/fetch-manager.t.cpp
index 98c820a..42f7f2d 100644
--- a/tests/unit-tests/fetch-manager.t.cpp
+++ b/tests/unit-tests/fetch-manager.t.cpp
@@ -19,13 +19,12 @@
  *	   Zhenkai Zhu <zhenkai@cs.ucla.edu>
  */
 
-#include "fetch-manager.h"
-#include "fetcher.h"
-#include "ndnx-wrapper.h"
+#include "fetch-manager.hpp"
+#include "fetcher.hpp"
+#include "ccnx-wrapper.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/make_shared.hpp>
-#include <boost/thread/thread.hpp>
-#include "logging.h"
+#include "logging.hpp"
 
 
 INIT_LOGGER ("Test.FetchManager");
diff --git a/tests/unit-tests/fetch-task-db.t.cpp b/tests/unit-tests/fetch-task-db.t.cpp
index 61bec89..8fd02f7 100644
--- a/tests/unit-tests/fetch-task-db.t.cpp
+++ b/tests/unit-tests/fetch-task-db.t.cpp
@@ -19,8 +19,8 @@
  *	   Zhenkai Zhu <zhenkai@cs.ucla.edu>
  */
 
-#include "logging.h"
-#include "fetch-task-db.h"
+#include "logging.hpp"
+#include "fetch-task-db.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
diff --git a/tests/unit-tests/fs-watcher.t.cpp b/tests/unit-tests/fs-watcher.t.cpp
index d943903..993a438 100644
--- a/tests/unit-tests/fs-watcher.t.cpp
+++ b/tests/unit-tests/fs-watcher.t.cpp
@@ -1,4 +1,4 @@
-#include "fs-watcher.h"
+#include "fs-watcher.hpp"
 #include <boost/make_shared.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/tests/unit-tests/object-manager.t.cpp b/tests/unit-tests/object-manager.t.cpp
index 60f0c58..90e0ba5 100644
--- a/tests/unit-tests/object-manager.t.cpp
+++ b/tests/unit-tests/object-manager.t.cpp
@@ -19,8 +19,8 @@
  *	   Zhenkai Zhu <zhenkai@cs.ucla.edu>
  */
 
-#include "logging.h"
-#include "object-manager.h"
+#include "logging.hpp"
+#include "object-manager.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
diff --git a/tests/unit-tests/protobuf.t.cpp b/tests/unit-tests/protobuf.t.cpp
index d0a7b8e..76287d8 100644
--- a/tests/unit-tests/protobuf.t.cpp
+++ b/tests/unit-tests/protobuf.t.cpp
@@ -1,5 +1,5 @@
-#include "ndnx-common.h"
-#include "sync-core.h"
+#include "ccnx-common.hpp"
+#include "sync-core.hpp"
 #include <boost/make_shared.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/iostreams/filter/gzip.hpp>
diff --git a/tests/unit-tests/serve-and-fetch.t.cpp b/tests/unit-tests/serve-and-fetch.t.cpp
index 8e54404..2a2dc00 100644
--- a/tests/unit-tests/serve-and-fetch.t.cpp
+++ b/tests/unit-tests/serve-and-fetch.t.cpp
@@ -19,13 +19,13 @@
  *	   Zhenkai Zhu <zhenkai@cs.ucla.edu>
  */
 
-#include "fetch-manager.h"
-#include "ndnx-wrapper.h"
-#include "ndnx-common.h"
-#include "scheduler.h"
-#include "object-db.h"
-#include "object-manager.h"
-#include "content-server.h"
+#include "fetch-manager.hpp"
+#include "ccnx-wrapper.hpp"
+#include "ccnx-common.hpp"
+#include "scheduler.hpp"
+#include "object-db.hpp"
+#include "object-manager.hpp"
+#include "content-server.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/filesystem.hpp>
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <ctime>
 
-#include "logging.h"
+#include "logging.hpp"
 
 INIT_LOGGER("Test.ServerAndFetch");
 
diff --git a/tests/unit-tests/sync-core.t.cpp b/tests/unit-tests/sync-core.t.cpp
index 04f560a..85bdfb5 100644
--- a/tests/unit-tests/sync-core.t.cpp
+++ b/tests/unit-tests/sync-core.t.cpp
@@ -1,5 +1,5 @@
-#include "sync-core.h"
-#include "logging.h"
+#include "sync-core.hpp"
+#include "logging.hpp"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
diff --git a/tests/unit-tests/sync-log.t.cpp b/tests/unit-tests/sync-log.t.cpp
index 8ac36b1..de85da0 100644
--- a/tests/unit-tests/sync-log.t.cpp
+++ b/tests/unit-tests/sync-log.t.cpp
@@ -22,9 +22,9 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "logging.h"
+#include "logging.hpp"
 #include <unistd.h>
-#include "action-log.h"
+#include "action-log.hpp"
 #include <iostream>
 #include <ndnx-name.h>
 #include <boost/filesystem.hpp>