From 1b5df331299da9a1cdab94595ecf043a86fd6c3e Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 25 Feb 2025 14:08:51 +0100
Subject: [PATCH] (1829) dix: clean up including panoramix headers

* use their actual path instead of relying this to be in compiler's
  include path list.
* no need to do it only conditionally, no #ifdef needed

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/events.c    | 6 ++----
 dix/getevents.c | 7 ++-----
 dix/main.c      | 5 +----
 dix/property.c  | 2 ++
 dix/resource.c  | 6 ++----
 dix/window.c    | 6 ++----
 6 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/dix/events.c b/dix/events.c
index 4c7886362..fbd1c42d8 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -129,6 +129,8 @@ Equipment Corporation.
 #include "os/bug_priv.h"
 #include "os/client_priv.h"
 #include "os/fmt.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 #include "xkb/xkbsrv_priv.h"
 
 #include "misc.h"
@@ -139,10 +141,6 @@ Equipment Corporation.
 #include "scrnintstr.h"
 #include "cursorstr.h"
 #include "dixstruct.h"
-#ifdef XINERAMA
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
 #include "globals.h"
 #include "xace.h"
 #include "probes.h"
diff --git a/dix/getevents.c b/dix/getevents.c
index 58ace1831..9c943e126 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -43,6 +43,8 @@
 #include "dix/input_priv.h"
 #include "mi/mi_priv.h"
 #include "os/bug_priv.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "misc.h"
 #include "resource.h"
@@ -60,11 +62,6 @@
 
 #include "xkbsrv.h"
 
-#ifdef XINERAMA
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
-
 #include "exglobals.h"
 #include "exevents.h"
 #include "extnsionst.h"
diff --git a/dix/main.c b/dix/main.c
index 8737aa36f..6f8112846 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -98,6 +98,7 @@ Equipment Corporation.
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
 #include "os/screensaver.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "scrnintstr.h"
 #include "misc.h"
@@ -114,11 +115,7 @@ Equipment Corporation.
 #include "extnsionst.h"
 #include "privates.h"
 #include "exevents.h"
-#ifdef XINERAMA
-#include "panoramiXsrv.h"
-#else
 #include "dixevents.h"          /* InitEvents() */
-#endif /* XINERAMA */
 
 #ifdef DPMSExtension
 #include <X11/extensions/dpmsconst.h>
diff --git a/dix/property.c b/dix/property.c
index cb6d2e2e5..489216f57 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -51,6 +51,8 @@ SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "dix/property_priv.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "windowstr.h"
 #include "propertyst.h"
diff --git a/dix/resource.c b/dix/resource.c
index 292c3c056..dffe7a259 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -127,6 +127,8 @@ Equipment Corporation.
 #include "dix/registry_priv.h"
 #include "dix/resource_priv.h"
 #include "os/osdep.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "misc.h"
 #include "os.h"
@@ -138,10 +140,6 @@ Equipment Corporation.
 #include "colormap.h"
 #include "inputstr.h"
 #include "cursor.h"
-#ifdef XINERAMA
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
 #include "xace.h"
 #include <assert.h>
 #include "gcstruct.h"
diff --git a/dix/window.c b/dix/window.c
index ab7ebaee6..7b0903f00 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -111,6 +111,8 @@ Equipment Corporation.
 #include "os/auth.h"
 #include "os/client_priv.h"
 #include "os/screensaver.h"
+#include "Xext/panoramiX.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "misc.h"
 #include "scrnintstr.h"
@@ -126,10 +128,6 @@ Equipment Corporation.
 #include "gcstruct.h"
 #include "servermd.h"
 #include "mivalidate.h"
-#ifdef XINERAMA
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
 #include "dixevents.h"
 #include "globals.h"
 #include "compint.h"