diff --git a/hw/xfree86/dixmods/GLcoremodule.c b/hw/xfree86/dixmods/GLcoremodule.c
index 666ce52ce9..4e03b59feb 100644
--- a/hw/xfree86/dixmods/GLcoremodule.c
+++ b/hw/xfree86/dixmods/GLcoremodule.c
@@ -32,8 +32,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86Module.h"
diff --git a/hw/xfree86/dixmods/afbmodule.c b/hw/xfree86/dixmods/afbmodule.c
index 74dca9a261..d9cdbf9c3b 100644
--- a/hw/xfree86/dixmods/afbmodule.c
+++ b/hw/xfree86/dixmods/afbmodule.c
@@ -29,10 +29,6 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifdef XFree86LOADER
 
 #include "xf86Module.h"
diff --git a/hw/xfree86/dixmods/dbemodule.c b/hw/xfree86/dixmods/dbemodule.c
index 218b28cece..7daa838ebf 100644
--- a/hw/xfree86/dixmods/dbemodule.c
+++ b/hw/xfree86/dixmods/dbemodule.c
@@ -4,10 +4,6 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include "xf86Module.h"
 
 static MODULESETUPPROTO(dbeSetup);
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index 88d3f6c2e4..68caa4b028 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -23,8 +23,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #ifdef XFree86LOADER
diff --git a/hw/xfree86/dixmods/extmod/xf86dga.c b/hw/xfree86/dixmods/extmod/xf86dga.c
index 9c55d87311..9979bfb30a 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga.c
@@ -7,12 +7,12 @@ Copyright (c) 1995, 1996, 1999  XFree86 Inc
 
 */
 
-#define NEED_REPLIES
-#define NEED_EVENTS
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
+#define NEED_REPLIES
+#define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "misc.h"
diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
index ee3600f1a0..a5cab0f118 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -6,12 +6,12 @@
 /* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.17 2001/10/28 03:32:51 tsi Exp $ */
 
 
-#define NEED_REPLIES
-#define NEED_EVENTS
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
+#define NEED_REPLIES
+#define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "misc.h"
diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c
index 176401b137..a5dc2e2123 100644
--- a/hw/xfree86/dixmods/extmod/xf86misc.c
+++ b/hw/xfree86/dixmods/extmod/xf86misc.c
@@ -6,12 +6,12 @@
 
 /* THIS IS NOT AN X CONSORTIUM STANDARD */
 
-#define NEED_REPLIES
-#define NEED_EVENTS
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
+#define NEED_REPLIES
+#define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "misc.h"
diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
index 11e01757a8..50575cc058 100644
--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -33,12 +33,12 @@ from Kaleb S. KEITHLEY
 /* $Xorg: xf86vmode.c,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ */
 /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
 
-#define NEED_REPLIES
-#define NEED_EVENTS
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
+#define NEED_REPLIES
+#define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "misc.h"
diff --git a/hw/xfree86/dixmods/extmod/xvmod.c b/hw/xfree86/dixmods/extmod/xvmod.c
index 7775049780..7899f3a751 100644
--- a/hw/xfree86/dixmods/extmod/xvmod.c
+++ b/hw/xfree86/dixmods/extmod/xvmod.c
@@ -1,7 +1,7 @@
 /* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.1 1998/08/13 14:45:36 dawes Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include <X11/X.h>
diff --git a/hw/xfree86/dixmods/fbmodule.c b/hw/xfree86/dixmods/fbmodule.c
index 50cce798c5..80d99933a1 100644
--- a/hw/xfree86/dixmods/fbmodule.c
+++ b/hw/xfree86/dixmods/fbmodule.c
@@ -29,10 +29,6 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifdef XFree86LOADER
 
 #include "xf86Module.h"
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c
index 853d49b0f0..1c4f10656a 100644
--- a/hw/xfree86/dixmods/glxmodule.c
+++ b/hw/xfree86/dixmods/glxmodule.c
@@ -33,6 +33,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
 #include "xf86Module.h"
 #include "colormap.h"
 #include "micmap.h"
diff --git a/hw/xfree86/dixmods/laymodule.c b/hw/xfree86/dixmods/laymodule.c
index 5bcd101aa0..5af41617ab 100644
--- a/hw/xfree86/dixmods/laymodule.c
+++ b/hw/xfree86/dixmods/laymodule.c
@@ -26,10 +26,6 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifdef XFree86LOADER
 
 #include "xf86Module.h"
diff --git a/hw/xfree86/dixmods/mfbmodule.c b/hw/xfree86/dixmods/mfbmodule.c
index dc9fddc5b6..be3b9eed0d 100644
--- a/hw/xfree86/dixmods/mfbmodule.c
+++ b/hw/xfree86/dixmods/mfbmodule.c
@@ -29,10 +29,6 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifdef XFree86LOADER
 #include "xf86Module.h"
 
diff --git a/hw/xfree86/dixmods/recordmod.c b/hw/xfree86/dixmods/recordmod.c
index 2825555c2b..5afb1d379f 100644
--- a/hw/xfree86/dixmods/recordmod.c
+++ b/hw/xfree86/dixmods/recordmod.c
@@ -1,7 +1,7 @@
 /* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.5 1999/01/26 05:54:21 dawes Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
 #endif
 
 #include "xf86Module.h"
diff --git a/hw/xfree86/dixmods/shmodule.c b/hw/xfree86/dixmods/shmodule.c
index 16ba6f2cef..5f347a3b5c 100644
--- a/hw/xfree86/dixmods/shmodule.c
+++ b/hw/xfree86/dixmods/shmodule.c
@@ -26,10 +26,6 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifdef XFree86LOADER
 
 #include "xf86Module.h"
diff --git a/mi/miinitext.c b/mi/miinitext.c
index acc074378d..d2c68e18aa 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -52,6 +52,10 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
 #ifdef HAVE_DMX_CONFIG_H
 #include <dmx-config.h>
 #endif
diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c
index 2e6ad6ee38..ee0acb028f 100644
--- a/xkb/ddxKillSrv.c
+++ b/xkb/ddxKillSrv.c
@@ -30,6 +30,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
 #include <stdio.h>
 #define	NEED_EVENTS 1
 #include <X11/X.h>
diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c
index b2b2dadc4e..5c0bca4cdf 100644
--- a/xkb/ddxPrivate.c
+++ b/xkb/ddxPrivate.c
@@ -4,6 +4,10 @@
 #include <dix-config.h>
 #endif
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
 #include <stdio.h>
 #define NEED_EVENTS 1
 #include <X11/X.h>
diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c
index 9e0ac9dd26..1b7853fa0a 100644
--- a/xkb/ddxVT.c
+++ b/xkb/ddxVT.c
@@ -30,6 +30,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
 #include <stdio.h>
 #define	NEED_EVENTS 1
 #include <X11/X.h>