From 75c751dd92bd2a368fefa84add25a59fbc4d62b2 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 9 Feb 2026 15:06:54 +0100
Subject: [PATCH] include: drop including dix-config.h

All xserver sources need to include it at the very top anyways, so
no need to clutter public SDK headers with extra complexity.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 include/client.h      | 4 ----
 include/displaymode.h | 4 ----
 include/servermd.h    | 5 -----
 include/vidmodestr.h  | 4 ----
 4 files changed, 17 deletions(-)

diff --git a/include/client.h b/include/client.h
index d71dc8d053..0f32a97f0c 100644
--- a/include/client.h
+++ b/include/client.h
@@ -26,10 +26,6 @@
 #ifndef CLIENT_H
 #define CLIENT_H
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif                          /* HAVE_DIX_CONFIG_H */
-
 struct _Client;
 typedef struct _ClientId *ClientIdPtr;
 
diff --git a/include/displaymode.h b/include/displaymode.h
index 9b60126045..c97a11eb78 100644
--- a/include/displaymode.h
+++ b/include/displaymode.h
@@ -1,10 +1,6 @@
 #ifndef _DISMODEPROC_H_
 #define _DISMODEPROC_H_
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include "scrnintstr.h"
 
 #define MAXCLOCKS   128
diff --git a/include/servermd.h b/include/servermd.h
index 5802af58e7..a49c92d453 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -47,11 +47,6 @@ SOFTWARE.
 #ifndef SERVERMD_H
 #define SERVERMD_H 1
 
-#if !defined(_DIX_CONFIG_H_) && !defined(_XORG_SERVER_H_)
-#error Drivers must include xorg-server.h before any other xserver headers
-#error xserver code must include dix-config.h before any other headers
-#endif
-
 #include <X11/Xarch.h>		/* for X_LITTLE_ENDIAN/X_BIG_ENDIAN */
 
 #if X_BYTE_ORDER == X_LITTLE_ENDIAN
diff --git a/include/vidmodestr.h b/include/vidmodestr.h
index 67a0189594..5aad268309 100644
--- a/include/vidmodestr.h
+++ b/include/vidmodestr.h
@@ -1,10 +1,6 @@
 #ifndef _VIDMODEPROC_H_
 #define _VIDMODEPROC_H_
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include "displaymode.h"
 
 typedef enum {