Get Xvesa building

76 files changed, 235 insertions, 41 deletions

diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
index a98a5b2ff..07ea3b9ad 100644
--- a/hw/kdrive/Makefile.am
+++ b/hw/kdrive/Makefile.am
@@ -1,32 +1,4 @@
 SUBDIRS =	\
+	src	\
+	linux	\
 	vesa	\
-	linux
-
-INCLUDES = 					\
-	-I$(top_srcdir)/fb			\
-	-I$(top_srcdir)/include			\
-	-I$(top_srcdir)/mi			\
-	-I$(top_srcdir)/miext/shadow		\
-	-I$(top_srcdir)/randr			\
-	-I$(top_srcdir)/render			
-
-
-noinst_LTLIBRARIES = libkdrive.la
-
-libkdrive_la_SOURCES =	\
-	kaa.c		\
-	kasync.c	\
-	kcmap.c		\
-	kcolor.c	\
-	kcurscol.c	\
-	kdrive.c	\
-	kinfo.c		\
-	kinput.c	\
-	kmap.c		\
-	kmode.c		\
-	knoop.c		\
-	kpict.c		\
-	kshadow.c	\
-	ktest.c		\
-	kxv.c		\
-	vga.c
diff --git a/hw/kdrive/chips/chips.c b/hw/kdrive/chips/chips.c
index faebaba32..c0b0bb6a8 100644
--- a/hw/kdrive/chips/chips.c
+++ b/hw/kdrive/chips/chips.c
@@ -21,6 +21,9 @@
  */
 /* $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>
+#endif
 #include "chips.h"
 #include <sys/io.h>
 
diff --git a/hw/kdrive/chips/chipsdraw.c b/hw/kdrive/chips/chipsdraw.c
index fb860c382..4fc210597 100644
--- a/hw/kdrive/chips/chipsdraw.c
+++ b/hw/kdrive/chips/chipsdraw.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "chips.h"
 
 #include	"Xmd.h"
diff --git a/hw/kdrive/chips/chipsstub.c b/hw/kdrive/chips/chipsstub.c
index 73c284942..e46df972e 100644
--- a/hw/kdrive/chips/chipsstub.c
+++ b/hw/kdrive/chips/chipsstub.c
@@ -24,6 +24,9 @@
  */
 /* $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>
+#endif
 #include "chips.h"
 
 extern int  chips_clk, chips_mclk;
diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
index c1c30fe1c..3bdeed1d1 100644
--- a/hw/kdrive/fbdev/fbdev.c
+++ b/hw/kdrive/fbdev/fbdev.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "fbdev.h"
 
 /* this code was used to debug MSB 24bpp code on a 16bpp frame buffer */
diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c
index 8ef7671c3..aeb4d14b0 100644
--- a/hw/kdrive/fbdev/fbinit.c
+++ b/hw/kdrive/fbdev/fbinit.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include <fbdev.h>
 
 void
diff --git a/hw/kdrive/i810/i810.c b/hw/kdrive/i810/i810.c
index 59dfa257c..e36ea816e 100644
--- a/hw/kdrive/i810/i810.c
+++ b/hw/kdrive/i810/i810.c
@@ -42,6 +42,9 @@ X Window System is a trademark of The Open Group */
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <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 7b33fa227..c448f3471 100644
--- a/hw/kdrive/i810/i810_cursor.c
+++ b/hw/kdrive/i810/i810_cursor.c
@@ -71,6 +71,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #include "kxv.h"
 #include "i810.h"
diff --git a/hw/kdrive/i810/i810_video.c b/hw/kdrive/i810/i810_video.c
index a7b0ae824..8f4cfcf27 100644
--- a/hw/kdrive/i810/i810_video.c
+++ b/hw/kdrive/i810/i810_video.c
@@ -68,6 +68,9 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #include "kxv.h"
 #include "i810.h"
diff --git a/hw/kdrive/i810/i810draw.c b/hw/kdrive/i810/i810draw.c
index 3f8a836cf..d6d857c4f 100644
--- a/hw/kdrive/i810/i810draw.c
+++ b/hw/kdrive/i810/i810draw.c
@@ -35,6 +35,9 @@ X Window System is a trademark of The Open Group */
    Author: Pontus Lidman <pontus.lidman@nokia.com>
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #ifdef XV
 #include "kxv.h"
