diff --git a/headers/posix/net/if.h b/headers/posix/net/if.h
index 5b3fc91d5c..d75527b4ef 100644
--- a/headers/posix/net/if.h
+++ b/headers/posix/net/if.h
@@ -5,8 +5,16 @@
 #ifndef _NET_IF_H
 #define _NET_IF_H
 
-#include <Drivers.h>
-#include <sys/socketvar.h>
+/* FIXME: this file is NOT POSIX compliant, and rely on way too much OS-dependent
+   definition.
+   Moving private parts to private headers should help clean up this file
+   
+   POSIX net/if.h spec:
+   http://www.opengroup.org/onlinepubs/007904975/basedefs/net/if.h.html
+*/
+
+#include <Drivers.h>	/* FIXME */
+#include <OS.h>			/* FIXME */
 #include <net/if_types.h>
 #include <netinet/in.h>
 #include <net/route.h>
@@ -15,6 +23,9 @@
 extern "C" {
 #endif
 
+/* Forward reference... */
+struct socket;
+
 enum {
 	IF_GETADDR = B_DEVICE_OP_CODES_END,
 	IF_INIT,