diff --git a/dix/cursor_priv.h b/dix/cursor_priv.h
index a1f15a5a6..47386d81e 100644
--- a/dix/cursor_priv.h
+++ b/dix/cursor_priv.h
@@ -12,7 +12,6 @@
 
 #include "include/cursor.h"
 #include "include/dix.h"
-#include "include/window.h"
 
 extern CursorPtr rootCursor;
 
@@ -60,6 +59,4 @@ 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 e8674f7fc..f2fa88d16 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -70,6 +70,8 @@ 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 820133e10..3b8edee1b 100644
--- a/mi/mioverlay.c
+++ b/mi/mioverlay.c
@@ -3,9 +3,9 @@
 
 #include <X11/X.h>
 
-#include "dix/cursor_priv.h"
 #include "mi/mi_priv.h"
 
+
 #include "scrnintstr.h"
 #include <X11/extensions/shapeproto.h>
 #include "validate.h"
diff --git a/mi/miwindow.c b/mi/miwindow.c
index a4b97a7b8..4412b9c18 100644
--- a/mi/miwindow.c
+++ b/mi/miwindow.c
@@ -49,7 +49,6 @@ SOFTWARE.
 #include <X11/X.h>
 #include <X11/extensions/shapeconst.h>
 
-#include "dix/cursor_priv.h"
 #include "dix/input_priv.h"
 #include "mi/mi_priv.h"