diff --git a/composite/compint.h b/composite/compint.h
index 3a91914f9..bb05c3d80 100644
--- a/composite/compint.h
+++ b/composite/compint.h
@@ -41,13 +41,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifndef _COMPINT_H_
+#define _COMPINT_H_
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _COMPINT_H_
-#define _COMPINT_H_
-
 #include "dix/screen_hooks_priv.h"
 
 #include "misc.h"
diff --git a/composite/compositeext.h b/composite/compositeext.h
index 945a4c35c..ae579edf2 100644
--- a/composite/compositeext.h
+++ b/composite/compositeext.h
@@ -21,13 +21,13 @@
  * SOFTWARE.
  */
 
+#ifndef _COMPOSITEEXT_H_
+#define _COMPOSITEEXT_H_
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _COMPOSITEEXT_H_
-#define _COMPOSITEEXT_H_
-
 #include "misc.h"
 #include "scrnintstr.h"