diff -Nur xorg-server-0.99.3.old/dix/Makefile.am xorg-server-0.99.3/dix/Makefile.am
--- xorg-server-0.99.3.old/dix/Makefile.am	2005-11-04 04:08:06.000000000 +1100
+++ xorg-server-0.99.3/dix/Makefile.am	2005-11-15 23:11:24.000000000 +1100
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libdix.la libxpstubs.la
 
-AM_CFLAGS = $(DIX_CFLAGS) \
+AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) \
 	-DVENDOR_STRING=\""@VENDOR_STRING@"\" \
 	-DVENDOR_RELEASE="@VENDOR_RELEASE@"
 
diff -Nur xorg-server-0.99.3.old/dix/events.c xorg-server-0.99.3/dix/events.c
--- xorg-server-0.99.3.old/dix/events.c	2005-08-26 08:11:04.000000000 +1000
+++ xorg-server-0.99.3/dix/events.c	2005-11-15 23:19:38.000000000 +1100
@@ -111,6 +111,10 @@
 
 /* $Xorg: events.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif