diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index 75aa396fb..a36677491 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -14,6 +14,10 @@ is" without express or implied warranty.
 */
 /* $XFree86$ */
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "screenint.h"
diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c
index 61f4c44c0..779633a96 100644
--- a/hw/xnest/Color.c
+++ b/hw/xnest/Color.c
@@ -14,6 +14,10 @@ is" without express or implied warranty.
 */
 /* $XFree86$ */
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "scrnintstr.h"
diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c
index cea8b60d0..f95860022 100644
--- a/hw/xnest/Cursor.c
+++ b/hw/xnest/Cursor.c
@@ -14,6 +14,10 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "screenint.h"
diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index 602a6c9b2..fa8457651 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -15,6 +15,10 @@ is" without express or implied warranty.
 /* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.4 2001/10/28 03:34:10 tsi Exp $ */
 
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "screenint.h"
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index 98b7e5046..3d520279c 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -14,6 +14,10 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #define NEED_EVENTS
 #include <X11/Xproto.h>
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c
index bdc0180ae..d86816e8f 100644
--- a/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -14,6 +14,10 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.6 2003/07/16 01:38:51 dawes Exp $ */
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
index 8ef90588f..e46b48f11 100644
--- a/hw/xnest/GC.c
+++ b/hw/xnest/GC.c
@@ -14,6 +14,10 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.6 2001/10/28 03:34:11 tsi Exp $ */
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "gcstruct.h"
diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c
index 0e80f7118..233424823 100644
--- a/hw/xnest/GCOps.c
+++ b/hw/xnest/GCOps.c
@@ -14,6 +14,10 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.5 2003/07/16 01:38:51 dawes Exp $ */
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "regionstr.h"
diff --git a/hw/xnest/GetTime.c b/hw/xnest/GetTime.c
index 421234316..bdcc6beae 100644
--- a/hw/xnest/GetTime.c
+++ b/hw/xnest/GetTime.c
@@ -31,10 +31,15 @@ from the X Consortium.
 /* $XFree86$ */
 
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/Xos.h>
 #include "os.h"
 #include <time.h>
 
+#ifdef DDXTIME
 CARD32
 GetTimeInMillis()
 {
@@ -43,3 +48,4 @@ GetTimeInMillis()
     X_GETTIMEOFDAY(&tp);
     return(tp.tv_sec * 1000) + (tp.tv_usec / 1000);
 }
+#endif
diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c
index 362e9a4b6..9915502c4 100644
--- a/hw/xnest/Handlers.c
+++ b/hw/xnest/Handlers.c
@@ -14,6 +14,10 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "screenint.h"
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index d520a4ef5..f2e7122f3 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -14,6 +14,10 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.24 2003/01/15 02:34:14 torrey Exp $ */
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "screenint.h"
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index d1260c694..52c5e91fe 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -16,9 +16,13 @@ is" without express or implied warranty.
 /* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.9 2003/09/13 21:33:09 dawes Exp $ */
 
 #define NEED_EVENTS
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "keysym.h"
+#include <X11/keysym.h>
 #include "screenint.h"
 #include "inputstr.h"
 #include "misc.h"
diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c
index 569382203..30ffbc6e6 100644
--- a/hw/xnest/Pixmap.c
+++ b/hw/xnest/Pixmap.c
@@ -14,6 +14,10 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.7 2003/07/16 01:38:51 dawes Exp $ */
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "regionstr.h"
diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c
index 7613122be..1533a06d8 100644
--- a/hw/xnest/Pointer.c
+++ b/hw/xnest/Pointer.c
@@ -14,6 +14,10 @@ is" without express or implied warranty.
 */
 /* $XFree86$ */
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "screenint.h"
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index 1ce79cc52..660e54fe7 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -14,6 +14,10 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.12 2003/11/14 22:25:59 dawes Exp $ */
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "scrnintstr.h"
diff --git a/hw/xnest/TestExt.c b/hw/xnest/TestExt.c
index be9299c31..74446b050 100644
--- a/hw/xnest/TestExt.c
+++ b/hw/xnest/TestExt.c
@@ -14,6 +14,10 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.5 2001/08/27 17:41:00 dawes Exp $ */
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xlib.h>
diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c
index 93e9fb38a..bbdb71ec6 100644
--- a/hw/xnest/Visual.c
+++ b/hw/xnest/Visual.c
@@ -14,6 +14,10 @@ is" without express or implied warranty.
 */
 /* $XFree86$ */
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "scrnintstr.h"
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index 6d2fccc31..f652c342a 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -14,6 +14,10 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.7 2001/10/28 03:34:11 tsi Exp $ */
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "gcstruct.h"
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 486bd7dce..acc074378 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -56,6 +56,11 @@ SOFTWARE.
 #include <dmx-config.h>
 #endif
 
+#ifdef HAVE_XNEST_CONFIG_H
+#include <xnest-config.h>
+#undef DPMSExtension
+#endif
+
 #include "misc.h"
 #include "extension.h"
 #include "micmap.h"