diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c
index 9a2ef87ab..f768b10fd 100644
--- a/Xi/grabdevb.c
+++ b/Xi/grabdevb.c
@@ -56,6 +56,7 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
index 7668735ea..5f9e8284b 100644
--- a/Xi/grabdevk.c
+++ b/Xi/grabdevk.c
@@ -56,6 +56,7 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
diff --git a/dix/input_priv.h b/dix/input_priv.h
index cf9f12f20..2ce785f4a 100644
--- a/dix/input_priv.h
+++ b/dix/input_priv.h
@@ -428,4 +428,13 @@ extern CallbackListPtr DeviceEventCallback;
 DeviceIntPtr PickPointer(ClientPtr pClient)
     _X_ATTRIBUTE_NONNULL_ARG(1);
 
+/*
+ * @brief pick an appropriate keyboard for the given client
+ *
+ * searching the list of devices for the keyboard device that is
+ * paired with the client's pointer.
+ */
+DeviceIntPtr PickKeyboard(ClientPtr client)
+    _X_ATTRIBUTE_NONNULL_ARG(1);
+
 #endif /* _XSERVER_INPUT_PRIV_H */
diff --git a/include/dix.h b/include/dix.h
index 0695a5971..7c4ba4dc0 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -260,9 +260,6 @@ WriteEventsToClient(ClientPtr /*pClient */ ,
                     int /*count */ ,
                     xEventPtr /*events */ );
 
-extern _X_EXPORT DeviceIntPtr
-PickKeyboard(ClientPtr /* client */ );
-
 /*
  *  ServerGrabCallback stuff
  */
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index cfe9ba11c..05177bc1b 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -34,6 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/XIproto.h>
 
 #include "dix/exevents_priv.h"
+#include "dix/input_priv.h"
 
 #include "inputstr.h"
 #include "exglobals.h"