diff --git a/examples/stats/wscript b/examples/stats/wscript
index e3ac10d5b..b51afea0e 100644
--- a/examples/stats/wscript
+++ b/examples/stats/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('wifi-example-sim', ['stats'])
+    obj = bld.create_ns3_program('wifi-example-sim', ['stats', 'internet', 'mobility', 'wifi'])
     obj.source = ['wifi-example-sim.cc',
                   'wifi-example-apps.cc']
diff --git a/examples/tcp/wscript b/examples/tcp/wscript
index 3f2fb3e17..816708ecb 100644
--- a/examples/tcp/wscript
+++ b/examples/tcp/wscript
@@ -18,7 +18,7 @@ def build(bld):
     obj.source = 'tcp-star-server.cc'
 
     obj = bld.create_ns3_program('star',
-                                 ['netanim', 'point-to-point', 'internet'])
+                                 ['netanim', 'point-to-point', 'applications', 'internet'])
     obj.source = 'star.cc'
 
     obj = bld.create_ns3_program('tcp-bulk-send',
diff --git a/src/contrib/flow-monitor/wscript b/src/contrib/flow-monitor/wscript
index 733724a3c..960f60f8c 100644
--- a/src/contrib/flow-monitor/wscript
+++ b/src/contrib/flow-monitor/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_module('flow-monitor', ['internet'])
+    obj = bld.create_ns3_module('flow-monitor', ['internet', 'contrib'])
     obj.source = ["model/%s" % s for s in [
        'flow-monitor.cc',
        'flow-classifier.cc',
diff --git a/src/lte/wscript b/src/lte/wscript
index 0f6239125..cda7c8313 100644
--- a/src/lte/wscript
+++ b/src/lte/wscript
@@ -2,7 +2,7 @@
 
 def build(bld):
 
-    module = bld.create_ns3_module('lte', ['core', 'network', 'spectrum'])
+    module = bld.create_ns3_module('lte', ['core', 'network', 'spectrum', 'wimax'])
     module.source = [
         'model/lte-spectrum-phy.cc',
         'model/enb-lte-spectrum-phy.cc',
diff --git a/src/mesh/wscript b/src/mesh/wscript
index c196d7839..15cada027 100644
--- a/src/mesh/wscript
+++ b/src/mesh/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_module('mesh', ['wifi'])
+    obj = bld.create_ns3_module('mesh', ['internet', 'wifi', 'bridge', 'applications'])
 
     obj.source = [
         'model/mesh-information-element-vector.cc',
diff --git a/src/test/ns3tcp/wscript b/src/test/ns3tcp/wscript
index 03215d601..cfdb73ab6 100644
--- a/src/test/ns3tcp/wscript
+++ b/src/test/ns3tcp/wscript
@@ -4,7 +4,7 @@ def configure(conf):
     pass
 
 def build(bld):
-    ns3tcp = bld.create_ns3_module('ns3tcp')
+    ns3tcp = bld.create_ns3_module('ns3tcp', ['internet', 'point-to-point', 'csma', 'applications'])
     headers = bld.new_task_gen('ns3header')
     headers.module = 'ns3tcp'
     headers.source = [
diff --git a/src/test/ns3wifi/wscript b/src/test/ns3wifi/wscript
index bb11b400a..e6a20b524 100644
--- a/src/test/ns3wifi/wscript
+++ b/src/test/ns3wifi/wscript
@@ -4,7 +4,7 @@ def configure(conf):
     pass
 
 def build(bld):
-    ns3wifi = bld.create_ns3_module('ns3wifi')
+    ns3wifi = bld.create_ns3_module('ns3wifi', ['internet', 'mobility', 'propagation', 'wifi', 'applications'])
     ns3wifi.source = [
         'wifi-interference-test-suite.cc',
         'wifi-msdu-aggregator-test-suite.cc',
diff --git a/src/uan/examples/wscript b/src/uan/examples/wscript
index c8166cbf0..4a1cd4f7d 100644
--- a/src/uan/examples/wscript
+++ b/src/uan/examples/wscript
@@ -1,8 +1,8 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_program('uan-cw-example', ['core', 'mobility', 'uan'])
+    obj = bld.create_ns3_program('uan-cw-example', ['network', 'mobility', 'contrib', 'applications', 'uan'])
     obj.source = 'uan-cw-example.cc'
 
-    obj = bld.create_ns3_program('uan-rc-example', ['core', 'mobility', 'uan'])
+    obj = bld.create_ns3_program('uan-rc-example', ['network', 'mobility', 'contrib', 'applications', 'uan'])
     obj.source = 'uan-rc-example.cc'
diff --git a/src/wimax/examples/wscript b/src/wimax/examples/wscript
index 1fdfbb0f7..7f5697941 100644
--- a/src/wimax/examples/wscript
+++ b/src/wimax/examples/wscript
@@ -1,10 +1,10 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_program( 'wimax-ipv4', ['wimax', 'internet'])
+    obj = bld.create_ns3_program( 'wimax-ipv4', ['wimax', 'internet', 'csma'])
     obj.source = 'wimax-ipv4.cc'
 
-    obj = bld.create_ns3_program( 'wimax-multicast', ['wimax', 'internet'])
+    obj = bld.create_ns3_program( 'wimax-multicast', ['wimax', 'internet', 'csma'])
     obj.source = 'wimax-multicast.cc'
         
     obj = bld.create_ns3_program( 'wimax-simple', ['wimax', 'internet'])
diff --git a/src/wimax/wscript b/src/wimax/wscript
index 392e538f8..7becb87ea 100644
--- a/src/wimax/wscript
+++ b/src/wimax/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_module('wimax', ['network', 'spectrum'])
+    obj = bld.create_ns3_module('wimax', ['network', 'spectrum', 'point-to-point'])
     obj.source = [
             'model/cid.cc',
             'model/cid-factory.cc',