diff --git a/Xext/saver.c b/Xext/saver.c
index 70d16c325..1356d6f4b 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -61,6 +61,8 @@ in this Software without prior written authorization from the X Consortium.
 #include "protocol-versions.h"
 #include "extinit_priv.h"
 
+Bool noScreenSaverExtension = FALSE;
+
 static int ScreenSaverEventBase = 0;
 
 static Bool ScreenSaverHandle(ScreenPtr pScreen, int xstate, Bool force);
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 8198c8ee9..f53d66465 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -37,6 +37,7 @@
 #include <X11/Xatom.h>
 #include <X11/Xfuncproto.h>
 
+#include "include/extinit_priv.h"
 #include "os/osdep.h"
 #include "os/xserver_poll.h"
 
diff --git a/include/extinit.h b/include/extinit.h
index c834ed608..9921bdb3b 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -62,10 +62,6 @@ extern _X_EXPORT Bool noCompositeExtension;
 extern _X_EXPORT Bool noPanoramiXExtension;
 #endif
 
-#if defined(SCREENSAVER)
-extern _X_EXPORT Bool noScreenSaverExtension;
-#endif
-
 #ifdef MITSHM
 extern _X_EXPORT Bool noMITShmExtension;
 #endif
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index adf928c26..5e781dcb2 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -16,6 +16,7 @@ extern Bool noGlxExtension;
 extern Bool noRenderExtension;
 extern Bool noResExtension;
 extern Bool noRRExtension;
+extern Bool noScreenSaverExtension;
 extern Bool noShapeExtension;
 extern Bool noTestExtensions;
 
diff --git a/os/utils.c b/os/utils.c
index 453cc1159..aece66c90 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -124,9 +124,6 @@ __stdcall unsigned long GetTickCount(void);
 #ifdef COMPOSITE
 Bool noCompositeExtension = FALSE;
 #endif
-#ifdef SCREENSAVER
-Bool noScreenSaverExtension = FALSE;
-#endif
 #ifdef MITSHM
 Bool noMITShmExtension = FALSE;
 #endif