diff --git a/mi/miinitext.h b/mi/miinitext.h
index a1ceb9aa8..3581ea7b4 100644
--- a/mi/miinitext.h
+++ b/mi/miinitext.h
@@ -71,13 +71,13 @@ SOFTWARE.
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifndef MIINITEXT_H
+#define MIINITEXT_H
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef MIINITEXT_H
-#define MIINITEXT_H
-
 void ListStaticExtensions(void);
 
 #endif /* MIINITEXT_H */
diff --git a/mi/mioverlay.h b/mi/mioverlay.h
index 420a846c2..1514e51b4 100644
--- a/mi/mioverlay.h
+++ b/mi/mioverlay.h
@@ -1,11 +1,10 @@
+#ifndef __MIOVERLAY_H
+#define __MIOVERLAY_H
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef __MIOVERLAY_H
-#define __MIOVERLAY_H
-
 typedef void (*miOverlayTransFunc) (ScreenPtr, int, BoxPtr);
 typedef Bool (*miOverlayInOverlayFunc) (WindowPtr);
 
diff --git a/mi/miscanfill.h b/mi/miscanfill.h
index 7fba199de..5918e8b58 100644
--- a/mi/miscanfill.h
+++ b/mi/miscanfill.h
@@ -26,12 +26,13 @@ from The Open Group.
 
 */
 
+#ifndef SCANFILLINCLUDED
+#define SCANFILLINCLUDED
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef SCANFILLINCLUDED
-#define SCANFILLINCLUDED
 /*
  *     scanfill.h
  *
diff --git a/mi/mivalidate.h b/mi/mivalidate.h
index 4c64ab34e..b90f871ae 100644
--- a/mi/mivalidate.h
+++ b/mi/mivalidate.h
@@ -26,13 +26,13 @@ from The Open Group.
 
 */
 
+#ifndef MIVALIDATE_H
+#define MIVALIDATE_H
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef MIVALIDATE_H
-#define MIVALIDATE_H
-
 #include "regionstr.h"
 
 typedef union _Validate {