diff --git a/adhoc/adhoc-osx.mm b/adhoc/adhoc-osx.mm
index df2ce1c..bb6c858 100644
--- a/adhoc/adhoc-osx.mm
+++ b/adhoc/adhoc-osx.mm
@@ -20,12 +20,12 @@
  *         Zhenkai Zhu <zhenkai@cs.ucla.edu>
  */
 
-#include "adhoc.h"
+#include "adhoc.hpp"
 #include "core/chronoshare-config.hpp"
 
 #if (__APPLE__ && HAVE_COREWLAN)
 
-#include "logging.h"
+#include "logging.hpp"
 #include <sstream>
 
 using namespace std;
diff --git a/cmd/csd.cpp b/cmd/csd.cpp
index 8d9a9fb..5b8e834 100644
--- a/cmd/csd.cpp
+++ b/cmd/csd.cpp
@@ -20,10 +20,10 @@
 
 #include <QtCore>
 
-#include "dispatcher.h"
-#include "fs-watcher.h"
-#include "logging.h"
-#include "ndnx-wrapper.h"
+#include "dispatcher.hpp"
+#include "fs-watcher.hpp"
+#include "logging.hpp"
+#include "ccnx-wrapper.hpp"
 
 #include <boost/make_shared.hpp>
 
diff --git a/cmd/dump-db.cpp b/cmd/dump-db.cpp
index 41b1285..098d3e7 100644
--- a/cmd/dump-db.cpp
+++ b/cmd/dump-db.cpp
@@ -18,10 +18,10 @@
  * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include "dispatcher.h"
-#include "fs-watcher.h"
-#include "logging.h"
-#include "ndnx-wrapper.h"
+#include "dispatcher.hpp"
+#include "fs-watcher.hpp"
+#include "logging.hpp"
+#include "ccnx-wrapper.hpp"
 
 #include <boost/make_shared.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/fs-watcher/fs-watcher.cpp b/fs-watcher/fs-watcher.cpp
index 2c83f09..d7b98ad 100644
--- a/fs-watcher/fs-watcher.cpp
+++ b/fs-watcher/fs-watcher.cpp
@@ -20,9 +20,9 @@
  *         Zhenkai Zhu <zhenkai@cs.ucla.edu>
  */
 
-#include "fs-watcher.h"
-#include "db-helper.h"
-#include "logging.h"
+#include "fs-watcher.hpp"
+#include "db-helper.hpp"
+#include "logging.hpp"
 
 #include <boost/bind.hpp>
 
diff --git a/fs-watcher/fs-watcher.hpp b/fs-watcher/fs-watcher.hpp
index e3c9305..6976cbd 100644
--- a/fs-watcher/fs-watcher.hpp
+++ b/fs-watcher/fs-watcher.hpp
@@ -27,7 +27,7 @@
 #include <boost/filesystem.hpp>
 #include <sqlite3.h>
 
