diff --git a/mi/mi.h b/mi/mi.h
index f2c925fe8..aa7e7fa02 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -127,6 +127,12 @@ extern _X_EXPORT RegionPtr miHandleExposures(DrawablePtr /*pSrcDrawable */ ,
                                              int /*dsty */
     );
 
+extern _X_EXPORT void miSendExposures(WindowPtr /*pWin */ ,
+                                      RegionPtr /*pRgn */ ,
+                                      int /*dx */ ,
+                                      int       /*dy */
+    );
+
 extern _X_EXPORT void miWindowExposures(WindowPtr /*pWin */ ,
                                         RegionPtr /*prgn */);
 
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 56b3e985b..43352b68c 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -13,9 +13,7 @@
 #include "include/events.h"
 #include "include/gc.h"
 #include "include/pixmap.h"
-#include "include/regionstr.h"
 #include "include/screenint.h"
-#include "include/window.h"
 #include "mi/mi.h"
 
 void miScreenClose(ScreenPtr pScreen);
@@ -42,6 +40,4 @@ typedef void (*mieqHandler) (int screen, InternalEvent *event,
                              DeviceIntPtr dev);
 void mieqSetHandler(int event, mieqHandler handler);
 
-void miSendExposures(WindowPtr pWin, RegionPtr pRgn, int dx, int dy);
-
 #endif /* _XSERVER_MI_PRIV_H */
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 4af84310c..6f834854a 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -74,12 +74,10 @@ Equipment Corporation.
 #include <dix-config.h>
 
 #include <X11/X.h>
-#include <X11/Xmd.h>
 #include <X11/Xproto.h>
 #include <X11/Xprotostr.h>
 
 #include "dix/dix_priv.h"
-#include "mi/mi_priv.h"
 
 #include "misc.h"
 #include "regionstr.h"
@@ -88,7 +86,11 @@ Equipment Corporation.
 #include "windowstr.h"
 #include "pixmap.h"
 #include "input.h"
+
 #include "dixstruct.h"
+#include "mi.h"
+#include <X11/Xmd.h>
+
 #include "globals.h"
 
 #ifdef XINERAMA
diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c
index ddb1cf607..b57018242 100644
--- a/miext/rootless/rootlessScreen.c
+++ b/miext/rootless/rootlessScreen.c
@@ -37,8 +37,8 @@
 #include <string.h>
 
 #include "dix/colormap_priv.h"
-#include "mi/mi_priv.h"
 
+#include "mi.h"
 #include "scrnintstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index f1cdec307..f089448ad 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -35,12 +35,9 @@
 #include <limits.h>             /* For CHAR_BIT */
 #include <assert.h>
 #include <X11/Xatom.h>
-
-#include "mi/mi_priv.h"
-#include "dix_priv.h"
-
 #ifdef __APPLE__
 #include <Xplugin.h>
+#include "mi.h"
 #include "pixmapstr.h"
 #include "windowstr.h"
 //#include <X11/extensions/applewm.h>