diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 1971cf431..069270219 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -30,6 +30,7 @@
 
 #include "mi/mipointer_priv.h"
 #include "os/client_priv.h"
+#include "os/osdep.h"
 
 #include "ephyr.h"
 #include "inputstr.h"
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index f60f1f8a3..233e54b57 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -39,7 +39,6 @@ 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/osdep.h"
 
diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c
index 8a3b5c778..c663310d5 100644
--- a/hw/xfree86/common/xf86Cursor.c
+++ b/hw/xfree86/common/xf86Cursor.c
@@ -34,7 +34,6 @@
 #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/xnest/Screen.c b/hw/xnest/Screen.c
index a41c5b341..4c7ebd95b 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -19,7 +19,6 @@ is" without express or implied warranty.
 
 #include "mi/mi.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 5b0ad8a33..22b52344d 100644
--- a/hw/xquartz/xpr/xprCursor.c
+++ b/hw/xquartz/xpr/xprCursor.c
@@ -38,8 +38,6 @@
 #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 6b42c990e..3fc050bfa 100644
--- a/hw/xwin/wincursor.c
+++ b/hw/xwin/wincursor.c
@@ -36,9 +36,6 @@
 #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 ba1710a25..2b5851dd9 100644
--- a/mi/mipointer.h
+++ b/mi/mipointer.h
@@ -77,6 +77,12 @@ 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);
 
diff --git a/mi/mipointer_priv.h b/mi/mipointer_priv.h
index cc4ce9940..6c61fdc22 100644
--- a/mi/mipointer_priv.h
+++ b/mi/mipointer_priv.h
@@ -8,10 +8,8 @@
 #include <X11/Xdefs.h>
 
 #include "dix/screenint_priv.h"
-#include "include/input.h"
 #include "mi/mipointer.h"
 
-void miPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);
 void miPointerSetScreen(DeviceIntPtr pDev, int screen_num, int x, int y);
 void miPointerUpdateSprite(DeviceIntPtr pDev);