diff --git a/ChangeLog b/ChangeLog
index 7c3e1675ad..60760cd63e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,169 @@
 	* hw/kdrive/*:
 	Start importing kdrive.
 
+	* hw/kdrive/Makefile.am:
+	* hw/kdrive/ati/Makefile.am:
+	* hw/kdrive/ati/ati.c:
+	* hw/kdrive/ati/ati.h:
+	* hw/kdrive/ati/ati_cursor.c:
+	* hw/kdrive/ati/ati_draw.c:
+	* hw/kdrive/ati/ati_dri.c:
+	* hw/kdrive/ati/ati_stub.c:
+	* hw/kdrive/ati/ati_video.c:
+	* hw/kdrive/ati/radeon_composite.c:
+	* hw/kdrive/chips/Makefile.am:
+	* hw/kdrive/chips/chips.c:
+	* hw/kdrive/chips/chipsdraw.c:
+	* hw/kdrive/chips/chipsstub.c:
+	* hw/kdrive/ephyr/Makefile.am:
+	* hw/kdrive/ephyr/ephyr.c:
+	* hw/kdrive/ephyr/ephyr.h:
+	* hw/kdrive/ephyr/ephyrinit.c:
+	* hw/kdrive/ephyr/os.c:
+	* hw/kdrive/epson/Makefile.am:
+	* hw/kdrive/epson/epson13806.c:
+	* hw/kdrive/epson/epson13806stub.c:
+	* hw/kdrive/fake/Makefile.am:
+	* hw/kdrive/fake/fake.c:
+	* hw/kdrive/fake/fakeinit.c:
+	* hw/kdrive/fake/kbd.c:
+	* hw/kdrive/fake/mouse.c:
+	* hw/kdrive/fake/os.c:
+	* hw/kdrive/fbdev/Makefile.am:
+	* hw/kdrive/fbdev/fbdev.c:
+	* hw/kdrive/fbdev/fbinit.c:
+	* hw/kdrive/i810/Makefile.am:
+	* hw/kdrive/i810/i810.c:
+	* hw/kdrive/i810/i810_cursor.c:
+	* hw/kdrive/i810/i810_video.c:
+	* hw/kdrive/i810/i810draw.c:
+	* hw/kdrive/i810/i810stub.c:
+	* hw/kdrive/igs/igs.c:
+	* hw/kdrive/igs/igscmap.c:
+	* hw/kdrive/igs/igscurs.c:
+	* hw/kdrive/igs/igsdraw.c:
+	* hw/kdrive/igs/igsreg.c:
+	* hw/kdrive/igs/igsstub.c:
+	* hw/kdrive/ipaq/ipaq.c:
+	* hw/kdrive/itsy/itsy.c:
+	* hw/kdrive/itsy/kbd.c:
+	* hw/kdrive/itsy/ts.c:
+	* hw/kdrive/linux/Makefile.am:
+	* hw/kdrive/linux/agp.c:
+	* hw/kdrive/linux/bus.c:
+	* hw/kdrive/linux/evdev.c:
+	* hw/kdrive/linux/keyboard.c:
+	* hw/kdrive/linux/linux.c:
+	* hw/kdrive/linux/mouse.c:
+	* hw/kdrive/linux/ms.c:
+	* hw/kdrive/linux/ps2.c:
+	* hw/kdrive/linux/ts.c:
+	* hw/kdrive/linux/tslib.c:
+	* hw/kdrive/mach64/Makefile.am:
+	* hw/kdrive/mach64/mach64.c:
+	* hw/kdrive/mach64/mach64curs.c:
+	* hw/kdrive/mach64/mach64draw.c:
+	* hw/kdrive/mach64/mach64stub.c:
+	* hw/kdrive/mach64/mach64video.c:
+	* hw/kdrive/mga/Makefile.am:
+	* hw/kdrive/mga/g400_composite.c:
+	* hw/kdrive/mga/mga.c:
+	* hw/kdrive/mga/mgadraw.c:
+	* hw/kdrive/mga/mgastub.c:
+	* hw/kdrive/neomagic/Makefile.am:
+	* hw/kdrive/neomagic/backend.c:
+	* hw/kdrive/neomagic/neo_draw.c:
+	* hw/kdrive/neomagic/neomagic.c:
+	* hw/kdrive/neomagic/neomagicstub.c:
+	* hw/kdrive/nvidia/Makefile.am:
+	* hw/kdrive/nvidia/nvidia.c:
+	* hw/kdrive/nvidia/nvidiacurs.c:
+	* hw/kdrive/nvidia/nvidiadraw.c:
+	* hw/kdrive/nvidia/nvidiastub.c:
+	* hw/kdrive/nvidia/nvidiavideo.c:
+	* hw/kdrive/pcmcia/pcmcia.c:
+	* hw/kdrive/pcmcia/pcmciacurs.c:
+	* hw/kdrive/pcmcia/pcmciarotate.c:
+	* hw/kdrive/pcmcia/pcmciashadow.c:
+	* hw/kdrive/pcmcia/pcmciastub.c:
+	* hw/kdrive/pm2/Makefile.am:
+	* hw/kdrive/pm2/pm2.c:
+	* hw/kdrive/pm2/pm2_draw.c:
+	* hw/kdrive/pm2/pm2stub.c:
+	* hw/kdrive/r128/Makefile.am:
+	* hw/kdrive/r128/r128.c:
+	* hw/kdrive/r128/r128draw.c:
+	* hw/kdrive/r128/r128stub.c:
+	* hw/kdrive/savage/s3.c:
+	* hw/kdrive/savage/s3clock.c:
+	* hw/kdrive/savage/s3cmap.c:
+	* hw/kdrive/savage/s3curs.c:
+	* hw/kdrive/savage/s3draw.c:
+	* hw/kdrive/savage/s3gc.c:
+	* hw/kdrive/savage/s3reg.c:
+	* hw/kdrive/savage/s3rtst.c:
+	* hw/kdrive/savage/s3stub.c:
+	* hw/kdrive/sdl/Makefile.am:
+	* hw/kdrive/sdl/sdl.c:
+	* hw/kdrive/sis300/Makefile.am:
+	* hw/kdrive/sis300/sis.c:
+	* hw/kdrive/sis300/sis.h:
+	* hw/kdrive/sis300/sis_draw.c:
+	* hw/kdrive/sis300/sis_stub.c:
+	* hw/kdrive/sis530/sis.c:
+	* hw/kdrive/sis530/sisclock.c:
+	* hw/kdrive/sis530/siscmap.c:
+	* hw/kdrive/sis530/siscurs.c:
+	* hw/kdrive/sis530/sisdraw.c:
+	* hw/kdrive/sis530/sisio.c:
+	* hw/kdrive/sis530/sisstub.c:
+	* hw/kdrive/smi/Makefile.am:
+	* hw/kdrive/smi/smi.c:
+	* hw/kdrive/smi/smidraw.c:
+	* hw/kdrive/smi/smistub.c:
+	* hw/kdrive/smi/smivideo.c:
+	* hw/kdrive/src/Makefile.am:
+	* hw/kdrive/src/kaa.c:
+	* hw/kdrive/src/kaapict.c:
+	* hw/kdrive/src/kasync.c:
+	* hw/kdrive/src/kcmap.c:
+	* hw/kdrive/src/kcolor.c:
+	* hw/kdrive/src/kcurscol.c:
+	* hw/kdrive/src/kdrive.c:
+	* hw/kdrive/src/kinfo.c:
+	* hw/kdrive/src/kinput.c:
+	* hw/kdrive/src/kkeymap.c:
+	* hw/kdrive/src/kloadmap.c:
+	* hw/kdrive/src/kmap.c:
+	* hw/kdrive/src/kmode.c:
+	* hw/kdrive/src/knoop.c:
+	* hw/kdrive/src/koffscreen.c:
+	* hw/kdrive/src/kshadow.c:
+	* hw/kdrive/src/ktest.c:
+	* hw/kdrive/src/kxv.c:
+	* hw/kdrive/src/vga.c:
+	* hw/kdrive/trident/trident.c:
+	* hw/kdrive/trident/tridentcurs.c:
+	* hw/kdrive/trident/tridentdraw.c:
+	* hw/kdrive/trident/tridentstub.c:
+	* hw/kdrive/trio/s3.c:
+	* hw/kdrive/trio/s3clock.c:
+	* hw/kdrive/trio/s3cmap.c:
+	* hw/kdrive/trio/s3curs.c:
+	* hw/kdrive/trio/s3stub.c:
+	* hw/kdrive/ts300/ts300.c:
+	* hw/kdrive/vesa/Makefile.am:
+	* hw/kdrive/vesa/vbe.c:
+	* hw/kdrive/vesa/vesa.c:
+	* hw/kdrive/vesa/vesainit.c:
+	* hw/kdrive/vesa/vga.c:
+	* hw/kdrive/vesa/vm86.c:
+	* hw/kdrive/via/Makefile.am:
+	* hw/kdrive/vxworks/vxkbd.c:
+	* hw/kdrive/vxworks/vxmouse.c:
+	* hw/kdrive/vxworks/vxworks.c:
+	Build fixes: XSERVER_LIBS -> KDRIVE_LIBS, config.h -> kdrive-config.h
+
 2005-12-26  Daniel Stone  <daniel@freedesktop.org>
 
 	* xkb/xkbInit.c:
diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
index aed7543d55..d2907bb627 100644
--- a/hw/kdrive/Makefile.am
+++ b/hw/kdrive/Makefile.am
@@ -1,3 +1,7 @@
+# none of this works yet.  fbdev, ephyr, and the hardware servers all rely
+# on miext/shadow/ changes we haven't brought over yet, and sdl relies on
+# some detection-fu that hasn't been ported.
+
 if KDRIVEVESA
 VESA_SUBDIRS = vesa mach64 mga nvidia r128 smi chips pm2 via neomagic
 endif
diff --git a/hw/kdrive/ati/Makefile.am b/hw/kdrive/ati/Makefile.am
index 2a268122c4..6420d93b51 100644
--- a/hw/kdrive/ati/Makefile.am
+++ b/hw/kdrive/ati/Makefile.am
@@ -27,7 +27,7 @@ INCLUDES = 					\
 	$(DRI_INCLUDES)				\
 	$(FBDEV_INCLUDES)			\
 	$(VESA_INCLUDES)			\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 bin_PROGRAMS = Xati
 
diff --git a/hw/kdrive/ati/ati.c b/hw/kdrive/ati/ati.c
index 54624e7519..4db069a8b6 100644
--- a/hw/kdrive/ati/ati.c
+++ b/hw/kdrive/ati/ati.c
@@ -24,7 +24,7 @@
 /* $Header$ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "ati.h"
 #include "ati_reg.h"
diff --git a/hw/kdrive/ati/ati.h b/hw/kdrive/ati/ati.h
index d5bedd9bbb..3b5fee3809 100644
--- a/hw/kdrive/ati/ati.h
+++ b/hw/kdrive/ati/ati.h
@@ -27,7 +27,7 @@
 #define _ATI_H_
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 
 #ifdef KDRIVEFBDEV
diff --git a/hw/kdrive/ati/ati_cursor.c b/hw/kdrive/ati/ati_cursor.c
index 9ea51c4049..a14fc6c976 100644
--- a/hw/kdrive/ati/ati_cursor.c
+++ b/hw/kdrive/ati/ati_cursor.c
@@ -22,7 +22,7 @@
 /* $RCSId$ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "ati.h"
 #include "ati_reg.h"
diff --git a/hw/kdrive/ati/ati_draw.c b/hw/kdrive/ati/ati_draw.c
index 40f281a870..28cc7b0474 100644
--- a/hw/kdrive/ati/ati_draw.c
+++ b/hw/kdrive/ati/ati_draw.c
@@ -24,7 +24,7 @@
 /* $Header$ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "ati.h"
 #include "ati_reg.h"
diff --git a/hw/kdrive/ati/ati_dri.c b/hw/kdrive/ati/ati_dri.c
index 4a6dcb4abc..f2830e13a3 100644
--- a/hw/kdrive/ati/ati_dri.c
+++ b/hw/kdrive/ati/ati_dri.c
@@ -26,7 +26,7 @@
 #include <sys/time.h>
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 
 #include "ati.h"
diff --git a/hw/kdrive/ati/ati_stub.c b/hw/kdrive/ati/ati_stub.c
index 0162362bfb..01ebc3139f 100644
--- a/hw/kdrive/ati/ati_stub.c
+++ b/hw/kdrive/ati/ati_stub.c
@@ -24,7 +24,7 @@
 /* $Header$ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "ati.h"
 #include "klinux.h"
diff --git a/hw/kdrive/ati/ati_video.c b/hw/kdrive/ati/ati_video.c
index 96c0b99d6f..504bdfd4f9 100644
--- a/hw/kdrive/ati/ati_video.c
+++ b/hw/kdrive/ati/ati_video.c
@@ -25,7 +25,7 @@
 /* $RCSId$ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "ati.h"
 #include "ati_dma.h"
diff --git a/hw/kdrive/ati/radeon_composite.c b/hw/kdrive/ati/radeon_composite.c
index d9c0181434..18ada4f611 100644
--- a/hw/kdrive/ati/radeon_composite.c
+++ b/hw/kdrive/ati/radeon_composite.c
@@ -24,7 +24,7 @@
 /* $Header$ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "ati.h"
 #include "ati_reg.h"
diff --git a/hw/kdrive/chips/Makefile.am b/hw/kdrive/chips/Makefile.am
index 833c1f44a5..0585c7b58a 100644
--- a/hw/kdrive/chips/Makefile.am
+++ b/hw/kdrive/chips/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 bin_PROGRAMS = Xchips
 
diff --git a/hw/kdrive/chips/chips.c b/hw/kdrive/chips/chips.c
index 5131689147..10bd24cf3c 100644
--- a/hw/kdrive/chips/chips.c
+++ b/hw/kdrive/chips/chips.c
@@ -22,7 +22,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.18 2001/06/04 09:45:42 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "chips.h"
 #include "kaa.h"
diff --git a/hw/kdrive/chips/chipsdraw.c b/hw/kdrive/chips/chipsdraw.c
index 554a3f0c62..7b1b560532 100644
--- a/hw/kdrive/chips/chipsdraw.c
+++ b/hw/kdrive/chips/chipsdraw.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.10 2001/06/03 18:48:19 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "chips.h"
 
diff --git a/hw/kdrive/chips/chipsstub.c b/hw/kdrive/chips/chipsstub.c
index 00a48a48f6..3499a4874d 100644
--- a/hw/kdrive/chips/chipsstub.c
+++ b/hw/kdrive/chips/chipsstub.c
@@ -25,7 +25,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/chips/chipsstub.c,v 1.1 2001/09/05 07:12:42 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "chips.h"
 
diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
index 18b4980069..3a878f8ded 100644
--- a/hw/kdrive/ephyr/Makefile.am
+++ b/hw/kdrive/ephyr/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 noinst_LIBRARIES = libxephyr.a libxephyr-hostx.a
 
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index f414aa597a..d6b3a158c1 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -29,7 +29,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "ephyr.h"
 
diff --git a/hw/kdrive/ephyr/ephyr.h b/hw/kdrive/ephyr/ephyr.h
index 408110132d..93c210795c 100644
--- a/hw/kdrive/ephyr/ephyr.h
+++ b/hw/kdrive/ephyr/ephyr.h
@@ -38,6 +38,8 @@
 #include "randrstr.h"
 #endif
 
+#include "damage.h"
+
 typedef struct _ephyrPriv {
     CARD8	*base;
     int		bytes_per_line;
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index a7ebc417fa..28deee8267 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -24,7 +24,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "ephyr.h"
 
diff --git a/hw/kdrive/ephyr/os.c b/hw/kdrive/ephyr/os.c
index 2ee556155d..ead15868bc 100644
--- a/hw/kdrive/ephyr/os.c
+++ b/hw/kdrive/ephyr/os.c
@@ -24,7 +24,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "ephyr.h"
 
diff --git a/hw/kdrive/epson/Makefile.am b/hw/kdrive/epson/Makefile.am
index a4ec2706a8..a9b8750450 100644
--- a/hw/kdrive/epson/Makefile.am
+++ b/hw/kdrive/epson/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 bin_PROGRAMS = Xepson
 
diff --git a/hw/kdrive/epson/epson13806.c b/hw/kdrive/epson/epson13806.c
index 01ce6e76de..43a9b58da1 100644
--- a/hw/kdrive/epson/epson13806.c
+++ b/hw/kdrive/epson/epson13806.c
@@ -31,7 +31,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 
 #include <sys/ioctl.h>
diff --git a/hw/kdrive/epson/epson13806stub.c b/hw/kdrive/epson/epson13806stub.c
index 35db3e44ab..125d90289a 100644
--- a/hw/kdrive/epson/epson13806stub.c
+++ b/hw/kdrive/epson/epson13806stub.c
@@ -29,7 +29,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 
 #include <epson13806.h>
diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am
index 825f0a8c21..02b79a9618 100644
--- a/hw/kdrive/fake/Makefile.am
+++ b/hw/kdrive/fake/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 noinst_LIBRARIES = libfake.a
 
diff --git a/hw/kdrive/fake/fake.c b/hw/kdrive/fake/fake.c
index 25b0c8136b..d56512b3fc 100644
--- a/hw/kdrive/fake/fake.c
+++ b/hw/kdrive/fake/fake.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "fake.h"
 
diff --git a/hw/kdrive/fake/fakeinit.c b/hw/kdrive/fake/fakeinit.c
index fc24965025..c5ee4bc3f7 100644
--- a/hw/kdrive/fake/fakeinit.c
+++ b/hw/kdrive/fake/fakeinit.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "fake.h"
 
diff --git a/hw/kdrive/fake/kbd.c b/hw/kdrive/fake/kbd.c
index e6595c5109..9cf4de0609 100644
--- a/hw/kdrive/fake/kbd.c
+++ b/hw/kdrive/fake/kbd.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/fake/kbd.c,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "fake.h"
 #include "kkeymap.h"
diff --git a/hw/kdrive/fake/mouse.c b/hw/kdrive/fake/mouse.c
index 9c11133b52..714a45123f 100644
--- a/hw/kdrive/fake/mouse.c
+++ b/hw/kdrive/fake/mouse.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <errno.h>
diff --git a/hw/kdrive/fake/os.c b/hw/kdrive/fake/os.c
index 16786835a1..32cb139c0d 100644
--- a/hw/kdrive/fake/os.c
+++ b/hw/kdrive/fake/os.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "fake.h"
 
diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am
index 3a8131cfb2..fce6df9f40 100644
--- a/hw/kdrive/fbdev/Makefile.am
+++ b/hw/kdrive/fbdev/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 noinst_LIBRARIES = libfbdev.a
 
diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
index d38701019e..e8338136a9 100644
--- a/hw/kdrive/fbdev/fbdev.c
+++ b/hw/kdrive/fbdev/fbdev.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.31 2002/10/14 18:01:40 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "fbdev.h"
 #include <sys/ioctl.h>
diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c
index a63ca838e2..ba9d1c6951 100644
--- a/hw/kdrive/fbdev/fbinit.c
+++ b/hw/kdrive/fbdev/fbinit.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/fbinit.c,v 1.8 2001/05/29 17:47:55 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include <fbdev.h>
 
diff --git a/hw/kdrive/i810/Makefile.am b/hw/kdrive/i810/Makefile.am
index da6d0801ba..fdf1a19644 100644
--- a/hw/kdrive/i810/Makefile.am
+++ b/hw/kdrive/i810/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 bin_PROGRAMS = Xi810
 
diff --git a/hw/kdrive/i810/i810.c b/hw/kdrive/i810/i810.c
index 0c233b95de..d2318d786c 100644
--- a/hw/kdrive/i810/i810.c
+++ b/hw/kdrive/i810/i810.c
@@ -43,7 +43,7 @@ X Window System is a trademark of The Open Group */
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kxv.h"
diff --git a/hw/kdrive/i810/i810_cursor.c b/hw/kdrive/i810/i810_cursor.c
index 6e41f581bd..cf4f717f2f 100644
--- a/hw/kdrive/i810/i810_cursor.c
+++ b/hw/kdrive/i810/i810_cursor.c
@@ -72,7 +72,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kxv.h"
diff --git a/hw/kdrive/i810/i810_video.c b/hw/kdrive/i810/i810_video.c
index 520ba6b33d..ac881d51d7 100644
--- a/hw/kdrive/i810/i810_video.c
+++ b/hw/kdrive/i810/i810_video.c
@@ -69,7 +69,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kxv.h"
diff --git a/hw/kdrive/i810/i810draw.c b/hw/kdrive/i810/i810draw.c
index a71e7a432d..b571efbe0e 100644
--- a/hw/kdrive/i810/i810draw.c
+++ b/hw/kdrive/i810/i810draw.c
@@ -36,7 +36,7 @@ X Window System is a trademark of The Open Group */
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kaa.h"
diff --git a/hw/kdrive/i810/i810stub.c b/hw/kdrive/i810/i810stub.c
index c679e976c8..c195947c97 100644
--- a/hw/kdrive/i810/i810stub.c
+++ b/hw/kdrive/i810/i810stub.c
@@ -37,7 +37,7 @@ X Window System is a trademark of The Open Group */
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kxv.h"
diff --git a/hw/kdrive/igs/igs.c b/hw/kdrive/igs/igs.c
index 1b0907d4fe..a0b139a30a 100644
--- a/hw/kdrive/igs/igs.c
+++ b/hw/kdrive/igs/igs.c
@@ -24,7 +24,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "igs.h"
 
