diff --git a/hw/kdrive/Kdrive.tmpl b/hw/kdrive/Kdrive.tmpl
index ade5604af..f174049f6 100644
--- a/hw/kdrive/Kdrive.tmpl
+++ b/hw/kdrive/Kdrive.tmpl
@@ -1,18 +1,17 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/Kdrive.tmpl,v 1.2 2001/05/26 01:25:41 keithp Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/Kdrive.tmpl,v 1.3tsi Exp $
 
 #include <Server.tmpl>
 
 #if BuildRender
-RENDERINCS=-I$(KDRIVE)/../../render -I$(EXTINCSRC)
+RENDERINCS=-I$(KDRIVE)/../../render
 #endif
 
 #if BuildRandR
-RANDRINCS=-I$(KDRIVE)/../../randr -I$(EXTINCSRC)
+RANDRINCS=-I$(KDRIVE)/../../randr
 #endif
 
 KDINCS = -I$(KDRIVE) -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
-	 -I$(KDRIVE)/../../fb -I$(KDRIVE)/../../mi \
-	 -I$(KDRIVE)/../../miext/shadow \
-	 -I$(KDRIVE)/../../miext/layer \
+	 -I$(KDRIVE)/../../fb -I$(KDRIVE)/../../mi -I$(KDRIVE)/../../Xext \
+	 -I$(KDRIVE)/../../miext/shadow -I$(KDRIVE)/../../miext/layer \
 	 -I$(KDRIVE)/../../include -I$(KDRIVE)/../../os \
          -I$(EXTINCSRC) -I$(XINCLUDESRC) $(RENDERINCS) $(RANDRINCS)
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index dabfd9c22..d88f549f0 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -1,5 +1,5 @@
 /*
- * Id: kdrive.c,v 1.1 1999/11/02 03:54:46 keithp Exp $
+ * $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.21tsi Exp $ 
  *
  * Copyright © 1999 Keith Packard
  *
@@ -21,7 +21,6 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.20 2001/09/29 04:16:38 keithp Exp $ */
 
 #include "kdrive.h"
 #ifdef PSEUDO8
@@ -34,6 +33,10 @@
 #include "kxv.h"
 #endif
 
+#ifdef DPMSExtension
+#include "dpmsproc.h"
+#endif
+
 CARD8	kdBpp[] = { 1, 4, 8, 16, 24, 32 };
 
 #define NUM_KD_BPP (sizeof (kdBpp) / sizeof (kdBpp[0]))