-#include "scheduler.h"
+#include "scheduler.hpp"
 
 class FsWatcher : public QObject
 {
diff --git a/gui/chronosharegui.cpp b/gui/chronosharegui.cpp
index ef28d5e..546fb80 100644
--- a/gui/chronosharegui.cpp
+++ b/gui/chronosharegui.cpp
@@ -21,11 +21,11 @@
  *         Ilya Moiseenko <iliamo@ucla.edu>
  */
 
-#include "chronosharegui.h"
+#include "chronosharegui.hpp"
 #include "core/chronoshare-config.hpp"
 
-#include "logging.h"
-#include "ndnx-wrapper.h"
+#include "logging.hpp"
+#include "ccnx-wrapper.hpp"
 #include <QValidator>
 #include <QDir>
 #include <QFileInfo>
diff --git a/gui/chronosharegui.hpp b/gui/chronosharegui.hpp
index c56baa5..9a69d3d 100644
--- a/gui/chronosharegui.hpp
+++ b/gui/chronosharegui.hpp
@@ -23,11 +23,11 @@
 #ifndef CHRONOSHAREGUI_H
 #define CHRONOSHAREGUI_H
 
-#include "adhoc.h"
+#include "adhoc.hpp"
 
 #if __APPLE__ && HAVE_SPARKLE
 #define SPARKLE_SUPPORTED 1
-#include "sparkle-auto-update.h"
+#include "sparkle-auto-update.hpp"
 #endif
 
 #include <QtGui>
@@ -43,8 +43,8 @@
 #include <QMessageBox>
 #include <QApplication>
 
-#include "fs-watcher.h"
-#include "dispatcher.h"
+#include "fs-watcher.hpp"
+#include "dispatcher.hpp"
 #include "server.hpp"
 #include <boost/thread/thread.hpp>
 
diff --git a/gui/main.cpp b/gui/main.cpp
index 5939bab..b5f4f5f 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -18,8 +18,8 @@
  * Author: Jared Lindblom <lindblom@cs.ucla.edu>
  */
 
-#include "chronosharegui.h"
-#include "logging.h"
+#include "chronosharegui.hpp"
+#include "logging.hpp"
 #include <QApplication>
 
 int main(int argc, char *argv[])
diff --git a/osx/auto-update/sparkle-auto-update.mm b/osx/auto-update/sparkle-auto-update.mm
index dda0e79..be555c6 100644
--- a/osx/auto-update/sparkle-auto-update.mm
+++ b/osx/auto-update/sparkle-auto-update.mm
@@ -19,12 +19,12 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include "sparkle-auto-update.h"
+#include "sparkle-auto-update.hpp"
 #import <Foundation/Foundation.h>
 #import <AppKit/AppKit.h>
 #import <Sparkle/Sparkle.h>
 
-#include "logging.h"
+#include "logging.hpp"
 
 INIT_LOGGER ("SparkeAutoUpdate");
 
diff --git a/src/action-log.cpp b/src/action-log.cpp
index a680dbe..aa36c7f 100644
--- a/src/action-log.cpp
+++ b/src/action-log.cpp
@@ -19,8 +19,8 @@
  *	   Zhenkai Zhu <zhenkai@cs.ucla.edu>
  */
 
-#include "action-log.h"
-#include "logging.h"
+#include "action-log.hpp"
+#include "logging.hpp"
 
 #include <boost/make_shared.hpp>
 
diff --git a/src/action-log.hpp b/src/action-log.hpp
index 2002b4c..10156a6 100644
--- a/src/action-log.hpp
+++ b/src/action-log.hpp
@@ -22,13 +22,13 @@
 #ifndef ACTION_LOG_H
 #define ACTION_LOG_H
 
-#include "db-helper.h"
-#include "file-state.h"
-#include "sync-log.h"
-#include "action-item.pb.h"
-#include "file-item.pb.h"
-#include "ndnx-wrapper.h"
-#include "ndnx-pco.h"
+#include "db-helper.hpp"
+#include "file-state.hpp"
+#include "sync-log.hpp"
+#include "action-item.pb.hpp"
+#include "file-item.pb.hpp"
+#include "ccnx-wrapper.hpp"
+#include "ccnx-pco.hpp"
 
 #include <boost/tuple/tuple.hpp>
 
diff --git a/src/content-server.cpp b/src/content-server.cpp
index 850803e..4a1ee94 100644
--- a/src/content-server.cpp
+++ b/src/content-server.cpp
@@ -19,13 +19,13 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include "content-server.h"
-#include "logging.h"
+#include "content-server.hpp"
+#include "logging.hpp"
 #include <boost/make_shared.hpp>
 #include <utility>
-#include "task.h"
-#include "periodic-task.h"
-#include "simple-interval-generator.h"
+#include "task.hpp"
+#include "periodic-task.hpp"
+#include "simple-interval-generator.hpp"
 #include <boost/lexical_cast.hpp>
 
 INIT_LOGGER ("ContentServer");
diff --git a/src/content-server.hpp b/src/content-server.hpp
index 84a0bc7..410d193 100644
--- a/src/content-server.hpp
+++ b/src/content-server.hpp
@@ -22,14 +22,14 @@
 #ifndef CONTENT_SERVER_H
 #define CONTENT_SERVER_H
 
-#include "ndnx-wrapper.h"
-#include "object-db.h"
-#include "action-log.h"
+#include "ccnx-wrapper.hpp"
+#include "object-db.hpp"
+#include "action-log.hpp"
 #include <set>
 #include <map>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/locks.hpp>
-#include "scheduler.h"
+#include "scheduler.hpp"
 
 class ContentServer
 {
diff --git a/src/db-helper.hpp b/src/db-helper.hpp
index abd9a90..f1e3f16 100644
--- a/src/db-helper.hpp
+++ b/src/db-helper.hpp
@@ -27,7 +27,7 @@
 #include <openssl/evp.h>
 #include <boost/exception/all.hpp>
 #include <string>
-#include "hash-helper.h"
+#include "hash-helper.hpp"
 #include <boost/filesystem.hpp>
 
 typedef boost::error_info<struct tag_errmsg, std::string> errmsg_info_str;
diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp
index 98613cf..9d91b0f 100644
--- a/src/dispatcher.cpp
+++ b/src/dispatcher.cpp
@@ -19,10 +19,10 @@
  * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include "dispatcher.h"
-#include "logging.h"
-#include "ndnx-discovery.h"
-#include "fetch-task-db.h"
+#include "dispatcher.hpp"
+#include "logging.hpp"
+#include "ccnx-discovery.hpp"
+#include "fetch-task-db.hpp"
 
 #include <boost/make_shared.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/src/dispatcher.hpp b/src/dispatcher.hpp
index 4938174..14a1b72 100644
--- a/src/dispatcher.hpp
+++ b/src/dispatcher.hpp
@@ -22,15 +22,15 @@
 #ifndef DISPATCHER_H
 #define DISPATCHER_H
 
-#include "action-log.h"
-#include "sync-core.h"
-#include "ndnx-wrapper.h"
-#include "executor.h"
-#include "object-db.h"
-#include "object-manager.h"
-#include "content-server.h"
-#include "state-server.h"
-#include "fetch-manager.h"
+#include "action-log.hpp"
+#include "sync-core.hpp"
+#include "ccnx-wrapper.hpp"
+#include "executor.hpp"
+#include "object-db.hpp"
+#include "object-manager.hpp"
+#include "content-server.hpp"
+#include "state-server.hpp"
+#include "fetch-manager.hpp"
 
 #include <boost/function.hpp>
 #include <boost/filesystem.hpp>
diff --git a/src/fetch-manager.cpp b/src/fetch-manager.cpp
index 034b9d6..cd031eb 100644
--- a/src/fetch-manager.cpp
+++ b/src/fetch-manager.cpp
@@ -19,14 +19,14 @@
  *	   Zhenkai Zhu <zhenkai@cs.ucla.edu>
  */
 
-#include "fetch-manager.h"
+#include "fetch-manager.hpp"
 #include <boost/make_shared.hpp>
 #include <boost/ref.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "simple-interval-generator.h"
-#include "logging.h"
+#include "simple-interval-generator.hpp"
+#include "logging.hpp"
 
 INIT_LOGGER ("FetchManager");
 
diff --git a/src/fetch-task-db.cpp b/src/fetch-task-db.cpp
index 3141048..cbcc278 100644
--- a/src/fetch-task-db.cpp
+++ b/src/fetch-task-db.cpp
@@ -18,8 +18,8 @@
  * Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
-#include "fetch-task-db.h"
-#include "db-helper.h"
+#include "fetch-task-db.hpp"
+#include "db-helper.hpp"
 
 using namespace std;
 using namespace boost;
diff --git a/src/file-state.hpp b/src/file-state.hpp
index f5617d4..99c28f5 100644
--- a/src/file-state.hpp
+++ b/src/file-state.hpp
@@ -22,11 +22,11 @@
 #ifndef FILE_STATE_H
 #define FILE_STATE_H
 
-#include "db-helper.h"
+#include "db-helper.hpp"
 
-#include "ndnx-name.h"
-#include "file-item.pb.h"
-#include "hash-helper.h"
+#include "ccnx-name.hpp"
+#include "file-item.pb.hpp"
+#include "hash-helper.hpp"
 
 #include <boost/tuple/tuple.hpp>
 #include <boost/exception/all.hpp>
diff --git a/src/hash-helper.hpp b/src/hash-helper.hpp
index a2690ce..00e5128 100644
--- a/src/hash-helper.hpp
+++ b/src/hash-helper.hpp
@@ -27,7 +27,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/exception/all.hpp>
 #include <boost/filesystem.hpp>
-#include "ndnx-common.h"
+#include "ccnx-common.hpp"
 
 // Other options: VP_md2, EVP_md5, EVP_sha, EVP_sha1, EVP_sha256, EVP_dss, EVP_dss1, EVP_mdc2, EVP_ripemd160
 #define HASH_FUNCTION EVP_sha256
diff --git a/src/logging.cpp b/src/logging.cpp
index 28d965b..2c3f7e9 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -20,7 +20,7 @@
  *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include "logging.h"
+#include "logging.hpp"
 
 #ifdef HAVE_LOG4CXX
 
diff --git a/src/object-manager.cpp b/src/object-manager.cpp
index 9b87853..311df3c 100644
--- a/src/object-manager.cpp
+++ b/src/object-manager.cpp
@@ -19,12 +19,12 @@
  *	   Zhenkai Zhu <zhenkai@cs.ucla.edu>
  */
 
-#include "object-manager.h"
-#include "ndnx-name.h"
-#include "ndnx-common.h"
-#include "ndnx-pco.h"
-#include "object-db.h"
-#include "logging.h"
+#include "object-manager.hpp"
+#include "ccnx-name.hpp"
+#include "ccnx-common.hpp"
+#include "ccnx-pco.hpp"
+#include "object-db.hpp"
+#include "logging.hpp"
 
 #include <sys/stat.h>
 
diff --git a/src/state-server.hpp b/src/state-server.hpp
index 26a6697..5de691c 100644
--- a/src/state-server.hpp
+++ b/src/state-server.hpp
@@ -22,15 +22,15 @@
 #ifndef STATE_SERVER_H
 #define STATE_SERVER_H
 
-#include "ndnx-wrapper.h"
-#include "object-manager.h"
-#include "object-db.h"
-#include "action-log.h"
+#include "ccnx-wrapper.hpp"
+#include "object-manager.hpp"
+#include "object-db.hpp"
+#include "action-log.hpp"
 #include <set>
 #include <map>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/locks.hpp>
-#include "executor.h"
+#include "executor.hpp"
 
 #include "../contrib/json_spirit/json_spirit_writer_template.h"
 #include "../contrib/json_spirit/json_spirit_value.h"
diff --git a/src/sync-core.cpp b/src/sync-core.cpp
index 9ba28b7..f3f0edc 100644
--- a/src/sync-core.cpp
+++ b/src/sync-core.cpp
@@ -19,12 +19,12 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include "sync-core.h"
-#include "sync-state-helper.h"
-#include "logging.h"
-#include "random-interval-generator.h"
-#include "simple-interval-generator.h"
-#include "periodic-task.h"
+#include "sync-core.hpp"
+#include "sync-state-helper.hpp"
+#include "logging.hpp"
+#include "random-interval-generator.hpp"
+#include "simple-interval-generator.hpp"
+#include "periodic-task.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/make_shared.hpp>
diff --git a/src/sync-core.hpp b/src/sync-core.hpp
index 8d97bd3..749f45d 100644
--- a/src/sync-core.hpp
+++ b/src/sync-core.hpp
@@ -22,11 +22,11 @@
 #ifndef SYNC_CORE_H
 #define SYNC_CORE_H
 
-#include "sync-log.h"
-#include "ndnx-wrapper.h"
-#include "ndnx-selectors.h"
-#include "scheduler.h"
-#include "task.h"
+#include "sync-log.hpp"
+#include "ccnx-wrapper.hpp"
+#include "ccnx-selectors.hpp"
+#include "scheduler.hpp"
+#include "task.hpp"
 
 #include <boost/function.hpp>
 
diff --git a/src/sync-log.cpp b/src/sync-log.cpp
index 23df286..f1a9f47 100644
--- a/src/sync-log.cpp
+++ b/src/sync-log.cpp
@@ -19,8 +19,8 @@
  *	   Zhenkai Zhu <zhenkai@cs.ucla.edu>
  */
 
-#include "sync-log.h"
-#include "logging.h"
+#include "sync-log.hpp"
+#include "logging.hpp"
 #include <utility>
 
 #include <boost/make_shared.hpp>
diff --git a/src/sync-log.hpp b/src/sync-log.hpp
index 1d243ad..034ed30 100644
--- a/src/sync-log.hpp
+++ b/src/sync-log.hpp
@@ -22,7 +22,7 @@
 #ifndef SYNC_LOG_H
 #define SYNC_LOG_H
 
-#include "db-helper.h"
+#include "db-helper.hpp"
 #include <sync-state.pb.h>
 #include <ndnx-name.h>
 #include <map>
diff --git a/src/sync-state-helper.hpp b/src/sync-state-helper.hpp
index 410bb8c..09d9c9e 100644
--- a/src/sync-state-helper.hpp
+++ b/src/sync-state-helper.hpp
@@ -22,7 +22,7 @@
 #ifndef SYNC_STATE_HELPER_H
 #define SYNC_STATE_HELPER_H
 
-#include "sync-state.pb.h"
+#include "sync-state.pb.hpp"
 
 inline std::ostream &
 operator << (std::ostream &os, const SyncStateMsgPtr &msg)
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>