diff --git a/ndn-all.hpp b/ndn-all.hpp
index 294e30b..68dde0d 100644
--- a/ndn-all.hpp
+++ b/ndn-all.hpp
@@ -20,42 +20,24 @@
 #ifndef NDNSIM_NDN_ALL_HPP
 #define NDNSIM_NDN_ALL_HPP
 
-// #include "ns3/ndnSIM/helper/ndn-app-helper.hpp"
-// #include "ns3/ndnSIM/helper/ndn-face-container.hpp"
-// #include "ns3/ndnSIM/helper/ndn-fib-helper.hpp"
-// #include "ns3/ndnSIM/helper/ndn-global-routing-helper.hpp"
+#include "ns3/ndnSIM/helper/ndn-stack-helper.hpp"
+#include "ns3/ndnSIM/helper/ndn-app-helper.hpp"
+#include "ns3/ndnSIM/helper/ndn-global-routing-helper.hpp"
 // #include "ns3/ndnSIM/helper/ndn-ip-faces-helper.hpp"
 // #include "ns3/ndnSIM/helper/ndn-link-control-helper.hpp"
-// #include "ns3/ndnSIM/helper/ndn-stack-helper.hpp"
-// #include "ns3/ndnSIM/helper/ndn-strategy-choice-helper.hpp"
 
-// #include "ns3/ndnSIM/utils/batches.hpp"
-// #include "ns3/ndnSIM/utils/topology/annotated-topology-reader.hpp"
-// #include "ns3/ndnSIM/utils/topology/rocketfuel-map-reader.hpp"
-// #include "ns3/ndnSIM/utils/topology/rocketfuel-weights-reader.hpp"
-// #include "ns3/ndnSIM/utils/tracers/l2-rate-tracer.hpp"
-// #include "ns3/ndnSIM/utils/tracers/l2-tracer.hpp"
-// #include "ns3/ndnSIM/utils/tracers/ndn-app-delay-tracer.hpp"
-// #include "ns3/ndnSIM/utils/tracers/ndn-cs-tracer.hpp"
-// #include "ns3/ndnSIM/utils/tracers/ndn-l3-aggregate-tracer.hpp"
-// #include "ns3/ndnSIM/utils/tracers/ndn-l3-rate-tracer.hpp"
-// #include "ns3/ndnSIM/utils/tracers/ndn-l3-tracer.hpp"
+#include "ns3/ndnSIM/utils/topology/annotated-topology-reader.hpp"
+#include "ns3/ndnSIM/utils/topology/rocketfuel-map-reader.hpp"
+#include "ns3/ndnSIM/utils/topology/rocketfuel-weights-reader.hpp"
+#include "ns3/ndnSIM/utils/tracers/l2-rate-tracer.hpp"
+#include "ns3/ndnSIM/utils/tracers/ndn-app-delay-tracer.hpp"
+#include "ns3/ndnSIM/utils/tracers/ndn-cs-tracer.hpp"
+#include "ns3/ndnSIM/utils/tracers/ndn-l3-rate-tracer.hpp"
 
 // #include "ns3/ndnSIM/model/ndn-app-face.hpp"
-// #include "ns3/ndnSIM/model/ndn-common.hpp"
-// #include "ns3/ndnSIM/model/ndn-global-router.hpp"
-// #include "ns3/ndnSIM/model/ndn-header.hpp"
 // #include "ns3/ndnSIM/model/ndn-l3-protocol.hpp"
 // #include "ns3/ndnSIM/model/ndn-net-device-face.hpp"
-// #include "ns3/ndnSIM/model/ndn-ns3.hpp"
 
-// #include "ns3/ndnSIM/apps/callback-based-app.hpp"
 // #include "ns3/ndnSIM/apps/ndn-app.hpp"
-// #include "ns3/ndnSIM/apps/ndn-consumer-batches.hpp"
-// #include "ns3/ndnSIM/apps/ndn-consumer-cbr.hpp"
-// #include "ns3/ndnSIM/apps/ndn-consumer-window.hpp"
-// #include "ns3/ndnSIM/apps/ndn-consumer-zipf-mandelbrot.hpp"
-// #include "ns3/ndnSIM/apps/ndn-consumer.hpp"
-// #include "ns3/ndnSIM/apps/ndn-producer.hpp"
 
 #endif // NDNSIM_NDN_ALL_HPP