diff --git a/mi/mipointer.h b/mi/mipointer.h
index 59c16aaee..5a5275044 100644
--- a/mi/mipointer.h
+++ b/mi/mipointer.h
@@ -90,10 +90,6 @@ extern _X_EXPORT ScreenPtr
 miPointerSetPosition(DeviceIntPtr pDev, int mode, double *x, double *y,
                      int *nevents, InternalEvent *events);
 
-/* Sets whether the sprite should be updated immediately on pointer moves */
-extern _X_EXPORT Bool
-miPointerSetWaitForUpdate(ScreenPtr pScreen, Bool wait);
-
 extern _X_EXPORT DevPrivateKeyRec miPointerPrivKeyRec;
 
 #define miPointerPrivKey (&miPointerPrivKeyRec)
diff --git a/mi/mipointer_priv.h b/mi/mipointer_priv.h
index 4e3dc61d9..8a218d857 100644
--- a/mi/mipointer_priv.h
+++ b/mi/mipointer_priv.h
@@ -22,4 +22,7 @@ void miPointerUpdateSprite(DeviceIntPtr pDev);
   */
 void miPointerInvalidateSprite(DeviceIntPtr pDev);
 
+/* Sets whether the sprite should be updated immediately on pointer moves */
+Bool miPointerSetWaitForUpdate(ScreenPtr pScreen, Bool wait);
+
 #endif /* _XSERVER_MI_MIPOINTER_PRIV_H */
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 64801a42f..9474f29ff 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -29,6 +29,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <ctype.h>
 #include <stdio.h>
 #include <math.h>
+#include <ctype.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
@@ -37,6 +38,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "dix/dix_priv.h"
 #include "dix/dixgrabs_priv.h"
 #include "dix/input_priv.h"
+#include "mi/mipointer_priv.h"
 #include "xkb/xkbsrv_priv.h"
 
 #include "misc.h"