merge src/simulator into src/core; move src/core to new module layout

2011-02-18 16:05:39 -08:00
parent 9471e3121f
commit df07734f32
241 changed files with 358 additions and 386 deletions
--- a/examples/animation/dumbbell-animation.cc
+++ b/examples/animation/dumbbell-animation.cc
@@ -19,7 +19,7 @@
 #include <iostream>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-global-routing-helper.h"
--- a/examples/animation/grid-animation.cc
+++ b/examples/animation/grid-animation.cc
@@ -19,7 +19,7 @@
 #include <iostream>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-global-routing-helper.h"
--- a/examples/animation/star-animation.cc
+++ b/examples/animation/star-animation.cc
@@ -16,7 +16,7 @@
 */

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-global-routing-helper.h"
--- a/examples/csma/csma-broadcast.cc
+++ b/examples/csma/csma-broadcast.cc
@@ -33,7 +33,7 @@
 #include <cassert>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"

--- a/examples/csma/csma-multicast.cc
+++ b/examples/csma/csma-multicast.cc
@@ -33,7 +33,7 @@
 #include <fstream>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-static-routing-helper.h"
--- a/examples/csma/csma-one-subnet.cc
+++ b/examples/csma/csma-one-subnet.cc
@@ -28,7 +28,7 @@
 #include <iostream>
 #include <fstream>

-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/core-module.h"
 #include "ns3/helper-module.h"
--- a/examples/csma/csma-packet-socket.cc
+++ b/examples/csma/csma-packet-socket.cc
@@ -33,7 +33,7 @@
 #include <cassert>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"

--- a/examples/csma/csma-ping.cc
+++ b/examples/csma/csma-ping.cc
@@ -29,7 +29,7 @@
 #include <cassert>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"

--- a/examples/csma/csma-raw-ip-socket.cc
+++ b/examples/csma/csma-raw-ip-socket.cc
@@ -32,7 +32,7 @@
 #include <cassert>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"

--- a/examples/csma/csma-star.cc
+++ b/examples/csma/csma-star.cc
@@ -16,7 +16,7 @@
 */

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/csma-module.h"
--- a/examples/emulation/emu-ping.cc
+++ b/examples/emulation/emu-ping.cc
@@ -53,7 +53,7 @@

 #include "ns3/abort.h"
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/emu-module.h"
 #include "ns3/v4ping-module.h"
--- a/examples/emulation/emu-udp-echo.cc
+++ b/examples/emulation/emu-udp-echo.cc
@@ -63,7 +63,7 @@

 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/emu-helper.h"

--- a/examples/energy/wscript
+++ b/examples/energy/wscript
@@ -1,5 +1,5 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

 def build(bld):
-    obj = bld.create_ns3_program('energy-model-example', ['core', 'simulator', 'mobility', 'wifi', 'energy', 'internet-stack'])
+    obj = bld.create_ns3_program('energy-model-example', ['core', 'mobility', 'wifi', 'energy', 'internet-stack'])
    obj.source = 'energy-model-example.cc'
--- a/examples/error-model/simple-error-model.cc
+++ b/examples/error-model/simple-error-model.cc
@@ -37,7 +37,7 @@
 #include <fstream>
 #include "ns3/core-module.h"
 #include "ns3/common-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-global-routing-helper.h"
--- a/examples/ipv6/fragmentation-ipv6.cc
+++ b/examples/ipv6/fragmentation-ipv6.cc
@@ -30,7 +30,7 @@

 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv6-static-routing-helper.h"

--- a/examples/ipv6/icmpv6-redirect.cc
+++ b/examples/ipv6/icmpv6-redirect.cc
@@ -42,7 +42,7 @@

 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv6-static-routing-helper.h"

--- a/examples/ipv6/loose-routing-ipv6.cc
+++ b/examples/ipv6/loose-routing-ipv6.cc
@@ -40,7 +40,7 @@

 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv6-header.h"
 using namespace ns3;
--- a/examples/ipv6/ping6.cc
+++ b/examples/ipv6/ping6.cc
@@ -31,7 +31,7 @@

 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"

 using namespace ns3;