diff --git a/hw/kdrive/igs/igscmap.c b/hw/kdrive/igs/igscmap.c
index e6dc04e7b6..06ab7a490e 100644
--- a/hw/kdrive/igs/igscmap.c
+++ b/hw/kdrive/igs/igscmap.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "igs.h"
 
diff --git a/hw/kdrive/igs/igscurs.c b/hw/kdrive/igs/igscurs.c
index 6bdc61658d..6d6267666e 100644
--- a/hw/kdrive/igs/igscurs.c
+++ b/hw/kdrive/igs/igscurs.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "igs.h"
 #include "cursorstr.h"
diff --git a/hw/kdrive/igs/igsdraw.c b/hw/kdrive/igs/igsdraw.c
index d92ea66530..46c98cfc75 100644
--- a/hw/kdrive/igs/igsdraw.c
+++ b/hw/kdrive/igs/igsdraw.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "igs.h"
 #include "igsdraw.h"
diff --git a/hw/kdrive/igs/igsreg.c b/hw/kdrive/igs/igsreg.c
index d63fce0356..831d985bd3 100644
--- a/hw/kdrive/igs/igsreg.c
+++ b/hw/kdrive/igs/igsreg.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "igsreg.h"
 #include <stdio.h>
diff --git a/hw/kdrive/igs/igsstub.c b/hw/kdrive/igs/igsstub.c
index 00dd450f83..b0ce151f0e 100644
--- a/hw/kdrive/igs/igsstub.c
+++ b/hw/kdrive/igs/igsstub.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "igs.h"
 
