diff --git a/Xext/xtest.c b/Xext/xtest.c
index 69ca1db08..13f550154 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -38,7 +38,6 @@
 #include "dix/input_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
-#include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
 #include "os/client_priv.h"
 #include "os/osdep.h"
@@ -52,6 +51,7 @@
 #include "scrnintstr.h"
 #include "dixevents.h"
 #include "sleepuntil.h"
+#include "mi.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
 #include "exglobals.h"
diff --git a/Xi/exevents.c b/Xi/exevents.c
index ae4268696..4dd675315 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -93,7 +93,6 @@ SOFTWARE.
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
-#include "mi/mi_priv.h"
 
 #include "inputstr.h"
 #include "windowstr.h"
@@ -109,6 +108,7 @@ SOFTWARE.
 #include "xiquerydevice.h"      /* For List*Info */
 #include "eventstr.h"
 #include "inpututils.h"
+#include "mi.h"
 #include "xkbsrv.h"
 
 #define WID(w) ((w) ? ((w)->drawable.id) : 0)
diff --git a/dix/devices.c b/dix/devices.c
index 740390207..85805231d 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
 #include "dix/ptrveloc_priv.h"
-#include "mi/mi_priv.h"
 #include "os/osdep.h"
 #include "xkb/xkbsrv_priv.h"
 
@@ -74,6 +73,7 @@ SOFTWARE.
 #include "ptrveloc.h"
 #include "privates.h"
 #include "xace.h"
+#include "mi.h"
 #include "dispatch.h"
 #include "swaprep.h"
 #include "dixevents.h"
diff --git a/dix/gestures.c b/dix/gestures.c
index 4889a145a..4810ce030 100644
--- a/dix/gestures.c
+++ b/dix/gestures.c
@@ -29,7 +29,6 @@
 #include "dix/dixgrabs_priv.h"
 #include "dix/eventconvert.h"
 #include "dix/input_priv.h"
-#include "mi/mi_priv.h"
 
 #include "inputstr.h"
 #include "scrnintstr.h"
@@ -38,6 +37,7 @@
 #include "exglobals.h"
 #include "inpututils.h"
 #include "windowstr.h"
+#include "mi.h"
 
 #define GESTURE_HISTORY_SIZE 100
 
diff --git a/dix/touch.c b/dix/touch.c
index 749454637..31011b059 100644
--- a/dix/touch.c
+++ b/dix/touch.c
@@ -31,7 +31,6 @@
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
-#include "mi/mi_priv.h"
 
 #include "inputstr.h"
 #include "scrnintstr.h"
@@ -39,6 +38,7 @@
 #include "exglobals.h"
 #include "inpututils.h"
 #include "windowstr.h"
+#include "mi.h"
 
 #define TOUCH_HISTORY_SIZE 100
 
diff --git a/mi/mi.h b/mi/mi.h
index d2858fe50..36c4fb179 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -114,6 +114,11 @@ miDoCopy(DrawablePtr pSrcDrawable,
 typedef struct _DeviceRec *DevicePtr;
 #endif
 
+extern _X_EXPORT void mieqProcessDeviceEvent(DeviceIntPtr /* dev */ ,
+                                             InternalEvent * /* event */ ,
+                                             ScreenPtr  /* screen */
+    );
+
 extern _X_EXPORT void mieqProcessInputEvents(void
     );
 
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index d03ff0869..bba4c9a29 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -25,6 +25,5 @@ Bool mieqInit(void);
 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);
 
 #endif /* _XSERVER_MI_PRIV_H */
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 260f453ee..8b48255c0 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -37,7 +37,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "dix/dix_priv.h"
 #include "dix/dixgrabs_priv.h"
 #include "dix/input_priv.h"
-#include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
 #include "xkb/xkbsrv_priv.h"
 
@@ -45,6 +44,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "exevents.h"
 #include "eventstr.h"
+#include "mi.h"
 #include "mipointer.h"
 #include "inpututils.h"