diff --git a/examples/wireless/wscript b/examples/wireless/wscript
index 48c5bb99e..c89779525 100644
--- a/examples/wireless/wscript
+++ b/examples/wireless/wscript
@@ -5,10 +5,10 @@ def build(bld):
                                                     'internet'])
     obj.source = 'mixed-wireless.cc'
 
-    obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi', 'contrib'])
     obj.source = 'wifi-adhoc.cc'
 
-    obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['core', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['core', 'mobility', 'wifi', 'contrib'])
     obj.source = 'wifi-clear-channel-cmu.cc'
 
     obj = bld.create_ns3_program('wifi-ap', ['core', 'mobility', 'wifi'])
@@ -20,7 +20,7 @@ def build(bld):
     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', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('multirate', ['core', 'mobility', 'wifi', 'contrib'])
     obj.source = 'multirate.cc'
 
     obj = bld.create_ns3_program('wifi-simple-adhoc', ['core', 'mobility', 'wifi'])
@@ -38,7 +38,7 @@ def build(bld):
     obj = bld.create_ns3_program('wifi-blockack', ['core', 'mobility', 'wifi'])
     obj.source = 'wifi-blockack.cc'
 
-    obj = bld.create_ns3_program('ofdm-validation', ['core', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('ofdm-validation', ['core', 'mobility', 'wifi', 'contrib'])
     obj.source = 'ofdm-validation.cc'
 
     obj = bld.create_ns3_program('wifi-hidden-terminal', ['core', 'mobility', 'wifi', 'propagation', 'flow-monitor'])
diff --git a/samples/wscript b/samples/wscript
index b2d373dc8..be3ee904d 100644
--- a/samples/wscript
+++ b/samples/wscript
@@ -47,7 +47,7 @@ def build(bld):
     obj.source = 'main-random-walk.cc'
 
     obj = bld.create_ns3_program('main-propagation-loss',
-                                 ['core', 'mobility', 'wifi'])
+                                 ['core', 'mobility', 'contrib'])
     obj.source = 'main-propagation-loss.cc'
 
     obj = bld.create_ns3_program('sample-random-variable',
diff --git a/src/applications/bulk-send/wscript b/src/applications/bulk-send/wscript
index dd6cc316e..2f8393fa1 100644
--- 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', 'network'])
+    module = bld.create_ns3_module('bulk-send', ['core', 'internet'])
     module.source = [
         'bulk-send-application.cc',
         ]
diff --git a/src/applications/onoff/wscript b/src/applications/onoff/wscript
index ec57f06a5..3185c2d20 100644
--- 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', 'network'])
+    module = bld.create_ns3_module('onoff', ['core', 'network', 'internet'])
     module.source = [
         'onoff-application.cc',
         ]
diff --git a/src/applications/packet-sink/wscript b/src/applications/packet-sink/wscript
index d8d4cef89..c003ed54f 100644
--- a/src/applications/packet-sink/wscript
+++ b/src/applications/packet-sink/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('packet-sink', ['network'])
+    module = bld.create_ns3_module('packet-sink', ['internet'])
     module.source = [
         'packet-sink.cc',
         ]
diff --git a/src/devices/tap-bridge/wscript b/src/devices/tap-bridge/wscript
index 345b305f8..dabbba7d0 100644
--- a/src/devices/tap-bridge/wscript
+++ b/src/devices/tap-bridge/wscript
@@ -20,7 +20,7 @@ def configure(conf):
         conf.env.append_value('NS3_EXECUTABLE_PATH', tapcreatordir)
 
 def build(bld):
-    module = bld.create_ns3_module('tap-bridge', ['network'])
+    module = bld.create_ns3_module('tap-bridge', ['network', 'internet'])
     module.source = [
         ]
     headers = bld.new_task_gen('ns3header')
diff --git a/src/devices/wifi/wscript b/src/devices/wifi/wscript
index 48c3fdc7e..954040187 100644
--- a/src/devices/wifi/wscript
+++ b/src/devices/wifi/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('wifi', ['network'])
+    obj = bld.create_ns3_module('wifi', ['network', 'propagation'])
     obj.source = [
         'wifi-information-element.cc',
         'wifi-information-element-vector.cc',
diff --git a/src/devices/wimax/wscript b/src/devices/wimax/wscript
index 2dca80b3c..ae7dd3ec2 100644
--- a/src/devices/wimax/wscript
+++ b/src/devices/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'])
+    obj = bld.create_ns3_module('wimax', ['network', 'spectrum'])
     obj.source = [
             'cid.cc',
             'cid-factory.cc',