diff --git a/hw/kdrive/ipaq/ipaq.c b/hw/kdrive/ipaq/ipaq.c
index f94b32121c..f1432a605a 100644
--- a/hw/kdrive/ipaq/ipaq.c
+++ b/hw/kdrive/ipaq/ipaq.c
@@ -25,7 +25,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/ipaq/ipaq.c,v 1.2 2001/05/29 17:47:55 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "pcmcia.h"
 
diff --git a/hw/kdrive/itsy/itsy.c b/hw/kdrive/itsy/itsy.c
index 48b56b7ff9..0524b98d11 100644
--- a/hw/kdrive/itsy/itsy.c
+++ b/hw/kdrive/itsy/itsy.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/itsy.c,v 1.2 1999/12/30 03:03:09 robin Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "itsy.h"
 
diff --git a/hw/kdrive/itsy/kbd.c b/hw/kdrive/itsy/kbd.c
index eec6514e1b..76062c5a8e 100644
--- a/hw/kdrive/itsy/kbd.c
+++ b/hw/kdrive/itsy/kbd.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/kbd.c,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "itsy.h"
 #include "kkeymap.h"
diff --git a/hw/kdrive/itsy/ts.c b/hw/kdrive/itsy/ts.c
index 10efe90c84..c773c0e4f6 100644
--- a/hw/kdrive/itsy/ts.c
+++ b/hw/kdrive/itsy/ts.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/ts.c,v 1.1 1999/11/19 13:53:54 hohndel Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include "itsy.h"
diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am
index c12adc29dd..cf3183b8ff 100644
--- a/hw/kdrive/linux/Makefile.am
+++ b/hw/kdrive/linux/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 
 noinst_LIBRARIES = liblinux.a
