diff --git a/model/ndn-l3-protocol.cpp b/model/ndn-l3-protocol.cpp
index 47ce00c..f7ad619 100644
--- a/model/ndn-l3-protocol.cpp
+++ b/model/ndn-l3-protocol.cpp
@@ -47,12 +47,13 @@
 #include "ns3/ndnSIM/NFD/daemon/mgmt/tables-config-section.hpp"
 #include "ns3/ndnSIM/NFD/daemon/mgmt/command-authenticator.hpp"
 
-#include "ns3/ndnSIM/NFD/rib/service.hpp"
+#include "ns3/ndnSIM/NFD/daemon/rib/service.hpp"
 
 #include "ns3/ndnSIM/NFD/daemon/face/null-face.hpp"
 #include "ns3/ndnSIM/NFD/daemon/face/internal-face.hpp"
 
-#include "ns3/ndnSIM/NFD/core/config-file.hpp"
+#include "ns3/ndnSIM/NFD/daemon/common/global.hpp"
+#include "ns3/ndnSIM/NFD/daemon/common/config-file.hpp"
 
 #include <ndn-cxx/mgmt/dispatcher.hpp>
 
@@ -379,7 +380,7 @@
   // MUST HAPPEN BEFORE Simulator IS DESTROYED
   m_impl.reset();
 
-  nfd::scheduler::resetGlobalScheduler();
+  nfd::resetGlobalScheduler();
 
   m_node = 0;