diff --git a/include/client.h b/include/client.h
index d71dc8d05..58e98eacf 100644
--- a/include/client.h
+++ b/include/client.h
@@ -26,9 +26,7 @@
 #ifndef CLIENT_H
 #define CLIENT_H
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif                          /* HAVE_DIX_CONFIG_H */
 
 struct _Client;
 typedef struct _ClientId *ClientIdPtr;
diff --git a/include/displaymode.h b/include/displaymode.h
index 561087717..5221dc8b4 100644
--- a/include/displaymode.h
+++ b/include/displaymode.h
@@ -1,10 +1,8 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _DISMODEPROC_H_
 #define _DISMODEPROC_H_
 
+#include <dix-config.h>
+
 #include "scrnintstr.h"
 
 #define MAXCLOCKS   128
diff --git a/include/inpututils.h b/include/inpututils.h
index 49b1c1074..318c62e4c 100644
--- a/include/inpututils.h
+++ b/include/inpututils.h
@@ -21,14 +21,11 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include "dix-config.h"
-#endif
-
 #ifndef INPUTUTILS_H
 #define INPUTUTILS_H
 
+#include "dix-config.h"
+
 #include "input.h"
 #include "eventstr.h"
 #include <X11/extensions/XI2proto.h>
diff --git a/include/probes.h b/include/probes.h
index b7d69f57c..993191385 100644
--- a/include/probes.h
+++ b/include/probes.h
@@ -24,9 +24,7 @@
 #ifndef XORG_PROBES_H
 #define XORG_PROBES_H
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 /* definitions needed to include Dtrace probes in a source file */
 
diff --git a/include/vidmodestr.h b/include/vidmodestr.h
index b47daa779..41b310710 100644
--- a/include/vidmodestr.h
+++ b/include/vidmodestr.h
@@ -1,10 +1,8 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _VIDMODEPROC_H_
 #define _VIDMODEPROC_H_
 
+#include <dix-config.h>
+
 #include "displaymode.h"
 
 typedef enum {