--- a/examples/ipv6/radvd-two-prefix.cc
+++ b/examples/ipv6/radvd-two-prefix.cc
@@ -34,7 +34,7 @@

 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"

 #include "ns3/ipv6-routing-table-entry.h"
--- a/examples/ipv6/radvd.cc
+++ b/examples/ipv6/radvd.cc
@@ -33,7 +33,7 @@

 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"

 #include "ns3/radvd.h"
--- a/examples/matrix-topology/matrix-topology.cc
+++ b/examples/matrix-topology/matrix-topology.cc
@@ -47,7 +47,7 @@
 #include <time.h>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/global-route-manager.h"
--- a/examples/mesh/mesh.cc
+++ b/examples/mesh/mesh.cc
@@ -45,7 +45,7 @@


 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/global-routing-module.h"
--- a/examples/mesh/wscript
+++ b/examples/mesh/wscript
@@ -1,5 +1,5 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

 def build(bld):
-    obj = bld.create_ns3_program('mesh', ['core', 'simulator', 'mobility', 'wifi', 'mesh'])
+    obj = bld.create_ns3_program('mesh', ['core', 'mobility', 'wifi', 'mesh'])
    obj.source = 'mesh.cc'
--- a/examples/mobility/ns2-mobility-trace.cc
+++ b/examples/mobility/ns2-mobility-trace.cc
@@ -56,7 +56,7 @@

 #include "ns3/core-module.h"
 #include "ns3/mobility-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/mobility-module.h"
 #include "ns3/ns2-mobility-helper.h"
--- a/examples/mobility/wscript
+++ b/examples/mobility/wscript
@@ -1,6 +1,6 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

 def build(bld):
-    obj = bld.create_ns3_program('ns2-mobility-trace', ['core', 'simulator', 'mobility', 'wifi', 'mesh'])
+    obj = bld.create_ns3_program('ns2-mobility-trace', ['core', 'mobility', 'wifi', 'mesh'])
    obj.source = 'ns2-mobility-trace.cc'

--- a/examples/mpi/nms-p2p-nix-distributed.cc
+++ b/examples/mpi/nms-p2p-nix-distributed.cc
@@ -39,7 +39,7 @@
 #include <fstream>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/global-routing-module.h"
--- a/examples/mpi/simple-distributed.cc
+++ b/examples/mpi/simple-distributed.cc
@@ -42,7 +42,7 @@
 */

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/mpi-interface.h"
--- a/examples/mpi/third-distributed.cc
+++ b/examples/mpi/third-distributed.cc
@@ -15,7 +15,7 @@
 */

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/wifi-module.h"
--- a/examples/naming/object-names.cc
+++ b/examples/naming/object-names.cc
@@ -23,7 +23,7 @@
 //

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"

 using namespace ns3;
--- a/examples/naming/wscript
+++ b/examples/naming/wscript
@@ -1,5 +1,5 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

 def build(bld):
-    obj = bld.create_ns3_program('object-names', ['core', 'simulator', 'csma', 'internet-stack'])
+    obj = bld.create_ns3_program('object-names', ['core', 'csma', 'internet-stack'])
    obj.source = 'object-names.cc'
--- a/examples/realtime/realtime-udp-echo.cc
+++ b/examples/realtime/realtime-udp-echo.cc
@@ -27,7 +27,7 @@

 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"

 using namespace ns3;
--- a/examples/routing/dynamic-global-routing.cc
+++ b/examples/routing/dynamic-global-routing.cc
@@ -68,7 +68,7 @@
 #include <cassert>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-global-routing-helper.h"
--- a/examples/routing/global-injection-slash32.cc
+++ b/examples/routing/global-injection-slash32.cc
@@ -26,7 +26,7 @@

 #include "ns3/csma-net-device.h"
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-static-routing.h"
--- a/examples/routing/global-routing-slash32.cc
+++ b/examples/routing/global-routing-slash32.cc
@@ -26,7 +26,7 @@

 #include "ns3/csma-net-device.h"
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-global-routing-helper.h"
--- a/examples/routing/mixed-global-routing.cc
+++ b/examples/routing/mixed-global-routing.cc
@@ -37,7 +37,7 @@
 #include <cassert>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-global-routing-helper.h"
