diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 47ed8ec1e..db133242e 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -236,31 +236,6 @@ extern _X_EXPORT void XkbFreeNames(XkbDescPtr /* xkb */ ,
                                    Bool /* freeMap */
     );
 
-extern _X_EXPORT int _XkbLookupAnyDevice(DeviceIntPtr *pDev,
-                                         int id,
-                                         ClientPtr client,
-                                         Mask access_mode, int *xkb_err);
-
-extern _X_EXPORT int _XkbLookupKeyboard(DeviceIntPtr *pDev,
-                                        int id,
-                                        ClientPtr client,
-                                        Mask access_mode, int *xkb_err);
-
-extern _X_EXPORT int _XkbLookupBellDevice(DeviceIntPtr *pDev,
-                                          int id,
-                                          ClientPtr client,
-                                          Mask access_mode, int *xkb_err);
-
-extern _X_EXPORT int _XkbLookupLedDevice(DeviceIntPtr *pDev,
-                                         int id,
-                                         ClientPtr client,
-                                         Mask access_mode, int *xkb_err);
-
-extern _X_EXPORT int _XkbLookupButtonDevice(DeviceIntPtr *pDev,
-                                            int id,
-                                            ClientPtr client,
-                                            Mask access_mode, int *xkb_err);
-
 extern _X_EXPORT XkbDescPtr XkbAllocKeyboard(void
     );
 
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 39f4d56e0..42e3618c6 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -171,4 +171,16 @@ void XkbSendExtensionDeviceNotify(DeviceIntPtr kbd, ClientPtr client,
 void XkbSendNotification(DeviceIntPtr kbd, XkbChangesPtr pChanges,
                          XkbEventCausePtr cause);
 
+/* device lookup */
+int _XkbLookupAnyDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
+                        Mask access_mode, int *xkb_err);
+int _XkbLookupKeyboard(DeviceIntPtr *pDev, int id, ClientPtr client,
+                       Mask access_mode, int *xkb_err);
+int _XkbLookupBellDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
+                         Mask access_mode, int *xkb_err);
+int _XkbLookupLedDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
+                        Mask access_mode, int *xkb_err);
+int _XkbLookupButtonDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
+                           Mask access_mode, int *xkb_err);
+
 #endif /* _XSERVER_XKBSRV_PRIV_H_ */