diff --git a/dix/colormap_priv.h b/dix/colormap_priv.h
index 266e44793..c7d879c79 100644
--- a/dix/colormap_priv.h
+++ b/dix/colormap_priv.h
@@ -8,7 +8,6 @@
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 
-#include "dix/screenint_priv.h"
 #include "include/colormap.h"
 #include "include/dix.h"
 #include "include/window.h"
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 0a9c2dc20..ac01b52ee 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -111,7 +111,6 @@ Equipment Corporation.
 #include "dix/input_priv.h"
 #include "dix/gc_priv.h"
 #include "dix/registry_priv.h"
-#include "dix/screenint_priv.h"
 #include "include/resource.h"
 #include "os/auth.h"
 #include "os/client_priv.h"
diff --git a/dix/screenint_priv.h b/dix/screenint_priv.h
deleted file mode 100644
index 616cfbfb6..000000000
--- a/dix/screenint_priv.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: MIT OR X11
- *
- * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
- * Copyright © 1987, 1998 The Open Group
- */
-#ifndef _XSERVER_DIX_SCREENINT_PRIV_H
-#define _XSERVER_DIX_SCREENINT_PRIV_H
-
-#include <X11/Xdefs.h>
-
-#include "screenint.h"
-
-typedef Bool (*ScreenInitProcPtr)(ScreenPtr pScreen, int argc, char **argv);
-
-int AddScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
-int AddGPUScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
-
-void RemoveGPUScreen(ScreenPtr pScreen);
-
-void AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr newScreen);
-void DetachUnboundGPU(ScreenPtr unbound);
-
-void AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr newScreen);
-void DetachOffloadGPU(ScreenPtr slave);
-
-#endif /* _XSERVER_DIX_SCREENINT_PRIV_H */
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 9ca94e6ea..fff1a6403 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -38,7 +38,6 @@ from The Open Group.
 
 #include "dix/colormap_priv.h"
 #include "dix/dix_priv.h"
-#include "dix/screenint_priv.h"
 #include "os/osdep.h"
 
 #include "scrnintstr.h"
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 7c003efb5..052a063ae 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -54,9 +54,9 @@
 #include "config/dbus-core.h"
 #include "config/hotplug_priv.h"
 #include "dix/input_priv.h"
-#include "dix/screenint_priv.h"
 #include "os/osdep.h"
 
+#include "input.h"
 #include "servermd.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
index 2962c8b21..63c1be2c9 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -38,7 +38,6 @@
 #include <unistd.h>
 
 #include "config/hotplug_priv.h"
-#include "dix/screenint_priv.h"
 
 #include "os.h"
 #include "systemd-logind.h"
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index cdc4d0c7f..78ef815c0 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -27,7 +27,6 @@
 #include <X11/extensions/render.h>
 
 #include "dix/input_priv.h"
-#include "dix/screenint_priv.h"
 
 #include "xf86.h"
 #include "os.h"
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 1f268b64f..d092f9363 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -20,7 +20,6 @@ is" without express or implied warranty.
 #include <X11/fonts/fontstruct.h>
 #include <X11/fonts/libxfont2.h>
 
-#include "dix/screenint_priv.h"
 #include "os/osdep.h"
 
 #include "screenint.h"
diff --git a/include/screenint.h b/include/screenint.h
index fc313042d..9a095d5ac 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -56,6 +56,22 @@ typedef struct _Screen *ScreenPtr;
 
 extern _X_EXPORT void AttachOutputGPU(ScreenPtr pScreen, ScreenPtr newScreen);
 extern _X_EXPORT void DetachOutputGPU(ScreenPtr output);
+typedef Bool (*ScreenInitProcPtr)(ScreenPtr pScreen, int argc, char **argv);
+extern _X_EXPORT int AddScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
+extern _X_EXPORT int AddGPUScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
+
+extern _X_EXPORT void RemoveGPUScreen(ScreenPtr pScreen);
+
+extern _X_EXPORT void
+AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr newScreen);
+extern _X_EXPORT void
+DetachUnboundGPU(ScreenPtr unbound);
+
+extern _X_EXPORT void
+AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr newScreen);
+
+extern _X_EXPORT void
+DetachOffloadGPU(ScreenPtr slave);
 
 typedef struct _ColormapRec *ColormapPtr;
 
diff --git a/mi/mipointer_priv.h b/mi/mipointer_priv.h
index 6c61fdc22..fcd40e509 100644
--- a/mi/mipointer_priv.h
+++ b/mi/mipointer_priv.h
@@ -7,7 +7,6 @@
 
 #include <X11/Xdefs.h>
 
-#include "dix/screenint_priv.h"
 #include "mi/mipointer.h"
 
 void miPointerSetScreen(DeviceIntPtr pDev, int screen_num, int x, int y);