diff --git a/dix/cursor_priv.h b/dix/cursor_priv.h
index 67187b13f..466afa224 100644
--- a/dix/cursor_priv.h
+++ b/dix/cursor_priv.h
@@ -12,6 +12,7 @@
 
 #include "include/cursor.h"
 #include "include/dix.h"
+#include "include/window.h"
 
 extern CursorPtr rootCursor;
 
@@ -59,4 +60,6 @@ Bool CursorMetricsFromGlyph(FontPtr pfont,
                             unsigned ch,
                             CursorMetricPtr cm);
 
+void CheckCursorConfinement(WindowPtr pWin);
+
 #endif /* _XSERVER_DIX_CURSOR_PRIV_H */
diff --git a/include/cursor.h b/include/cursor.h
index 37e47e35e..b646eefa4 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -65,8 +65,6 @@ typedef struct _CursorMetric *CursorMetricPtr;
 extern _X_EXPORT int FreeCursor(void *pCurs,
                                 XID cid);
 
-extern _X_EXPORT void CheckCursorConfinement(WindowPtr /*pWin */ );
-
 extern _X_EXPORT void NewCurrentScreen(struct _DeviceIntRec * /*pDev */ ,
                                        ScreenPtr /*newScreen */ ,
                                        int /*x */ ,
diff --git a/mi/mioverlay.c b/mi/mioverlay.c
index 57d07cdf3..7a86cdfed 100644
--- a/mi/mioverlay.c
+++ b/mi/mioverlay.c
@@ -4,6 +4,9 @@
 #endif
 
 #include <X11/X.h>
+
+#include "dix/cursor_priv.h"
+
 #include "scrnintstr.h"
 #include <X11/extensions/shapeproto.h>
 #include "validate.h"
diff --git a/mi/miwindow.c b/mi/miwindow.c
index 68520ae6c..32debb48e 100644
--- a/mi/miwindow.c
+++ b/mi/miwindow.c
@@ -51,6 +51,7 @@ SOFTWARE.
 #include <X11/X.h>
 #include <X11/extensions/shapeconst.h>
 
+#include "dix/cursor_priv.h"
 #include "dix/input_priv.h"
 
 #include "regionstr.h"