diff --git a/hw/kdrive/linux/agp.c b/hw/kdrive/linux/agp.c
index d401e03a14..a874c7d4b0 100644
--- a/hw/kdrive/linux/agp.c
+++ b/hw/kdrive/linux/agp.c
@@ -42,7 +42,7 @@ of the copyright holder.
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include <X11/X.h>
 
diff --git a/hw/kdrive/linux/bus.c b/hw/kdrive/linux/bus.c
index 15d2ba846d..be61f891a9 100644
--- a/hw/kdrive/linux/bus.c
+++ b/hw/kdrive/linux/bus.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <X11/X.h>
diff --git a/hw/kdrive/linux/evdev.c b/hw/kdrive/linux/evdev.c
index 91770316c2..d83b13a6e9 100644
--- a/hw/kdrive/linux/evdev.c
+++ b/hw/kdrive/linux/evdev.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <errno.h>
diff --git a/hw/kdrive/linux/keyboard.c b/hw/kdrive/linux/keyboard.c
index 97b0683ded..cfafbb38f5 100644
--- a/hw/kdrive/linux/keyboard.c
+++ b/hw/kdrive/linux/keyboard.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kkeymap.h"
diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c
index 9c06c80089..be11ec539e 100644
--- a/hw/kdrive/linux/linux.c
+++ b/hw/kdrive/linux/linux.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "klinux.h"
diff --git a/hw/kdrive/linux/mouse.c b/hw/kdrive/linux/mouse.c
index 4a0c09a3e2..16c0e7ba38 100644
--- a/hw/kdrive/linux/mouse.c
+++ b/hw/kdrive/linux/mouse.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <errno.h>
diff --git a/hw/kdrive/linux/ms.c b/hw/kdrive/linux/ms.c
index b29f6527b9..6c8e6dc383 100644
--- a/hw/kdrive/linux/ms.c
+++ b/hw/kdrive/linux/ms.c
@@ -23,7 +23,7 @@ THE SOFTWARE.
 /* $RCSId: xc/programs/Xserver/hw/kdrive/linux/ms.c,v 1.1 2001/08/09 20:45:15 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <errno.h>
diff --git a/hw/kdrive/linux/ps2.c b/hw/kdrive/linux/ps2.c
index da3372011f..29b6a46a22 100644
--- a/hw/kdrive/linux/ps2.c
+++ b/hw/kdrive/linux/ps2.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <X11/X.h>
diff --git a/hw/kdrive/linux/ts.c b/hw/kdrive/linux/ts.c
index 9051c0d611..70c7361177 100644
--- a/hw/kdrive/linux/ts.c
+++ b/hw/kdrive/linux/ts.c
@@ -26,7 +26,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <X11/X.h>
diff --git a/hw/kdrive/linux/tslib.c b/hw/kdrive/linux/tslib.c
index 1addffdb4c..c4caff9221 100644
--- a/hw/kdrive/linux/tslib.c
+++ b/hw/kdrive/linux/tslib.c
@@ -66,7 +66,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <X11/X.h>
diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am
index 9a9b464698..193bc25449 100644
--- a/hw/kdrive/mach64/Makefile.am
+++ b/hw/kdrive/mach64/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = 					\
         @KDRIVE_INCS@				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 bin_PROGRAMS = Xmach64
 
diff --git a/hw/kdrive/mach64/mach64.c b/hw/kdrive/mach64/mach64.c
index 948065d037..1d4186d340 100644
--- a/hw/kdrive/mach64/mach64.c
+++ b/hw/kdrive/mach64/mach64.c
@@ -22,7 +22,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64.c,v 1.10 2002/10/14 18:01:41 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "mach64.h"
 #include "kaa.h"
diff --git a/hw/kdrive/mach64/mach64curs.c b/hw/kdrive/mach64/mach64curs.c
index b5d7cd16c7..9ac1efd532 100644
--- a/hw/kdrive/mach64/mach64curs.c
+++ b/hw/kdrive/mach64/mach64curs.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.6 2000/09/03 05:11:20 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "trident.h"
 #include "cursorstr.h"
diff --git a/hw/kdrive/mach64/mach64draw.c b/hw/kdrive/mach64/mach64draw.c
index 080904efed..f91798436a 100644
--- a/hw/kdrive/mach64/mach64draw.c
+++ b/hw/kdrive/mach64/mach64draw.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64draw.c,v 1.6 2001/07/23 03:44:17 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "mach64.h"
 #include "mach64draw.h"
diff --git a/hw/kdrive/mach64/mach64stub.c b/hw/kdrive/mach64/mach64stub.c
index 15ad0ce060..60808c26da 100644
--- a/hw/kdrive/mach64/mach64stub.c
+++ b/hw/kdrive/mach64/mach64stub.c
@@ -25,7 +25,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64stub.c,v 1.2 2001/10/12 06:33:10 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "mach64.h"
 #include <klinux.h>
diff --git a/hw/kdrive/mach64/mach64video.c b/hw/kdrive/mach64/mach64video.c
index 28d48deec4..7d42807daf 100644
--- a/hw/kdrive/mach64/mach64video.c
+++ b/hw/kdrive/mach64/mach64video.c
@@ -21,7 +21,7 @@
  */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64video.c,v 1.9tsi Exp $ */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "mach64.h"
 
diff --git a/hw/kdrive/mga/Makefile.am b/hw/kdrive/mga/Makefile.am
index 66b2636b1b..d236064ba2 100644
--- a/hw/kdrive/mga/Makefile.am
+++ b/hw/kdrive/mga/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 bin_PROGRAMS = Xmga
 
diff --git a/hw/kdrive/mga/g400_composite.c b/hw/kdrive/mga/g400_composite.c
index e0ecdcd730..671e517fb2 100644
--- a/hw/kdrive/mga/g400_composite.c
+++ b/hw/kdrive/mga/g400_composite.c
@@ -24,7 +24,7 @@
 /* $Header$ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 
 #include "mga.h"
diff --git a/hw/kdrive/mga/mga.c b/hw/kdrive/mga/mga.c
index c3f9479a22..990d646acb 100644
--- a/hw/kdrive/mga/mga.c
+++ b/hw/kdrive/mga/mga.c
@@ -23,7 +23,7 @@
  */
 /* $Header$ */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "mga.h"
 
diff --git a/hw/kdrive/mga/mgadraw.c b/hw/kdrive/mga/mgadraw.c
index c7b89da8b4..f961fc38df 100644
--- a/hw/kdrive/mga/mgadraw.c
+++ b/hw/kdrive/mga/mgadraw.c
@@ -23,7 +23,7 @@
  */
 /* $Header$ */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "mga.h"
 #include "g400_common.h"
diff --git a/hw/kdrive/mga/mgastub.c b/hw/kdrive/mga/mgastub.c
index 56b9d7149d..ebb40fd19a 100644
--- a/hw/kdrive/mga/mgastub.c
+++ b/hw/kdrive/mga/mgastub.c
@@ -23,7 +23,7 @@
  */
 /* $Header$ */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "mga.h"
 
diff --git a/hw/kdrive/neomagic/Makefile.am b/hw/kdrive/neomagic/Makefile.am
index 58f80c2301..21fc62a504 100644
--- a/hw/kdrive/neomagic/Makefile.am
+++ b/hw/kdrive/neomagic/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES =                      \
 	@KDRIVE_INCS@               \
 	$(FBDEV_INCLUDES)           \
 	$(VESA_INCLUDES)            \
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 bin_PROGRAMS = Xneomagic
 
