diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index dc3ae4b16..864f4f94b 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -230,11 +230,6 @@ extern _X_EXPORT void XkbFreeRMLVOSet(XkbRMLVOSet * /* rmlvo */ ,
                                       Bool      /* freeRMLVO */
     );
 
-extern _X_EXPORT XkbGeometryPtr XkbLookupNamedGeometry(DeviceIntPtr /* dev */ ,
-                                                       Atom /* name */ ,
-                                                       Bool *   /* shouldFree */
-    );
-
 extern _X_EXPORT void XkbConvertCase(KeySym /* sym */ ,
                                      KeySym * /* lower */ ,
                                      KeySym *   /* upper */
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 294000334..4bfff3836 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -160,6 +160,7 @@ Bool XkbEnableDisableControls(XkbSrvInfoPtr xkbi, unsigned long change,
                               unsigned long newValues, XkbChangesPtr changes,
                               XkbEventCausePtr cause);
 void XkbDisableComputedAutoRepeats(DeviceIntPtr pXDev, unsigned int key);
+XkbGeometryPtr XkbLookupNamedGeometry(DeviceIntPtr dev, Atom name, Bool *shouldFree);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;