diff --git a/model/ccnx-l3-protocol.h b/model/ccnx-l3-protocol.h
index 6167fd0..8c92c93 100644
--- a/model/ccnx-l3-protocol.h
+++ b/model/ccnx-l3-protocol.h
@@ -41,7 +41,7 @@
 class Header;
 class CcnxInterestHeader;
 class CcnxContentObjectHeader;
-class CcnxContentStore;
+//class CcnxContentStore;
 
 /**
  * \ingroup ccnx
@@ -161,7 +161,7 @@
   Ptr<Node> m_node; ///< \brief node on which ccnx stack is installed
   Ptr<CcnxForwardingStrategy> m_forwardingStrategy; ///< \brief smart pointer to the selected forwarding strategy
 
-  Ptr<CcnxContentStore> m_contentStore;
+  //Ptr<CcnxContentStore> m_contentStore;
   
   /**
    * \brief Trace of transmitted packets, including all headers
diff --git a/model/ccnx.h b/model/ccnx.h
index 666158f..7c0e1d0 100644
--- a/model/ccnx.h
+++ b/model/ccnx.h
@@ -26,6 +26,7 @@
 #include "ns3/callback.h"
 
 #include "ccnx-face.h"
+#include "ccnx-content-store.h"
 
 namespace ns3 {
 
@@ -140,6 +141,8 @@
    */
   virtual Ptr<CcnxFace>
   GetFace (uint32_t face) const = 0;
+    
+  Ptr<CcnxContentStore> m_contentStore;
 };
 
 } // namespace ns3