diff --git a/mi/mi.h b/mi/mi.h
index d0c50a35d..c2a1c4a10 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -67,11 +67,6 @@ typedef struct _miDash *miDashPtr;
 
 /* miarc.c */
 
-extern _X_EXPORT void miWideArc(DrawablePtr pDraw,
-                                GCPtr pGC,
-                                int narcs,
-                                xArc * parcs);
-
 extern _X_EXPORT void miPolyArc(DrawablePtr /*pDraw */ ,
                                 GCPtr /*pGC */ ,
                                 int /*narcs */ ,
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 26c9d158f..7711d4255 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -5,8 +5,15 @@
 #ifndef _XSERVER_MI_PRIV_H
 #define _XSERVER_MI_PRIV_H
 
-#include "screenint.h"
+#include <X11/Xprotostr.h>
+
+#include "include/gc.h"
+#include "include/pixmap.h"
+#include "include/screenint.h"
+#include "mi/mi.h"
 
 void miScreenClose(ScreenPtr pScreen);
 
+void miWideArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs);
+
 #endif /* _XSERVER_MI_PRIV_H */
diff --git a/mi/miarc.c b/mi/miarc.c
index 602ccbf76..9ea4a6155 100644
--- a/mi/miarc.c
+++ b/mi/miarc.c
@@ -51,15 +51,17 @@ SOFTWARE.
 #include <math.h>
 #include <X11/X.h>
 #include <X11/Xprotostr.h>
+#include <X11/Xfuncproto.h>
+
+#include "mi/mi_priv.h"
+
 #include "misc.h"
 #include "gcstruct.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "windowstr.h"
 #include "mifpoly.h"
-#include "mi.h"
 #include "mifillarc.h"
-#include <X11/Xfuncproto.h>
 
 #define EPSILON	0.000001
 #define ISEQUAL(a,b) (fabs((a) - (b)) <= EPSILON)
diff --git a/mi/mizerarc.c b/mi/mizerarc.c
index ca2cb4087..90dde9f8b 100644
--- a/mi/mizerarc.c
+++ b/mi/mizerarc.c
@@ -37,10 +37,12 @@ Author:  Bob Scheifler, MIT X Consortium
 #include <math.h>
 #include <X11/X.h>
 #include <X11/Xprotostr.h>
+
+#include "mi/mi_priv.h"
+
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
-#include "mi.h"
 #include "mizerarc.h"
 
 #define FULLCIRCLE (360 * 64)