diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index caac5c078..09cbac6f1 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -43,8 +43,8 @@
 
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
+#include "mi/mi_priv.h"
 
-#include "mi.h"
 #include "os.h"
 #include "servermd.h"
 #include "pixmapstr.h"
diff --git a/mi/mi.h b/mi/mi.h
index 670b3e606..4e01e9efe 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 mieqAddCallbackOnDrained(CallbackProcPtr callback,
-                                               void *param);
-
 extern _X_EXPORT void mieqRemoveCallbackOnDrained(CallbackProcPtr callback,
                                                   void *param);
 
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index fa6205131..2a2a8b617 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -9,6 +9,7 @@
 #include <X11/Xprotostr.h>
 
 #include "dix/screenint_priv.h"
+#include "include/callback.h"
 #include "include/events.h"
 #include "include/gc.h"
 #include "include/pixmap.h"
@@ -27,5 +28,6 @@ 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);
+void mieqAddCallbackOnDrained(CallbackProcPtr callback, void *param);
 
 #endif /* _XSERVER_MI_PRIV_H */