diff --git a/mi/miinitext.h b/mi/miinitext.h
index a1ceb9aa8..70042dcea 100644
--- a/mi/miinitext.h
+++ b/mi/miinitext.h
@@ -70,14 +70,11 @@ SOFTWARE.
  * the sale, use or other dealings in this Software without prior written
  * authorization from the copyright holder(s) and author(s).
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef MIINITEXT_H
 #define MIINITEXT_H
 
+#include <dix-config.h>
+
 void ListStaticExtensions(void);
 
 #endif /* MIINITEXT_H */
diff --git a/mi/mioverlay.h b/mi/mioverlay.h
index 420a846c2..7446bfbe2 100644
--- a/mi/mioverlay.h
+++ b/mi/mioverlay.h
@@ -1,11 +1,8 @@
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef __MIOVERLAY_H
 #define __MIOVERLAY_H
 
+#include <dix-config.h>
+
 typedef void (*miOverlayTransFunc) (ScreenPtr, int, BoxPtr);
 typedef Bool (*miOverlayInOverlayFunc) (WindowPtr);
 
diff --git a/mi/miscanfill.h b/mi/miscanfill.h
index 7fba199de..34a5fd410 100644
--- a/mi/miscanfill.h
+++ b/mi/miscanfill.h
@@ -25,13 +25,11 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SCANFILLINCLUDED
 #define SCANFILLINCLUDED
+
+#include <dix-config.h>
+
 /*
  *     scanfill.h
  *
diff --git a/mi/mivalidate.h b/mi/mivalidate.h
index 4c64ab34e..62c5d797f 100644
--- a/mi/mivalidate.h
+++ b/mi/mivalidate.h
@@ -25,14 +25,11 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef MIVALIDATE_H
 #define MIVALIDATE_H
 
+#include <dix-config.h>
+
 #include "regionstr.h"
 
 typedef union _Validate {