diff --git a/arch/sim/src/up_devconsole.c b/arch/sim/src/up_devconsole.c
index 601a13bf3b1..31c4e46c605 100644
--- a/arch/sim/src/up_devconsole.c
+++ b/arch/sim/src/up_devconsole.c
@@ -33,6 +33,10 @@
  *
  ************************************************************/
 
+#ifndef linux
+# error "Sorry, this will only work with Linux"
+#endif
+
 /************************************************************
  * Included Files
  ************************************************************/
diff --git a/arch/sim/src/up_tapdev.c b/arch/sim/src/up_tapdev.c
index 539667e6d75..dd7cbde2c54 100644
--- a/arch/sim/src/up_tapdev.c
+++ b/arch/sim/src/up_tapdev.c
@@ -38,6 +38,10 @@
  *
  ****************************************************************************/
 
+#ifndef linux
+# error "Sorry, this will only work with Linux"
+#endif
+
 /****************************************************************************
  * Included Files
  ****************************************************************************/
@@ -55,20 +59,8 @@
 #include <unistd.h>
 #include <string.h>
 
-#if 0
-#include "uip/uip.h"
-#include <net/uip/uip-arch.h>
-#include <net/uip/uip-arp.h>
-#endif
-
-#ifdef linux
-# include <sys/ioctl.h>
-# include <linux/if.h>
-# include <linux/if_tun.h>
-# define DEVTAP "/dev/net/tun"
-#else  /* linux */
-# define DEVTAP "/dev/tap0"
-#endif /* linux */
+#include <linux/if.h>
+#include <linux/if_tun.h>
 
 extern int lib_rawprintf(const char *format, ...);
 
@@ -78,6 +70,8 @@ extern int lib_rawprintf(const char *format, ...);
 
 #define TAPDEV_DEBUG    1
 
+#define DEVTAP          "/dev/net/tun"
+
 #define UIP_DRIPADDR0   192
 #define UIP_DRIPADDR1   168
 #define UIP_DRIPADDR2   0