diff --git a/include/displaymode.h b/include/displaymode.h
index 561087717..9b6012604 100644
--- a/include/displaymode.h
+++ b/include/displaymode.h
@@ -1,10 +1,10 @@
+#ifndef _DISMODEPROC_H_
+#define _DISMODEPROC_H_
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _DISMODEPROC_H_
-#define _DISMODEPROC_H_
-
 #include "scrnintstr.h"
 
 #define MAXCLOCKS   128
diff --git a/include/inpututils.h b/include/inpututils.h
index 49b1c1074..0c9217cfe 100644
--- a/include/inpututils.h
+++ b/include/inpututils.h
@@ -22,13 +22,13 @@
  *
  */
 
+#ifndef INPUTUTILS_H
+#define INPUTUTILS_H
+
 #ifdef HAVE_DIX_CONFIG_H
 #include "dix-config.h"
 #endif
 
-#ifndef INPUTUTILS_H
-#define INPUTUTILS_H
-
 #include "input.h"
 #include "eventstr.h"
 #include <X11/extensions/XI2proto.h>
diff --git a/include/vidmodestr.h b/include/vidmodestr.h
index b47daa779..67a018959 100644
--- a/include/vidmodestr.h
+++ b/include/vidmodestr.h
@@ -1,10 +1,10 @@
+#ifndef _VIDMODEPROC_H_
+#define _VIDMODEPROC_H_
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _VIDMODEPROC_H_
-#define _VIDMODEPROC_H_
-
 #include "displaymode.h"
 
 typedef enum {