diff --git a/examples/custom-apps/custom-app.cpp b/examples/custom-apps/custom-app.cpp
index 68f65e2..71ca87e 100644
--- a/examples/custom-apps/custom-app.cpp
+++ b/examples/custom-apps/custom-app.cpp
@@ -26,11 +26,11 @@
 #include "ns3/simulator.h"
 #include "ns3/packet.h"
 
-#include "ns3/ndn-app-face.h"
-#include "ns3/ndn-interest.h"
-#include "ns3/ndn-data.h"
+#include "ns3/ndn-app-face.hpp"
+#include "ns3/ndn-interest.hpp"
+#include "ns3/ndn-data.hpp"
 
-#include "ns3/ndn-fib.h"
+#include "ns3/ndn-fib.hpp"
 #include "ns3/random-variable.h"
 
 NS_LOG_COMPONENT_DEFINE ("CustomApp");
diff --git a/examples/custom-apps/custom-app.hpp b/examples/custom-apps/custom-app.hpp
index d1f85f7..86f7bb4 100644
--- a/examples/custom-apps/custom-app.hpp
+++ b/examples/custom-apps/custom-app.hpp
@@ -23,7 +23,7 @@
 #ifndef CUSTOM_APP_H_
 #define CUSTOM_APP_H_
 
-#include "ns3/ndn-app.h"
+#include "ns3/ndn-app.hpp"
 
 namespace ns3 {
 
diff --git a/examples/custom-apps/dumb-requester.cpp b/examples/custom-apps/dumb-requester.cpp
index 0c4c9f4..eca1cf2 100644
--- a/examples/custom-apps/dumb-requester.cpp
+++ b/examples/custom-apps/dumb-requester.cpp
@@ -20,7 +20,7 @@
 
 // dumb-requester.cc
 
-#include "dumb-requester.h"
+#include "dumb-requester.hpp"
 #include "ns3/ptr.h"
 #include "ns3/log.h"
 #include "ns3/simulator.h"
@@ -28,9 +28,9 @@
 #include "ns3/random-variable.h"
 #include "ns3/string.h"
 
-#include "ns3/ndn-app-face.h"
-#include "ns3/ndn-interest.h"
-#include "ns3/ndn-data.h"
+#include "ns3/ndn-app-face.hpp"
+#include "ns3/ndn-interest.hpp"
+#include "ns3/ndn-data.hpp"
 
 NS_LOG_COMPONENT_DEFINE ("DumbRequester");
 
diff --git a/examples/custom-apps/dumb-requester.hpp b/examples/custom-apps/dumb-requester.hpp
index 7b728c7..7a1272d 100644
--- a/examples/custom-apps/dumb-requester.hpp
+++ b/examples/custom-apps/dumb-requester.hpp
@@ -23,8 +23,8 @@
 #ifndef DUMB_REQUESTER_H_
 #define DUMB_REQUESTER_H_
 
-#include "ns3/ndn-app.h"
-#include "ns3/ndn-name.h"
+#include "ns3/ndn-app.hpp"
+#include "ns3/ndn-name.hpp"
 
 namespace ns3 {
 
diff --git a/examples/custom-apps/hijacker.cpp b/examples/custom-apps/hijacker.cpp
index a908dd0..f1852d4 100644
--- a/examples/custom-apps/hijacker.cpp
+++ b/examples/custom-apps/hijacker.cpp
@@ -20,8 +20,8 @@
 
 // hijacker.cc
 
-#include "hijacker.h"
-#include "ns3/ndn-name.h"
+#include "hijacker.hpp"
+#include "ns3/ndn-name.hpp"
 
 NS_LOG_COMPONENT_DEFINE ("Hijacker");
 
diff --git a/examples/ndn-simple-with-cs-lfu.cpp b/examples/ndn-simple-with-cs-lfu.cpp
index 0ed9079..4025763 100644
--- a/examples/ndn-simple-with-cs-lfu.cpp
+++ b/examples/ndn-simple-with-cs-lfu.cpp
@@ -24,7 +24,7 @@
 #include "ns3/ndnSIM-module.h"
 
 #include <sys/time.h>
-#include "ns3/ndnSIM/utils/mem-usage.h"
+#include "ns3/ndnSIM/utils/mem-usage.hpp"
 
 using namespace ns3;
 
diff --git a/examples/ndn-simple-with-link-failure.cpp b/examples/ndn-simple-with-link-failure.cpp
index 161e735..c96103d 100644
--- a/examples/ndn-simple-with-link-failure.cpp
+++ b/examples/ndn-simple-with-link-failure.cpp
@@ -25,7 +25,7 @@
 #include "ns3/ndnSIM-module.h"
 
 // for LinkStatusControl::FailLinks and LinkStatusControl::UpLinks
-#include "ns3/ndn-link-control-helper.h"
+#include "ns3/ndn-link-control-helper.hpp"
 
 using namespace ns3;