diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h
index 49c2f647d..9994e5103 100644
--- a/Xext/dpmsproc.h
+++ b/Xext/dpmsproc.h
@@ -1,10 +1,10 @@
 /* Prototypes for functions that the DDX must provide */
 
-#include <dix-config.h>
-
 #ifndef _DPMSPROC_H_
 #define _DPMSPROC_H_
 
+#include <dix-config.h>
+
 #include "dixstruct.h"
 
 extern int DPMSSet(ClientPtr client, int level);
diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h
index 8b46ef344..6db760aa3 100644
--- a/Xext/panoramiX.h
+++ b/Xext/panoramiX.h
@@ -28,21 +28,21 @@ Equipment Corporation.
 
 /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
 
-/*
- *	PanoramiX definitions
- */
-
-#include <dix-config.h>
-
 #ifndef _PANORAMIX_H_
 #define _PANORAMIX_H_
 
+#include <dix-config.h>
+
 #include <X11/Xmd.h>
 #include <X11/extensions/panoramiXproto.h>
 
 #include "gcstruct.h"
 #include "dixstruct.h"
 
+/*
+ *	PanoramiX definitions
+ */
+
 typedef struct _PanoramiXInfo {
     XID id;
 } PanoramiXInfo;
diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h
index 8eea4831f..fbccd2cd0 100644
--- a/Xext/panoramiXsrv.h
+++ b/Xext/panoramiXsrv.h
@@ -1,9 +1,8 @@
-
-#include <dix-config.h>
-
 #ifndef _PANORAMIXSRV_H_
 #define _PANORAMIXSRV_H_
 
+#include <dix-config.h>
+
 #include "panoramiX.h"
 
 extern int PanoramiXNumScreens;
diff --git a/Xext/sleepuntil.h b/Xext/sleepuntil.h
index ff5cc3364..037278d73 100644
--- a/Xext/sleepuntil.h
+++ b/Xext/sleepuntil.h
@@ -24,11 +24,11 @@
  * XFree86 Project.
  */
 
-#include <dix-config.h>
-
 #ifndef _SLEEPUNTIL_H_
 #define _SLEEPUNTIL_H_ 1
 
+#include <dix-config.h>
+
 #include "dix.h"
 
 extern int ClientSleepUntil(ClientPtr client,