diff --git a/Xext/xtest.c b/Xext/xtest.c
index cfb70bafe..02df5f94c 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -38,6 +38,7 @@
 #include "dix/input_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
+#include "mi/mipointer_priv.h"
 #include "os/osdep.h"
 
 #include "misc.h"
diff --git a/Xi/xiwarppointer.c b/Xi/xiwarppointer.c
index daa56619b..5f32b18de 100644
--- a/Xi/xiwarppointer.c
+++ b/Xi/xiwarppointer.c
@@ -38,6 +38,7 @@
 
 #include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
+#include "mi/mipointer_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
diff --git a/mi/mieq.c b/mi/mieq.c
index bb15e2aa9..0d41324ee 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -37,8 +37,12 @@ in this Software without prior written authorization from The Open Group.
 #include   <X11/X.h>
 #include   <X11/Xmd.h>
 #include   <X11/Xproto.h>
+#include   <X11/extensions/XI.h>
+#include   <X11/extensions/XIproto.h>
+#include   <X11/extensions/geproto.h>
 
 #include   "dix/cursor_priv.h"
+#include   "mi/mipointer_priv.h"
 #include   "os/screensaver.h"
 
 #include   "misc.h"
@@ -49,9 +53,6 @@ in this Software without prior written authorization from The Open Group.
 #include   "mi.h"
 #include   "mipointer.h"
 #include   "scrnintstr.h"
-#include   <X11/extensions/XI.h>
-#include   <X11/extensions/XIproto.h>
-#include   <X11/extensions/geproto.h>
 #include   "extinit.h"
 #include   "exglobals.h"
 #include   "eventstr.h"
diff --git a/mi/mipointer.h b/mi/mipointer.h
index 77230ab2e..58de5123b 100644
--- a/mi/mipointer.h
+++ b/mi/mipointer.h
@@ -90,9 +90,6 @@ extern _X_EXPORT ScreenPtr
 miPointerSetPosition(DeviceIntPtr pDev, int mode, double *x, double *y,
                      int *nevents, InternalEvent *events);
 
-extern _X_EXPORT void
-miPointerUpdateSprite(DeviceIntPtr pDev);
-
 /* Invalidate current sprite, forcing reload on next
  * sprite setting (window crossing, grab action, etc)
  */
diff --git a/mi/mipointer_priv.h b/mi/mipointer_priv.h
index 131e2fee1..a3fd8d74c 100644
--- a/mi/mipointer_priv.h
+++ b/mi/mipointer_priv.h
@@ -15,5 +15,6 @@ Bool miPointerInitialize(ScreenPtr pScreen, miPointerSpriteFuncPtr spriteFuncs,
                          miPointerScreenFuncPtr screenFuncs, Bool waitForUpdate);
 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);
 
 #endif /* _XSERVER_MI_MIPOINTER_PRIV_H */