diff --git a/src/devices/emu/wscript b/src/devices/emu/wscript
index 53761d516..f496f2433 100644
--- a/src/devices/emu/wscript
+++ b/src/devices/emu/wscript
@@ -2,14 +2,11 @@
 
 def configure(conf):
     if conf.env['ENABLE_THREADING']:
-        conf.env['ENABLE_EMU'] = conf.check(header_name='linux/if_ether.h',
-                                            define_name='HAVE_IF_ETHER_H')
-        conf.report_optional_feature("EmuNetDevice", "Emulated Net Device",
-                                     conf.env['ENABLE_EMU'],
-                                     "<linux/if_ether.h> include not detected")
+        conf.env['ENABLE_EMU'] = True
+        conf.report_optional_feature("EmuNetDevice", "Emulated Net Device", True, 
+                                     "")
     else:
-        conf.report_optional_feature("EmuNetDevice", "Emulated Net Device",
-                                     False,
+        conf.report_optional_feature("EmuNetDevice", "Emulated Net Device", False,
                                      "needs threading support which is not available")
 
 def build(bld):
diff --git a/src/devices/tap-bridge/tap-creator.cc b/src/devices/tap-bridge/tap-creator.cc
index 0692a0f0b..2a664c9b1 100644
--- a/src/devices/tap-bridge/tap-creator.cc
+++ b/src/devices/tap-bridge/tap-creator.cc
@@ -29,10 +29,17 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#if 0
 #include <linux/un.h>
 #include <linux/if.h>
 #include <linux/if_tun.h>
 #include <linux/route.h>
+#else
+#include <sys/un.h>
+#include <net/if.h>
+#include <linux/if_tun.h>
+#include <net/route.h>
+#endif
 #include <netinet/in.h>
 
 #include "tap-encode-decode.h"
diff --git a/src/devices/tap-bridge/wscript b/src/devices/tap-bridge/wscript
index 99b51c2c9..9956f6120 100644
--- a/src/devices/tap-bridge/wscript
+++ b/src/devices/tap-bridge/wscript
@@ -2,11 +2,11 @@
 
 def configure(conf):
     if conf.env['ENABLE_THREADING']:
-        conf.env['ENABLE_TAP'] = conf.check(header_name='linux/if_ether.h',
-                                            define_name='HAVE_IF_ETHER_H')
+        conf.env['ENABLE_TAP'] = conf.check(header_name='linux/if_tun.h',
+                                            define_name='HAVE_IF_TUN_H')
         conf.report_optional_feature("TapBridge", "Tap Bridge",
                                      conf.env['ENABLE_TAP'],
-                                     "<linux/if_ether.h> include not detected")
+                                     "<linux/if_tun.h> include not detected")
     else:
         conf.report_optional_feature("TapBridge", "Tap Bridge",
                                      False,