Solving a couple of bugs resulting from the packet format changes. Code compiles, but haven't fully tested yet
diff --git a/wscript b/wscript
index 8712817..974e39f 100644
--- a/wscript
+++ b/wscript
@@ -77,8 +77,8 @@
         "model/ndn-face.h",
         "model/ndn-app-face.h",
         "model/ndn-net-device-face.h",
-        "model/ndn-interest-header.h",
-        "model/ndn-content-object-header.h",
+        "model/ndn-interest.h",
+        "model/ndn-content-object.h",
         "model/ndn-name-components.h",
 
         "model/cs/ndn-content-store.h",