diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index eee12ac8a..248aaf1bb 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -28,6 +28,7 @@
 #include <xcb/xcb_keysyms.h>
 #include <X11/keysym.h>
 
+#include "mi/mipointer_priv.h"
 #include "os/osdep.h"
 
 #include "ephyr.h"
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 52c058f3e..3d94871dc 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -49,6 +49,7 @@
 #include "inpututils.h"
 #include "optionstr.h"
 
+#include "mi/mipointer_priv.h"
 #include "os/cmdline.h"
 
 #if defined(CONFIG_UDEV) || defined(CONFIG_HAL)
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 4a448a5ae..6452d2556 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -39,6 +39,7 @@ from The Open Group.
 #include "dix/colormap_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/screenint_priv.h"
+#include "mi/mipointer_priv.h"
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c
index c663310d5..8a3b5c778 100644
--- a/hw/xfree86/common/xf86Cursor.c
+++ b/hw/xfree86/common/xf86Cursor.c
@@ -34,6 +34,7 @@
 #include <X11/extensions/XIproto.h>
 
 #include "dix/input_priv.h"
+#include "mi/mipointer_priv.h"
 
 #include "cursor.h"
 #include "mipointer.h"
diff --git a/hw/xfree86/ramdac/xf86CursorRD.c b/hw/xfree86/ramdac/xf86CursorRD.c
index 880e23b04..f6d883f3b 100644
--- a/hw/xfree86/ramdac/xf86CursorRD.c
+++ b/hw/xfree86/ramdac/xf86CursorRD.c
@@ -4,6 +4,7 @@
 #endif
 
 #include "dix/cursor_priv.h"
+#include "mi/mipointer_priv.h"
 
 #include "xf86.h"
 #include "xf86CursorPriv.h"
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index b696f19a1..9455527ca 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -19,6 +19,7 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 
 #include "mi/mi_priv.h"
+#include "mi/mipointer_priv.h"
 
 #include "scrnintstr.h"
 #include "dix.h"
diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c
index 22b52344d..5b0ad8a33 100644
--- a/hw/xquartz/xpr/xprCursor.c
+++ b/hw/xquartz/xpr/xprCursor.c
@@ -38,6 +38,8 @@
 #include "darwinEvents.h"
 #include <Xplugin.h>
 
+#include "mi/mipointer_priv.h"
+
 #include "mi.h"
 #include "scrnintstr.h"
 #include "cursorstr.h"
diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c
index 3fc050bfa..6b42c990e 100644
--- a/hw/xwin/wincursor.c
+++ b/hw/xwin/wincursor.c
@@ -36,6 +36,9 @@
 #endif
 #include "win.h"
 #include "winmsg.h"
+
+#include "mi/mipointer_priv.h"
+
 #include <cursorstr.h>
 #include <mipointrst.h>
 #include <servermd.h>
diff --git a/mi/mipointer.h b/mi/mipointer.h
index 412694edd..c9205a583 100644
--- a/mi/mipointer.h
+++ b/mi/mipointer.h
@@ -77,12 +77,6 @@ extern _X_EXPORT Bool miDCInitialize(ScreenPtr /*pScreen */ ,
                                      miPointerScreenFuncPtr     /*screenFuncs */
     );
 
-extern _X_EXPORT void miPointerWarpCursor(DeviceIntPtr /*pDev */ ,
-                                          ScreenPtr /*pScreen */ ,
-                                          int /*x */ ,
-                                          int   /*y */
-    );
-
 extern _X_EXPORT ScreenPtr
 miPointerGetScreen(DeviceIntPtr pDev);
 extern _X_EXPORT void
diff --git a/mi/mipointer_priv.h b/mi/mipointer_priv.h
index 23bc7f9d9..24c713bfa 100644
--- a/mi/mipointer_priv.h
+++ b/mi/mipointer_priv.h
@@ -8,9 +8,11 @@
 #include <X11/Xdefs.h>
 
 #include "dix/screenint_priv.h"
+#include "include/input.h"
 #include "mi/mipointer.h"
 
 Bool miPointerInitialize(ScreenPtr pScreen, miPointerSpriteFuncPtr spriteFuncs,
                          miPointerScreenFuncPtr screenFuncs, Bool waitForUpdate);
+void miPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);
 
 #endif /* _XSERVER_MI_MIPOINTER_PRIV_H */