diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 41acb25aa..7cfa16493 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -62,6 +62,7 @@
 #include "xf86pciBus.h"
 #include "xf86Xinput.h"
 #include "loaderProcs.h"
+#include "xf86Xinput_priv.h"
 
 #include "xkbsrv.h"
 #include "picture.h"
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 596a32ea1..1f9be8b98 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -71,7 +71,7 @@
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "inputstr.h"
-#include "xf86Xinput.h"
+#include "xf86Xinput_priv.h"
 
 #include "mi.h"
 #include "mipointer.h"
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 2786e6c6c..86a2a4ea8 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -52,7 +52,7 @@
 #include "xf86_OSlib.h"
 #include "micmap.h"
 #include "xf86DDC.h"
-#include "xf86Xinput.h"
+#include "xf86Xinput_priv.h"
 #include "xf86InPriv.h"
 #include "mivalidate.h"
 
diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c
index ed7bdbd9f..427e9e0aa 100644
--- a/hw/xfree86/common/xf86PM.c
+++ b/hw/xfree86/common/xf86PM.c
@@ -32,7 +32,7 @@
 #include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
-#include "xf86Xinput.h"
+#include "xf86Xinput_priv.h"
 #include "xf86_OSproc.h"
 
 int (*xf86PMGetEventFromOs) (int fd, pmEvent * events, int num) = NULL;
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 245db5776..0e1a4e6a1 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -58,7 +58,7 @@
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Config.h"
-#include "xf86Xinput.h"
+#include "xf86Xinput_priv.h"
 #include "xf86Optrec.h"
 #include "mipointer.h"
 #include "extinit.h"
diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
index e73aff269..9914fb6d4 100644
--- a/hw/xfree86/common/xf86Xinput.h
+++ b/hw/xfree86/common/xf86Xinput.h
@@ -113,9 +113,6 @@ struct _InputInfoRec {
     InputAttributes *attrs;
 };
 
-/* xf86Globals.c */
-extern InputInfoPtr xf86InputDevs;
-
 /* xf86Xinput.c */
 extern _X_EXPORT void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute,
                                           int first_valuator, int num_valuators,
@@ -189,10 +186,6 @@ extern _X_EXPORT void xf86DisableDevice(DeviceIntPtr dev, Bool panic);
 extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev);
 extern _X_EXPORT void xf86InputEnableVTProbe(void);
 
-/* not exported */
-int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);
-InputInfoPtr xf86AllocateInput(void);
-
 /* xf86Helper.c */
 extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, void *module,
                                          int flags);
diff --git a/hw/xfree86/common/xf86Xinput_priv.h b/hw/xfree86/common/xf86Xinput_priv.h
new file mode 100644
index 000000000..b6fc9836a
--- /dev/null
+++ b/hw/xfree86/common/xf86Xinput_priv.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER__XF86XINPUT_H
+#define _XSERVER__XF86XINPUT_H
+
+#include "xf86Xinput.h"
+
+extern InputInfoPtr xf86InputDevs;
+
+int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);
+InputInfoPtr xf86AllocateInput(void);
+
+#endif /* _XSERVER__XF86XINPUT_H */
diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c
index 9a6434d31..0fcce2ad3 100644
--- a/hw/xfree86/os-support/linux/systemd-logind.c
+++ b/hw/xfree86/os-support/linux/systemd-logind.c
@@ -37,7 +37,7 @@
 #include "linux.h"
 #include "xf86.h"
 #include "xf86platformBus_priv.h"
-#include "xf86Xinput.h"
+#include "xf86Xinput_priv.h"
 #include "xf86Priv.h"
 #include "globals.h"
 
diff --git a/hw/xfree86/os-support/xf86OSpriv.h b/hw/xfree86/os-support/xf86OSpriv.h
index 5cb8188e9..aa5b05bcd 100644
--- a/hw/xfree86/os-support/xf86OSpriv.h
+++ b/hw/xfree86/os-support/xf86OSpriv.h
@@ -39,6 +39,9 @@ typedef struct {
 void xf86OSInitVidMem(VidMemInfoPtr);
 
 #ifdef XSERVER_PLATFORM_BUS
+
+struct OdevAttributes;
+
 #include "hotplug.h"
 void
 xf86PlatformDeviceProbe(struct OdevAttributes *attribs);