diff --git a/Xext/xtest.c b/Xext/xtest.c
index 332bc197a1..2048da3fa0 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -40,6 +40,7 @@
 #include "dix/exevents_priv.h"
 #include "dix/inpututils_priv.h"
 #include "dix/request_priv.h"
+#include "dix/screensaver_priv.h"
 #include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
 #include "miext/extinit_priv.h"
diff --git a/composite/compwindow.c b/composite/compwindow.c
index 73008f3750..ef0c705896 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -45,6 +45,7 @@
 
 #include "dix/dix_priv.h"
 #include "dix/resource_priv.h"
+#include "dix/screensaver_priv.h"
 #include "include/extinit.h"
 #include "os/osdep.h"
 #include "Xext/panoramiXsrv.h"
diff --git a/dix/screensaver_priv.h b/dix/screensaver_priv.h
index 764de97c0a..540cec8832 100644
--- a/dix/screensaver_priv.h
+++ b/dix/screensaver_priv.h
@@ -5,12 +5,14 @@
 #ifndef _XSERVER_DIX_SCREENSAVER_PRIV_H
 #define _XSERVER_DIX_SCREENSAVER_PRIV_H
 
+#include <stdbool.h>
 #include <X11/Xdefs.h>
 #include <X11/Xmd.h>
 
 #include "include/callback.h"
 #include "include/dix.h"
 #include "include/screenint.h"
+#include "include/scrnintstr.h"
 
 extern CARD32 defaultScreenSaverTime;
 extern CARD32 defaultScreenSaverInterval;
@@ -36,4 +38,10 @@ static inline int dixCallScreensaverAccessCallback(ClientPtr client,
     return rec.status;
 }
 
+extern int screenIsSaved;
+
+static inline bool HasSaverWindow(ScreenPtr pScreen) {
+    return (pScreen->screensaver.pWindow != NullWindow);
+}
+
 #endif /* _XSERVER_DIX_SCREENSAVER_PRIV_H */
diff --git a/include/windowstr.h b/include/windowstr.h
index d640ee7e4c..1b4b0d00e4 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -208,8 +208,4 @@ typedef struct _ScreenSaverStuff *ScreenSaverStuffPtr;
 #define SCREEN_IS_TILED     2
 #define SCREEN_IS_BLACK	    3
 
-#define HasSaverWindow(pScreen)   (pScreen->screensaver.pWindow != NullWindow)
-
-extern _X_EXPORT int screenIsSaved;
-
 #endif                          /* WINDOWSTRUCT_H */
diff --git a/mi/mieq.c b/mi/mieq.c
index 92a7d41698..269156fb3b 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -45,6 +45,7 @@ in this Software without prior written authorization from The Open Group.
 #include   "dix/dix_priv.h"
 #include   "dix/input_priv.h"
 #include   "dix/inpututils_priv.h"
+#include   "dix/screensaver_priv.h"
 #include   "mi/mi_priv.h"
 #include   "mi/mipointer_priv.h"
 #include   "os/bug_priv.h"
diff --git a/mi/mioverlay.c b/mi/mioverlay.c
index b762e8a982..eb905e40e8 100644
--- a/mi/mioverlay.c
+++ b/mi/mioverlay.c
@@ -8,6 +8,7 @@
 #include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/screen_hooks_priv.h"
+#include "dix/screensaver_priv.h"
 #include "mi/mi_priv.h"
 
 #include "scrnintstr.h"