diff --git a/helper/boost-graph-ndn-global-routing-helper.hpp b/helper/boost-graph-ndn-global-routing-helper.hpp
index a85e9c9..e615494 100644
--- a/helper/boost-graph-ndn-global-routing-helper.hpp
+++ b/helper/boost-graph-ndn-global-routing-helper.hpp
@@ -28,11 +28,11 @@
 #include <boost/graph/properties.hpp>
 #include <boost/ref.hpp>
 
-#include "ns3/ndn-face.h"
-#include "ns3/ndn-limits.h"
+#include "ns3/ndn-face.hpp"
+#include "ns3/ndn-limits.hpp"
 #include "ns3/node-list.h"
 #include "ns3/channel-list.h"
-#include "../model/ndn-global-router.h"
+#include "../model/ndn-global-router.hpp"
 #include <list>
 #include <map>
 
diff --git a/helper/ndn-app-helper.cpp b/helper/ndn-app-helper.cpp
index d835da4..b181f3b 100644
--- a/helper/ndn-app-helper.cpp
+++ b/helper/ndn-app-helper.cpp
@@ -18,11 +18,11 @@
  * Author: Ilya Moiseenko <iliamo@cs.ucla.edu>
  */
 
-#include "ndn-app-helper.h"
+#include "ndn-app-helper.hpp"
 #include "ns3/log.h"
 #include "ns3/string.h"
 #include "ns3/names.h"
-#include "ns3/ndn-app.h"
+#include "ns3/ndn-app.hpp"
 
 #ifdef NS3_MPI
 #include "ns3/mpi-interface.h"
diff --git a/helper/ndn-face-container.cpp b/helper/ndn-face-container.cpp
index 888b9a8..69e90c9 100644
--- a/helper/ndn-face-container.cpp
+++ b/helper/ndn-face-container.cpp
@@ -18,11 +18,11 @@
  * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include "ndn-face-container.h"
+#include "ndn-face-container.hpp"
 
 #include <algorithm>
 
-#include "ns3/ndn-face.h"
+#include "ns3/ndn-face.hpp"
 
 namespace ns3 {
 namespace ndn {
diff --git a/helper/ndn-face-container.hpp b/helper/ndn-face-container.hpp
index e1566e6..f430c96 100644
--- a/helper/ndn-face-container.hpp
+++ b/helper/ndn-face-container.hpp
@@ -26,7 +26,7 @@
 
 #include "ns3/ptr.h"
 #include "ns3/simple-ref-count.h"
-#include "ns3/ndn-face.h"
+#include "ns3/ndn-face.hpp"
 
 namespace ns3 {
 namespace ndn {
diff --git a/helper/ndn-global-routing-helper.cpp b/helper/ndn-global-routing-helper.cpp
index eee399c..ac462c0 100644
--- a/helper/ndn-global-routing-helper.cpp
+++ b/helper/ndn-global-routing-helper.cpp
@@ -24,13 +24,13 @@
 #pragma clang diagnostic ignored "-Wunneeded-internal-declaration"
 #endif
 
-#include "ndn-global-routing-helper.h"
+#include "ndn-global-routing-helper.hpp"
 
-#include "ns3/ndn-l3-protocol.h"
-#include "../model/ndn-net-device-face.h"
-#include "../model/ndn-global-router.h"
-#include "ns3/ndn-name.h"
-#include "ns3/ndn-fib.h"
+#include "ns3/ndn-l3-protocol.hpp"
+#include "../model/ndn-net-device-face.hpp"
+#include "../model/ndn-global-router.hpp"
+#include "ns3/ndn-name.hpp"
+#include "ns3/ndn-fib.hpp"
 
 #include "ns3/node.h"
 #include "ns3/node-container.h"
@@ -50,7 +50,7 @@
 // #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/dijkstra_shortest_paths.hpp>
 
-#include "boost-graph-ndn-global-routing-helper.h"
+#include "boost-graph-ndn-global-routing-helper.hpp"
 
 #include <math.h>
 
diff --git a/helper/ndn-link-control-helper.cpp b/helper/ndn-link-control-helper.cpp
index cf2b99d..1c43666 100644
--- a/helper/ndn-link-control-helper.cpp
+++ b/helper/ndn-link-control-helper.cpp
@@ -19,7 +19,7 @@
  *       : Saran Tarnoi <saran.tarnoi@gmail.com>
  */
 
-#include "ndn-link-control-helper.h"
+#include "ndn-link-control-helper.hpp"
 
 #include "ns3/assert.h"
 #include "ns3/names.h"
@@ -28,8 +28,8 @@
 #include "ns3/channel.h"
 #include "ns3/log.h"
 
-#include "ns3/ndn-l3-protocol.h"
-#include "ns3/ndn-net-device-face.h"
+#include "ns3/ndn-l3-protocol.hpp"
+#include "ns3/ndn-net-device-face.hpp"
 
 NS_LOG_COMPONENT_DEFINE ("ndn.LinkControlHelper");
 
diff --git a/helper/ndn-stack-helper.cpp b/helper/ndn-stack-helper.cpp
index 085078b..fe736b3 100644
--- a/helper/ndn-stack-helper.cpp
+++ b/helper/ndn-stack-helper.cpp
@@ -36,22 +36,22 @@
 #include "ns3/point-to-point-helper.h"
 #include "ns3/callback.h"
 
-#include "../model/ndn-net-device-face.h"
-#include "../model/ndn-l3-protocol.h"
+#include "../model/ndn-net-device-face.hpp"
+#include "../model/ndn-l3-protocol.hpp"
 
-#include "ns3/ndn-forwarding-strategy.h"
-#include "ns3/ndn-fib.h"
-#include "ns3/ndn-pit.h"
-#include "ns3/ndn-name.h"
-#include "ns3/ndn-content-store.h"
+#include "ns3/ndn-forwarding-strategy.hpp"
+#include "ns3/ndn-fib.hpp"
+#include "ns3/ndn-pit.hpp"
+#include "ns3/ndn-name.hpp"
+#include "ns3/ndn-content-store.hpp"
 
 #include "ns3/node-list.h"
 // #include "ns3/loopback-net-device.h"
 
 #include "ns3/data-rate.h"
 
-#include "ndn-face-container.h"
-#include "ndn-stack-helper.h"
+#include "ndn-face-container.hpp"
+#include "ndn-stack-helper.hpp"
 
 #include <limits>
 #include <map>