diff --git a/hw/kdrive/neomagic/backend.c b/hw/kdrive/neomagic/backend.c
index 958b837815..12fbf030a9 100644
--- a/hw/kdrive/neomagic/backend.c
+++ b/hw/kdrive/neomagic/backend.c
@@ -10,7 +10,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "backend.h"
 
diff --git a/hw/kdrive/neomagic/neo_draw.c b/hw/kdrive/neomagic/neo_draw.c
index be0d39a847..89452b3d86 100644
--- a/hw/kdrive/neomagic/neo_draw.c
+++ b/hw/kdrive/neomagic/neo_draw.c
@@ -22,7 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "neomagic.h"
 
diff --git a/hw/kdrive/neomagic/neomagic.c b/hw/kdrive/neomagic/neomagic.c
index 0a87cfa07c..ac0c7569ab 100644
--- a/hw/kdrive/neomagic/neomagic.c
+++ b/hw/kdrive/neomagic/neomagic.c
@@ -22,7 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "neomagic.h"
 #include <sys/io.h>
diff --git a/hw/kdrive/neomagic/neomagicstub.c b/hw/kdrive/neomagic/neomagicstub.c
index 9a283afed1..308f4a2c1e 100644
--- a/hw/kdrive/neomagic/neomagicstub.c
+++ b/hw/kdrive/neomagic/neomagicstub.c
@@ -22,7 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "neomagic.h"
 
diff --git a/hw/kdrive/nvidia/Makefile.am b/hw/kdrive/nvidia/Makefile.am
index 4b85662ba9..fda904bf2e 100644
--- a/hw/kdrive/nvidia/Makefile.am
+++ b/hw/kdrive/nvidia/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 bin_PROGRAMS = Xnvidia
 
diff --git a/hw/kdrive/nvidia/nvidia.c b/hw/kdrive/nvidia/nvidia.c
index a6a1f8ebc0..1703a30c4a 100644
--- a/hw/kdrive/nvidia/nvidia.c
+++ b/hw/kdrive/nvidia/nvidia.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "nvidia.h"
 #include "kaa.h"
diff --git a/hw/kdrive/nvidia/nvidiacurs.c b/hw/kdrive/nvidia/nvidiacurs.c
index b5d7cd16c7..9ac1efd532 100644
--- a/hw/kdrive/nvidia/nvidiacurs.c
+++ b/hw/kdrive/nvidia/nvidiacurs.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.6 2000/09/03 05:11:20 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "trident.h"
 #include "cursorstr.h"
diff --git a/hw/kdrive/nvidia/nvidiadraw.c b/hw/kdrive/nvidia/nvidiadraw.c
index 9fa9459b1b..dda3ea37af 100644
--- a/hw/kdrive/nvidia/nvidiadraw.c
+++ b/hw/kdrive/nvidia/nvidiadraw.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "nvidia.h"
 #include "nvidiadraw.h"
diff --git a/hw/kdrive/nvidia/nvidiastub.c b/hw/kdrive/nvidia/nvidiastub.c
index 57ba3bd9b1..ea2dd0f388 100644
--- a/hw/kdrive/nvidia/nvidiastub.c
+++ b/hw/kdrive/nvidia/nvidiastub.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "nvidia.h"
 
diff --git a/hw/kdrive/nvidia/nvidiavideo.c b/hw/kdrive/nvidia/nvidiavideo.c
index 04cc8044c2..1dd5a1c5d7 100644
--- a/hw/kdrive/nvidia/nvidiavideo.c
+++ b/hw/kdrive/nvidia/nvidiavideo.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "nvidia.h"
 
diff --git a/hw/kdrive/pcmcia/pcmcia.c b/hw/kdrive/pcmcia/pcmcia.c
index 087b0a604f..dfdd2f6a93 100644
--- a/hw/kdrive/pcmcia/pcmcia.c
+++ b/hw/kdrive/pcmcia/pcmcia.c
@@ -30,7 +30,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmcia.c,v 1.6 2002/10/14 18:01:41 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "pcmcia.h"
 #define extern
diff --git a/hw/kdrive/pcmcia/pcmciacurs.c b/hw/kdrive/pcmcia/pcmciacurs.c
index 1cb86cfe9f..89770bc354 100644
--- a/hw/kdrive/pcmcia/pcmciacurs.c
+++ b/hw/kdrive/pcmcia/pcmciacurs.c
@@ -24,7 +24,7 @@
 /* $RCSId: $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "pcmcia.h"
 #include "cursorstr.h"
diff --git a/hw/kdrive/pcmcia/pcmciarotate.c b/hw/kdrive/pcmcia/pcmciarotate.c
index 6ac7efbfd8..ac3ec9dc22 100644
--- a/hw/kdrive/pcmcia/pcmciarotate.c
+++ b/hw/kdrive/pcmcia/pcmciarotate.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include    <X11/X.h>
 #include    "scrnintstr.h"
diff --git a/hw/kdrive/pcmcia/pcmciashadow.c b/hw/kdrive/pcmcia/pcmciashadow.c
index abe73a0bad..c32333ff33 100644
--- a/hw/kdrive/pcmcia/pcmciashadow.c
+++ b/hw/kdrive/pcmcia/pcmciashadow.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciashadow.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include    <X11/X.h>
 #include    "scrnintstr.h"
diff --git a/hw/kdrive/pcmcia/pcmciastub.c b/hw/kdrive/pcmcia/pcmciastub.c
index b2145eab5f..c509553ce2 100644
--- a/hw/kdrive/pcmcia/pcmciastub.c
+++ b/hw/kdrive/pcmcia/pcmciastub.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciastub.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "pcmcia.h"
 
diff --git a/hw/kdrive/pm2/Makefile.am b/hw/kdrive/pm2/Makefile.am
index 4c19204679..aca4760940 100644
--- a/hw/kdrive/pm2/Makefile.am
+++ b/hw/kdrive/pm2/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 bin_PROGRAMS = Xpm2
 
diff --git a/hw/kdrive/pm2/pm2.c b/hw/kdrive/pm2/pm2.c
index df2cf7ce40..148f03abdc 100644
--- a/hw/kdrive/pm2/pm2.c
+++ b/hw/kdrive/pm2/pm2.c
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kaa.h"
diff --git a/hw/kdrive/pm2/pm2_draw.c b/hw/kdrive/pm2/pm2_draw.c
index 1662adc96d..332fc8c8a4 100644
--- a/hw/kdrive/pm2/pm2_draw.c
+++ b/hw/kdrive/pm2/pm2_draw.c
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kaa.h"
diff --git a/hw/kdrive/pm2/pm2stub.c b/hw/kdrive/pm2/pm2stub.c
index 07a176005e..fe469515b3 100644
--- a/hw/kdrive/pm2/pm2stub.c
+++ b/hw/kdrive/pm2/pm2stub.c
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "klinux.h"
diff --git a/hw/kdrive/r128/Makefile.am b/hw/kdrive/r128/Makefile.am
index d115fb0535..aa3ca9bcd8 100644
--- a/hw/kdrive/r128/Makefile.am
+++ b/hw/kdrive/r128/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 bin_PROGRAMS = Xr128
 
diff --git a/hw/kdrive/r128/r128.c b/hw/kdrive/r128/r128.c
index 62d96fab06..6758d64abf 100644
--- a/hw/kdrive/r128/r128.c
+++ b/hw/kdrive/r128/r128.c
@@ -23,7 +23,7 @@
  */
 /* $Header$ */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "r128.h"
 
diff --git a/hw/kdrive/r128/r128draw.c b/hw/kdrive/r128/r128draw.c
index 208d7ef5fe..bdc55bba30 100644
--- a/hw/kdrive/r128/r128draw.c
+++ b/hw/kdrive/r128/r128draw.c
@@ -23,7 +23,7 @@
  */
 /* $Header$ */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "r128.h"
 #include "kaa.h"
diff --git a/hw/kdrive/r128/r128stub.c b/hw/kdrive/r128/r128stub.c
index 8608d3f101..221648d9cc 100644
--- a/hw/kdrive/r128/r128stub.c
+++ b/hw/kdrive/r128/r128stub.c
@@ -23,7 +23,7 @@
  */
 /* $Header$ */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "r128.h"
 #include "klinux.h"