--- a/examples/routing/nix-simple.cc
+++ b/examples/routing/nix-simple.cc
@@ -15,7 +15,7 @@
 */

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-static-routing-helper.h"
--- a/examples/routing/nms-p2p-nix.cc
+++ b/examples/routing/nms-p2p-nix.cc
@@ -37,7 +37,7 @@
 #include <fstream>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/global-routing-module.h"
--- a/examples/routing/simple-alternate-routing.cc
+++ b/examples/routing/simple-alternate-routing.cc
@@ -38,7 +38,7 @@
 #include <cassert>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-global-routing-helper.h"
--- a/examples/routing/simple-global-routing.cc
+++ b/examples/routing/simple-global-routing.cc
@@ -40,7 +40,7 @@
 #include <cassert>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/flow-monitor-helper.h"
--- a/examples/routing/simple-routing-ping6.cc
+++ b/examples/routing/simple-routing-ping6.cc
@@ -30,7 +30,7 @@

 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv6-static-routing-helper.h"

--- a/examples/routing/static-routing-slash32.cc
+++ b/examples/routing/static-routing-slash32.cc
@@ -26,7 +26,7 @@

 #include "ns3/csma-net-device.h"
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-static-routing-helper.h"
--- a/examples/socket/socket-bound-static-routing.cc
+++ b/examples/socket/socket-bound-static-routing.cc
@@ -36,7 +36,7 @@
 #include <cassert>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-static-routing-helper.h"
--- a/examples/socket/socket-bound-tcp-static-routing.cc
+++ b/examples/socket/socket-bound-tcp-static-routing.cc
@@ -36,7 +36,7 @@
 #include <cassert>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-static-routing-helper.h"
--- a/examples/stats/wifi-example-apps.cc
+++ b/examples/stats/wifi-example-apps.cc
@@ -29,7 +29,7 @@

 #include "ns3/core-module.h"
 #include "ns3/common-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/internet-stack-module.h"

--- a/examples/tap/tap-csma-virtual-machine.cc
+++ b/examples/tap/tap-csma-virtual-machine.cc
@@ -61,7 +61,7 @@
 #include <iostream>
 #include <fstream>

-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/core-module.h"
 #include "ns3/helper-module.h"
--- a/examples/tap/tap-csma.cc
+++ b/examples/tap/tap-csma.cc
@@ -57,7 +57,7 @@
 #include <iostream>
 #include <fstream>

-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/core-module.h"
 #include "ns3/wifi-module.h"
--- a/examples/tap/tap-wifi-dumbbell.cc
+++ b/examples/tap/tap-wifi-dumbbell.cc
@@ -99,7 +99,7 @@
 #include <iostream>
 #include <fstream>

-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/core-module.h"
 #include "ns3/wifi-module.h"
--- a/examples/tap/tap-wifi-virtual-machine.cc
+++ b/examples/tap/tap-wifi-virtual-machine.cc
@@ -69,7 +69,7 @@
 #include <iostream>
 #include <fstream>

-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/core-module.h"
 #include "ns3/wifi-module.h"
--- a/examples/tcp/star.cc
+++ b/examples/tcp/star.cc
@@ -16,7 +16,7 @@
 */

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-global-routing-helper.h"
--- a/examples/tcp/tcp-bulk-send.cc
+++ b/examples/tcp/tcp-bulk-send.cc
@@ -27,7 +27,7 @@
 #include <string>
 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/node-module.h"
 #include "ns3/packet-sink.h"
--- a/examples/tcp/tcp-large-transfer.cc
+++ b/examples/tcp/tcp-large-transfer.cc
@@ -39,7 +39,7 @@
 #include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/node-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/ipv4-global-routing-helper.h"

 using namespace ns3;
