diff --git a/model/fib/ndn-fib-impl.cc b/model/fib/ndn-fib-impl.cc
index a55e9fd..b91e94c 100644
--- a/model/fib/ndn-fib-impl.cc
+++ b/model/fib/ndn-fib-impl.cc
@@ -20,7 +20,6 @@
 
 #include "ndn-fib-impl.h"
 
-#include "ns3/ndn.h"
 #include "ns3/ndn-face.h"
 #include "ns3/ndn-interest-header.h"
 
diff --git a/model/ndn-face.h b/model/ndn-face.h
index 0e98905..0a46401 100644
--- a/model/ndn-face.h
+++ b/model/ndn-face.h
@@ -25,9 +25,10 @@
 #include <algorithm>
 
 #include "ns3/ptr.h"
-#include "ns3/ndn.h"
+#include "ns3/object.h"
 #include "ns3/nstime.h"
 #include "ns3/type-id.h"
+#include "ns3/traced-callback.h"
 
 namespace ns3 {
 
@@ -50,7 +51,8 @@
  *
  * \see ndn::LocalFace, ndn::NetDeviceFace, ndn::Ipv4Face, ndn::UdpFace
  */
-class Face  : public Object
+class Face :
+    public Object
 {
 public:
   static TypeId