From 7104573a0f4b6fd621f6e6f026856159bb9af178 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 16 Dec 2025 16:27:46 +0100
Subject: [PATCH] xfree86: input: mouse: include <xorg-config.h> instead of
 <xorg-server.h>

If we're in Xserver tree, we must not include <xorg-server.h>,
but <xorg-config.h> instead.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xfree86/drivers/input/mouse/src/bsd_mouse.c  | 2 +-
 hw/xfree86/drivers/input/mouse/src/hurd_mouse.c | 3 ---
 hw/xfree86/drivers/input/mouse/src/lnx_mouse.c  | 5 +----
 hw/xfree86/drivers/input/mouse/src/mouse.c      | 5 +----
 hw/xfree86/drivers/input/mouse/src/pnp.c        | 5 +----
 hw/xfree86/drivers/input/mouse/src/sun_mouse.c  | 8 --------
 6 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/hw/xfree86/drivers/input/mouse/src/bsd_mouse.c b/hw/xfree86/drivers/input/mouse/src/bsd_mouse.c
index 365362dbf..749bc17d3 100644
--- a/hw/xfree86/drivers/input/mouse/src/bsd_mouse.c
+++ b/hw/xfree86/drivers/input/mouse/src/bsd_mouse.c
@@ -26,7 +26,7 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-#include <xorg-server.h>
+#include <xorg-config.h>
 
 #include <errno.h>
 #include <sys/stat.h>
diff --git a/hw/xfree86/drivers/input/mouse/src/hurd_mouse.c b/hw/xfree86/drivers/input/mouse/src/hurd_mouse.c
index d290b1769..128d69f51 100644
--- a/hw/xfree86/drivers/input/mouse/src/hurd_mouse.c
+++ b/hw/xfree86/drivers/input/mouse/src/hurd_mouse.c
@@ -21,11 +21,8 @@
  *
  */
 
-#ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
-#endif
 
-#include <xorg-server.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "inputstr.h"
diff --git a/hw/xfree86/drivers/input/mouse/src/lnx_mouse.c b/hw/xfree86/drivers/input/mouse/src/lnx_mouse.c
index a55b5f965..1dfffbb28 100644
--- a/hw/xfree86/drivers/input/mouse/src/lnx_mouse.c
+++ b/hw/xfree86/drivers/input/mouse/src/lnx_mouse.c
@@ -3,11 +3,8 @@
  * Copyright 1999 by The XFree86 Project, Inc.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <xorg-config.h>
 
-#include <xorg-server.h>
 #include <X11/X.h>
 #include "xf86.h"
 #include "xf86Xinput.h"
diff --git a/hw/xfree86/drivers/input/mouse/src/mouse.c b/hw/xfree86/drivers/input/mouse/src/mouse.c
index 9e285d4af..233da89ce 100644
--- a/hw/xfree86/drivers/input/mouse/src/mouse.c
+++ b/hw/xfree86/drivers/input/mouse/src/mouse.c
@@ -43,11 +43,8 @@
  * and to help limited dexterity persons
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <xorg-config.h>
 
-#include <xorg-server.h>
 #include <math.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/hw/xfree86/drivers/input/mouse/src/pnp.c b/hw/xfree86/drivers/input/mouse/src/pnp.c
index 3c2bb7071..a4c40ee06 100644
--- a/hw/xfree86/drivers/input/mouse/src/pnp.c
+++ b/hw/xfree86/drivers/input/mouse/src/pnp.c
@@ -20,11 +20,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <xorg-config.h>
 
-#include <xorg-server.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/hw/xfree86/drivers/input/mouse/src/sun_mouse.c b/hw/xfree86/drivers/input/mouse/src/sun_mouse.c
index a64801259..8d9e66973 100644
--- a/hw/xfree86/drivers/input/mouse/src/sun_mouse.c
+++ b/hw/xfree86/drivers/input/mouse/src/sun_mouse.c
@@ -45,14 +45,7 @@
  * dealings in this Software without prior written authorization from the
  * XFree86 Project.
  */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
-#endif
 
 #include <unistd.h> /* for ioctl(2) */
 #include <sys/stropts.h>
@@ -60,7 +53,6 @@
 #include <sys/msio.h>
 #include <fcntl.h>
 #include <errno.h>
-#include "xorg-server.h"
 #include "xf86.h"
 #include "xf86_OSlib.h"
 #include "mouse.h"