diff --git a/hw/kdrive/savage/s3.c b/hw/kdrive/savage/s3.c
index 06f23abafa..95051f27b4 100644
--- a/hw/kdrive/savage/s3.c
+++ b/hw/kdrive/savage/s3.c
@@ -25,7 +25,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3.c,v 1.4 2000/05/06 22:17:44 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "s3.h"
 
diff --git a/hw/kdrive/savage/s3clock.c b/hw/kdrive/savage/s3clock.c
index e3286b8c24..40b6ed6957 100644
--- a/hw/kdrive/savage/s3clock.c
+++ b/hw/kdrive/savage/s3clock.c
@@ -25,7 +25,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3clock.c,v 1.3 2000/02/23 20:30:02 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "s3.h"
 
diff --git a/hw/kdrive/savage/s3cmap.c b/hw/kdrive/savage/s3cmap.c
index f10ac5752c..57f19f4dfe 100644
--- a/hw/kdrive/savage/s3cmap.c
+++ b/hw/kdrive/savage/s3cmap.c
@@ -25,7 +25,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3cmap.c,v 1.4 2000/05/06 22:17:45 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "s3.h"
 
diff --git a/hw/kdrive/savage/s3curs.c b/hw/kdrive/savage/s3curs.c
index eae7f642b4..0440205eb8 100644
--- a/hw/kdrive/savage/s3curs.c
+++ b/hw/kdrive/savage/s3curs.c
@@ -25,7 +25,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3curs.c,v 1.3 2000/02/23 20:30:03 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "s3.h"
 #include "s3draw.h"
diff --git a/hw/kdrive/savage/s3draw.c b/hw/kdrive/savage/s3draw.c
index cae7656752..c22398fd2b 100644
--- a/hw/kdrive/savage/s3draw.c
+++ b/hw/kdrive/savage/s3draw.c
@@ -25,7 +25,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3draw.c,v 1.6 2001/05/29 04:54:11 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include	"s3.h"
 #include	"s3draw.h"
diff --git a/hw/kdrive/savage/s3gc.c b/hw/kdrive/savage/s3gc.c
index 6faadff27e..789ab43d0c 100644
--- a/hw/kdrive/savage/s3gc.c
+++ b/hw/kdrive/savage/s3gc.c
@@ -25,7 +25,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3gc.c,v 1.3 2000/01/21 01:12:02 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include	"s3.h"
 #include	"s3draw.h"
diff --git a/hw/kdrive/savage/s3reg.c b/hw/kdrive/savage/s3reg.c
index 052bcf4d79..df2534bdab 100644
--- a/hw/kdrive/savage/s3reg.c
+++ b/hw/kdrive/savage/s3reg.c
@@ -25,7 +25,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3reg.c,v 1.3 2000/02/23 20:30:04 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "s3reg.h"
 
diff --git a/hw/kdrive/savage/s3rtst.c b/hw/kdrive/savage/s3rtst.c
index c88e34585a..6bcd2a4ce8 100644
--- a/hw/kdrive/savage/s3rtst.c
+++ b/hw/kdrive/savage/s3rtst.c
@@ -25,7 +25,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3rtst.c,v 1.1 1999/11/19 13:53:57 hohndel Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include <stdio.h>
 #include "s3reg.h"
diff --git a/hw/kdrive/savage/s3stub.c b/hw/kdrive/savage/s3stub.c
index a678d9ec50..41553e6e39 100644
--- a/hw/kdrive/savage/s3stub.c
+++ b/hw/kdrive/savage/s3stub.c
@@ -25,7 +25,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3stub.c,v 1.3 2000/02/23 20:30:05 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "s3.h"
 
diff --git a/hw/kdrive/sdl/Makefile.am b/hw/kdrive/sdl/Makefile.am
index c8252d7c20..076f11f0ce 100644
--- a/hw/kdrive/sdl/Makefile.am
+++ b/hw/kdrive/sdl/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = 					\
 	@KDRIVE_PURE_INCS@				\
-	@XSERVER_CFLAGS@	\
+	@KDRIVE_CFLAGS@	\
 	@XSDL_INCS@
 
 bin_PROGRAMS = Xsdl
diff --git a/hw/kdrive/sdl/sdl.c b/hw/kdrive/sdl/sdl.c
index 3273591995..d354f6fb8d 100644
--- a/hw/kdrive/sdl/sdl.c
+++ b/hw/kdrive/sdl/sdl.c
@@ -27,7 +27,7 @@
  */
 /* $Header$ */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "kdrive-config.h"
 #endif
 #include "kdrive.h"
 #include "kkeymap.h"
diff --git a/hw/kdrive/sis300/Makefile.am b/hw/kdrive/sis300/Makefile.am
index b8d1b9ea6d..7b21757e5f 100644
--- a/hw/kdrive/sis300/Makefile.am
+++ b/hw/kdrive/sis300/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES = 					\
 	$(DRI_INCLUDES)				\
 	$(FBDEV_INCLUDES)			\
 	$(VESA_INCLUDES)			\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 bin_PROGRAMS = Xsis
 
diff --git a/hw/kdrive/sis300/sis.c b/hw/kdrive/sis300/sis.c
index 3dd04d83b5..61fa997eec 100644
--- a/hw/kdrive/sis300/sis.c
+++ b/hw/kdrive/sis300/sis.c
@@ -24,7 +24,7 @@
 /* $Header$ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "sis.h"
 #include "sis_reg.h"
diff --git a/hw/kdrive/sis300/sis.h b/hw/kdrive/sis300/sis.h
index 9e585bbf7f..21cbdfc552 100644
--- a/hw/kdrive/sis300/sis.h
+++ b/hw/kdrive/sis300/sis.h
@@ -26,7 +26,7 @@
 #ifndef _SIS_H_
 #define _SIS_H_
 
-#include "config.h"
+#include "kdrive-config.h"
 
 #ifdef KDRIVEFBDEV
 #include <fbdev.h>
diff --git a/hw/kdrive/sis300/sis_draw.c b/hw/kdrive/sis300/sis_draw.c
index ccdf7434bc..77e5829e43 100644
--- a/hw/kdrive/sis300/sis_draw.c
+++ b/hw/kdrive/sis300/sis_draw.c
@@ -26,7 +26,7 @@
 #include <sys/io.h>
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 
 #include "sis.h"
diff --git a/hw/kdrive/sis300/sis_stub.c b/hw/kdrive/sis300/sis_stub.c
index 58f6ac1b58..7f2e482512 100644
--- a/hw/kdrive/sis300/sis_stub.c
+++ b/hw/kdrive/sis300/sis_stub.c
@@ -24,7 +24,7 @@
 /* $Header$ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "sis.h"
 #include "klinux.h"
diff --git a/hw/kdrive/sis530/sis.c b/hw/kdrive/sis530/sis.c
index b2a95326ef..023711af3d 100644
--- a/hw/kdrive/sis530/sis.c
+++ b/hw/kdrive/sis530/sis.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sis.c,v 1.4 2000/05/06 22:17:49 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "sis.h"
 
diff --git a/hw/kdrive/sis530/sisclock.c b/hw/kdrive/sis530/sisclock.c
index 4db2a31b98..06379e55ad 100644
--- a/hw/kdrive/sis530/sisclock.c
+++ b/hw/kdrive/sis530/sisclock.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisclock.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "sis.h"
 #include <stdio.h>
diff --git a/hw/kdrive/sis530/siscmap.c b/hw/kdrive/sis530/siscmap.c
index e52841e9dc..42a0081983 100644
--- a/hw/kdrive/sis530/siscmap.c
+++ b/hw/kdrive/sis530/siscmap.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/siscmap.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "sis.h"
 
diff --git a/hw/kdrive/sis530/siscurs.c b/hw/kdrive/sis530/siscurs.c
index b507188c03..94dfffe7c9 100644
--- a/hw/kdrive/sis530/siscurs.c
+++ b/hw/kdrive/sis530/siscurs.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/siscurs.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "sis.h"
 #include "cursorstr.h"
diff --git a/hw/kdrive/sis530/sisdraw.c b/hw/kdrive/sis530/sisdraw.c
index 82618acab0..5c7867b255 100644
--- a/hw/kdrive/sis530/sisdraw.c
+++ b/hw/kdrive/sis530/sisdraw.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisdraw.c,v 1.5 2000/08/09 17:52:44 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "sis.h"
 #include "sisdraw.h"
diff --git a/hw/kdrive/sis530/sisio.c b/hw/kdrive/sis530/sisio.c
index 1a636a2f90..7b4765f314 100644
--- a/hw/kdrive/sis530/sisio.c
+++ b/hw/kdrive/sis530/sisio.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisio.c,v 1.1 1999/11/19 13:54:00 hohndel Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #ifdef linux
 #define extern
diff --git a/hw/kdrive/sis530/sisstub.c b/hw/kdrive/sis530/sisstub.c
index 8d0f8d002c..a377dd5181 100644
--- a/hw/kdrive/sis530/sisstub.c
+++ b/hw/kdrive/sis530/sisstub.c
@@ -25,7 +25,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisstub.c,v 1.4 2000/08/09 17:52:44 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "sis.h"
 
diff --git a/hw/kdrive/smi/Makefile.am b/hw/kdrive/smi/Makefile.am
index d7e4d66ae6..d0fe2de21a 100644
--- a/hw/kdrive/smi/Makefile.am
+++ b/hw/kdrive/smi/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = 					\
 	-I$(top_srcdir)/hw/kdrive/fbdev		\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
 	@KDRIVE_INCS@				\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 bin_PROGRAMS = Xsmi
 
diff --git a/hw/kdrive/smi/smi.c b/hw/kdrive/smi/smi.c
index 6851b86e78..96c774aac3 100644
--- a/hw/kdrive/smi/smi.c
+++ b/hw/kdrive/smi/smi.c
@@ -22,7 +22,7 @@
 /* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smi.c,v 1.11 2002/10/18 06:31:17 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "smi.h"
 #include "kaa.h"
diff --git a/hw/kdrive/smi/smidraw.c b/hw/kdrive/smi/smidraw.c
index 7f7ef4ca8a..4e1a9fd453 100644
--- a/hw/kdrive/smi/smidraw.c
+++ b/hw/kdrive/smi/smidraw.c
@@ -24,7 +24,7 @@
 /* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smidraw.c,v 1.7 2001/07/24 19:06:03 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "smi.h"
 #include "smidraw.h"
diff --git a/hw/kdrive/smi/smistub.c b/hw/kdrive/smi/smistub.c
index 82286e1f68..5770e2a6f0 100644
--- a/hw/kdrive/smi/smistub.c
+++ b/hw/kdrive/smi/smistub.c
@@ -25,7 +25,7 @@
 /* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smistub.c,v 1.4 2002/10/08 21:25:35 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "smi.h"
 #include "klinux.h"
diff --git a/hw/kdrive/smi/smivideo.c b/hw/kdrive/smi/smivideo.c
index 2395ebec79..32c73516a5 100644
--- a/hw/kdrive/smi/smivideo.c
+++ b/hw/kdrive/smi/smivideo.c
@@ -21,7 +21,7 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/kdrive/mach64/mach64video.c,v 1.10 2003/04/23 21:51:18 tsi Exp $ */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "mach64.h"
 
diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am
index 4758caea5e..b71748b1a5 100644
--- a/hw/kdrive/src/Makefile.am
+++ b/hw/kdrive/src/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 noinst_LIBRARIES = libkdrive.a
 
diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c
index 36406f2708..178544ce0e 100644
--- a/hw/kdrive/src/kaa.c
+++ b/hw/kdrive/src/kaa.c
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kaa.h"
diff --git a/hw/kdrive/src/kaapict.c b/hw/kdrive/src/kaapict.c
index da093b2247..6d44b726a0 100644
--- a/hw/kdrive/src/kaapict.c
+++ b/hw/kdrive/src/kaapict.c
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kaa.h"
diff --git a/hw/kdrive/src/kasync.c b/hw/kdrive/src/kasync.c
index 724d546dd6..d57fab757b 100644
--- a/hw/kdrive/src/kasync.c
+++ b/hw/kdrive/src/kasync.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/kasync.c,v 1.8 2001/03/30 02:15:19 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kaa.h"
diff --git a/hw/kdrive/src/kcmap.c b/hw/kdrive/src/kcmap.c
index 855dc6f029..92ce5b920e 100644
--- a/hw/kdrive/src/kcmap.c
+++ b/hw/kdrive/src/kcmap.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/kcmap.c,v 1.4 2000/05/24 23:57:56 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 
diff --git a/hw/kdrive/src/kcolor.c b/hw/kdrive/src/kcolor.c
index bfff3a52c5..c3669abdf3 100644
--- a/hw/kdrive/src/kcolor.c
+++ b/hw/kdrive/src/kcolor.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/kcolor.c,v 1.2 1999/12/30 03:03:05 robin Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include <stdio.h>
diff --git a/hw/kdrive/src/kcurscol.c b/hw/kdrive/src/kcurscol.c
index 50edf1735a..943417e0d0 100644
--- a/hw/kdrive/src/kcurscol.c
+++ b/hw/kdrive/src/kcurscol.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "cursorstr.h"
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index 57a5d7d03e..cc939d43fd 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #ifdef PSEUDO8
diff --git a/hw/kdrive/src/kinfo.c b/hw/kdrive/src/kinfo.c
index 883f7e56c9..3ba7687c27 100644
--- a/hw/kdrive/src/kinfo.c
+++ b/hw/kdrive/src/kinfo.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/kinfo.c,v 1.2 2000/02/23 20:29:53 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index a34350a6a7..f21aa2d70c 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.30 2002/11/13 16:37:39 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "inputstr.h"
@@ -1126,7 +1126,10 @@ KdReceiveTimeout (KdMouseInfo *mi)
 
 CARD32	KdSpecialKeys = 0;
 
+#if 0
+/* already defined in opaque.h */
 extern char dispatchException;
+#endif
 
 /*
  * kdCheckTermination
diff --git a/hw/kdrive/src/kkeymap.c b/hw/kdrive/src/kkeymap.c
index bfab840388..66383e7f32 100644
--- a/hw/kdrive/src/kkeymap.c
+++ b/hw/kdrive/src/kkeymap.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/kkeymap.c,v 1.1 1999/11/19 13:53:49 hohndel Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include <X11/keysym.h>
diff --git a/hw/kdrive/src/kloadmap.c b/hw/kdrive/src/kloadmap.c
index 17ec880ddb..bc003d485a 100644
--- a/hw/kdrive/src/kloadmap.c
+++ b/hw/kdrive/src/kloadmap.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/kloadmap.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kkeymap.h"
diff --git a/hw/kdrive/src/kmap.c b/hw/kdrive/src/kmap.c
index bd506996b7..73ff427c57 100644
--- a/hw/kdrive/src/kmap.c
+++ b/hw/kdrive/src/kmap.c
@@ -23,7 +23,7 @@
  */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/kmap.c,v 1.10 2001/07/24 21:26:17 keithp Exp $ */
 
-#include <config.h>
+#include <kdrive-config.h>
 #include "kdrive.h"
 
 #include <errno.h>
