diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index b438c0b2c..b06f57bef 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -228,9 +228,6 @@ extern _X_EXPORT void XkbFreeRMLVOSet(XkbRMLVOSet * /* rmlvo */ ,
 extern _X_EXPORT Bool XkbCopyDeviceKeymap(DeviceIntPtr /* dst */,
 					  DeviceIntPtr /* src */);
 
-extern _X_EXPORT void XkbCopyControls(XkbDescPtr /* dst */ ,
-                                      XkbDescPtr /* src */ );
-
 #include "xkbstr.h"
 #include "xkbrules.h"
 
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 8e385070c..a489a371a 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -173,6 +173,7 @@ Bool XkbApplyCompatMapToKey(XkbDescPtr xkb, KeyCode key, XkbChangesPtr changes);
 Bool XkbApplyVirtualModChanges(XkbDescPtr xkb, unsigned int changed,
                                XkbChangesPtr changes);
 Bool XkbDeviceApplyKeymap(DeviceIntPtr dst, XkbDescPtr src);
+void XkbCopyControls(XkbDescPtr dst, XkbDescPtr src);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;