diff --git a/include/displaymode.h b/include/displaymode.h
index 5610877171..9b60126045 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/vidmodestr.h b/include/vidmodestr.h
index b47daa7794..67a0189594 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 {