diff --git a/dix/getevents.c b/dix/getevents.c
index a81a201b2..465747287 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -41,7 +41,6 @@
 #include <X11/extensions/XKBproto.h>
 
 #include "dix/input_priv.h"
-#include "mi/mi_priv.h"
 
 #include "misc.h"
 #include "resource.h"
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index bab6096b1..a41c5b341 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -17,6 +17,7 @@ is" without express or implied warranty.
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 
+#include "mi/mi.h"
 #include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
 
diff --git a/mi/mi.h b/mi/mi.h
index 10432a71a..b7b320d2c 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -113,6 +113,14 @@ miDoCopy(DrawablePtr pSrcDrawable,
          int xOut,
          int yOut, miCopyProc copyProc, Pixel bitplane, void *closure);
 
+/* micursor.c */
+
+extern _X_EXPORT void miRecolorCursor(DeviceIntPtr /* pDev */ ,
+                                      ScreenPtr /*pScr */ ,
+                                      CursorPtr /*pCurs */ ,
+                                      Bool      /*displayed */
+    );
+
 /* midash.c */
 
 extern _X_EXPORT void miStepDash(int /*dist */ ,
diff --git a/mi/micmap.c b/mi/micmap.c
index 8c132335c..6d2abf63a 100644
--- a/mi/micmap.c
+++ b/mi/micmap.c
@@ -33,7 +33,7 @@
 #include <X11/Xproto.h>
 
 #include "dix/colormap_priv.h"
-
+#include "os/osdep.h"
 #include "scrnintstr.h"
 #include "colormapst.h"
 #include "resource.h"
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 4fd0a0c11..0571f1627 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -115,10 +115,6 @@ static void miPointerMoveNoEvent(DeviceIntPtr pDev, ScreenPtr pScreen, int x,
 
 static InternalEvent *mipointermove_events;   /* for WarpPointer MotionNotifies */
 
-static void
-miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr,
-                CursorPtr pCurs, Bool displayed);
-
 Bool
 miPointerInitialize(ScreenPtr pScreen,
                     miPointerSpriteFuncPtr spriteFuncs,
@@ -299,7 +295,7 @@ miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr pScreen,
     return TRUE;
 }
 
-static void
+void
 miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr,
                 CursorPtr pCurs, Bool displayed)
 {