diff --git a/hw/kdrive/i810/i810stub.c b/hw/kdrive/i810/i810stub.c
index 4ab4142ad..fc028288b 100644
--- a/hw/kdrive/i810/i810stub.c
+++ b/hw/kdrive/i810/i810stub.c
@@ -36,6 +36,9 @@ X Window System is a trademark of The Open Group */
    Author: Pontus Lidman <pontus.lidman@nokia.com>
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #include "kxv.h"
 #include "i810.h"
diff --git a/hw/kdrive/igs/igs.c b/hw/kdrive/igs/igs.c
index cdefe7551..1b0907d4f 100644
--- a/hw/kdrive/igs/igs.c
+++ b/hw/kdrive/igs/igs.c
@@ -23,6 +23,9 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "igs.h"
 
 Bool
diff --git a/hw/kdrive/igs/igscmap.c b/hw/kdrive/igs/igscmap.c
index fa464384c..e6dc04e7b 100644
--- a/hw/kdrive/igs/igscmap.c
+++ b/hw/kdrive/igs/igscmap.c
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "igs.h"
 
 #define IGS_DAC_SHIFT	8
diff --git a/hw/kdrive/igs/igscurs.c b/hw/kdrive/igs/igscurs.c
index 82fc1a166..6bdc61658 100644
--- a/hw/kdrive/igs/igscurs.c
+++ b/hw/kdrive/igs/igscurs.c
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "igs.h"
 #include "cursorstr.h"
 
diff --git a/hw/kdrive/igs/igsdraw.c b/hw/kdrive/igs/igsdraw.c
index 547e61791..d92ea6653 100644
--- a/hw/kdrive/igs/igsdraw.c
+++ b/hw/kdrive/igs/igsdraw.c
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "igs.h"
 #include "igsdraw.h"
 
diff --git a/hw/kdrive/igs/igsreg.c b/hw/kdrive/igs/igsreg.c
index 1f4e6de8a..d63fce035 100644
--- a/hw/kdrive/igs/igsreg.c
+++ b/hw/kdrive/igs/igsreg.c
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "igsreg.h"
 #include <stdio.h>
 
diff --git a/hw/kdrive/igs/igsstub.c b/hw/kdrive/igs/igsstub.c
index a25257ffc..832c9df23 100644
--- a/hw/kdrive/igs/igsstub.c
+++ b/hw/kdrive/igs/igsstub.c
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "igs.h"
 
 void
diff --git a/hw/kdrive/ipaq/ipaq.c b/hw/kdrive/ipaq/ipaq.c
index d93d38228..fcdfefd82 100644
--- a/hw/kdrive/ipaq/ipaq.c
+++ b/hw/kdrive/ipaq/ipaq.c
@@ -24,6 +24,9 @@
  */
 /* $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>
+#endif
 #include "pcmcia.h"
 
 extern KdCardFuncs  pcmciaFuncs;
diff --git a/hw/kdrive/itsy/itsy.c b/hw/kdrive/itsy/itsy.c
index 45553e55d..ef8ca6dad 100644
--- a/hw/kdrive/itsy/itsy.c
+++ b/hw/kdrive/itsy/itsy.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "itsy.h"
 
 /* struct with LCD characteristics defined in fb_brutus.h  */
diff --git a/hw/kdrive/itsy/kbd.c b/hw/kdrive/itsy/kbd.c
index 23cdf0a69..eec6514e1 100644
--- a/hw/kdrive/itsy/kbd.c
+++ b/hw/kdrive/itsy/kbd.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "itsy.h"
 #include "kkeymap.h"
 #include <X11/keysym.h>
diff --git a/hw/kdrive/itsy/ts.c b/hw/kdrive/itsy/ts.c
index 8501a5f86..10efe90c8 100644
--- a/hw/kdrive/itsy/ts.c
+++ b/hw/kdrive/itsy/ts.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #define NEED_EVENTS
 #include "itsy.h"
 #include <X11/Xproto.h>
diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am
index 500c1d3d8..a0e8c33e2 100644
--- a/hw/kdrive/linux/Makefile.am
+++ b/hw/kdrive/linux/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = 					\
-	$(X_CFLAGS)		\
-	-I$(top_srcdir)/hw/kdrive		\
+	$(X_CFLAGS)				\
+	-I$(top_srcdir)/hw/kdrive/src		\
 	-I$(top_srcdir)/include			\
 	-I$(top_srcdir)/mi			\
 	-I$(top_srcdir)/fb			\
