--- obex/apps/Makefile-orig	Mon Nov 29 09:48:20 1999
+++ obex/apps/Makefile	Tue Dec 18 00:00:15 2001
@@ -31,7 +31,7 @@
 EXECS = irobex_palm3 irobex_test obex_tcp irxfer
 RM_CMD = $(RM) *.BAK *.bak *.o ,* *~ *.a core $(EXECS)
 
-INCLUDES = -I$(ROOT)/usr/include -I/usr/lib/glib/include
+INCLUDES = -I$(ROOT)/usr/include -I/usr/lib/glib/include -I/usr/include/glib-1.2
 LIBRARIES = -lobex -lglib
 LIBPATH = -L$(ROOT)/usr/lib
 
--- obex/lib/src/irobex.c-orig	Fri Nov 26 17:14:17 1999
+++ obex/lib/src/irobex.c	Mon Dec 17 23:57:14 2001
@@ -42,6 +42,7 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 
+#include <linux/types.h>
 #include <linux/irda.h>
 
 #include <obex_main.h>
--- obex/lib/src/irobex.h-orig	Thu Sep 30 09:01:08 1999
+++ obex/lib/src/irobex.h	Mon Dec 17 23:56:55 2001
@@ -31,6 +31,7 @@
 #ifndef IROBEX_H
 #define IROBEX_H
 
+#include <linux/types.h>
 #include <linux/irda.h>
 
 #define MAX_DEVICES 10     /* Max devices to discover */
--- obex/lib/src/obex_transport.h-orig	Fri Nov 26 17:14:17 1999
+++ obex/lib/src/obex_transport.h	Mon Dec 17 23:56:26 2001
@@ -34,6 +34,7 @@
 #include <netinet/in.h>
 
 #ifdef HAVE_IRDA
+#include <linux/types.h>
 #include <linux/irda.h>
 #endif /*HAVE_IRDA*/