diff --git a/hw/kdrive/src/kmode.c b/hw/kdrive/src/kmode.c
index e79f5ff621..5a0c09095b 100644
--- a/hw/kdrive/src/kmode.c
+++ b/hw/kdrive/src/kmode.c
@@ -24,7 +24,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 
diff --git a/hw/kdrive/src/knoop.c b/hw/kdrive/src/knoop.c
index f3eee0f363..b358bb374f 100644
--- a/hw/kdrive/src/knoop.c
+++ b/hw/kdrive/src/knoop.c
@@ -28,7 +28,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include <gcstruct.h>
diff --git a/hw/kdrive/src/koffscreen.c b/hw/kdrive/src/koffscreen.c
index 4f69aacea3..eeb35fa56b 100644
--- a/hw/kdrive/src/koffscreen.c
+++ b/hw/kdrive/src/koffscreen.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kaa.h"
diff --git a/hw/kdrive/src/kshadow.c b/hw/kdrive/src/kshadow.c
index 285adf1d2e..36537ad405 100644
--- a/hw/kdrive/src/kshadow.c
+++ b/hw/kdrive/src/kshadow.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 
diff --git a/hw/kdrive/src/ktest.c b/hw/kdrive/src/ktest.c
index 3fe3739a52..935c00e62b 100644
--- a/hw/kdrive/src/ktest.c
+++ b/hw/kdrive/src/ktest.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/ktest.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 
diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c
index 57ca0db30a..8580dc2ee0 100644
--- a/hw/kdrive/src/kxv.c
+++ b/hw/kdrive/src/kxv.c
@@ -38,7 +38,7 @@ of the copyright holder.
 /* $RCSId: xc/programs/Xserver/hw/kdrive/kxv.c,v 1.3 2001/08/09 09:08:54 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 
diff --git a/hw/kdrive/src/vga.c b/hw/kdrive/src/vga.c
index 3e7a43ee93..9b8a7da397 100644
--- a/hw/kdrive/src/vga.c
+++ b/hw/kdrive/src/vga.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/vga.c,v 1.2 1999/12/30 03:03:07 robin Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "vga.h"
 #include <stdio.h>
diff --git a/hw/kdrive/trident/trident.c b/hw/kdrive/trident/trident.c
index 9423f90e05..59f0448963 100644
--- a/hw/kdrive/trident/trident.c
+++ b/hw/kdrive/trident/trident.c
@@ -22,7 +22,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.17 2001/06/03 18:48:19 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "trident.h"
 #include <sys/io.h>
diff --git a/hw/kdrive/trident/tridentcurs.c b/hw/kdrive/trident/tridentcurs.c
index 5f62294fba..521cf98d22 100644
--- a/hw/kdrive/trident/tridentcurs.c
+++ b/hw/kdrive/trident/tridentcurs.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.5 2000/08/29 17:20:15 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "trident.h"
 #include "cursorstr.h"
diff --git a/hw/kdrive/trident/tridentdraw.c b/hw/kdrive/trident/tridentdraw.c
index 641d9239b9..3ebba88d83 100644
--- a/hw/kdrive/trident/tridentdraw.c
+++ b/hw/kdrive/trident/tridentdraw.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.10 2001/06/03 18:48:19 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "trident.h"
 #include "tridentdraw.h"
diff --git a/hw/kdrive/trident/tridentstub.c b/hw/kdrive/trident/tridentstub.c
index 0dd15f1b53..ebfd7ee9cc 100644
--- a/hw/kdrive/trident/tridentstub.c
+++ b/hw/kdrive/trident/tridentstub.c
@@ -25,7 +25,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentstub.c,v 1.5 2000/11/29 08:42:25 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "trident.h"
 
diff --git a/hw/kdrive/trio/s3.c b/hw/kdrive/trio/s3.c
index c8359733b0..6fb8c967f3 100644
--- a/hw/kdrive/trio/s3.c
+++ b/hw/kdrive/trio/s3.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3.c,v 1.4 2000/05/06 22:17:52 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "s3.h"
 
diff --git a/hw/kdrive/trio/s3clock.c b/hw/kdrive/trio/s3clock.c
index f79dfa92d4..9fdd35e99a 100644
--- a/hw/kdrive/trio/s3clock.c
+++ b/hw/kdrive/trio/s3clock.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3clock.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "s3.h"
 
diff --git a/hw/kdrive/trio/s3cmap.c b/hw/kdrive/trio/s3cmap.c
index 19e192ed0d..d59f296590 100644
--- a/hw/kdrive/trio/s3cmap.c
+++ b/hw/kdrive/trio/s3cmap.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3cmap.c,v 1.1 1999/11/19 13:54:05 hohndel Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "s3.h"
 
diff --git a/hw/kdrive/trio/s3curs.c b/hw/kdrive/trio/s3curs.c
index 9416b4398b..4d802c5188 100644
--- a/hw/kdrive/trio/s3curs.c
+++ b/hw/kdrive/trio/s3curs.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3curs.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "s3.h"
 #include "s3draw.h"
diff --git a/hw/kdrive/trio/s3stub.c b/hw/kdrive/trio/s3stub.c
index fe76d4066e..68178eda0a 100644
--- a/hw/kdrive/trio/s3stub.c
+++ b/hw/kdrive/trio/s3stub.c
@@ -25,7 +25,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3stub.c,v 1.3 2000/02/23 20:30:13 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "s3.h"
 
diff --git a/hw/kdrive/ts300/ts300.c b/hw/kdrive/ts300/ts300.c
index 00f80e87a6..620ee7f409 100644
--- a/hw/kdrive/ts300/ts300.c
+++ b/hw/kdrive/ts300/ts300.c
@@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/ts300/ts300.c,v 1.3 2000/02/23 20:30:14 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 
diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am
index bdcb10c0e0..33683fb942 100644
--- a/hw/kdrive/vesa/Makefile.am
+++ b/hw/kdrive/vesa/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 noinst_LIBRARIES = libvesa.a
 
diff --git a/hw/kdrive/vesa/vbe.c b/hw/kdrive/vesa/vbe.c
index 7fc891a096..5fbd8abef3 100644
--- a/hw/kdrive/vesa/vbe.c
+++ b/hw/kdrive/vesa/vbe.c
@@ -22,7 +22,7 @@ THE SOFTWARE.
 /* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vbe.c,v 1.9 2001/05/29 04:54:12 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "vesa.h"
 
diff --git a/hw/kdrive/vesa/vesa.c b/hw/kdrive/vesa/vesa.c
index f09f4f3f96..67d2d438a6 100644
--- a/hw/kdrive/vesa/vesa.c
+++ b/hw/kdrive/vesa/vesa.c
@@ -22,7 +22,7 @@ THE SOFTWARE.
 /* $Id$ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "vesa.h"
 #include "vga.h"
diff --git a/hw/kdrive/vesa/vesainit.c b/hw/kdrive/vesa/vesainit.c
index 0006e6c2e5..9337157312 100644
--- a/hw/kdrive/vesa/vesainit.c
+++ b/hw/kdrive/vesa/vesainit.c
@@ -22,7 +22,7 @@ THE SOFTWARE.
 /* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vesainit.c,v 1.7 2001/09/05 07:12:43 keithp Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "vesa.h"
 
diff --git a/hw/kdrive/vesa/vga.c b/hw/kdrive/vesa/vga.c
index 5007467748..3050eacce3 100644
--- a/hw/kdrive/vesa/vga.c
+++ b/hw/kdrive/vesa/vga.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "vesa.h"
 
diff --git a/hw/kdrive/vesa/vm86.c b/hw/kdrive/vesa/vm86.c
index 9d1fa8bcf7..c4aadbd85f 100644
--- a/hw/kdrive/vesa/vm86.c
+++ b/hw/kdrive/vesa/vm86.c
@@ -44,7 +44,7 @@ THE SOFTWARE.
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "vm86.h"
 
diff --git a/hw/kdrive/via/Makefile.am b/hw/kdrive/via/Makefile.am
index bcd0e8b869..9304c37e83 100644
--- a/hw/kdrive/via/Makefile.am
+++ b/hw/kdrive/via/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = 					\
         @KDRIVE_INCS@				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@
 
 bin_PROGRAMS = Xvia
 
diff --git a/hw/kdrive/vxworks/vxkbd.c b/hw/kdrive/vxworks/vxkbd.c
index 4bcca02b15..1c23aa9155 100644
--- a/hw/kdrive/vxworks/vxkbd.c
+++ b/hw/kdrive/vxworks/vxkbd.c
@@ -7,7 +7,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kkeymap.h"
diff --git a/hw/kdrive/vxworks/vxmouse.c b/hw/kdrive/vxworks/vxmouse.c
index 75ed39bd0d..97e24af4a9 100644
--- a/hw/kdrive/vxworks/vxmouse.c
+++ b/hw/kdrive/vxworks/vxmouse.c
@@ -7,7 +7,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <X11/X.h>
diff --git a/hw/kdrive/vxworks/vxworks.c b/hw/kdrive/vxworks/vxworks.c
index a40f7590fa..ce214ff848 100644
--- a/hw/kdrive/vxworks/vxworks.c
+++ b/hw/kdrive/vxworks/vxworks.c
@@ -7,7 +7,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include <X11/keysym.h>