diff --git a/hw/kdrive/linux/agp.c b/hw/kdrive/linux/agp.c
index 37fa7f10c..6f4482c03 100644
--- a/hw/kdrive/linux/agp.c
+++ b/hw/kdrive/linux/agp.c
@@ -41,6 +41,9 @@ of the copyright holder.
  * Author: Pontus Lidman <pontus.lidman@nokia.com> (adaption to KDrive) and others
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 
 #include <unistd.h>
diff --git a/hw/kdrive/linux/bus.c b/hw/kdrive/linux/bus.c
index 7d95d9150..3dcebc70e 100644
--- a/hw/kdrive/linux/bus.c
+++ b/hw/kdrive/linux/bus.c
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/hw/kdrive/linux/keyboard.c b/hw/kdrive/linux/keyboard.c
index 14fdd1b7d..2efda3955 100644
--- a/hw/kdrive/linux/keyboard.c
+++ b/hw/kdrive/linux/keyboard.c
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #include "kkeymap.h"
 #include <linux/keyboard.h>
diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c
index fba4c5f53..9f2ca3cc8 100644
--- a/hw/kdrive/linux/linux.c
+++ b/hw/kdrive/linux/linux.c
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #include <errno.h>
 #include <signal.h>
diff --git a/hw/kdrive/linux/mouse.c b/hw/kdrive/linux/mouse.c
index 782f92fd2..7c91a52d1 100644
--- a/hw/kdrive/linux/mouse.c
+++ b/hw/kdrive/linux/mouse.c
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <errno.h>
 #include <termios.h>
diff --git a/hw/kdrive/linux/ms.c b/hw/kdrive/linux/ms.c
index 41fb4c9ba..20c3dc680 100644
--- a/hw/kdrive/linux/ms.c
+++ b/hw/kdrive/linux/ms.c
@@ -22,6 +22,9 @@ 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>
+#endif
 #define NEED_EVENTS
 #include <errno.h>
 #include <termios.h>
