--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c.wireless_inc	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c	2007-11-30 17:28:52.000000000 +0100
@@ -174,7 +174,6 @@
 #include <netinet/in.h>
 #include <linux/types.h>
 #include <linux/socket.h>
-#include <linux/compiler.h>
 #include <iwlib.h>
 #include <linux/if_packet.h>
 #include <stdio.h>
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c.wireless_inc	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c	2007-11-30 17:29:19.000000000 +0100
@@ -203,12 +203,11 @@
 
 #include <unistd.h>
 #include <sys/socket.h>
-#include <linux/compiler.h>
 #include <iwlib.h>
 #include <sys/ioctl.h>
 #include "netlink.h"
 #include "rtnetlink.h"
-#include <linux/if.h>
+#include <net/if.h>
 #include <linux/if_packet.h>
 #include <math.h>
 #include <linux/wireless.h>
--- xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c.wireless_inc	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c	2007-11-30 17:28:52.000000000 +0100
@@ -103,7 +103,6 @@
 #include <sys/ioctl.h>
 #include <linux/types.h>
 #include <linux/socket.h>
-#include <linux/compiler.h>
 #include <iwlib.h>
 #include <stdlib.h>
 #include <string.h>
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c.wireless_inc	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c	2007-11-30 17:28:52.000000000 +0100
@@ -203,7 +203,7 @@
 #include <netinet/in.h>
 #include <linux/types.h>
 #include <linux/socket.h>
-#include <linux/compiler.h>
+#include <net/if.h>
 #include <linux/wireless.h>
 #include <iwlib.h>
 #include <linux/if_packet.h>
--- xsupplicant-1.2.8/configure.in.wireless_inc	2006-10-07 20:02:55.000000000 +0200
+++ xsupplicant-1.2.8/configure.in	2007-11-30 17:28:52.000000000 +0100
@@ -119,6 +119,8 @@ if test $SYSTEM = "Linux"; then
    #ifndef __user
    #define __user
    #endif
+   #include <net/if.h>
+   #include <linux/types.h>
    #include <linux/wireless.h>])
 
    AC_MSG_CHECKING([iwlib version])
@@ -127,6 +129,8 @@ if test $SYSTEM = "Linux"; then
 		   #ifndef __user
 		   #define __user
 		   #endif
+                   #include <net/if.h>
+                   #include <linux/types.h>
                    #include <linux/wireless.h>
                    #include <iwlib.h>], 
                [iw_extract_event_stream(NULL, NULL, 0);], [AC_DEFINE(NEW_IWLIB) AC_MSG_RESULT([3 params])], [AC_MSG_RESULT([2 params])])