Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -6,6 +6,8 @@ ifndef CFLAGS
 CFLAGS = -MMD -O2 -Wall -g
 endif
 
+MADWIFI_SOURCE=$(shell echo /usr/include/madwifi-*)
+
 # Include directories for CVS version
 CFLAGS += -I. -I../utils -I../hostapd
 
@@ -79,7 +81,7 @@ CONFIG_WIRELESS_EXTENSION=y
 endif
 
 ifdef CONFIG_DRIVER_MADWIFI
-CFLAGS += -DCONFIG_DRIVER_MADWIFI
+CFLAGS += -DCONFIG_DRIVER_MADWIFI -I$(MADWIFI_SOURCE)
 OBJS_d += driver_madwifi.o
 CONFIG_WIRELESS_EXTENSION=y
 endif
Index: driver_atmel.c
===================================================================
--- driver_atmel.c.orig
+++ driver_atmel.c
@@ -44,6 +44,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <errno.h>
 
 #include "wireless_copy.h"
Index: driver_hostap.c
===================================================================
--- driver_hostap.c.orig
+++ driver_hostap.c
@@ -17,6 +17,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <errno.h>
 
 #include "wireless_copy.h"
Index: driver_prism54.c
===================================================================
--- driver_prism54.c.orig
+++ driver_prism54.c
@@ -18,6 +18,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <errno.h>
 
 #include "wireless_copy.h"
Index: driver_madwifi.c
===================================================================
--- driver_madwifi.c.orig
+++ driver_madwifi.c
@@ -18,7 +18,9 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <errno.h>
+#include <sys/socket.h>
 
 #include "common.h"
 #include "driver.h"
Index: driver_ipw.c
===================================================================
--- driver_ipw.c.orig
+++ driver_ipw.c
@@ -19,6 +19,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <errno.h>
 
 #include "wireless_copy.h"