diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
index bc62dce6d..a98a5b2ff 100644
--- a/hw/kdrive/Makefile.am
+++ b/hw/kdrive/Makefile.am
@@ -30,19 +30,3 @@ libkdrive_la_SOURCES =	\
 	ktest.c		\
 	kxv.c		\
 	vga.c
-
-bin_PROGRAMS = Xvesa
-
-Xvesa_SOURCES = # Intentionally left blank
-
-Xvesa_LDADD = \
-	$(top_builddir)/dix/libdix.la		\
-	$(top_builddir)/hw/kdrive/libkdrive.la  \
-	$(top_builddir)/hw/kdrive/linux/liblinux.la  \
-	$(top_builddir)/hw/kdrive/vesa/libvesa.la \
-	$(top_builddir)/fb/libfb.la		\
-	$(top_builddir)/mi/libmi.la		\
-	$(top_builddir)/render/librender.la	\
-	$(top_builddir)/randr/librandr.la	\
-	$(top_builddir)/os/libos.la		\
-	$(X_LIBS) -lXfont -lm -lz
diff --git a/hw/kdrive/linux/agp.c b/hw/kdrive/linux/agp.c
index 61d0dfb64..37fa7f10c 100644
--- a/hw/kdrive/linux/agp.c
+++ b/hw/kdrive/linux/agp.c
@@ -43,9 +43,6 @@ of the copyright holder.
 
 #include <X11/X.h>
 
-#include "Xdefs.h"
-#include "Xmd.h"
-
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -62,7 +59,7 @@ of the copyright holder.
 #if defined(linux)
 #include <asm/ioctl.h>
 
-#include "../../xfree86/os-support/linux/agpgart.h"
+#include <linux/agpgart.h>
 
 #elif defined(__FreeBSD__)
 #include <sys/ioctl.h>
diff --git a/hw/kdrive/linux/agp.h b/hw/kdrive/linux/agp.h
index 9146f3c39..419dee1b4 100644
--- a/hw/kdrive/linux/agp.h
+++ b/hw/kdrive/linux/agp.h
@@ -40,7 +40,8 @@ X Window System is a trademark of The Open Group */
 #ifndef _AGP_H_
 #define _AGP_H_
 
-#include "Xdefs.h"
+#include <X11/Xdefs.h>
+#include <X11/Xmd.h>
 
 /* These two definitions must be consistent with the kernel's,
    but using 1 or 2 in driver code is even uglier */
@@ -48,8 +49,8 @@ X Window System is a trademark of The Open Group */
 #define AGP_PHYS_MEMORY   2
 
 typedef struct _AgpInfo {
-	CARD32		bridgeId;
-	CARD32		agpMode;
+	unsigned long	bridgeId;
+	unsigned long	agpMode;
 	unsigned long	base;
 	unsigned long	size;
 	unsigned long	totalPages;
diff --git a/hw/kdrive/linux/bus.c b/hw/kdrive/linux/bus.c
index d9893d552..7d95d9150 100644
--- a/hw/kdrive/linux/bus.c
+++ b/hw/kdrive/linux/bus.c
@@ -25,10 +25,10 @@
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/Xpoll.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "kdrive.h"
-#include "Xpoll.h"
 
 /* /dev/adbmouse is a busmouse */
 
diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c
index 5a3f29bcb..fba4c5f53 100644
--- a/hw/kdrive/linux/linux.c
+++ b/hw/kdrive/linux/linux.c
@@ -29,7 +29,7 @@
 #include <linux/kd.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <keysym.h>
+#include <X11/keysym.h>
 #include <linux/apm_bios.h>
 
 static int  vtno;
diff --git a/hw/kdrive/linux/mouse.c b/hw/kdrive/linux/mouse.c
index 59e5dbd3d..782f92fd2 100644
--- a/hw/kdrive/linux/mouse.c
+++ b/hw/kdrive/linux/mouse.c
@@ -23,14 +23,14 @@
  */
 
 #define NEED_EVENTS
+#include <errno.h>
+#include <termios.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/Xpoll.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "kdrive.h"
-#include "Xpoll.h"
-#include <errno.h>
-#include <termios.h>
 
 #undef DEBUG
 #undef DEBUG_BYTES
diff --git a/hw/kdrive/linux/ms.c b/hw/kdrive/linux/ms.c
index 0906ff003..41fb4c9ba 100644
--- a/hw/kdrive/linux/ms.c
+++ b/hw/kdrive/linux/ms.c
@@ -23,14 +23,14 @@ THE SOFTWARE.
 /* $RCSId: xc/programs/Xserver/hw/kdrive/linux/ms.c,v 1.1 2001/08/09 20:45:15 dawes Exp $ */
 
 #define NEED_EVENTS
+#include <errno.h>
+#include <termios.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/Xpoll.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "kdrive.h"
-#include "Xpoll.h"
-#include <errno.h>
-#include <termios.h>
 
 int
 MsReadBytes (int fd, char *buf, int len, int min)
diff --git a/hw/kdrive/linux/ps2.c b/hw/kdrive/linux/ps2.c
index 58710718e..343b0dfa1 100644
--- a/hw/kdrive/linux/ps2.c
+++ b/hw/kdrive/linux/ps2.c
@@ -25,10 +25,10 @@
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/Xpoll.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "kdrive.h"
-#include "Xpoll.h"
 
 int
 Ps2ReadBytes (int fd, char *buf, int len, int min)
diff --git a/hw/kdrive/linux/ts.c b/hw/kdrive/linux/ts.c
index 75e79338e..1f938a53a 100644
--- a/hw/kdrive/linux/ts.c
+++ b/hw/kdrive/linux/ts.c
@@ -28,10 +28,10 @@
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/Xpoll.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "kdrive.h"
-#include "Xpoll.h"
 #include <sys/ioctl.h>
 #if 1
 #include <linux/h3600_ts.h>	/* touch screen events */
diff --git a/hw/kdrive/linux/tslib.c b/hw/kdrive/linux/tslib.c
index 13fc40209..ae740c48f 100644
--- a/hw/kdrive/linux/tslib.c
+++ b/hw/kdrive/linux/tslib.c
@@ -49,10 +49,10 @@
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/Xpoll.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "kdrive.h"
-#include "Xpoll.h"
 #include <sys/ioctl.h>
 #include <tslib.h>
 
diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am
index b94ef9c4d..f6a4dc822 100644
--- a/hw/kdrive/vesa/Makefile.am
+++ b/hw/kdrive/vesa/Makefile.am
@@ -9,11 +9,27 @@ INCLUDES = 					\
 	-I$(top_srcdir)/render
 
 
-noinst_LTLIBRARIES = libvesa.la
+bin_PROGRAMS = Xvesa
 
-libvesa_la_SOURCES = 	\
+Xvesa_SOURCES = \
 	vesa.c		\
 	vesainit.c	\
 	vbe.c		\
 	vga.c		\
 	vm86.c
+
+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)/miext/layer/liblayer.la	\
+	$(top_builddir)/miext/shadow/libshadow.la \
+	$(top_builddir)/render/librender.la	\
+	$(top_builddir)/randr/librandr.la	\
+	$(top_builddir)/os/libos.la		\
+	$(top_builddir)/xtrans/libxtrans.la	\
+	$(X_LIBS) -lXfont -lXau -lXdmcp 	\
+	-lm -lz