Solving a couple of bugs resulting from the packet format changes. Code compiles, but haven't fully tested yet
diff --git a/apps/ndn-consumer.cc b/apps/ndn-consumer.cc
index 671dbff..c889b6d 100644
--- a/apps/ndn-consumer.cc
+++ b/apps/ndn-consumer.cc
@@ -30,8 +30,8 @@
 #include "ns3/double.h"
 
 #include "ns3/ndn-app-face.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/weights-path-stretch-tag.h"
 
 #include <boost/ref.hpp>