diff --git a/examples/wscript b/examples/wscript
index a72b94513..4d5ef4c8e 100644
--- a/examples/wscript
+++ b/examples/wscript
@@ -48,10 +48,6 @@ def build(bld):
                                  ['csma', 'internet-stack'])
     obj.source = 'csma-one-subnet.cc'
 
-    obj = bld.create_ns3_program('tap-wifi-dumbbell',
-                                 ['wifi', 'csma', 'point-to-point', 'tap-bridge', 'internet-stack'])
-    obj.source = 'tap-wifi-dumbbell.cc'
-
     obj = bld.create_ns3_program('csma-bridge',
                                  ['bridge', 'csma', 'internet-stack'])
     obj.source = 'csma-bridge.cc'
@@ -145,3 +141,7 @@ def build(bld):
                                      ['emu', 'internet-stack'])
         obj.source = 'emu-udp-echo.cc'
 
+    if env['ENABLE_TAP']:
+        obj = bld.create_ns3_program('tap-wifi-dumbbell',
+                                     ['wifi', 'csma', 'point-to-point', 'tap-bridge', 'internet-stack'])
+        obj.source = 'tap-wifi-dumbbell.cc'
diff --git a/src/helper/wscript b/src/helper/wscript
index bf53247db..79fe4abe5 100644
--- a/src/helper/wscript
+++ b/src/helper/wscript
@@ -21,7 +21,6 @@ def build(bld):
         'ipv4-interface-container.cc',
         'udp-echo-helper.cc',
         'bridge-helper.cc',
-        'tap-bridge-helper.cc',
         'yans-wifi-helper.cc',
         'v4ping-helper.cc',
         ]
@@ -47,7 +46,6 @@ def build(bld):
         'ipv4-interface-container.h',
         'udp-echo-helper.h',
         'bridge-helper.h',
-        'tap-bridge-helper.h',
         'yans-wifi-helper.h',
         'v4ping-helper.h',
         ]
@@ -60,4 +58,11 @@ def build(bld):
         headers.source.extend([
                 'emu-helper.h',
                 ])
+    if env['ENABLE_TAP']:
+        helper.source.extend([
+                'tap-bridge-helper.cc',
+                ])
+        headers.source.extend([
+                'tap-bridge-helper.h',
+                ])