--- a/examples/tcp/tcp-nsc-lfn.cc
+++ b/examples/tcp/tcp-nsc-lfn.cc
@@ -36,7 +36,7 @@
 #include "ns3/common-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/node-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/ipv4-global-routing-helper.h"

 using namespace ns3;
--- a/examples/tcp/tcp-nsc-zoo.cc
+++ b/examples/tcp/tcp-nsc-zoo.cc
@@ -33,7 +33,7 @@
 #include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/node-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/ipv4-global-routing-helper.h"

 using namespace ns3;
--- a/examples/tcp/tcp-star-server.cc
+++ b/examples/tcp/tcp-star-server.cc
@@ -49,7 +49,7 @@
 #include <cassert>

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-global-routing-helper.h"
--- a/examples/topology-read/topology-example-sim.cc
+++ b/examples/topology-read/topology-example-sim.cc
@@ -30,7 +30,7 @@
 #include "ns3/common-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/ipv4-static-routing-helper.h"
 #include "ns3/ipv4-list-routing-helper.h"

--- a/examples/tutorial/fifth.cc
+++ b/examples/tutorial/fifth.cc
@@ -17,7 +17,7 @@
 #include <fstream>
 #include "ns3/core-module.h"
 #include "ns3/common-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"

--- a/examples/tutorial/first.cc
+++ b/examples/tutorial/first.cc
@@ -15,7 +15,7 @@
 */

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"

--- a/examples/tutorial/second.cc
+++ b/examples/tutorial/second.cc
@@ -15,7 +15,7 @@
 */

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv4-global-routing-helper.h"
--- a/examples/tutorial/sixth.cc
+++ b/examples/tutorial/sixth.cc
@@ -17,7 +17,7 @@
 #include <fstream>
 #include "ns3/core-module.h"
 #include "ns3/common-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"

--- a/examples/tutorial/third.cc
+++ b/examples/tutorial/third.cc
@@ -15,7 +15,7 @@
 */

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/wifi-module.h"
--- a/examples/tutorial/wscript
+++ b/examples/tutorial/wscript
@@ -4,20 +4,20 @@ def build(bld):
    obj = bld.create_ns3_program('hello-simulator', ['core'])
    obj.source = 'hello-simulator.cc'
        
-    obj = bld.create_ns3_program('first', ['core', 'simulator', 'point-to-point', 'internet-stack'])
+    obj = bld.create_ns3_program('first', ['core', 'point-to-point', 'internet-stack'])
    obj.source = 'first.cc'
        
-    obj = bld.create_ns3_program('second', ['core', 'simulator', 'point-to-point', 'csma', 'internet-stack'])
+    obj = bld.create_ns3_program('second', ['core', 'point-to-point', 'csma', 'internet-stack'])
    obj.source = 'second.cc'
        
-    obj = bld.create_ns3_program('third', ['core', 'simulator', 'point-to-point', 'csma', 'wifi', 'internet-stack'])
+    obj = bld.create_ns3_program('third', ['core', 'point-to-point', 'csma', 'wifi', 'internet-stack'])
    obj.source = 'third.cc'

    obj = bld.create_ns3_program('fourth', ['core'])
    obj.source = 'fourth.cc'

-    obj = bld.create_ns3_program('fifth', ['core', 'simulator', 'point-to-point', 'internet-stack'])
+    obj = bld.create_ns3_program('fifth', ['core', 'point-to-point', 'internet-stack'])
    obj.source = 'fifth.cc'

-    obj = bld.create_ns3_program('sixth', ['core', 'simulator', 'point-to-point', 'internet-stack'])
+    obj = bld.create_ns3_program('sixth', ['core', 'point-to-point', 'internet-stack'])
    obj.source = 'sixth.cc'
--- a/examples/udp-client-server/udp-client-server.cc
+++ b/examples/udp-client-server/udp-client-server.cc
@@ -25,7 +25,7 @@

 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"

 using namespace ns3;
--- a/examples/udp-client-server/udp-trace-client-server.cc
+++ b/examples/udp-client-server/udp-trace-client-server.cc
@@ -25,7 +25,7 @@

 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"

 using namespace ns3;
