diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 3ad14bb2c80486527b125a506382e529fc435615..ac84383f0f7dbb969c0111db4f24312467038640 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -23,7 +23,8 @@
  */
 
 #include "net/tap.h"
-#incude "qemu-common.h"
+#include "qemu-common.h"
+#include "sysemu.h"
 
 #ifdef __NetBSD__
 #include <net/if_tap.h>
@@ -34,8 +35,9 @@
 #else
 #include <util.h>
 #endif
-#elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
+#if defined (__GLIBC__) && defined (__FreeBSD_kernel__)
 #include <freebsd/stdlib.h>
+#endif
 
 #if defined(__OpenBSD__)
 #include <util.h>
diff --git a/net/tap-linux.h b/net/tap-linux.h
index d81c65081fd4d1f51d00be894960aee0aa5ab4f3..f1a0fce1764b92dc35655b23f95f61d2d378c4d4 100644
--- a/net/tap-linux.h
+++ b/net/tap-linux.h
@@ -17,6 +17,8 @@
 #define QEMU_TAP_H
 
 #include <stdint.h>
+#ifdef __LINUX__
+
 #include <linux/ioctl.h>
 
 /* Ioctl defines */
@@ -26,6 +28,8 @@
 #define TUNGETIFF      _IOR('T', 210, unsigned int)
 #define TUNSETSNDBUF   _IOW('T', 212, int)
 
+#endif
+
 /* TUNSETIFF ifr flags */
 #define IFF_TAP		0x0002
 #define IFF_NO_PI	0x1000
diff --git a/net/tap.c b/net/tap.c
index 60354e47a992577d38704dcb7e5cdc1c672d0f83..bdb4a15c2ab29d5bc0b196d2a6ca903a2b33d080 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -31,6 +31,7 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <sys/socket.h>
 #include <net/if.h>
 
 #include "net.h"