diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 2a21381c3..4ea23bd20 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -506,10 +506,6 @@ extern _X_EXPORT void XkbHandleBell(BOOL force,
                                     ClientPtr pClient
     );
 
-extern _X_EXPORT void XkbSendAccessXNotify(DeviceIntPtr /* kbd */ ,
-                                           xkbAccessXNotify *   /* pEv */
-    );
-
 extern _X_EXPORT void XkbSendNamesNotify(DeviceIntPtr /* kbd */ ,
                                          xkbNamesNotify *       /* ev */
     );
@@ -544,25 +540,6 @@ extern _X_EXPORT Bool XkbEnableDisableControls(XkbSrvInfoPtr /* xkbi */ ,
                                                XkbEventCausePtr /* cause */
     );
 
-extern _X_EXPORT void AccessXInit(DeviceIntPtr  /* dev */
-    );
-
-extern _X_EXPORT Bool AccessXFilterPressEvent(DeviceEvent * /* event */ ,
-                                              DeviceIntPtr      /* keybd */
-    );
-
-extern _X_EXPORT Bool AccessXFilterReleaseEvent(DeviceEvent * /* event */ ,
-                                                DeviceIntPtr    /* keybd */
-    );
-
-extern _X_EXPORT void AccessXCancelRepeatKey(XkbSrvInfoPtr /* xkbi */ ,
-                                             KeyCode    /* key */
-    );
-
-extern _X_EXPORT void AccessXComputeCurveFactor(XkbSrvInfoPtr /* xkbi */ ,
-                                                XkbControlsPtr  /* ctrls */
-    );
-
 extern _X_EXPORT XkbInterestPtr XkbFindClientResource(DevicePtr /* inDev */ ,
                                                       ClientPtr /* client */
     );
@@ -576,11 +553,6 @@ extern _X_EXPORT int XkbRemoveResourceClient(DevicePtr /* inDev */ ,
                                              XID        /* id */
     );
 
-extern _X_EXPORT int XkbDDXAccessXBeep(DeviceIntPtr /* dev */ ,
-                                       unsigned int /* what */ ,
-                                       unsigned int     /* which */
-    );
-
 extern _X_EXPORT int XkbDDXUsesSoftRepeat(DeviceIntPtr  /* dev */
     );
 
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 46b961734..701d287b5 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -123,4 +123,13 @@ extern const char *XkbBaseDirectory;
 extern const char *XkbBinDirectory;
 extern CARD32 xkbDebugFlags;
 
+/* AccessX functions */
+void XkbSendAccessXNotify(DeviceIntPtr kbd, xkbAccessXNotify *pEv);
+void AccessXInit(DeviceIntPtr dev);
+Bool AccessXFilterPressEvent(DeviceEvent *event, DeviceIntPtr keybd);
+Bool AccessXFilterReleaseEvent(DeviceEvent *event, DeviceIntPtr keybd);
+void AccessXCancelRepeatKey(XkbSrvInfoPtr xkbi, KeyCode key);
+void AccessXComputeCurveFactor(XkbSrvInfoPtr xkbi, XkbControlsPtr ctrls);
+int XkbDDXAccessXBeep(DeviceIntPtr dev, unsigned int what, unsigned int which);
+
 #endif /* _XSERVER_XKBSRV_PRIV_H_ */