diff --git a/Xi/xiwarppointer.c b/Xi/xiwarppointer.c
index 8ca83536c..ede4b181f 100644
--- a/Xi/xiwarppointer.c
+++ b/Xi/xiwarppointer.c
@@ -38,6 +38,7 @@
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XI2proto.h>
 
+#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
diff --git a/dix/cursor_priv.h b/dix/cursor_priv.h
index 466afa224..3488f102c 100644
--- a/dix/cursor_priv.h
+++ b/dix/cursor_priv.h
@@ -10,8 +10,10 @@
 #include <X11/Xdefs.h>
 #include <X11/Xmd.h>
 
+#include "dix/screenint_priv.h"
 #include "include/cursor.h"
 #include "include/dix.h"
+#include "include/input.h"
 #include "include/window.h"
 
 extern CursorPtr rootCursor;
@@ -62,4 +64,9 @@ Bool CursorMetricsFromGlyph(FontPtr pfont,
 
 void CheckCursorConfinement(WindowPtr pWin);
 
+void NewCurrentScreen(DeviceIntPtr pDev,
+                      ScreenPtr newScreen,
+                      int x,
+                      int y);
+
 #endif /* _XSERVER_DIX_CURSOR_PRIV_H */
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index b6d259660..08dc3533c 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -17,6 +17,8 @@ is" without express or implied warranty.
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 
+#include "dix/cursor_priv.h"
+
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"
@@ -25,7 +27,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "inputstr.h"
 #include "inpututils.h"
-
 #include "mi.h"
 
 #include "xnest-xcb.h"
diff --git a/include/cursor.h b/include/cursor.h
index b646eefa4..43f77ba44 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -65,11 +65,6 @@ typedef struct _CursorMetric *CursorMetricPtr;
 extern _X_EXPORT int FreeCursor(void *pCurs,
                                 XID cid);
 
-extern _X_EXPORT void NewCurrentScreen(struct _DeviceIntRec * /*pDev */ ,
-                                       ScreenPtr /*newScreen */ ,
-                                       int /*x */ ,
-                                       int /*y */ );
-
 extern _X_EXPORT Bool PointerConfinedToScreen(struct _DeviceIntRec * /* pDev */
                                               );
 
diff --git a/mi/mieq.c b/mi/mieq.c
index cb341b366..440563d80 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -39,6 +39,9 @@ in this Software without prior written authorization from The Open Group.
 #include   <X11/X.h>
 #include   <X11/Xmd.h>
 #include   <X11/Xproto.h>
+
+#include   "dix/cursor_priv.h"
+
 #include   "misc.h"
 #include   "windowstr.h"
 #include   "pixmapstr.h"
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 48489dc84..7c29d70d4 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -54,6 +54,7 @@ in this Software without prior written authorization from The Open Group.
 #include   <X11/Xmd.h>
 #include   <X11/Xproto.h>
 
+#include   "dix/cursor_priv.h"
 #include   "dix/dix_priv.h"
 #include   "dix/input_priv.h"