diff --git a/mi/mi.h b/mi/mi.h
index 380a380c9..89870d523 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -258,13 +258,6 @@ extern _X_EXPORT Bool miScreenInit(ScreenPtr pScreen,
 
 /* mivaltree.c */
 
-extern _X_EXPORT int miShapedWindowIn(RegionPtr /*universe */ ,
-                                      RegionPtr /*bounding */ ,
-                                      BoxPtr /*rect */ ,
-                                      int /*x */ ,
-                                      int       /*y */
-    );
-
 extern _X_EXPORT int miValidateTree(WindowPtr /*pParent */ ,
                                     WindowPtr /*pChild */ ,
                                     VTKind      /*kind */
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index bb2c3d413..865fe2b56 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -49,5 +49,7 @@ void miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what);
 void miSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h,
                       unsigned int subWindowMode);
 Bool miCreateScreenResources(ScreenPtr pScreen);
+int miShapedWindowIn(RegionPtr universe, RegionPtr bounding, BoxPtr rect,
+                     int x, int y);
 
 #endif /* _XSERVER_MI_PRIV_H */
diff --git a/mi/mivaltree.c b/mi/mivaltree.c
index 0dff150c2..edab5dc1b 100644
--- a/mi/mivaltree.c
+++ b/mi/mivaltree.c
@@ -91,10 +91,12 @@ Equipment Corporation.
 #include <dix-config.h>
 
 #include    <X11/X.h>
+
+#include    "mi/mi_priv.h"
+
 #include    "scrnintstr.h"
 #include    "validate.h"
 #include    "windowstr.h"
-#include    "mi.h"
 #include    "regionstr.h"
 #include    "mivalidate.h"
 #include    "globals.h"
diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c
index e311021db..beacff99f 100644
--- a/miext/rootless/rootlessValTree.c
+++ b/miext/rootless/rootlessValTree.c
@@ -92,11 +92,13 @@ Equipment Corporation.
 #include <dix-config.h>
 
 #include <stddef.h>             /* For NULL */
-#include    <X11/X.h>
+#include <X11/X.h>
+
+#include "mi/mi_priv.h"
+
 #include    "scrnintstr.h"
 #include    "validate.h"
 #include    "windowstr.h"
-#include    "mi.h"
 #include    "regionstr.h"
 #include    "mivalidate.h"