diff --git a/hw/kdrive/linux/ps2.c b/hw/kdrive/linux/ps2.c
index 343b0dfa1..0fb76a6de 100644
--- a/hw/kdrive/linux/ps2.c
+++ b/hw/kdrive/linux/ps2.c
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/hw/kdrive/linux/ts.c b/hw/kdrive/linux/ts.c
index 1f938a53a..7f256988b 100644
--- a/hw/kdrive/linux/ts.c
+++ b/hw/kdrive/linux/ts.c
@@ -25,6 +25,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/hw/kdrive/linux/tslib.c b/hw/kdrive/linux/tslib.c
index ae740c48f..e0731bf70 100644
--- a/hw/kdrive/linux/tslib.c
+++ b/hw/kdrive/linux/tslib.c
@@ -46,6 +46,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/hw/kdrive/mach64/mach64.c b/hw/kdrive/mach64/mach64.c
index 4971949c5..0039c838a 100644
--- a/hw/kdrive/mach64/mach64.c
+++ b/hw/kdrive/mach64/mach64.c
@@ -21,6 +21,9 @@
  */
 /* $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>
+#endif
 #include "mach64.h"
 #include <sys/io.h>
 
diff --git a/hw/kdrive/mach64/mach64curs.c b/hw/kdrive/mach64/mach64curs.c
index b77a7d00b..b5d7cd16c 100644
--- a/hw/kdrive/mach64/mach64curs.c
+++ b/hw/kdrive/mach64/mach64curs.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "trident.h"
 #include "cursorstr.h"
 
diff --git a/hw/kdrive/mach64/mach64draw.c b/hw/kdrive/mach64/mach64draw.c
index 54474f5e1..10b24a15b 100644
--- a/hw/kdrive/mach64/mach64draw.c
+++ b/hw/kdrive/mach64/mach64draw.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "mach64.h"
 #include "mach64draw.h"
 
diff --git a/hw/kdrive/mach64/mach64stub.c b/hw/kdrive/mach64/mach64stub.c
index 46ea0ab08..a6671d1b7 100644
--- a/hw/kdrive/mach64/mach64stub.c
+++ b/hw/kdrive/mach64/mach64stub.c
@@ -24,6 +24,9 @@
  */
 /* $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>
+#endif
 #include "mach64.h"
 
 void
diff --git a/hw/kdrive/mach64/mach64video.c b/hw/kdrive/mach64/mach64video.c
index 2e2023bf9..24d941584 100644
--- a/hw/kdrive/mach64/mach64video.c
+++ b/hw/kdrive/mach64/mach64video.c
@@ -20,6 +20,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64video.c,v 1.9tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "mach64.h"
 
 #include "Xv.h"
diff --git a/hw/kdrive/pcmcia/pcmcia.c b/hw/kdrive/pcmcia/pcmcia.c
index 999f93910..087b0a604 100644
--- a/hw/kdrive/pcmcia/pcmcia.c
+++ b/hw/kdrive/pcmcia/pcmcia.c
@@ -29,6 +29,9 @@
  */
 /* $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>
+#endif
 #include "pcmcia.h"
 #define extern
 #include <asm/io.h>
diff --git a/hw/kdrive/pcmcia/pcmciacurs.c b/hw/kdrive/pcmcia/pcmciacurs.c
index 184d9c753..1cb86cfe9 100644
--- a/hw/kdrive/pcmcia/pcmciacurs.c
+++ b/hw/kdrive/pcmcia/pcmciacurs.c
@@ -23,6 +23,9 @@
  */
 /* $RCSId: $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "pcmcia.h"
 #include "cursorstr.h"
 
diff --git a/hw/kdrive/pcmcia/pcmciarotate.c b/hw/kdrive/pcmcia/pcmciarotate.c
index 7f6315437..6ac7efbfd 100644
--- a/hw/kdrive/pcmcia/pcmciarotate.c
+++ b/hw/kdrive/pcmcia/pcmciarotate.c
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include    <X11/X.h>
 #include    "scrnintstr.h"
 #include    "windowstr.h"
diff --git a/hw/kdrive/pcmcia/pcmciashadow.c b/hw/kdrive/pcmcia/pcmciashadow.c
index 0047ddca7..abe73a0ba 100644
--- a/hw/kdrive/pcmcia/pcmciashadow.c
+++ b/hw/kdrive/pcmcia/pcmciashadow.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include    <X11/X.h>
 #include    "scrnintstr.h"
 #include    "windowstr.h"
diff --git a/hw/kdrive/pcmcia/pcmciastub.c b/hw/kdrive/pcmcia/pcmciastub.c
index b74a9ccdd..8759f4a08 100644
--- a/hw/kdrive/pcmcia/pcmciastub.c
+++ b/hw/kdrive/pcmcia/pcmciastub.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "pcmcia.h"
 
 void
diff --git a/hw/kdrive/savage/s3.c b/hw/kdrive/savage/s3.c
index 6776d69ba..06f23abaf 100644
--- a/hw/kdrive/savage/s3.c
+++ b/hw/kdrive/savage/s3.c
@@ -24,6 +24,9 @@
  */
 /* $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>
+#endif
 #include "s3.h"
 
 #define REGISTERS_OFFSET    (0x1000000)
diff --git a/hw/kdrive/savage/s3clock.c b/hw/kdrive/savage/s3clock.c
index 99c466dce..e3286b8c2 100644
--- a/hw/kdrive/savage/s3clock.c
+++ b/hw/kdrive/savage/s3clock.c
@@ -24,6 +24,9 @@
  */
 /* $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>
+#endif
 #include "s3.h"
 
 /*
diff --git a/hw/kdrive/savage/s3cmap.c b/hw/kdrive/savage/s3cmap.c
index a61e3d1fc..f10ac5752 100644
--- a/hw/kdrive/savage/s3cmap.c
+++ b/hw/kdrive/savage/s3cmap.c
@@ -24,6 +24,9 @@
  */
 /* $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>
+#endif
 #include "s3.h"
 
 void
diff --git a/hw/kdrive/savage/s3curs.c b/hw/kdrive/savage/s3curs.c
index 67b0cf2b2..eae7f642b 100644
--- a/hw/kdrive/savage/s3curs.c
+++ b/hw/kdrive/savage/s3curs.c
@@ -24,6 +24,9 @@
  */
 /* $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>
+#endif
 #include "s3.h"
 #include "s3draw.h"
 #include "cursorstr.h"
diff --git a/hw/kdrive/savage/s3draw.c b/hw/kdrive/savage/s3draw.c
index b33126004..cae765675 100644
--- a/hw/kdrive/savage/s3draw.c
+++ b/hw/kdrive/savage/s3draw.c
@@ -24,6 +24,9 @@
  */
 /* $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>
+#endif
 #include	"s3.h"
 #include	"s3draw.h"
 
diff --git a/hw/kdrive/savage/s3gc.c b/hw/kdrive/savage/s3gc.c
index e631ec487..6faadff27 100644
--- a/hw/kdrive/savage/s3gc.c
+++ b/hw/kdrive/savage/s3gc.c
@@ -24,6 +24,9 @@
  */
 /* $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>
+#endif
 #include	"s3.h"
 #include	"s3draw.h"
 
diff --git a/hw/kdrive/savage/s3reg.c b/hw/kdrive/savage/s3reg.c
index 078093786..052bcf4d7 100644
--- a/hw/kdrive/savage/s3reg.c
+++ b/hw/kdrive/savage/s3reg.c
@@ -24,6 +24,9 @@
  */
 /* $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>
+#endif
 #include "s3reg.h"
 
 #define CR00 S3_CR+0x00
diff --git a/hw/kdrive/savage/s3rtst.c b/hw/kdrive/savage/s3rtst.c
index bc9bfaeb6..c88e34585 100644
--- a/hw/kdrive/savage/s3rtst.c
+++ b/hw/kdrive/savage/s3rtst.c
@@ -24,6 +24,9 @@
  */
 /* $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>
+#endif
 #include <stdio.h>
 #include "s3reg.h"
 
diff --git a/hw/kdrive/savage/s3stub.c b/hw/kdrive/savage/s3stub.c
index 2bf8d76ff..d5c55d598 100644
--- a/hw/kdrive/savage/s3stub.c
+++ b/hw/kdrive/savage/s3stub.c
@@ -24,6 +24,9 @@
  */
 /* $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>
+#endif
 #include "s3.h"
 
 void
diff --git a/hw/kdrive/sis530/sis.c b/hw/kdrive/sis530/sis.c
index b57295f34..b2a95326e 100644
--- a/hw/kdrive/sis530/sis.c
+++ b/hw/kdrive/sis530/sis.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "sis.h"
 
 #define MAX_FB_SIZE	(4096 * 1024)
diff --git a/hw/kdrive/sis530/sisclock.c b/hw/kdrive/sis530/sisclock.c
index dd7ff5393..4db2a31b9 100644
--- a/hw/kdrive/sis530/sisclock.c
+++ b/hw/kdrive/sis530/sisclock.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "sis.h"
 #include <stdio.h>
 
diff --git a/hw/kdrive/sis530/siscmap.c b/hw/kdrive/sis530/siscmap.c
index cc971f969..e52841e9d 100644
--- a/hw/kdrive/sis530/siscmap.c
+++ b/hw/kdrive/sis530/siscmap.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "sis.h"
 
 void
diff --git a/hw/kdrive/sis530/siscurs.c b/hw/kdrive/sis530/siscurs.c
index 9ca41b6e7..b507188c0 100644
--- a/hw/kdrive/sis530/siscurs.c
+++ b/hw/kdrive/sis530/siscurs.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "sis.h"
 #include "cursorstr.h"
 
diff --git a/hw/kdrive/sis530/sisdraw.c b/hw/kdrive/sis530/sisdraw.c
index 50dbab9ce..82618acab 100644
--- a/hw/kdrive/sis530/sisdraw.c
+++ b/hw/kdrive/sis530/sisdraw.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "sis.h"
 #include "sisdraw.h"
 
diff --git a/hw/kdrive/sis530/sisio.c b/hw/kdrive/sis530/sisio.c
index 7d0eea6db..1a636a2f9 100644
--- a/hw/kdrive/sis530/sisio.c
+++ b/hw/kdrive/sis530/sisio.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #ifdef linux
 #define extern
 #include <asm/io.h>
diff --git a/hw/kdrive/sis530/sisstub.c b/hw/kdrive/sis530/sisstub.c
index 60750abdf..f1f242b40 100644
--- a/hw/kdrive/sis530/sisstub.c
+++ b/hw/kdrive/sis530/sisstub.c
@@ -24,6 +24,9 @@
  */
 /* $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>
+#endif
 #include "sis.h"
 
 static const int   sisCards[] = { 0x6306, 0x0200 };
diff --git a/hw/kdrive/trident/trident.c b/hw/kdrive/trident/trident.c
index 6215b035c..9423f90e0 100644
--- a/hw/kdrive/trident/trident.c
+++ b/hw/kdrive/trident/trident.c
@@ -21,6 +21,9 @@
  */
 /* $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>
+#endif
 #include "trident.h"
 #include <sys/io.h>
 
diff --git a/hw/kdrive/trident/tridentcurs.c b/hw/kdrive/trident/tridentcurs.c
index 40ac16d52..5f62294fb 100644
--- a/hw/kdrive/trident/tridentcurs.c
+++ b/hw/kdrive/trident/tridentcurs.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "trident.h"
 #include "cursorstr.h"
 
diff --git a/hw/kdrive/trident/tridentdraw.c b/hw/kdrive/trident/tridentdraw.c
index 49513d6e4..641d9239b 100644
--- a/hw/kdrive/trident/tridentdraw.c
+++ b/hw/kdrive/trident/tridentdraw.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "trident.h"
 #include "tridentdraw.h"
 
diff --git a/hw/kdrive/trident/tridentstub.c b/hw/kdrive/trident/tridentstub.c
index 9fce1fbbe..1e9761141 100644
--- a/hw/kdrive/trident/tridentstub.c
+++ b/hw/kdrive/trident/tridentstub.c
@@ -24,6 +24,9 @@
  */
 /* $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>
+#endif
 #include "trident.h"
 
 extern int  trident_clk, trident_mclk;
diff --git a/hw/kdrive/trio/s3.c b/hw/kdrive/trio/s3.c
index 5419ff5fd..c8359733b 100644
--- a/hw/kdrive/trio/s3.c
+++ b/hw/kdrive/trio/s3.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "s3.h"
 
 #define REGISTERS_OFFSET    (0x1000000)
diff --git a/hw/kdrive/trio/s3clock.c b/hw/kdrive/trio/s3clock.c
index b6d0836e9..f79dfa92d 100644
--- a/hw/kdrive/trio/s3clock.c
+++ b/hw/kdrive/trio/s3clock.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "s3.h"
 
 /*
diff --git a/hw/kdrive/trio/s3cmap.c b/hw/kdrive/trio/s3cmap.c
index 804e66092..19e192ed0 100644
--- a/hw/kdrive/trio/s3cmap.c
+++ b/hw/kdrive/trio/s3cmap.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "s3.h"
 
 void
diff --git a/hw/kdrive/trio/s3curs.c b/hw/kdrive/trio/s3curs.c
index 01fa04923..9416b4398 100644
--- a/hw/kdrive/trio/s3curs.c
+++ b/hw/kdrive/trio/s3curs.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "s3.h"
 #include "s3draw.h"
 #include "cursorstr.h"
diff --git a/hw/kdrive/trio/s3stub.c b/hw/kdrive/trio/s3stub.c
index 4ac796d71..80d8fd56a 100644
--- a/hw/kdrive/trio/s3stub.c
+++ b/hw/kdrive/trio/s3stub.c
@@ -24,6 +24,9 @@
  */
 /* $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>
+#endif
 #include "s3.h"
 
 void
diff --git a/hw/kdrive/ts300/ts300.c b/hw/kdrive/ts300/ts300.c
index 891a17239..bd239d9fa 100644
--- a/hw/kdrive/ts300/ts300.c
+++ b/hw/kdrive/ts300/ts300.c
@@ -23,6 +23,9 @@
  */
 /* $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>
+#endif
 #include "kdrive.h"
 
 extern KdCardFuncs  sisFuncs;
diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am
index f6a4dc822..de9226b5d 100644
--- a/hw/kdrive/vesa/Makefile.am
+++ b/hw/kdrive/vesa/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = 					\
 	-I$(top_srcdir)/fb			\
-	-I$(top_srcdir)/hw/kdrive		\
+	-I$(top_srcdir)/hw/kdrive/src		\
 	-I$(top_srcdir)/include			\
 	-I$(top_srcdir)/mi			\
 	-I$(top_srcdir)/miext/layer		\
@@ -20,16 +20,19 @@ Xvesa_SOURCES = \
 
 Xvesa_LDADD = \
 	$(top_builddir)/dix/libdix.la		\
-	$(top_builddir)/hw/kdrive/libkdrive.la  \
-	$(top_builddir)/hw/kdrive/linux/liblinux.la  \
-	$(top_builddir)/fb/libfb.la		\
-	$(top_builddir)/mi/libmi.la		\
-	$(top_builddir)/Xext
+	$(top_builddir)/os/libos.la		\
 	$(top_builddir)/miext/layer/liblayer.la	\
+	$(top_builddir)/hw/kdrive/src/libkdrive.la  \
+	$(top_builddir)/hw/kdrive/linux/liblinux.la  \
 	$(top_builddir)/miext/shadow/libshadow.la \
+	$(top_builddir)/randr/librandr.la	\
 	$(top_builddir)/render/librender.la	\
+	$(top_builddir)/fb/libfb.la		\
+	$(top_builddir)/mi/libmi.la		\
+	$(top_builddir)/Xext/libXext.la		\
 	$(top_builddir)/randr/librandr.la	\
-	$(top_builddir)/os/libos.la		\
+	$(top_builddir)/render/librender.la	\
 	$(top_builddir)/xtrans/libxtrans.la	\
 	$(X_LIBS) -lXfont -lXau -lXdmcp 	\
-	-lm -lz
+	$(top_builddir)/dix/libxpstubs.la	\
+	-lfreetype -lm -lz
diff --git a/hw/kdrive/vesa/vbe.c b/hw/kdrive/vesa/vbe.c
index 0e57e8d1f..3e88adae1 100644
--- a/hw/kdrive/vesa/vbe.c
+++ b/hw/kdrive/vesa/vbe.c
@@ -21,6 +21,9 @@ 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>
+#endif
 #include "vesa.h"
 
 int
diff --git a/hw/kdrive/vesa/vesa.c b/hw/kdrive/vesa/vesa.c
index 2a12e132e..4913dbd79 100644
--- a/hw/kdrive/vesa/vesa.c
+++ b/hw/kdrive/vesa/vesa.c
@@ -19,8 +19,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/vesa/vesa.c,v 1.21 2002/10/14 18:01:42 keithp Exp $ */
+/* $Id$ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "vesa.h"
 #ifdef RANDR
 #include <randrstr.h>
diff --git a/hw/kdrive/vesa/vesainit.c b/hw/kdrive/vesa/vesainit.c
index 4930bc0c0..3e9463db9 100644
--- a/hw/kdrive/vesa/vesainit.c
+++ b/hw/kdrive/vesa/vesainit.c
@@ -21,6 +21,9 @@ 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>
+#endif
 #include "vesa.h"
 
 const KdCardFuncs vesaFuncs = {
diff --git a/hw/kdrive/vesa/vga.c b/hw/kdrive/vesa/vga.c
index 36e6b46a4..aad2756de 100644
--- a/hw/kdrive/vesa/vga.c
+++ b/hw/kdrive/vesa/vga.c
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "vesa.h"
 
 static const VesaModeRec vgaModes[] = {
diff --git a/hw/kdrive/vesa/vm86.c b/hw/kdrive/vesa/vm86.c
index e6eaa53d0..b5a3983ea 100644
--- a/hw/kdrive/vesa/vm86.c
+++ b/hw/kdrive/vesa/vm86.c
@@ -43,6 +43,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "vm86.h"
 
 #define PUSHW(vi, i) \
diff --git a/hw/kdrive/vxworks/vxkbd.c b/hw/kdrive/vxworks/vxkbd.c
index ab9a00573..4bcca02b1 100644
--- a/hw/kdrive/vxworks/vxkbd.c
+++ b/hw/kdrive/vxworks/vxkbd.c
@@ -6,6 +6,9 @@
  * Author: Keith Packard
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #include "kkeymap.h"
 #include <X11/keysym.h>
diff --git a/hw/kdrive/vxworks/vxmouse.c b/hw/kdrive/vxworks/vxmouse.c
index ad6e2c03d..75ed39bd0 100644
--- a/hw/kdrive/vxworks/vxmouse.c
+++ b/hw/kdrive/vxworks/vxmouse.c
@@ -6,6 +6,9 @@
  * Author: Keith Packard
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/hw/kdrive/vxworks/vxworks.c b/hw/kdrive/vxworks/vxworks.c
index b7c9fd431..9bfc9e278 100644
--- a/hw/kdrive/vxworks/vxworks.c
+++ b/hw/kdrive/vxworks/vxworks.c
@@ -6,6 +6,9 @@
  * Author: Keith Packard
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #include <X11/keysym.h>