diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 3d94871dc..8b4b99d61 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -49,6 +49,7 @@
 #include "inpututils.h"
 #include "optionstr.h"
 
+#include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
 #include "os/cmdline.h"
 
diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c
index ca451604d..447f23931 100644
--- a/hw/vfb/InitInput.c
+++ b/hw/vfb/InitInput.c
@@ -29,14 +29,16 @@ from The Open Group.
 #include <dix-config.h>
 
 #include <X11/X.h>
-#include "mi.h"
 #include <X11/Xproto.h>
+#include <X11/Xos.h>
+#include <X11/keysym.h>
+
+#include "mi/mi_priv.h"
+
 #include "scrnintstr.h"
 #include "inputstr.h"
-#include <X11/Xos.h>
 #include "mipointer.h"
 #include "xkbsrv.h"
-#include <X11/keysym.h>
 #include "xserver-properties.h"
 #include "exevents.h"
 #include "extinit.h"
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 52cf2de56..7346bbcb1 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -52,6 +52,7 @@
 #include "config/dbus-core.h"
 #include "dix/input_priv.h"
 #include "dix/screenint_priv.h"
+#include "mi/mi_priv.h"
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
@@ -59,7 +60,6 @@
 #include "servermd.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
-#include "mi.h"
 #include "systemd-logind.h"
 #include "loaderProcs.h"
 
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 5754a90ee..95b271777 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -22,6 +22,7 @@ is" without express or implied warranty.
 #include <X11/fonts/libxfont2.h>
 
 #include "dix/screenint_priv.h"
+#include "mi/mi_priv.h"
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
 
@@ -31,7 +32,6 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "servermd.h"
-#include "mi.h"
 #include "dixfontstr.h"
 #include "extinit_priv.h"
 #include "Xnest.h"
diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index ea5693be1..35e33bab1 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -45,13 +45,15 @@
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
+
+#include "mi/mi_priv.h"
+
 #include "misc.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
 #include "inputstr.h"
 #include "inpututils.h"
 #include "eventstr.h"
-#include "mi.h"
 #include "scrnintstr.h"
 #include "mipointer.h"
 #include "os.h"
diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index 144ff0fc6..e354dd8e8 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -32,13 +32,13 @@
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
+#include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
 
 #include <inputstr.h>
 #include <xkbsrv.h>
 #include <xserver-properties.h>
 #include <inpututils.h>
-#include <mi.h>
 #include <mipointer.h>
 #include <mipointrst.h>
 #include <misc.h>
diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c
index 6aced4f9c..c50464a60 100644
--- a/hw/xwin/InitInput.c
+++ b/hw/xwin/InitInput.c
@@ -29,6 +29,9 @@
 #ifdef HAVE_XWIN_CONFIG_H
 #include <xwin-config.h>
 #endif
+
+#include "mi/mi_priv.h"
+
 #include "win.h"
 #include "dixstruct_priv.h"
 #include "inputstr.h"
diff --git a/mi/mi.h b/mi/mi.h
index e1d37a285..4f41fbe72 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -114,9 +114,6 @@ miDoCopy(DrawablePtr pSrcDrawable,
 typedef struct _DeviceRec *DevicePtr;
 #endif
 
-extern _X_EXPORT Bool mieqInit(void
-    );
-
 extern _X_EXPORT void mieqFini(void);
 
 extern _X_EXPORT void mieqEnqueue(DeviceIntPtr /*pDev */ ,
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index bd92ba171..90c231ed1 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -5,6 +5,7 @@
 #ifndef _XSERVER_MI_PRIV_H
 #define _XSERVER_MI_PRIV_H
 
+#include <X11/Xdefs.h>
 #include <X11/Xprotostr.h>
 
 #include "include/gc.h"
@@ -17,5 +18,6 @@ void miScreenClose(ScreenPtr pScreen);
 void miWideArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs);
 void miStepDash(int dist, int * pDashIndex, unsigned char * pDash,
                 int numInDashList, int *pDashOffset);
+Bool mieqInit(void);
 
 #endif /* _XSERVER_MI_PRIV_H */
diff --git a/mi/mieq.c b/mi/mieq.c
index bca6f8be7..852732b98 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -42,6 +42,7 @@ in this Software without prior written authorization from The Open Group.
 #include   <X11/extensions/geproto.h>
 
 #include   "dix/cursor_priv.h"
+#include   "mi/mi_priv.h"
 #include   "mi/mipointer_priv.h"
 #include   "os/screensaver.h"
 
@@ -50,7 +51,6 @@ in this Software without prior written authorization from The Open Group.
 #include   "pixmapstr.h"
 #include   "inputstr.h"
 #include   "inpututils.h"
-#include   "mi.h"
 #include   "mipointer.h"
 #include   "scrnintstr.h"
 #include   "extinit.h"
diff --git a/test/input.c b/test/input.c
index ef1d14cd9..39057c828 100644
--- a/test/input.c
+++ b/test/input.c
@@ -37,6 +37,7 @@
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
+#include "mi/mi_priv.h"
 
 #include "misc.h"
 #include "resource.h"
@@ -45,7 +46,6 @@
 #include "exglobals.h"
 #include "eventstr.h"
 #include "inpututils.h"
-#include "mi.h"
 #include "assert.h"
 
 #include "tests-common.h"