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>