From 5a8da5bdc32ae0fc19717e6320a80527113a2105 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 9 Sep 2025 17:28:30 +0200
Subject: [PATCH] damage: consolidate damageextint.h

* move the stuff only used in .c file there
* drop unnecessary include files

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 damageext/damageext.c    | 29 +++++++++++++++++++++++++++++
 damageext/damageextint.h | 39 +--------------------------------------
 2 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/damageext/damageext.c b/damageext/damageext.c
index d1cf3ee6b2..e378ad10ed 100644
--- a/damageext/damageext.c
+++ b/damageext/damageext.c
@@ -23,17 +23,46 @@
 
 #include <dix-config.h>
 
+#include <X11/Xproto.h>
+#include <X11/extensions/damageproto.h>
+
 #include "dix/dix_priv.h"
+#include "include/pixmapstr.h"
 #include "miext/extinit_priv.h"
 #include "os/client_priv.h"
 #include "Xext/panoramiX.h"
 #include "Xext/panoramiXsrv.h"
+#include "xfixes/xfixes.h"
 
 #include "damageextint.h"
 #include "damagestr.h"
 #include "protocol-versions.h"
 #include "dixstruct_priv.h"
 
+typedef struct _DamageClient {
+    CARD32 major_version;
+    CARD32 minor_version;
+    int critical;
+} DamageClientRec, *DamageClientPtr;
+
+typedef struct _DamageExt {
+    DamagePtr pDamage;
+    DrawablePtr pDrawable;
+    DamageReportLevel level;
+    ClientPtr pClient;
+    XID id;
+    XID drawable;
+} DamageExtRec, *DamageExtPtr;
+
+#define VERIFY_DAMAGEEXT(pDamageExt, rid, client, mode) { \
+    int rc = dixLookupResourceByType((void **)&(pDamageExt), rid, \
+                                     DamageExtType, client, mode); \
+    if (rc != Success) \
+        return rc; \
+}
+
+#define GetDamageClient(pClient) ((DamageClientPtr)dixLookupPrivate(&(pClient)->devPrivates, DamageClientPrivateKey))
+
 #ifdef XINERAMA
 
 typedef struct {
diff --git a/damageext/damageextint.h b/damageext/damageextint.h
index 95a8fd5ac0..51370d2e37 100644
--- a/damageext/damageextint.h
+++ b/damageext/damageextint.h
@@ -22,46 +22,9 @@
 #ifndef _DAMAGEEXTINT_H_
 #define _DAMAGEEXTINT_H_
 
-#include <dix-config.h>
-
 #include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/extensions/damageproto.h>
 
-#include "dix/selection_priv.h"
-
-#include "misc.h"
-#include "os.h"
-#include "dixstruct.h"
-#include "extnsionst.h"
-#include "windowstr.h"
-#include "scrnintstr.h"
-#include "damage.h"
-#include "xfixes.h"
-
-typedef struct _DamageClient {
-    CARD32 major_version;
-    CARD32 minor_version;
-    int critical;
-} DamageClientRec, *DamageClientPtr;
-
-#define GetDamageClient(pClient) ((DamageClientPtr)dixLookupPrivate(&(pClient)->devPrivates, DamageClientPrivateKey))
-
-typedef struct _DamageExt {
-    DamagePtr pDamage;
-    DrawablePtr pDrawable;
-    DamageReportLevel level;
-    ClientPtr pClient;
-    XID id;
-    XID drawable;
-} DamageExtRec, *DamageExtPtr;
-
-#define VERIFY_DAMAGEEXT(pDamageExt, rid, client, mode) { \
-    int rc = dixLookupResourceByType((void **)&(pDamageExt), rid, \
-                                     DamageExtType, client, mode); \
-    if (rc != Success) \
-        return rc; \
-}
+#include "include/dix.h"
 
 void
  DamageExtSetCritical(ClientPtr pClient, Bool critical);