diff --git a/model/cs/content-store-impl.cpp b/model/cs/content-store-impl.cpp
index dce3924..225d137 100644
--- a/model/cs/content-store-impl.cpp
+++ b/model/cs/content-store-impl.cpp
@@ -18,14 +18,14 @@
  * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include "content-store-impl.h"
+#include "content-store-impl.hpp"
 
-#include "../../utils/trie/random-policy.h"
-#include "../../utils/trie/lru-policy.h"
-#include "../../utils/trie/fifo-policy.h"
-#include "../../utils/trie/lfu-policy.h"
-#include "../../utils/trie/multi-policy.h"
-#include "../../utils/trie/aggregate-stats-policy.h"
+#include "../../utils/trie/random-policy.hpp"
+#include "../../utils/trie/lru-policy.hpp"
+#include "../../utils/trie/fifo-policy.hpp"
+#include "../../utils/trie/lfu-policy.hpp"
+#include "../../utils/trie/multi-policy.hpp"
+#include "../../utils/trie/aggregate-stats-policy.hpp"
 
 #define NS_OBJECT_ENSURE_REGISTERED_TEMPL(type, templ)  \
   static struct X ## type ## templ ## RegistrationClass \
diff --git a/model/cs/content-store-impl.hpp b/model/cs/content-store-impl.hpp
index 403ceef..1254bb2 100644
--- a/model/cs/content-store-impl.hpp
+++ b/model/cs/content-store-impl.hpp
@@ -21,7 +21,8 @@
 #ifndef NDN_CONTENT_STORE_IMPL_H_
 #define NDN_CONTENT_STORE_IMPL_H_
 
-#include "ndn-content-store.h"
+#include "ndn-content-store.hpp"
+
 #include "ns3/packet.h"
 #include "ns3/ndn-interest.h"
 #include "ns3/ndn-data.h"
@@ -31,7 +32,7 @@
 #include "ns3/uinteger.h"
 #include "ns3/string.h"
 
-#include "../../utils/trie/trie-with-policy.h"
+#include "../../utils/trie/trie-with-policy.hpp"
 
 namespace ns3 {
 namespace ndn {
diff --git a/model/cs/content-store-nocache.cpp b/model/cs/content-store-nocache.cpp
index 001dc58..61515c1 100644
--- a/model/cs/content-store-nocache.cpp
+++ b/model/cs/content-store-nocache.cpp
@@ -20,12 +20,10 @@
  *         
  */
 
-#include "content-store-nocache.h"
+#include "content-store-nocache.hpp"
+
 #include "ns3/log.h"
 #include "ns3/packet.h"
-#include "ns3/ndn-name.h"
-#include "ns3/ndn-interest.h"
-#include "ns3/ndn-data.h"
 
 NS_LOG_COMPONENT_DEFINE ("ndn.cs.Nocache");
 
diff --git a/model/cs/content-store-nocache.hpp b/model/cs/content-store-nocache.hpp
index ca3afe2..ac7ced7 100644
--- a/model/cs/content-store-nocache.hpp
+++ b/model/cs/content-store-nocache.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_CONTENT_STORE_NOCACHE_H
 #define	NDN_CONTENT_STORE_NOCACHE_H
 
-#include "ns3/ndn-content-store.h"
+#include "ns3/ndnSIM/model/cs/ndn-content-store.hpp"
 
 namespace ns3 {
 namespace ndn {
diff --git a/model/cs/content-store-with-freshness.cpp b/model/cs/content-store-with-freshness.cpp
index 3691891..e132a78 100644
--- a/model/cs/content-store-with-freshness.cpp
+++ b/model/cs/content-store-with-freshness.cpp
@@ -18,12 +18,12 @@
  * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include "content-store-with-freshness.h"
+#include "content-store-with-freshness.hpp"
 
-#include "../../utils/trie/random-policy.h"
-#include "../../utils/trie/lru-policy.h"
-#include "../../utils/trie/fifo-policy.h"
-#include "../../utils/trie/lfu-policy.h"
+#include "../../utils/trie/random-policy.hpp"
+#include "../../utils/trie/lru-policy.hpp"
+#include "../../utils/trie/fifo-policy.hpp"
+#include "../../utils/trie/lfu-policy.hpp"
 
 #define NS_OBJECT_ENSURE_REGISTERED_TEMPL(type, templ)  \
   static struct X ## type ## templ ## RegistrationClass \
diff --git a/model/cs/content-store-with-freshness.hpp b/model/cs/content-store-with-freshness.hpp
index e53cbba..2bd74de 100644
--- a/model/cs/content-store-with-freshness.hpp
+++ b/model/cs/content-store-with-freshness.hpp
@@ -23,8 +23,10 @@
 
 #include "content-store-impl.h"
 
-#include "../../utils/trie/multi-policy.h"
-#include "custom-policies/freshness-policy.h"
+#include "content-store-impl.hpp"
+
+#include "../../utils/trie/multi-policy.hpp"
+#include "custom-policies/freshness-policy.hpp"
 
 namespace ns3 {
 namespace ndn {
diff --git a/model/cs/content-store-with-probability.cpp b/model/cs/content-store-with-probability.cpp
index f3def33..bf5c181 100644
--- a/model/cs/content-store-with-probability.cpp
+++ b/model/cs/content-store-with-probability.cpp
@@ -18,12 +18,12 @@
  * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include "content-store-with-probability.h"
+#include "content-store-with-probability.hpp"
 
-#include "../../utils/trie/random-policy.h"
-#include "../../utils/trie/lru-policy.h"
-#include "../../utils/trie/fifo-policy.h"
-#include "../../utils/trie/lfu-policy.h"
+#include "../../utils/trie/random-policy.hpp"
+#include "../../utils/trie/lru-policy.hpp"
+#include "../../utils/trie/fifo-policy.hpp"
+#include "../../utils/trie/lfu-policy.hpp"
 
 #define NS_OBJECT_ENSURE_REGISTERED_TEMPL(type, templ)  \
   static struct X ## type ## templ ## RegistrationClass \
diff --git a/model/cs/content-store-with-probability.hpp b/model/cs/content-store-with-probability.hpp
index 42ad716..55266e8 100644
--- a/model/cs/content-store-with-probability.hpp
+++ b/model/cs/content-store-with-probability.hpp
@@ -23,8 +23,10 @@
 
 #include "content-store-impl.h"
 
-#include "../../utils/trie/multi-policy.h"
-#include "custom-policies/probability-policy.h"
+#include "content-store-impl.hpp"
+
+#include "../../utils/trie/multi-policy.hpp"
+#include "custom-policies/probability-policy.hpp"
 #include "ns3/double.h"
 #include "ns3/type-id.h"
 
diff --git a/model/cs/content-store-with-stats.cpp b/model/cs/content-store-with-stats.cpp
index ad179e4..7d6e567 100644
--- a/model/cs/content-store-with-stats.cpp
+++ b/model/cs/content-store-with-stats.cpp
@@ -18,12 +18,12 @@
  * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include "content-store-with-stats.h"
+#include "content-store-with-stats.hpp"
 
-#include "../../utils/trie/random-policy.h"
-#include "../../utils/trie/lru-policy.h"
-#include "../../utils/trie/fifo-policy.h"
-#include "../../utils/trie/lfu-policy.h"
+#include "../../utils/trie/random-policy.hpp"
+#include "../../utils/trie/lru-policy.hpp"
+#include "../../utils/trie/fifo-policy.hpp"
+#include "../../utils/trie/lfu-policy.hpp"
 
 #define NS_OBJECT_ENSURE_REGISTERED_TEMPL(type, templ)  \
   static struct X ## type ## templ ## RegistrationClass \
diff --git a/model/cs/content-store-with-stats.hpp b/model/cs/content-store-with-stats.hpp
index a3f5fdd..542b88c 100644
--- a/model/cs/content-store-with-stats.hpp
+++ b/model/cs/content-store-with-stats.hpp
@@ -23,8 +23,10 @@
 
 #include "content-store-impl.h"
 
-#include "../../utils/trie/multi-policy.h"
-#include "custom-policies/lifetime-stats-policy.h"
+#include "content-store-impl.hpp"
+
+#include "../../utils/trie/multi-policy.hpp"
+#include "custom-policies/lifetime-stats-policy.hpp"
 
 namespace ns3 {
 namespace ndn {
diff --git a/model/cs/ndn-content-store.cpp b/model/cs/ndn-content-store.cpp
index ecc9de8..4d3bb65 100644
--- a/model/cs/ndn-content-store.cpp
+++ b/model/cs/ndn-content-store.cpp
@@ -20,12 +20,10 @@
  *         
  */
 
-#include "ndn-content-store.h"
+#include "ndn-content-store.hpp"
+
 #include "ns3/log.h"
 #include "ns3/packet.h"
-#include "ns3/ndn-name.h"
-#include "ns3/ndn-interest.h"
-#include "ns3/ndn-data.h"
 
 NS_LOG_COMPONENT_DEFINE ("ndn.cs.ContentStore");
 
diff --git a/model/ndn-app-face.cpp b/model/ndn-app-face.cpp
index 1de26e3..9125e2c 100644
--- a/model/ndn-app-face.cpp
+++ b/model/ndn-app-face.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "ndn-app-face.h"
+#include "ndn-app-face.hpp"
 
 #include "ns3/log.h"
 #include "ns3/packet.h"
@@ -28,11 +28,11 @@
 #include "ns3/assert.h"
 #include "ns3/simulator.h"
 
-#include "ns3/ndn-header-helper.h"
-#include "ns3/ndn-app.h"
+#include "ns3/ndn-header-helper.hpp"
+#include "ns3/ndn-app.hpp"
 
-#include "ndn-interest.h"
-#include "ndn-data.h"
+#include "ndn-interest.hpp"
+#include "ndn-data.hpp"
 
 NS_LOG_COMPONENT_DEFINE ("ndn.AppFace");
 
diff --git a/model/ndn-app-face.hpp b/model/ndn-app-face.hpp
index 029dd0a..3663be0 100644
--- a/model/ndn-app-face.hpp
+++ b/model/ndn-app-face.hpp
@@ -22,7 +22,7 @@
 #ifndef NDN_APP_FACE_H
 #define NDN_APP_FACE_H
 
-#include "ndn-face.h"
+#include "ndn-face.hpp"
 #include "ns3/traced-callback.h"
 
 namespace ns3 {
diff --git a/model/ndn-face.cpp b/model/ndn-face.cpp
index 293a6d7..6b23dd7 100644
--- a/model/ndn-face.cpp
+++ b/model/ndn-face.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "ndn-face.h"
+#include "ndn-face.hpp"
 
 #include "ns3/packet.h"
 #include "ns3/log.h"
@@ -32,8 +32,8 @@
 #include "ns3/random-variable.h"
 #include "ns3/pointer.h"
 
-#include "ns3/ndn-header-helper.h"
-#include "ns3/ndnSIM/utils/ndn-fw-hop-count-tag.h"
+#include "ns3/ndn-header-helper.hpp"
+#include "ns3/ndnSIM/utils/ndn-fw-hop-count-tag.hpp"
 
 #include "ns3/ndn-wire.h"
 
diff --git a/model/ndn-face.hpp b/model/ndn-face.hpp
index a166a7b..bf0a9b2 100644
--- a/model/ndn-face.hpp
+++ b/model/ndn-face.hpp
@@ -29,7 +29,7 @@
 #include "ns3/nstime.h"
 #include "ns3/type-id.h"
 #include "ns3/traced-callback.h"
-#include "ns3/ndn-name.h"
+#include "ns3/ndn-name.hpp"
 
 namespace ns3 {
 
diff --git a/model/ndn-global-router.cpp b/model/ndn-global-router.cpp
index b3a0b1b..e29c055 100644
--- a/model/ndn-global-router.cpp
+++ b/model/ndn-global-router.cpp
@@ -18,11 +18,11 @@
  * Author:  Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include "ndn-global-router.h"
+#include "ndn-global-router.hpp"
 
-#include "ns3/ndn-l3-protocol.h"
-#include "ns3/ndn-face.h"
-#include "ns3/ndn-name.h"
+#include "ns3/ndn-l3-protocol.hpp"
+#include "ns3/ndn-face.hpp"
+#include "ns3/ndn-name.hpp"
 
 #include "ns3/channel.h"
 
diff --git a/model/ndn-l3-protocol.cpp b/model/ndn-l3-protocol.cpp
index d2d2b29..5ab8cba 100644
--- a/model/ndn-l3-protocol.cpp
+++ b/model/ndn-l3-protocol.cpp
@@ -19,7 +19,7 @@
  *         Ilya Moiseenko <iliamo@cs.ucla.edu>
  */
 
-#include "ndn-l3-protocol.h"
+#include "ndn-l3-protocol.hpp"
 
 #include "ns3/packet.h"
 #include "ns3/node.h"
@@ -32,14 +32,14 @@
 #include "ns3/simulator.h"
 #include "ns3/random-variable.h"
 
-#include "ns3/ndn-pit.h"
-#include "ns3/ndn-interest.h"
-#include "ns3/ndn-data.h"
+#include "ns3/ndn-pit.hpp"
+#include "ns3/ndn-interest.hpp"
+#include "ns3/ndn-data.hpp"
 
-#include "ns3/ndn-face.h"
-#include "ns3/ndn-forwarding-strategy.h"
+#include "ns3/ndn-face.hpp"
+#include "ns3/ndn-forwarding-strategy.hpp"
 
-#include "ndn-net-device-face.h"
+#include "ndn-net-device-face.hpp"
 
 #include <boost/foreach.hpp>
 
diff --git a/model/ndn-net-device-face.cpp b/model/ndn-net-device-face.cpp
index eb2b357..af4baa0 100644
--- a/model/ndn-net-device-face.cpp
+++ b/model/ndn-net-device-face.cpp
@@ -19,8 +19,8 @@
  *
  */
 
-#include "ndn-net-device-face.h"
-#include "ndn-l3-protocol.h"
+#include "ndn-net-device-face.hpp"
+#include "ndn-l3-protocol.hpp"
 
 #include "ns3/net-device.h"
 #include "ns3/log.h"
@@ -31,7 +31,7 @@
 // #include "ns3/address.h"
 #include "ns3/point-to-point-net-device.h"
 #include "ns3/channel.h"
-#include "ns3/ndn-name.h"
+#include "ns3/ndn-name.hpp"
 
 NS_LOG_COMPONENT_DEFINE ("ndn.NetDeviceFace");
 
diff --git a/model/ndn-net-device-face.hpp b/model/ndn-net-device-face.hpp
index d001015..6bf231c 100644
--- a/model/ndn-net-device-face.hpp
+++ b/model/ndn-net-device-face.hpp
@@ -21,7 +21,7 @@
 #ifndef NDN_NET_DEVICE_FACE_H
 #define NDN_NET_DEVICE_FACE_H
 
-#include "ndn-face.h"
+#include "ndn-face.hpp"
 #include "ns3/net-device.h"
 
 namespace ns3 {