diff -uNr linuxwacom-0.7.1.orig/src/Makefile.am linuxwacom-0.7.1/src/Makefile.am
--- linuxwacom-0.7.1.orig/src/Makefile.am	2005-11-21 18:43:24.000000000 +0000
+++ linuxwacom-0.7.1/src/Makefile.am	2005-11-21 20:05:32.000000000 +0000
@@ -7,7 +7,7 @@
 wacomcfgdir = $(includedir)/wacomcfg
 wacomcfg_HEADERS = wacomcfg.h
 
-x86moduledir = @WCM_XLIBDIR@/modules/input
+x86moduledir = @WCM_XLIBDIR@/xorg/modules/input
 x86module_DATA = @WCM_XF86MODULES@
 
 AM_CFLAGS = -Wall -pedantic
diff -uNr linuxwacom-0.7.1.orig/src/Makefile.in linuxwacom-0.7.1/src/Makefile.in
--- linuxwacom-0.7.1.orig/src/Makefile.in	2005-11-21 18:43:24.000000000 +0000
+++ linuxwacom-0.7.1/src/Makefile.in	2005-11-21 20:05:46.000000000 +0000
@@ -130,7 +130,7 @@
 wacomcfgdir = $(includedir)/wacomcfg
 wacomcfg_HEADERS = wacomcfg.h
 
-x86moduledir = @WCM_XLIBDIR@/modules/input
+x86moduledir = @WCM_XLIBDIR@/xorg/modules/input
 x86module_DATA = @WCM_XF86MODULES@
 
 AM_CFLAGS = -Wall -pedantic
diff -uNr linuxwacom-0.7.1.orig/src/xf86Wacom.h linuxwacom-0.7.1/src/xf86Wacom.h
--- linuxwacom-0.7.1.orig/src/xf86Wacom.h	2005-11-21 18:43:24.000000000 +0000
+++ linuxwacom-0.7.1/src/xf86Wacom.h	2005-11-21 19:55:49.000000000 +0000
@@ -27,7 +27,7 @@
 
 /****************************************************************************/
 
-#include <xf86Version.h>
+#include <xorg/xf86Version.h>
 #include <Xwacom.h>
 
 /*****************************************************************************
@@ -69,21 +69,21 @@
 #include <errno.h>
 #endif
 
-#include <misc.h>
-#include <xf86.h>
+#include <xorg/misc.h>
+#include <xorg/xf86.h>
 #define NEED_XF86_TYPES
 #if !defined(DGUX)
-#include <xf86_ansic.h>
-#include <xisb.h>
+#include <xorg/xf86_ansic.h>
+#include <xorg/xisb.h>
 #endif
-#include <xf86_OSproc.h>
-#include <xf86Xinput.h>
-#include <exevents.h>           /* Needed for InitValuator/Proximity stuff */
-#include <keysym.h>
-#include <mipointer.h>
+#include <xorg/xf86_OSproc.h>
+#include <xorg/xf86Xinput.h>
+#include <xorg/exevents.h>           /* Needed for InitValuator/Proximity stuff */
+#include <X11/keysym.h>
+#include <xorg/mipointer.h>
 
 #ifdef XFree86LOADER
-#include <xf86Module.h>
+#include <xorg/xf86Module.h>
 #endif
 
 /*****************************************************************************