--- xorg-server-1.2.0/hw/xfree86/os-support/linux/lnx.h.old	2007-01-28 15:09:02.000000000 +0100
+++ xorg-server-1.2.0/hw/xfree86/os-support/linux/lnx.h	2007-01-28 15:19:59.000000000 +0100
@@ -11,7 +11,6 @@
 
 /* new pciconfig_iobase syscall added in 2.2.15 and 2.3.99 */
 #  include <linux/unistd.h>
-#  include <asm/pci.h>
 extern long (*_iobase)(unsigned, int, int, int);
 
 /*
--- xorg-server-1.2.0/hw/xfree86/os-support/linux/lnx_axp.c.old	2007-01-28 15:18:07.000000000 +0100
+++ xorg-server-1.2.0/hw/xfree86/os-support/linux/lnx_axp.c	2007-01-28 15:17:38.000000000 +0100
@@ -112,8 +112,9 @@
 /*
  * pciconfig_iobase wrappers and dynamic i/o selection
  */
-#include <linux/unistd.h>
-#include <asm/pci.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+#include "lnx.h"
 #include <errno.h>
 
 /* glibc versions (single hose only) */