diff --git a/apps/ndn-app.cc b/apps/ndn-app.cpp
similarity index 100%
rename from apps/ndn-app.cc
rename to apps/ndn-app.cpp
diff --git a/apps/ndn-app.h b/apps/ndn-app.hpp
similarity index 100%
rename from apps/ndn-app.h
rename to apps/ndn-app.hpp
diff --git a/apps/ndn-consumer-batches.cc b/apps/ndn-consumer-batches.cpp
similarity index 100%
rename from apps/ndn-consumer-batches.cc
rename to apps/ndn-consumer-batches.cpp
diff --git a/apps/ndn-consumer-batches.h b/apps/ndn-consumer-batches.hpp
similarity index 100%
rename from apps/ndn-consumer-batches.h
rename to apps/ndn-consumer-batches.hpp
diff --git a/apps/ndn-consumer-cbr.cc b/apps/ndn-consumer-cbr.cpp
similarity index 100%
rename from apps/ndn-consumer-cbr.cc
rename to apps/ndn-consumer-cbr.cpp
diff --git a/apps/ndn-consumer-cbr.h b/apps/ndn-consumer-cbr.hpp
similarity index 100%
rename from apps/ndn-consumer-cbr.h
rename to apps/ndn-consumer-cbr.hpp
diff --git a/apps/ndn-consumer-window.cc b/apps/ndn-consumer-window.cpp
similarity index 100%
rename from apps/ndn-consumer-window.cc
rename to apps/ndn-consumer-window.cpp
diff --git a/apps/ndn-consumer-window.h b/apps/ndn-consumer-window.hpp
similarity index 100%
rename from apps/ndn-consumer-window.h
rename to apps/ndn-consumer-window.hpp
diff --git a/apps/ndn-consumer-zipf-mandelbrot.cc b/apps/ndn-consumer-zipf-mandelbrot.cpp
similarity index 100%
rename from apps/ndn-consumer-zipf-mandelbrot.cc
rename to apps/ndn-consumer-zipf-mandelbrot.cpp
diff --git a/apps/ndn-consumer-zipf-mandelbrot.h b/apps/ndn-consumer-zipf-mandelbrot.hpp
similarity index 100%
rename from apps/ndn-consumer-zipf-mandelbrot.h
rename to apps/ndn-consumer-zipf-mandelbrot.hpp
diff --git a/apps/ndn-consumer.cc b/apps/ndn-consumer.cpp
similarity index 100%
rename from apps/ndn-consumer.cc
rename to apps/ndn-consumer.cpp
diff --git a/apps/ndn-consumer.h b/apps/ndn-consumer.hpp
similarity index 100%
rename from apps/ndn-consumer.h
rename to apps/ndn-consumer.hpp
diff --git a/apps/ndn-producer.cc b/apps/ndn-producer.cpp
similarity index 100%
rename from apps/ndn-producer.cc
rename to apps/ndn-producer.cpp
diff --git a/apps/ndn-producer.h b/apps/ndn-producer.hpp
similarity index 100%
rename from apps/ndn-producer.h
rename to apps/ndn-producer.hpp
diff --git a/docs/doxygen.h b/docs/doxygen.hpp
similarity index 100%
rename from docs/doxygen.h
rename to docs/doxygen.hpp
diff --git a/examples/custom-apps/custom-app.cc b/examples/custom-apps/custom-app.cpp
similarity index 100%
rename from examples/custom-apps/custom-app.cc
rename to examples/custom-apps/custom-app.cpp
diff --git a/examples/custom-apps/custom-app.h b/examples/custom-apps/custom-app.hpp
similarity index 100%
rename from examples/custom-apps/custom-app.h
rename to examples/custom-apps/custom-app.hpp
diff --git a/examples/custom-apps/dumb-requester.cc b/examples/custom-apps/dumb-requester.cpp
similarity index 100%
rename from examples/custom-apps/dumb-requester.cc
rename to examples/custom-apps/dumb-requester.cpp
diff --git a/examples/custom-apps/dumb-requester.h b/examples/custom-apps/dumb-requester.hpp
similarity index 100%
rename from examples/custom-apps/dumb-requester.h
rename to examples/custom-apps/dumb-requester.hpp
diff --git a/examples/custom-apps/hijacker.cc b/examples/custom-apps/hijacker.cpp
similarity index 100%
rename from examples/custom-apps/hijacker.cc
rename to examples/custom-apps/hijacker.cpp
diff --git a/examples/custom-apps/hijacker.h b/examples/custom-apps/hijacker.hpp
similarity index 100%
rename from examples/custom-apps/hijacker.h
rename to examples/custom-apps/hijacker.hpp
diff --git a/examples/ndn-congestion-alt-topo-plugin.cc b/examples/ndn-congestion-alt-topo-plugin.cpp
similarity index 100%
rename from examples/ndn-congestion-alt-topo-plugin.cc
rename to examples/ndn-congestion-alt-topo-plugin.cpp
diff --git a/examples/ndn-congestion-topo-plugin.cc b/examples/ndn-congestion-topo-plugin.cpp
similarity index 100%
rename from examples/ndn-congestion-topo-plugin.cc
rename to examples/ndn-congestion-topo-plugin.cpp
diff --git a/examples/ndn-csma.cc b/examples/ndn-csma.cpp
similarity index 100%
rename from examples/ndn-csma.cc
rename to examples/ndn-csma.cpp
diff --git a/examples/ndn-grid-topo-plugin.cc b/examples/ndn-grid-topo-plugin.cpp
similarity index 100%
rename from examples/ndn-grid-topo-plugin.cc
rename to examples/ndn-grid-topo-plugin.cpp
diff --git a/examples/ndn-grid.cc b/examples/ndn-grid.cpp
similarity index 100%
rename from examples/ndn-grid.cc
rename to examples/ndn-grid.cpp
diff --git a/examples/ndn-simple-wifi.cc b/examples/ndn-simple-wifi.cpp
similarity index 100%
rename from examples/ndn-simple-wifi.cc
rename to examples/ndn-simple-wifi.cpp
diff --git a/examples/ndn-simple-with-cs-lfu.cc b/examples/ndn-simple-with-cs-lfu.cpp
similarity index 100%
rename from examples/ndn-simple-with-cs-lfu.cc
rename to examples/ndn-simple-with-cs-lfu.cpp
diff --git a/examples/ndn-simple-with-custom-app.cc b/examples/ndn-simple-with-custom-app.cpp
similarity index 100%
rename from examples/ndn-simple-with-custom-app.cc
rename to examples/ndn-simple-with-custom-app.cpp
diff --git a/examples/ndn-simple-with-link-failure.cc b/examples/ndn-simple-with-link-failure.cpp
similarity index 100%
rename from examples/ndn-simple-with-link-failure.cc
rename to examples/ndn-simple-with-link-failure.cpp
diff --git a/examples/ndn-simple-with-pcap.cc b/examples/ndn-simple-with-pcap.cpp
similarity index 100%
rename from examples/ndn-simple-with-pcap.cc
rename to examples/ndn-simple-with-pcap.cpp
diff --git a/examples/ndn-simple.cc b/examples/ndn-simple.cpp
similarity index 100%
rename from examples/ndn-simple.cc
rename to examples/ndn-simple.cpp
diff --git a/examples/ndn-tree-app-delay-tracer.cc b/examples/ndn-tree-app-delay-tracer.cpp
similarity index 100%
rename from examples/ndn-tree-app-delay-tracer.cc
rename to examples/ndn-tree-app-delay-tracer.cpp
diff --git a/examples/ndn-tree-cs-tracers.cc b/examples/ndn-tree-cs-tracers.cpp
similarity index 100%
rename from examples/ndn-tree-cs-tracers.cc
rename to examples/ndn-tree-cs-tracers.cpp
diff --git a/examples/ndn-tree-tracers.cc b/examples/ndn-tree-tracers.cpp
similarity index 100%
rename from examples/ndn-tree-tracers.cc
rename to examples/ndn-tree-tracers.cpp
diff --git a/examples/ndn-tree-with-l2tracer.cc b/examples/ndn-tree-with-l2tracer.cpp
similarity index 100%
rename from examples/ndn-tree-with-l2tracer.cc
rename to examples/ndn-tree-with-l2tracer.cpp
diff --git a/examples/ndn-zipf-mandelbrot.cc b/examples/ndn-zipf-mandelbrot.cpp
similarity index 100%
rename from examples/ndn-zipf-mandelbrot.cc
rename to examples/ndn-zipf-mandelbrot.cpp
diff --git a/helper/boost-graph-ndn-global-routing-helper.h b/helper/boost-graph-ndn-global-routing-helper.hpp
similarity index 100%
rename from helper/boost-graph-ndn-global-routing-helper.h
rename to helper/boost-graph-ndn-global-routing-helper.hpp
diff --git a/helper/ndn-app-helper.cc b/helper/ndn-app-helper.cpp
similarity index 100%
rename from helper/ndn-app-helper.cc
rename to helper/ndn-app-helper.cpp
diff --git a/helper/ndn-app-helper.h b/helper/ndn-app-helper.hpp
similarity index 100%
rename from helper/ndn-app-helper.h
rename to helper/ndn-app-helper.hpp
diff --git a/helper/ndn-face-container.cc b/helper/ndn-face-container.cpp
similarity index 100%
rename from helper/ndn-face-container.cc
rename to helper/ndn-face-container.cpp
diff --git a/helper/ndn-face-container.h b/helper/ndn-face-container.hpp
similarity index 100%
rename from helper/ndn-face-container.h
rename to helper/ndn-face-container.hpp
diff --git a/helper/ndn-global-routing-helper.cc b/helper/ndn-global-routing-helper.cpp
similarity index 100%
rename from helper/ndn-global-routing-helper.cc
rename to helper/ndn-global-routing-helper.cpp
diff --git a/helper/ndn-global-routing-helper.h b/helper/ndn-global-routing-helper.hpp
similarity index 100%
rename from helper/ndn-global-routing-helper.h
rename to helper/ndn-global-routing-helper.hpp
diff --git a/helper/ndn-link-control-helper.cc b/helper/ndn-link-control-helper.cpp
similarity index 100%
rename from helper/ndn-link-control-helper.cc
rename to helper/ndn-link-control-helper.cpp
diff --git a/helper/ndn-link-control-helper.h b/helper/ndn-link-control-helper.hpp
similarity index 100%
rename from helper/ndn-link-control-helper.h
rename to helper/ndn-link-control-helper.hpp
diff --git a/helper/ndn-stack-helper.cc b/helper/ndn-stack-helper.cpp
similarity index 100%
rename from helper/ndn-stack-helper.cc
rename to helper/ndn-stack-helper.cpp
diff --git a/helper/ndn-stack-helper.h b/helper/ndn-stack-helper.hpp
similarity index 100%
rename from helper/ndn-stack-helper.h
rename to helper/ndn-stack-helper.hpp
diff --git a/model/cs/content-store-impl.cc b/model/cs/content-store-impl.cpp
similarity index 100%
rename from model/cs/content-store-impl.cc
rename to model/cs/content-store-impl.cpp
diff --git a/model/cs/content-store-impl.h b/model/cs/content-store-impl.hpp
similarity index 100%
rename from model/cs/content-store-impl.h
rename to model/cs/content-store-impl.hpp
diff --git a/model/cs/content-store-nocache.cc b/model/cs/content-store-nocache.cpp
similarity index 100%
rename from model/cs/content-store-nocache.cc
rename to model/cs/content-store-nocache.cpp
diff --git a/model/cs/content-store-nocache.h b/model/cs/content-store-nocache.hpp
similarity index 100%
rename from model/cs/content-store-nocache.h
rename to model/cs/content-store-nocache.hpp
diff --git a/model/cs/content-store-with-freshness.cc b/model/cs/content-store-with-freshness.cpp
similarity index 100%
rename from model/cs/content-store-with-freshness.cc
rename to model/cs/content-store-with-freshness.cpp
diff --git a/model/cs/content-store-with-freshness.h b/model/cs/content-store-with-freshness.hpp
similarity index 100%
rename from model/cs/content-store-with-freshness.h
rename to model/cs/content-store-with-freshness.hpp
diff --git a/model/cs/content-store-with-probability.cc b/model/cs/content-store-with-probability.cpp
similarity index 100%
rename from model/cs/content-store-with-probability.cc
rename to model/cs/content-store-with-probability.cpp
diff --git a/model/cs/content-store-with-probability.h b/model/cs/content-store-with-probability.hpp
similarity index 100%
rename from model/cs/content-store-with-probability.h
rename to model/cs/content-store-with-probability.hpp
diff --git a/model/cs/content-store-with-stats.cc b/model/cs/content-store-with-stats.cpp
similarity index 100%
rename from model/cs/content-store-with-stats.cc
rename to model/cs/content-store-with-stats.cpp
diff --git a/model/cs/content-store-with-stats.h b/model/cs/content-store-with-stats.hpp
similarity index 100%
rename from model/cs/content-store-with-stats.h
rename to model/cs/content-store-with-stats.hpp
diff --git a/model/cs/custom-policies/freshness-policy.h b/model/cs/custom-policies/freshness-policy.hpp
similarity index 100%
rename from model/cs/custom-policies/freshness-policy.h
rename to model/cs/custom-policies/freshness-policy.hpp
diff --git a/model/cs/custom-policies/lifetime-stats-policy.h b/model/cs/custom-policies/lifetime-stats-policy.hpp
similarity index 100%
rename from model/cs/custom-policies/lifetime-stats-policy.h
rename to model/cs/custom-policies/lifetime-stats-policy.hpp
diff --git a/model/cs/custom-policies/probability-policy.h b/model/cs/custom-policies/probability-policy.hpp
similarity index 100%
rename from model/cs/custom-policies/probability-policy.h
rename to model/cs/custom-policies/probability-policy.hpp
diff --git a/model/cs/ndn-content-store.cc b/model/cs/ndn-content-store.cpp
similarity index 100%
rename from model/cs/ndn-content-store.cc
rename to model/cs/ndn-content-store.cpp
diff --git a/model/cs/ndn-content-store.h b/model/cs/ndn-content-store.hpp
similarity index 100%
rename from model/cs/ndn-content-store.h
rename to model/cs/ndn-content-store.hpp
diff --git a/model/ndn-app-face.cc b/model/ndn-app-face.cpp
similarity index 100%
rename from model/ndn-app-face.cc
rename to model/ndn-app-face.cpp
diff --git a/model/ndn-app-face.h b/model/ndn-app-face.hpp
similarity index 100%
rename from model/ndn-app-face.h
rename to model/ndn-app-face.hpp
diff --git a/model/ndn-common.h b/model/ndn-common.hpp
similarity index 100%
rename from model/ndn-common.h
rename to model/ndn-common.hpp
diff --git a/model/ndn-face.cc b/model/ndn-face.cpp
similarity index 100%
rename from model/ndn-face.cc
rename to model/ndn-face.cpp
diff --git a/model/ndn-face.h b/model/ndn-face.hpp
similarity index 100%
rename from model/ndn-face.h
rename to model/ndn-face.hpp
diff --git a/model/ndn-global-router.cc b/model/ndn-global-router.cpp
similarity index 100%
rename from model/ndn-global-router.cc
rename to model/ndn-global-router.cpp
diff --git a/model/ndn-global-router.h b/model/ndn-global-router.hpp
similarity index 100%
rename from model/ndn-global-router.h
rename to model/ndn-global-router.hpp
diff --git a/model/ndn-l3-protocol.cc b/model/ndn-l3-protocol.cpp
similarity index 100%
rename from model/ndn-l3-protocol.cc
rename to model/ndn-l3-protocol.cpp
diff --git a/model/ndn-l3-protocol.h b/model/ndn-l3-protocol.hpp
similarity index 100%
rename from model/ndn-l3-protocol.h
rename to model/ndn-l3-protocol.hpp
diff --git a/model/ndn-net-device-face.cc b/model/ndn-net-device-face.cpp
similarity index 100%
rename from model/ndn-net-device-face.cc
rename to model/ndn-net-device-face.cpp
diff --git a/model/ndn-net-device-face.h b/model/ndn-net-device-face.hpp
similarity index 100%
rename from model/ndn-net-device-face.h
rename to model/ndn-net-device-face.hpp
diff --git a/plugins/ip-faces/ndn-ip-face-stack.cc b/plugins/ip-faces/ndn-ip-face-stack.cpp
similarity index 100%
rename from plugins/ip-faces/ndn-ip-face-stack.cc
rename to plugins/ip-faces/ndn-ip-face-stack.cpp
diff --git a/plugins/ip-faces/ndn-ip-face-stack.h b/plugins/ip-faces/ndn-ip-face-stack.hpp
similarity index 100%
rename from plugins/ip-faces/ndn-ip-face-stack.h
rename to plugins/ip-faces/ndn-ip-face-stack.hpp
diff --git a/plugins/ip-faces/ndn-ip-faces-helper.cc b/plugins/ip-faces/ndn-ip-faces-helper.cpp
similarity index 100%
rename from plugins/ip-faces/ndn-ip-faces-helper.cc
rename to plugins/ip-faces/ndn-ip-faces-helper.cpp
diff --git a/plugins/ip-faces/ndn-ip-faces-helper.h b/plugins/ip-faces/ndn-ip-faces-helper.hpp
similarity index 100%
rename from plugins/ip-faces/ndn-ip-faces-helper.h
rename to plugins/ip-faces/ndn-ip-faces-helper.hpp
diff --git a/plugins/ip-faces/ndn-tcp-face.cc b/plugins/ip-faces/ndn-tcp-face.cpp
similarity index 100%
rename from plugins/ip-faces/ndn-tcp-face.cc
rename to plugins/ip-faces/ndn-tcp-face.cpp
diff --git a/plugins/ip-faces/ndn-tcp-face.h b/plugins/ip-faces/ndn-tcp-face.hpp
similarity index 100%
rename from plugins/ip-faces/ndn-tcp-face.h
rename to plugins/ip-faces/ndn-tcp-face.hpp
diff --git a/plugins/ip-faces/ndn-udp-face.cc b/plugins/ip-faces/ndn-udp-face.cpp
similarity index 100%
rename from plugins/ip-faces/ndn-udp-face.cc
rename to plugins/ip-faces/ndn-udp-face.cpp
diff --git a/plugins/ip-faces/ndn-udp-face.h b/plugins/ip-faces/ndn-udp-face.hpp
similarity index 100%
rename from plugins/ip-faces/ndn-udp-face.h
rename to plugins/ip-faces/ndn-udp-face.hpp
diff --git a/plugins/topology/annotated-topology-reader.cc b/plugins/topology/annotated-topology-reader.cpp
similarity index 100%
rename from plugins/topology/annotated-topology-reader.cc
rename to plugins/topology/annotated-topology-reader.cpp
diff --git a/plugins/topology/annotated-topology-reader.h b/plugins/topology/annotated-topology-reader.hpp
similarity index 100%
rename from plugins/topology/annotated-topology-reader.h
rename to plugins/topology/annotated-topology-reader.hpp
diff --git a/plugins/topology/rocketfuel-map-reader.cc b/plugins/topology/rocketfuel-map-reader.cpp
similarity index 100%
rename from plugins/topology/rocketfuel-map-reader.cc
rename to plugins/topology/rocketfuel-map-reader.cpp
diff --git a/plugins/topology/rocketfuel-map-reader.h b/plugins/topology/rocketfuel-map-reader.hpp
similarity index 100%
rename from plugins/topology/rocketfuel-map-reader.h
rename to plugins/topology/rocketfuel-map-reader.hpp
diff --git a/plugins/topology/rocketfuel-weights-reader.cc b/plugins/topology/rocketfuel-weights-reader.cpp
similarity index 100%
rename from plugins/topology/rocketfuel-weights-reader.cc
rename to plugins/topology/rocketfuel-weights-reader.cpp
diff --git a/plugins/topology/rocketfuel-weights-reader.h b/plugins/topology/rocketfuel-weights-reader.hpp
similarity index 100%
rename from plugins/topology/rocketfuel-weights-reader.h
rename to plugins/topology/rocketfuel-weights-reader.hpp
diff --git a/utils/batches.cc b/utils/batches.cpp
similarity index 100%
rename from utils/batches.cc
rename to utils/batches.cpp
diff --git a/utils/batches.h b/utils/batches.hpp
similarity index 100%
rename from utils/batches.h
rename to utils/batches.hpp
diff --git a/utils/mem-usage.h b/utils/mem-usage.hpp
similarity index 100%
rename from utils/mem-usage.h
rename to utils/mem-usage.hpp
diff --git a/utils/ndn-fw-hop-count-tag.cc b/utils/ndn-fw-hop-count-tag.cpp
similarity index 100%
rename from utils/ndn-fw-hop-count-tag.cc
rename to utils/ndn-fw-hop-count-tag.cpp
diff --git a/utils/ndn-fw-hop-count-tag.h b/utils/ndn-fw-hop-count-tag.hpp
similarity index 100%
rename from utils/ndn-fw-hop-count-tag.h
rename to utils/ndn-fw-hop-count-tag.hpp
diff --git a/utils/ndn-limits-rate.cc b/utils/ndn-limits-rate.cpp
similarity index 100%
rename from utils/ndn-limits-rate.cc
rename to utils/ndn-limits-rate.cpp
diff --git a/utils/ndn-limits-rate.h b/utils/ndn-limits-rate.hpp
similarity index 100%
rename from utils/ndn-limits-rate.h
rename to utils/ndn-limits-rate.hpp
diff --git a/utils/ndn-limits-window.cc b/utils/ndn-limits-window.cpp
similarity index 100%
rename from utils/ndn-limits-window.cc
rename to utils/ndn-limits-window.cpp
diff --git a/utils/ndn-limits-window.h b/utils/ndn-limits-window.hpp
similarity index 100%
rename from utils/ndn-limits-window.h
rename to utils/ndn-limits-window.hpp
diff --git a/utils/ndn-limits.cc b/utils/ndn-limits.cpp
similarity index 100%
rename from utils/ndn-limits.cc
rename to utils/ndn-limits.cpp
diff --git a/utils/ndn-limits.h b/utils/ndn-limits.hpp
similarity index 100%
rename from utils/ndn-limits.h
rename to utils/ndn-limits.hpp
diff --git a/utils/ndn-rtt-estimator.cc b/utils/ndn-rtt-estimator.cpp
similarity index 100%
rename from utils/ndn-rtt-estimator.cc
rename to utils/ndn-rtt-estimator.cpp
diff --git a/utils/ndn-rtt-estimator.h b/utils/ndn-rtt-estimator.hpp
similarity index 100%
rename from utils/ndn-rtt-estimator.h
rename to utils/ndn-rtt-estimator.hpp
diff --git a/utils/ndn-rtt-mean-deviation.cc b/utils/ndn-rtt-mean-deviation.cpp
similarity index 100%
rename from utils/ndn-rtt-mean-deviation.cc
rename to utils/ndn-rtt-mean-deviation.cpp
diff --git a/utils/ndn-rtt-mean-deviation.h b/utils/ndn-rtt-mean-deviation.hpp
similarity index 100%
rename from utils/ndn-rtt-mean-deviation.h
rename to utils/ndn-rtt-mean-deviation.hpp
diff --git a/utils/tracers/l2-rate-tracer.cc b/utils/tracers/l2-rate-tracer.cpp
similarity index 100%
rename from utils/tracers/l2-rate-tracer.cc
rename to utils/tracers/l2-rate-tracer.cpp
diff --git a/utils/tracers/l2-rate-tracer.h b/utils/tracers/l2-rate-tracer.hpp
similarity index 100%
rename from utils/tracers/l2-rate-tracer.h
rename to utils/tracers/l2-rate-tracer.hpp
diff --git a/utils/tracers/l2-tracer.cc b/utils/tracers/l2-tracer.cpp
similarity index 100%
rename from utils/tracers/l2-tracer.cc
rename to utils/tracers/l2-tracer.cpp
diff --git a/utils/tracers/l2-tracer.h b/utils/tracers/l2-tracer.hpp
similarity index 100%
rename from utils/tracers/l2-tracer.h
rename to utils/tracers/l2-tracer.hpp
diff --git a/utils/tracers/ndn-app-delay-tracer.cc b/utils/tracers/ndn-app-delay-tracer.cpp
similarity index 100%
rename from utils/tracers/ndn-app-delay-tracer.cc
rename to utils/tracers/ndn-app-delay-tracer.cpp
diff --git a/utils/tracers/ndn-app-delay-tracer.h b/utils/tracers/ndn-app-delay-tracer.hpp
similarity index 100%
rename from utils/tracers/ndn-app-delay-tracer.h
rename to utils/tracers/ndn-app-delay-tracer.hpp
diff --git a/utils/tracers/ndn-cs-tracer.cc b/utils/tracers/ndn-cs-tracer.cpp
similarity index 100%
rename from utils/tracers/ndn-cs-tracer.cc
rename to utils/tracers/ndn-cs-tracer.cpp
diff --git a/utils/tracers/ndn-cs-tracer.h b/utils/tracers/ndn-cs-tracer.hpp
similarity index 100%
rename from utils/tracers/ndn-cs-tracer.h
rename to utils/tracers/ndn-cs-tracer.hpp
diff --git a/utils/tracers/ndn-l3-aggregate-tracer.cc b/utils/tracers/ndn-l3-aggregate-tracer.cpp
similarity index 100%
rename from utils/tracers/ndn-l3-aggregate-tracer.cc
rename to utils/tracers/ndn-l3-aggregate-tracer.cpp
diff --git a/utils/tracers/ndn-l3-aggregate-tracer.h b/utils/tracers/ndn-l3-aggregate-tracer.hpp
similarity index 100%
rename from utils/tracers/ndn-l3-aggregate-tracer.h
rename to utils/tracers/ndn-l3-aggregate-tracer.hpp
diff --git a/utils/tracers/ndn-l3-rate-tracer.cc b/utils/tracers/ndn-l3-rate-tracer.cpp
similarity index 100%
rename from utils/tracers/ndn-l3-rate-tracer.cc
rename to utils/tracers/ndn-l3-rate-tracer.cpp
diff --git a/utils/tracers/ndn-l3-rate-tracer.h b/utils/tracers/ndn-l3-rate-tracer.hpp
similarity index 100%
rename from utils/tracers/ndn-l3-rate-tracer.h
rename to utils/tracers/ndn-l3-rate-tracer.hpp
diff --git a/utils/tracers/ndn-l3-tracer.cc b/utils/tracers/ndn-l3-tracer.cpp
similarity index 100%
rename from utils/tracers/ndn-l3-tracer.cc
rename to utils/tracers/ndn-l3-tracer.cpp
diff --git a/utils/tracers/ndn-l3-tracer.h b/utils/tracers/ndn-l3-tracer.hpp
similarity index 100%
rename from utils/tracers/ndn-l3-tracer.h
rename to utils/tracers/ndn-l3-tracer.hpp
diff --git a/utils/trie/aggregate-stats-policy.h b/utils/trie/aggregate-stats-policy.hpp
similarity index 100%
rename from utils/trie/aggregate-stats-policy.h
rename to utils/trie/aggregate-stats-policy.hpp
diff --git a/utils/trie/counting-policy.h b/utils/trie/counting-policy.hpp
similarity index 100%
rename from utils/trie/counting-policy.h
rename to utils/trie/counting-policy.hpp
diff --git a/utils/trie/detail/functor-hook.h b/utils/trie/detail/functor-hook.hpp
similarity index 100%
rename from utils/trie/detail/functor-hook.h
rename to utils/trie/detail/functor-hook.hpp
diff --git a/utils/trie/detail/multi-policy-container.h b/utils/trie/detail/multi-policy-container.hpp
similarity index 100%
rename from utils/trie/detail/multi-policy-container.h
rename to utils/trie/detail/multi-policy-container.hpp
diff --git a/utils/trie/detail/multi-type-container.h b/utils/trie/detail/multi-type-container.hpp
similarity index 100%
rename from utils/trie/detail/multi-type-container.h
rename to utils/trie/detail/multi-type-container.hpp
diff --git a/utils/trie/empty-policy.h b/utils/trie/empty-policy.hpp
similarity index 100%
rename from utils/trie/empty-policy.h
rename to utils/trie/empty-policy.hpp
diff --git a/utils/trie/fifo-policy.h b/utils/trie/fifo-policy.hpp
similarity index 100%
rename from utils/trie/fifo-policy.h
rename to utils/trie/fifo-policy.hpp
diff --git a/utils/trie/lfu-policy.h b/utils/trie/lfu-policy.hpp
similarity index 100%
rename from utils/trie/lfu-policy.h
rename to utils/trie/lfu-policy.hpp
diff --git a/utils/trie/lru-policy.h b/utils/trie/lru-policy.hpp
similarity index 100%
rename from utils/trie/lru-policy.h
rename to utils/trie/lru-policy.hpp
diff --git a/utils/trie/multi-policy.h b/utils/trie/multi-policy.hpp
similarity index 100%
rename from utils/trie/multi-policy.h
rename to utils/trie/multi-policy.hpp
diff --git a/utils/trie/payload-policy.h b/utils/trie/payload-policy.hpp
similarity index 100%
rename from utils/trie/payload-policy.h
rename to utils/trie/payload-policy.hpp
diff --git a/utils/trie/payload-with-policy.h b/utils/trie/payload-with-policy.hpp
similarity index 100%
rename from utils/trie/payload-with-policy.h
rename to utils/trie/payload-with-policy.hpp
diff --git a/utils/trie/persistent-policy.h b/utils/trie/persistent-policy.hpp
similarity index 100%
rename from utils/trie/persistent-policy.h
rename to utils/trie/persistent-policy.hpp
diff --git a/utils/trie/random-policy.h b/utils/trie/random-policy.hpp
similarity index 100%
rename from utils/trie/random-policy.h
rename to utils/trie/random-policy.hpp
diff --git a/utils/trie/trie-with-policy.h b/utils/trie/trie-with-policy.hpp
similarity index 100%
rename from utils/trie/trie-with-policy.h
rename to utils/trie/trie-with-policy.hpp
diff --git a/utils/trie/trie.h b/utils/trie/trie.hpp
similarity index 100%
rename from utils/trie/trie.h
rename to utils/trie/trie.hpp