diff --git a/dix/window.c b/dix/window.c
index 573d195ab..f3823e823 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -104,6 +104,7 @@ Equipment Corporation.
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
 #include "dix/property_priv.h"
+#include "mi/mi_priv.h"         /* miPaintWindow */
 #include "os/auth.h"
 #include "os/client_priv.h"
 #include "os/screensaver.h"
@@ -129,7 +130,6 @@ Equipment Corporation.
 #endif
 #include "dixevents.h"
 #include "globals.h"
-#include "mi.h"                 /* miPaintWindow */
 #ifdef COMPOSITE
 #include "compint.h"
 #endif
diff --git a/mi/mi.h b/mi/mi.h
index 7f256bac5..e0eef7f28 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -127,11 +127,6 @@ extern _X_EXPORT RegionPtr miHandleExposures(DrawablePtr /*pSrcDrawable */ ,
                                              int /*dsty */
     );
 
-extern _X_EXPORT void miPaintWindow(WindowPtr /*pWin */ ,
-                                    RegionPtr /*prgn */ ,
-                                    int /*what */
-    );
-
 extern _X_EXPORT void miClearDrawable(DrawablePtr /*pDraw */ ,
                                       GCPtr     /*pGC */
     );
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 74621f5a0..360820146 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -45,4 +45,6 @@ void mieqSetHandler(int event, mieqHandler handler);
 void miSendExposures(WindowPtr pWin, RegionPtr pRgn, int dx, int dy);
 void miWindowExposures(WindowPtr pWin, RegionPtr prgn);
 
+void miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what);
+
 #endif /* _XSERVER_MI_PRIV_H */