diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 72b46dc5f..4939a5f5e 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -213,9 +213,6 @@ extern _X_EXPORT void XkbApplyMappingChange(DeviceIntPtr /* pXDev */ ,
                                             ClientPtr   /* client */
     );
 
-extern _X_EXPORT void XkbComputeDerivedState(XkbSrvInfoPtr      /* xkbi */
-    );
-
 extern _X_EXPORT void XkbCheckSecondaryEffects(XkbSrvInfoPtr /* xkbi */ ,
                                                unsigned int /* which */ ,
                                                XkbChangesPtr /* changes */ ,
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index cc73d6f82..db2ad4e01 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -145,6 +145,7 @@ void XkbUpdateIndicators(DeviceIntPtr keybd, CARD32 changed, Bool check_edevs,
 void XkbUpdateAllDeviceIndicators(XkbChangesPtr changes, XkbEventCausePtr cause);
 unsigned int XkbIndicatorsToUpdate(DeviceIntPtr dev, unsigned long state_changes,
                                    Bool enabled_ctrl_changes);
+void XkbComputeDerivedState(XkbSrvInfoPtr xkbi);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;