--- a/examples/udp/udp-echo.cc
+++ b/examples/udp/udp-echo.cc
@@ -27,7 +27,7 @@

 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"

 using namespace ns3;
--- a/examples/wireless/simple-wifi-frame-aggregation.cc
+++ b/examples/wireless/simple-wifi-frame-aggregation.cc
@@ -18,7 +18,7 @@
 * Author: Mirko Banchi <mk.banchi@gmail.com>
 */
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/wifi-module.h"
--- a/examples/wireless/wifi-blockack.cc
+++ b/examples/wireless/wifi-blockack.cc
@@ -40,7 +40,7 @@
 *    - the recipient receives a block ack request or a MPDU with ack policy Block Ack. 
 */
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/global-routing-module.h"
--- a/examples/wireless/wifi-wired-bridging.cc
+++ b/examples/wireless/wifi-wired-bridging.cc
@@ -44,7 +44,7 @@
 //

 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/mobility-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/wifi-module.h"
--- a/examples/wireless/wscript
+++ b/examples/wireless/wscript
@@ -1,45 +1,45 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

 def build(bld):
-    obj = bld.create_ns3_program('mixed-wireless', ['core', 'simulator', 'mobility', 'wifi', 'point-to-point', 
+    obj = bld.create_ns3_program('mixed-wireless', ['core', 'mobility', 'wifi', 'point-to-point', 
                                                    'internet-stack'])
    obj.source = 'mixed-wireless.cc'

-    obj = bld.create_ns3_program('wifi-adhoc', ['core', 'simulator', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi'])
    obj.source = 'wifi-adhoc.cc'

-    obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['core', 'simulator', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['core', 'mobility', 'wifi'])
    obj.source = 'wifi-clear-channel-cmu.cc'

-    obj = bld.create_ns3_program('wifi-ap', ['core', 'simulator', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-ap', ['core', 'mobility', 'wifi'])
    obj.source = 'wifi-ap.cc'

-    obj = bld.create_ns3_program('wifi-wired-bridging', ['core', 'simulator', 'mobility', 'wifi', 'csma', 'helper', 'bridge'])
+    obj = bld.create_ns3_program('wifi-wired-bridging', ['core', 'mobility', 'wifi', 'csma', 'helper', 'bridge'])
    obj.source = 'wifi-wired-bridging.cc'

-    obj = bld.create_ns3_program('simple-wifi-frame-aggregation', ['core', 'simulator', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('simple-wifi-frame-aggregation', ['core', 'mobility', 'wifi'])
    obj.source = 'simple-wifi-frame-aggregation.cc'

-    obj = bld.create_ns3_program('multirate', ['core', 'simulator', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('multirate', ['core', 'mobility', 'wifi'])
    obj.source = 'multirate.cc'

-    obj = bld.create_ns3_program('wifi-simple-adhoc', ['core', 'simulator', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-simple-adhoc', ['core', 'mobility', 'wifi'])
    obj.source = 'wifi-simple-adhoc.cc'

-    obj = bld.create_ns3_program('wifi-simple-adhoc-grid', ['core', 'simulator', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-simple-adhoc-grid', ['core', 'mobility', 'wifi'])
    obj.source = 'wifi-simple-adhoc-grid.cc'

-    obj = bld.create_ns3_program('wifi-simple-infra', ['core', 'simulator', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-simple-infra', ['core', 'mobility', 'wifi'])
    obj.source = 'wifi-simple-infra.cc'

-    obj = bld.create_ns3_program('wifi-simple-interference', ['core', 'simulator', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-simple-interference', ['core', 'mobility', 'wifi'])
    obj.source = 'wifi-simple-interference.cc'

-    obj = bld.create_ns3_program('wifi-blockack', ['core', 'simulator', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-blockack', ['core', 'mobility', 'wifi'])
    obj.source = 'wifi-blockack.cc'

-    obj = bld.create_ns3_program('ofdm-validation', ['core', 'simulator', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('ofdm-validation', ['core', 'mobility', 'wifi'])
    obj.source = 'ofdm-validation.cc'

-    obj = bld.create_ns3_program('wifi-hidden-terminal', ['core', 'simulator', 'mobility', 'wifi', 'propagation', 'flow-monitor'])
+    obj = bld.create_ns3_program('wifi-hidden-terminal', ['core', 'mobility', 'wifi', 'propagation', 'flow-monitor'])
    obj.source = 'wifi-hidden-terminal.cc'
--- a/samples/main-random-topology.cc
+++ b/samples/main-random-topology.cc
@@ -2,7 +2,7 @@

 #include "ns3/core-module.h"
 #include "ns3/mobility-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"
 #include "ns3/helper-module.h"

 using namespace ns3;
--- a/samples/main-random-walk.cc
+++ b/samples/main-random-walk.cc
@@ -3,7 +3,7 @@
 #include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/mobility-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"

 using namespace ns3;

--- a/samples/main-simple.cc
+++ b/samples/main-simple.cc
@@ -3,7 +3,7 @@
 #include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/node-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"

 using namespace ns3;

--- a/samples/wscript
+++ b/samples/wscript
@@ -11,7 +11,7 @@ def build(bld):
    obj = bld.create_ns3_program('main-callback', ['core'])
    obj.source = 'main-callback.cc'

-    obj = bld.create_ns3_program('sample-simulator', ['core', 'simulator'])
+    obj = bld.create_ns3_program('sample-simulator', ['core'])
    obj.source = 'sample-simulator.cc'

    obj = bld.create_ns3_program('main-ptr', ['core'] )
@@ -20,10 +20,10 @@ def build(bld):
    obj = bld.create_ns3_program('main-random-variable', ['core', 'contrib'])
    obj.source = 'main-random-variable.cc'

-    obj = bld.create_ns3_program('main-packet-header', ['common', 'simulator'])
+    obj = bld.create_ns3_program('main-packet-header', ['common', 'core'])
    obj.source = 'main-packet-header.cc'

-    obj = bld.create_ns3_program('main-packet-tag', ['common', 'simulator'])
+    obj = bld.create_ns3_program('main-packet-tag', ['common', 'core'])
    obj.source = 'main-packet-tag.cc'

    if bld.env['ENABLE_THREADING'] and bld.env["ENABLE_REAL_TIME"]:
@@ -35,22 +35,22 @@ def build(bld):
    obj.source = 'main-simple.cc'

    obj = bld.create_ns3_program('main-grid-topology',
-                                 ['core', 'simulator', 'mobility', 'internet-stack'])
+                                 ['core', 'mobility', 'internet-stack'])
    obj.source = 'main-grid-topology.cc'

    obj = bld.create_ns3_program('main-random-topology',
-                                 ['core', 'simulator', 'helper', 'mobility'])
+                                 ['core', 'helper', 'mobility'])
    obj.source = 'main-random-topology.cc'
    
    obj = bld.create_ns3_program('main-random-walk',
-                                 ['core', 'simulator', 'helper', 'mobility'])
+                                 ['core', 'helper', 'mobility'])
    obj.source = 'main-random-walk.cc'

    obj = bld.create_ns3_program('main-propagation-loss',
-                                 ['core', 'simulator', 'mobility', 'wifi'])
+                                 ['core', 'mobility', 'wifi'])
    obj.source = 'main-propagation-loss.cc'

    obj = bld.create_ns3_program('sample-random-variable',
-                                 ['core', 'simulator'])
+                                 ['core'])
    obj.source = 'sample-random-variable.cc'

--- a/scratch/multiple-sources/simple-simulation.cc
+++ b/scratch/multiple-sources/simple-simulation.cc
@@ -3,7 +3,7 @@
 #include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/node-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"

 using namespace ns3;

--- a/scratch/simple.cc
+++ b/scratch/simple.cc
@@ -3,7 +3,7 @@
 #include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/node-module.h"
-#include "ns3/simulator-module.h"
+#include "ns3/core-module.h"

 using namespace ns3;

--- a/src/applications/bulk-send/wscript
+++ b/src/applications/bulk-send/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

 def build(bld):
-    module = bld.create_ns3_module('bulk-send', ['core', 'simulator', 'node'])
+    module = bld.create_ns3_module('bulk-send', ['core', 'node'])
    module.source = [
        'bulk-send-application.cc',
        ]
--- a/src/applications/onoff/wscript
+++ b/src/applications/onoff/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

 def build(bld):
-    module = bld.create_ns3_module('onoff', ['core', 'simulator', 'node'])
+    module = bld.create_ns3_module('onoff', ['core', 'node'])
    module.source = [
        'onoff-application.cc',
        ]
--- a/src/common/wscript
+++ b/src/common/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

 def build(bld):
-    common = bld.create_ns3_module('common', ['core', 'simulator', 'mobility'])
+    common = bld.create_ns3_module('common', ['core', 'mobility'])
    common.source = [
        'buffer.cc',
        'buffer-test.cc',
--- a/src/contrib/energy/examples/wscript
+++ b/src/contrib/energy/examples/wscript
@@ -1,5 +1,5 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

 def build(bld):
-    obj = bld.create_ns3_program('li-ion-energy-source', ['core', 'simulator', 'energy'])
+    obj = bld.create_ns3_program('li-ion-energy-source', ['core', 'energy'])
    obj.source = 'li-ion-energy-source.cc'
--- a/src/contrib/wscript
+++ b/src/contrib/wscript
@@ -20,7 +20,7 @@ def configure(conf):


 def build(bld):
-    module = bld.create_ns3_module('contrib', ['simulator', 'common'])
+    module = bld.create_ns3_module('contrib', ['core', 'common'])
    module.source = [
        'event-garbage-collector.cc',
        'gnuplot.cc',
--- a/src/core/model/abort.h
+++ b/src/core/model/abort.h
--- a/src/core/model/assert.h
+++ b/src/core/model/assert.h
--- a/src/core/model/attribute-accessor-helper.h
+++ b/src/core/model/attribute-accessor-helper.h
--- a/src/core/model/attribute-helper.h
+++ b/src/core/model/attribute-helper.h
--- a/src/core/model/attribute-list.cc
+++ b/src/core/model/attribute-list.cc
--- a/src/core/model/attribute-list.h
+++ b/src/core/model/attribute-list.h
--- a/src/core/model/attribute.cc
+++ b/src/core/model/attribute.cc
--- a/src/core/model/attribute.h
+++ b/src/core/model/attribute.h
--- a/src/core/model/boolean.cc
+++ b/src/core/model/boolean.cc
--- a/src/core/model/boolean.h
+++ b/src/core/model/boolean.h
--- a/src/core/model/breakpoint.cc
+++ b/src/core/model/breakpoint.cc
--- a/src/core/model/breakpoint.h
+++ b/src/core/model/breakpoint.h
--- a/src/core/model/cairo-wideint-private.h
+++ b/src/core/model/cairo-wideint-private.h
@@ -32,7 +32,7 @@
 #ifndef CAIRO_WIDEINT_H
 #define CAIRO_WIDEINT_H

-#include "ns3/simulator-config.h"
+#include "ns3/core-config.h"
 #define cairo_private 
 #define HAVE_UINT64_T 1

--- a/src/core/model/cairo-wideint.c
+++ b/src/core/model/cairo-wideint.c
--- a/src/core/model/calendar-scheduler.cc
+++ b/src/core/model/calendar-scheduler.cc
--- a/src/core/model/calendar-scheduler.h
+++ b/src/core/model/calendar-scheduler.h
--- a/src/core/model/callback.cc
+++ b/src/core/model/callback.cc
--- a/src/core/model/callback.h
+++ b/src/core/model/callback.h
--- a/src/core/model/command-line.cc
+++ b/src/core/model/command-line.cc
--- a/src/core/model/command-line.h
+++ b/src/core/model/command-line.h
--- a/src/core/model/config.cc
+++ b/src/core/model/config.cc
--- a/Show More
+++ b/Show More