diff --git a/dix/dispatch.h b/dix/dispatch.h
index 9d68a0727d..62534d4912 100644
--- a/dix/dispatch.h
+++ b/dix/dispatch.h
@@ -23,17 +23,17 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef DISPATCH_H
+#define DISPATCH_H 1
+
+#include <dix-config.h>
+
 /*
  * This prototypes the dispatch.c module (except for functions declared in
  * global headers), plus related dispatch procedures from devices.c, events.c,
  * extension.c, property.c.
  */
 
-#include <dix-config.h>
-
-#ifndef DISPATCH_H
-#define DISPATCH_H 1
-
 int ProcAllocColor(ClientPtr /* client */ );
 int ProcAllocColorCells(ClientPtr /* client */ );
 int ProcAllocColorPlanes(ClientPtr /* client */ );
diff --git a/dix/enterleave.h b/dix/enterleave.h
index b6341ff68a..d8d5ab6d66 100644
--- a/dix/enterleave.h
+++ b/dix/enterleave.h
@@ -24,11 +24,11 @@
  *
  */
 
-#include <dix-config.h>
-
 #ifndef ENTERLEAVE_H
 #define ENTERLEAVE_H
 
+#include <dix-config.h>
+
 #include <dix.h> /* DoFocusEvents() */
 
 extern void DoEnterLeaveEvents(DeviceIntPtr pDev,