From b8d2961d830684cc06841ba5381a9c9a269b5117 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 15 Oct 2024 14:54:43 +0200
Subject: [PATCH] x21

---
 glx/extension_string.c       | 2 +-
 glx/glxbyteorder.h           | 4 ----
 glx/indirect_dispatch_swap.c | 1 +
 hw/xfree86/sdk/meson.build   | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/glx/extension_string.c b/glx/extension_string.c
index a5b8c747e..0d454c77b 100644
--- a/glx/extension_string.c
+++ b/glx/extension_string.c
@@ -30,8 +30,8 @@
  *
  * \author Ian Romanick <idr@us.ibm.com>
  */
+#include <dix-config.h>
 
-#include "dix-config.h"
 #include "extension_string.h"
 #include "opaque.h"
 
diff --git a/glx/glxbyteorder.h b/glx/glxbyteorder.h
index 8f0cd8a4b..75d5b4f35 100644
--- a/glx/glxbyteorder.h
+++ b/glx/glxbyteorder.h
@@ -31,10 +31,6 @@
 #if !defined(__GLXBYTEORDER_H__)
 #define __GLXBYTEORDER_H__
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include "misc.h"
 
 #endif                          /* !defined(__GLXBYTEORDER_H__) */
diff --git a/glx/indirect_dispatch_swap.c b/glx/indirect_dispatch_swap.c
index 3eeed00f3..44713df0a 100644
--- a/glx/indirect_dispatch_swap.c
+++ b/glx/indirect_dispatch_swap.c
@@ -24,6 +24,7 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include <dix-config.h>
 
 #include <inttypes.h>
 #include "glxserver.h"
diff --git a/hw/xfree86/sdk/meson.build b/hw/xfree86/sdk/meson.build
index 8e08b1930..30f4c30d6 100644
--- a/hw/xfree86/sdk/meson.build
+++ b/hw/xfree86/sdk/meson.build
@@ -33,7 +33,7 @@ if build_xv
 endif
 
 if build_glamor
-    xorg_sdk_headers += '../glamor/glamor.h'
+    xorg_sdk_headers += '../../../glamor/glamor.h'
 endif
 
 if build_xorg_sdk