From d7b6352154ff56b0d74653e0dd05469847bf69e3 Mon Sep 17 00:00:00 2001
From: Mike Gelfand <mikedld@mikedld.com>
Date: Mon, 23 Jun 2025 22:17:37 +0100
Subject: [PATCH] composite: move include guards up to wrap the whole file

See: https://gcc.gnu.org/onlinedocs/cppinternals/Guard-Macros.html
Signed-off-by: Mike Gelfand <mikedld@mikedld.com>
---
 composite/compint.h      | 6 +++---
 composite/compositeext.h | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

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"