diff --git a/Xext/dpms.c b/Xext/dpms.c
index 20c549d4c6..f322940cb6 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -34,6 +34,7 @@ Equipment Corporation.
 
 #include "dix/dix_priv.h"
 #include "dix/request_priv.h"
+#include "dix/screensaver_priv.h"
 #include "miext/extinit_priv.h"
 #include "os/screensaver.h"
 #include "Xext/geext_priv.h"
diff --git a/Xext/saver.c b/Xext/saver.c
index 2e5b94bce4..88beea5cbc 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -37,6 +37,7 @@ in this Software without prior written authorization from the X Consortium.
 #include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/request_priv.h"
+#include "dix/screensaver_priv.h"
 #include "dix/window_priv.h"
 #include "miext/extinit_priv.h"
 #include "os/osdep.h"
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 501a09acb0..a1b2b64485 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -114,6 +114,7 @@ Equipment Corporation.
 #include "dix/request_priv.h"
 #include "dix/resource_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/screensaver_priv.h"
 #include "dix/selection_priv.h"
 #include "dix/server_priv.h"
 #include "dix/window_priv.h"
diff --git a/dix/main.c b/dix/main.c
index b6ae5358ca..bc15b03d51 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -92,6 +92,7 @@ Equipment Corporation.
 #include "dix/input_priv.h"
 #include "dix/gc_priv.h"
 #include "dix/registry_priv.h"
+#include "dix/screensaver_priv.h"
 #include "dix/selection_priv.h"
 #include "os/audit_priv.h"
 #include "os/auth.h"
diff --git a/dix/screensaver_priv.h b/dix/screensaver_priv.h
new file mode 100644
index 0000000000..44c48a935d
--- /dev/null
+++ b/dix/screensaver_priv.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_DIX_SCREENSAVER_PRIV_H
+#define _XSERVER_DIX_SCREENSAVER_PRIV_H
+
+#include <X11/Xdefs.h>
+#include <X11/Xmd.h>
+
+extern CARD32 defaultScreenSaverTime;
+extern CARD32 defaultScreenSaverInterval;
+extern CARD32 ScreenSaverTime;
+extern CARD32 ScreenSaverInterval;
+extern Bool screenSaverSuspended;
+
+#endif /* _XSERVER_DIX_SCREENSAVER_PRIV_H */
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 309828ba6e..f9978078c8 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -51,6 +51,7 @@
 #include <grp.h>
 
 #include "dix/resource_priv.h"
+#include "dix/screensaver_priv.h"
 #include "os/log_priv.h"
 #include "os/osdep.h"
 #include "xkb/xkbsrv_priv.h"
diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c
index 49d35d48da..ff6ff2c224 100644
--- a/hw/xwin/winblock.c
+++ b/hw/xwin/winblock.c
@@ -31,6 +31,9 @@
 #ifdef HAVE_XWIN_CONFIG_H
 #include <xwin-config.h>
 #endif
+
+#include "dix/screensaver_priv.h"
+
 #include "win.h"
 #include "winmsg.h"
 
diff --git a/include/globals.h b/include/globals.h
index afb874c64e..e1bdf1e2d1 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -11,15 +11,6 @@
 
 /* Global X server variables that are visible to mi, dix, os, and ddx */
 
-extern _X_EXPORT CARD32 defaultScreenSaverTime;
-extern _X_EXPORT CARD32 defaultScreenSaverInterval;
-extern _X_EXPORT CARD32 ScreenSaverTime;
-extern _X_EXPORT CARD32 ScreenSaverInterval;
-
-#ifdef SCREENSAVER
-extern _X_EXPORT Bool screenSaverSuspended;
-#endif
-
 extern _X_EXPORT const char *defaultFontPath;
 extern _X_EXPORT int monitorResolution;
 extern _X_EXPORT int defaultColorVisualClass;
diff --git a/os/WaitFor.c b/os/WaitFor.c
index 973a3495d7..ae25fda3fd 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -63,6 +63,7 @@ SOFTWARE.
 #include <X11/X.h>
 
 #include "dix/dix_priv.h"
+#include "dix/screensaver_priv.h"
 #include "os/busfault.h"
 #include "os/client_priv.h"
 #include "os/screensaver.h"
diff --git a/os/utils.c b/os/utils.c
index 5a10837e64..52f9bf9c16 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -96,6 +96,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
+#include "dix/screensaver_priv.h"
 #include "miext/extinit_priv.h"
 #include "os/audit_priv.h"
 #include "os/auth.h"