diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h
index 49c2f647d..0389d3b85 100644
--- a/Xext/dpmsproc.h
+++ b/Xext/dpmsproc.h
@@ -1,7 +1,5 @@
 /* Prototypes for functions that the DDX must provide */
 
-#include <dix-config.h>
-
 #ifndef _DPMSPROC_H_
 #define _DPMSPROC_H_
 
diff --git a/Xext/sleepuntil.h b/Xext/sleepuntil.h
index ff5cc3364..ce7aaa4f1 100644
--- a/Xext/sleepuntil.h
+++ b/Xext/sleepuntil.h
@@ -24,8 +24,6 @@
  * XFree86 Project.
  */
 
-#include <dix-config.h>
-
 #ifndef _SLEEPUNTIL_H_
 #define _SLEEPUNTIL_H_ 1
 
diff --git a/Xi/allowev.h b/Xi/allowev.h
index f081ab52e..54fefa273 100644
--- a/Xi/allowev.h
+++ b/Xi/allowev.h
@@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef ALLOWEV_H
 #define ALLOWEV_H 1
 
diff --git a/Xi/chgdctl.h b/Xi/chgdctl.h
index 3924f7251..cbb264a7c 100644
--- a/Xi/chgdctl.h
+++ b/Xi/chgdctl.h
@@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGDCTL_H
 #define CHGDCTL_H 1
 
diff --git a/Xi/chgfctl.h b/Xi/chgfctl.h
index 45a55a5f8..3a465c68c 100644
--- a/Xi/chgfctl.h
+++ b/Xi/chgfctl.h
@@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGFCTL_H
 #define CHGFCTL_H 1
 
diff --git a/Xi/chgkbd.h b/Xi/chgkbd.h
index 55ea3947a..db6952f1b 100644
--- a/Xi/chgkbd.h
+++ b/Xi/chgkbd.h
@@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGKBD_H
 #define CHGKBD_H 1
 
diff --git a/Xi/chgkmap.h b/Xi/chgkmap.h
index 633af7ca4..c01540ee6 100644
--- a/Xi/chgkmap.h
+++ b/Xi/chgkmap.h
@@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGKMAP_H
 #define CHGKMAP_H 1
 
diff --git a/miext/rootless/rootless.h b/miext/rootless/rootless.h
index b375731bf..f04857749 100644
--- a/miext/rootless/rootless.h
+++ b/miext/rootless/rootless.h
@@ -28,10 +28,6 @@
  * use or other dealings in this Software without prior written authorization.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _ROOTLESS_H
 #define _ROOTLESS_H
 
diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h
index 4814991f0..6a4a4b0e5 100644
--- a/miext/shadow/shrotpack.h
+++ b/miext/shadow/shrotpack.h
@@ -26,10 +26,6 @@
  * orientations work.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include <stdlib.h>
 
 #include    <X11/X.h>
diff --git a/os/osdep.h b/os/osdep.h
index ff41f2482..6a11cf310 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -44,10 +44,6 @@ SOFTWARE.
 
 ******************************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _OSDEP_H_
 #define _OSDEP_H_ 1
 
diff --git a/test/xi2/protocol-common.h b/test/xi2/protocol-common.h
index 88c0bc864..54b9dd524 100644
--- a/test/xi2/protocol-common.h
+++ b/test/xi2/protocol-common.h
@@ -20,11 +20,6 @@
  *  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  *  DEALINGS IN THE SOFTWARE.
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include "dix/resource_priv.h"
 
 #include "scrnintstr.h"
diff --git a/xfixes/xfixes.h b/xfixes/xfixes.h
index 23f31cde4..f9ed5e6b0 100644
--- a/xfixes/xfixes.h
+++ b/xfixes/xfixes.h
@@ -20,10 +20,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _XFIXES_H_
 #define _XFIXES_H_
 
diff --git a/xkb/xkbDflts.h b/xkb/xkbDflts.h
index 248728acd..0089bc7e0 100644
--- a/xkb/xkbDflts.h
+++ b/xkb/xkbDflts.h
@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef DEFAULT_H
 #define DEFAULT_H 1