diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 110d5d5a6..9ed18f6c6 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -205,10 +205,6 @@ extern _X_EXPORT void XkbFreeKeyboard(XkbDescPtr /* xkb */ ,
                                       Bool      /* freeDesc */
     );
 
-extern _X_EXPORT void XkbFreeComponentNames(XkbComponentNamesPtr /* names */ ,
-                                            Bool        /* freeNames */
-    );
-
 extern _X_EXPORT void XkbSetActionKeyMods(XkbDescPtr /* xkb */ ,
                                           XkbAction * /* act */ ,
                                           unsigned int  /* mods */
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index bf68e2b9a..8b340580f 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -126,6 +126,7 @@ int XkbAllocControls(XkbDescPtr xkb, unsigned int which);
 int XkbCopyKeyTypes(XkbKeyTypePtr from, XkbKeyTypePtr into, int num_types);
 int XkbResizeKeyType(XkbDescPtr xkb, int type_ndx, int map_count,
                      Bool want_preserve, int new_num_lvls);
+void XkbFreeComponentNames(XkbComponentNamesPtr names, Bool freeNames);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;