From 9b8d7d1eb986e768f74fe6c6dd09efa7a715bcd9 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 21 Nov 2025 20:56:22 +0100
Subject: [PATCH] treewide: don't include <region.h> anymore

Nothing in there that we need, include <regionstr.h> instead.
But keeping the file in place, until all external consumer have
been migrated.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xext/xace.h        | 2 +-
 Xi/exevents.c      | 1 -
 dix/gc.c           | 1 -
 fb/fb.h            | 2 +-
 hw/xnest/GC.c      | 5 +++--
 hw/xnest/GCOps.c   | 1 -
 hw/xnest/Window.c  | 2 +-
 hw/xwin/win.h      | 1 -
 include/gcstruct.h | 7 +++----
 include/window.h   | 7 ++++---
 mi/mi.h            | 6 ++++--
 mi/miwindow.c      | 3 +--
 12 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/Xext/xace.h b/Xext/xace.h
index c9951f2c9f..fb026a6342 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -25,10 +25,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "dix/selection_priv.h"
 #include "include/callback.h"
+#include "include/regionstr.h"
 
 #include "extnsionst.h"
 #include "pixmap.h"
-#include "region.h"
 #include "window.h"
 #include "property.h"
 
diff --git a/Xi/exevents.c b/Xi/exevents.c
index cba0516060..c2d2a8ef80 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -107,7 +107,6 @@ SOFTWARE.
 #include "inputstr.h"
 #include "windowstr.h"
 #include "miscstruct.h"
-#include "region.h"
 #include "extnsionst.h"
 #include "exglobals.h"
 #include "eventstr.h"
diff --git a/dix/gc.c b/dix/gc.c
index 434e7ca240..92bb20a7c7 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include "pixmapstr.h"
 #include "dixfontstr.h"
 #include "scrnintstr.h"
-#include "region.h"
 #include "dixstruct.h"
 #include "privates.h"
 #include "dix.h"
diff --git a/fb/fb.h b/fb/fb.h
index 59abe41bf5..626f677bff 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -30,7 +30,7 @@
 #include "scrnintstr.h"
 #include "pixmap.h"
 #include "pixmapstr.h"
-#include "region.h"
+#include "regionstr.h"
 #include "gcstruct.h"
 #include "colormap.h"
 #include "miscstruct.h"
diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
index 15a6d03c61..eba61b4661 100644
--- a/hw/xnest/GC.c
+++ b/hw/xnest/GC.c
@@ -15,6 +15,7 @@ is" without express or implied warranty.
 
 #include <stdint.h>
 
+#include <X11/fonts/fontstruct.h>
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
@@ -22,13 +23,13 @@ is" without express or implied warranty.
 #include <xcb/xcb.h>
 #include <xcb/xcb_aux.h>
 
+#include "include/regionstr.h"
+
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
 #include "scrnintstr.h"
-#include <X11/fonts/fontstruct.h>
 #include "mistruct.h"
-#include "region.h"
 
 #include "xnest-xcb.h"
 
diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c
index 0fbbf6eb0f..1396090c64 100644
--- a/hw/xnest/GCOps.c
+++ b/hw/xnest/GCOps.c
@@ -28,7 +28,6 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
-#include "region.h"
 #include "servermd.h"
 
 #include "xnest-xcb.h"
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index 6a6789d82c..7cf9befab5 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -21,6 +21,7 @@ is" without express or implied warranty.
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 
+#include "include/regionstr.h"
 #include "mi/mi_priv.h"
 
 #include "gcstruct.h"
@@ -28,7 +29,6 @@ is" without express or implied warranty.
 #include "windowstr.h"
 #include "pixmapstr.h"
 #include "scrnintstr.h"
-#include "region.h"
 
 #include "xnest-xcb.h"
 
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 364e96564a..369ea37bb7 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -150,7 +150,6 @@
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "pixmap.h"
-#include "region.h"
 #include "gcstruct.h"
 #include "colormap.h"
 #include "miscstruct.h"
diff --git a/include/gcstruct.h b/include/gcstruct.h
index 88ecb9c8d4..45613da15a 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -47,14 +47,13 @@ SOFTWARE.
 #ifndef GCSTRUCT_H
 #define GCSTRUCT_H
 
-#include "gc.h"
+#include <X11/Xprotostr.h>
 
-#include "regionstr.h"
-#include "region.h"
+#include "gc.h"
 #include "pixmap.h"
+#include "regionstr.h"
 #include "screenint.h"
 #include "privates.h"
-#include <X11/Xprotostr.h>
 
 #define GCAllBits ((1 << (GCLastBit + 1)) - 1)
 
diff --git a/include/window.h b/include/window.h
index b5c779d297..b2ff98e887 100644
--- a/include/window.h
+++ b/include/window.h
@@ -47,11 +47,12 @@ SOFTWARE.
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include "misc.h"
-#include "region.h"
-#include "screenint.h"
 #include <X11/Xproto.h>
 
+#include "misc.h"
+#include "regionstr.h"
+#include "screenint.h"
+
 #define TOTALLY_OBSCURED 0
 #define UNOBSCURED 1
 #define OBSCURED 2
diff --git a/mi/mi.h b/mi/mi.h
index 0adb915cd2..7293a828fc 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -46,12 +46,14 @@ SOFTWARE.
 
 #ifndef MI_H
 #define MI_H
+
 #include <X11/X.h>
-#include "region.h"
+#include <X11/fonts/font.h>
+
+#include "regionstr.h"
 #include "validate.h"
 #include "window.h"
 #include "gc.h"
-#include <X11/fonts/font.h>
 #include "input.h"
 #include "cursor.h"
 #include "privates.h"
diff --git a/mi/miwindow.c b/mi/miwindow.c
index 9b2d154747..63b8bea550 100644
--- a/mi/miwindow.c
+++ b/mi/miwindow.c
@@ -52,10 +52,9 @@ SOFTWARE.
 #include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
+#include "include/regionstr.h"
 #include "mi/mi_priv.h"
 
-#include "regionstr.h"
-#include "region.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"