diff -u -p linux/include/linux/irda.d1.h linux/include/linux/irda.h
--- linux/include/linux/irda.d1.h	Wed Jun  4 13:38:02 2003
+++ linux/include/linux/irda.h	Wed Jun  4 14:16:33 2003
@@ -25,7 +25,11 @@
 #ifndef KERNEL_IRDA_H
 #define KERNEL_IRDA_H
 
-#include <linux/socket.h> /* only for sa_family_t */
+/* Please do *not* add any #include in this file, this file is
+ * included as-is in user space.
+ * Please fix the calling file to properly included needed files before
+ * this one, or preferably to include <net/irda/irda.h> instead.
+ * Jean II */
 
 /* Hint bit positions for first hint byte */
 #define HINT_PNP         0x01
diff -u -p linux/drivers/net/irda/old_belkin.d1.c linux/drivers/net/irda/old_belkin.c
--- linux/drivers/net/irda/old_belkin.d1.c	Wed Jun  4 13:41:23 2003
+++ linux/drivers/net/irda/old_belkin.c	Wed Jun  4 13:42:08 2003
@@ -32,8 +32,6 @@
 #include <linux/delay.h>
 #include <linux/tty.h>
 #include <linux/init.h>
-#include <linux/net.h>
-#include <linux/irda.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irda_device.h>