diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 0ce862fc9..2a595b6e3 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -59,17 +59,17 @@
 #include <X11/Xatom.h>
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-
-#include "dix/input_priv.h"
+#include <X11/keysym.h>
 
 #include "dix/dix_priv.h"
+#include "dix/input_priv.h"
+#include "mi/mi_priv.h"
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_os_support.h"
 #include "xf86_OSlib.h"
-#include <X11/keysym.h>
 
 #ifdef XFreeXDGA
 #include "dgaproc.h"
@@ -78,9 +78,7 @@
 
 #include "inputstr.h"
 #include "xf86Xinput.h"
-#include "mi.h"
 #include "mipointer.h"
-
 #include "xkbsrv.h"
 #include "xkbstr.h"
 
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index 09ac2b955..155296785 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -19,6 +19,7 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 
 #include "dix/cursor_priv.h"
+#include "mi/mi_priv.h"
 
 #include "screenint.h"
 #include "input.h"
@@ -28,7 +29,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "inputstr.h"
 #include "inpututils.h"
-#include "mi.h"
 
 #include "Xnest.h"
 
diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c
index 037ab1ecc..8956b859e 100644
--- a/hw/xwin/winkeybd.c
+++ b/hw/xwin/winkeybd.c
@@ -34,6 +34,9 @@
 #ifdef HAVE_XWIN_CONFIG_H
 #include <xwin-config.h>
 #endif
+
+#include "mi/mi_priv.h"
+
 #include "win.h"
 
 #include "dix/dix_priv.h"
diff --git a/mi/mi.h b/mi/mi.h
index d2858fe50..670b3e606 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -114,9 +114,6 @@ miDoCopy(DrawablePtr pSrcDrawable,
 typedef struct _DeviceRec *DevicePtr;
 #endif
 
-extern _X_EXPORT void mieqProcessInputEvents(void
-    );
-
 extern _X_EXPORT void mieqAddCallbackOnDrained(CallbackProcPtr callback,
                                                void *param);
 
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index d03ff0869..fa6205131 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -26,5 +26,6 @@ void mieqFini(void);
 void mieqEnqueue(DeviceIntPtr pDev, InternalEvent *e);
 void mieqSwitchScreen(DeviceIntPtr pDev, ScreenPtr pScreen, Bool set_dequeue_screen);
 void mieqProcessDeviceEvent(DeviceIntPtr dev, InternalEvent *event, ScreenPtr screen);
+void mieqProcessInputEvents(void);
 
 #endif /* _XSERVER_MI_PRIV_H */