diff --git a/mi/mi.h b/mi/mi.h
index 101dfe468..7108f0432 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -264,6 +264,13 @@ 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 5722a7cbf..cb59a947b 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -48,7 +48,4 @@ void miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what);
 
 void miSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h,
                       unsigned int subWindowMode);
-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 edab5dc1b..0dff150c2 100644
--- a/mi/mivaltree.c
+++ b/mi/mivaltree.c
@@ -91,12 +91,10 @@ 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 beacff99f..e311021db 100644
--- a/miext/rootless/rootlessValTree.c
+++ b/miext/rootless/rootlessValTree.c
@@ -92,13 +92,11 @@ Equipment Corporation.
 #include <dix-config.h>
 
 #include <stddef.h>             /* For NULL */
-#include <X11/X.h>
-
-#include "mi/mi_priv.h"
-
+#include    <X11/X.h>
 #include    "scrnintstr.h"
 #include    "validate.h"
 #include    "windowstr.h"
+#include    "mi.h"
 #include    "regionstr.h"
 #include    "mivalidate.h"