Solving a couple of bugs resulting from the packet format changes. Code compiles, but haven't fully tested yet
diff --git a/model/fw/best-route.cc b/model/fw/best-route.cc
index 046d7a2..03400b7 100644
--- a/model/fw/best-route.cc
+++ b/model/fw/best-route.cc
@@ -21,7 +21,7 @@
#include "best-route.h"
-#include "ns3/ndn-interest-header.h"
+#include "ns3/ndn-interest.h"
#include "ns3/ndn-pit.h"
#include "ns3/ndn-pit-entry.h"
diff --git a/model/fw/flooding.cc b/model/fw/flooding.cc
index b4e94a8..80b863a 100644
--- a/model/fw/flooding.cc
+++ b/model/fw/flooding.cc
@@ -21,7 +21,7 @@
#include "flooding.h"
-#include "ns3/ndn-interest-header.h"
+#include "ns3/ndn-interest.h"
#include "ns3/ndn-pit.h"
#include "ns3/ndn-pit-entry.h"
diff --git a/model/fw/green-yellow-red.cc b/model/fw/green-yellow-red.cc
index 3351cda..52acc68 100644
--- a/model/fw/green-yellow-red.cc
+++ b/model/fw/green-yellow-red.cc
@@ -23,8 +23,8 @@
#include "ns3/ndn-pit.h"
#include "ns3/ndn-pit-entry.h"
-#include "ns3/ndn-interest-header.h"
-#include "ns3/ndn-content-object-header.h"
+#include "ns3/ndn-interest.h"
+#include "ns3/ndn-content-object.h"
#include "ns3/ndn-pit.h"
#include "ns3/ndn-fib.h"
#include "ns3/ndn-content-store.h"
diff --git a/model/fw/nacks.cc b/model/fw/nacks.cc
index 511b022..4e7894a 100644
--- a/model/fw/nacks.cc
+++ b/model/fw/nacks.cc
@@ -22,8 +22,8 @@
#include "ns3/ndn-pit.h"
#include "ns3/ndn-pit-entry.h"
-#include "ns3/ndn-interest-header.h"
-#include "ns3/ndn-content-object-header.h"
+#include "ns3/ndn-interest.h"
+#include "ns3/ndn-content-object.h"
#include "ns3/ndn-pit.h"
#include "ns3/ndn-fib.h"
#include "ns3/ndn-content-store.h"
diff --git a/model/fw/ndn-forwarding-strategy.cc b/model/fw/ndn-forwarding-strategy.cc
index 770613b..390bdd1 100644
--- a/model/fw/ndn-forwarding-strategy.cc
+++ b/model/fw/ndn-forwarding-strategy.cc
@@ -23,8 +23,8 @@
#include "ns3/ndn-pit.h"
#include "ns3/ndn-pit-entry.h"
-#include "ns3/ndn-interest-header.h"
-#include "ns3/ndn-content-object-header.h"
+#include "ns3/ndn-interest.h"
+#include "ns3/ndn-content-object.h"
#include "ns3/ndn-pit.h"
#include "ns3/ndn-fib.h"
#include "ns3/ndn-content-store.h"
diff --git a/model/fw/per-fib-limits.cc b/model/fw/per-fib-limits.cc
index 3b60cf5..3ec4f57 100644
--- a/model/fw/per-fib-limits.cc
+++ b/model/fw/per-fib-limits.cc
@@ -22,8 +22,8 @@
#include "per-out-face-limits.h"
#include "ns3/ndn-l3-protocol.h"
-#include "ns3/ndn-interest-header.h"
-#include "ns3/ndn-content-object-header.h"
+#include "ns3/ndn-interest.h"
+#include "ns3/ndn-content-object.h"
#include "best-route.h"
#include "flooding.h"
diff --git a/model/fw/per-out-face-limits.cc b/model/fw/per-out-face-limits.cc
index 5591739..41ca598 100644
--- a/model/fw/per-out-face-limits.cc
+++ b/model/fw/per-out-face-limits.cc
@@ -21,8 +21,8 @@
#include "per-out-face-limits.h"
#include "ns3/ndn-l3-protocol.h"
-#include "ns3/ndn-interest-header.h"
-#include "ns3/ndn-content-object-header.h"
+#include "ns3/ndn-interest.h"
+#include "ns3/ndn-content-object.h"
#include "best-route.h"
#include "flooding.h"
diff --git a/model/fw/smart-flooding.cc b/model/fw/smart-flooding.cc
index 8a1d367..3777739 100644
--- a/model/fw/smart-flooding.cc
+++ b/model/fw/smart-flooding.cc
@@ -20,7 +20,7 @@
#include "smart-flooding.h"
-#include "ns3/ndn-interest-header.h"
+#include "ns3/ndn-interest.h"
#include "ns3/ndn-pit.h"
#include "ns3/ndn-pit-entry.h"