--- xf86-input-sample-1.0.0/src/sample.c.orig	2006-07-13 23:31:28.000000000 -0700
+++ xf86-input-sample-1.0.0/src/sample.c	2006-07-13 23:32:40.000000000 -0700
@@ -41,12 +41,12 @@
  ****************************************************************************/
 
 #include <misc.h>
+#include <xisb.h>
 #include <xf86.h>
-#define NEED_XF86_TYPES
+// #define NEED_XF86_TYPES
 #include <xf86_ansic.h>
 #include <xf86_OSproc.h>
 #include <xf86Xinput.h>
-#include <xisb.h>
 #include <exevents.h>			/* Needed for InitValuator/Proximity stuff	*/
 
 /*****************************************************************************