diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 844b66c83..af3643374 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -213,13 +213,6 @@ extern _X_EXPORT void XkbApplyMappingChange(DeviceIntPtr /* pXDev */ ,
                                             ClientPtr   /* client */
     );
 
-extern _X_EXPORT Bool XkbEnableDisableControls(XkbSrvInfoPtr /* xkbi */ ,
-                                               unsigned long /* change */ ,
-                                               unsigned long /* newValues */ ,
-                                               XkbChangesPtr /* changes */ ,
-                                               XkbEventCausePtr /* cause */
-    );
-
 extern _X_EXPORT void XkbDDXChangeControls(DeviceIntPtr /* dev */ ,
                                            XkbControlsPtr /* old */ ,
                                            XkbControlsPtr       /* new */
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 52164ae30..d5443f9be 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -156,6 +156,9 @@ void XkbHandleBell(BOOL force, BOOL eventOnly, DeviceIntPtr kbd, CARD8 percent,
                    ClientPtr pClient);
 void XkbHandleActions(DeviceIntPtr dev, DeviceIntPtr kbd, DeviceEvent *event);
 void XkbProcessKeyboardEvent(DeviceEvent *event, DeviceIntPtr keybd);
+Bool XkbEnableDisableControls(XkbSrvInfoPtr xkbi, unsigned long change,
+                              unsigned long newValues, XkbChangesPtr changes,
+                              XkbEventCausePtr cause);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;