From 5d0dc36712414ebc8282043cf5edf17dfb3f279d Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 13 Feb 2026 12:59:41 +0100
Subject: [PATCH] include: dont include xorg-config.h

Those public headers shouldn't ever attempt to include xorg-config.h.
All xfree86 source files need to include it at the very top anyway,
while drivers have to include xorg-server.h instead.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 include/xf86Optrec.h | 5 -----
 include/xf86Parser.h | 5 -----
 include/xf86Sbus.h   | 2 --
 3 files changed, 12 deletions(-)

diff --git a/include/xf86Optrec.h b/include/xf86Optrec.h
index 9e9855558f..8447d7d68d 100644
--- a/include/xf86Optrec.h
+++ b/include/xf86Optrec.h
@@ -56,14 +56,9 @@
  * This file contains the Option Record that is passed between the Parser,
  * and Module setup procs.
  */
-
 #ifndef _xf86Optrec_h_
 #define _xf86Optrec_h_
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include <stdio.h>
 #include <string.h>
 #include "xf86Optionstr.h"
diff --git a/include/xf86Parser.h b/include/xf86Parser.h
index 85a186721e..8ffd2ba3cc 100644
--- a/include/xf86Parser.h
+++ b/include/xf86Parser.h
@@ -56,14 +56,9 @@
  * This file contains the external interfaces for the XFree86 configuration
  * file parser.
  */
-
 #ifndef _xf86Parser_h_
 #define _xf86Parser_h_
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include <X11/Xdefs.h>
 #include "xf86Optrec.h"
 #include "list.h"
diff --git a/include/xf86Sbus.h b/include/xf86Sbus.h
index 20d8e44dd2..1b75c82ab8 100644
--- a/include/xf86Sbus.h
+++ b/include/xf86Sbus.h
@@ -23,8 +23,6 @@
 #ifndef _XF86_SBUS_H
 #define _XF86_SBUS_H
 
-#include <xorg-config.h>
-
 #if defined(__linux__)
 #include <asm/types.h>
 #include <linux/fb.h>