diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index ca0a54b32..70933b000 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -395,23 +395,11 @@ extern _X_EXPORT Bool XkbEnableDisableControls(XkbSrvInfoPtr /* xkbi */ ,
                                                XkbEventCausePtr /* cause */
     );
 
-extern _X_EXPORT int XkbDDXUsesSoftRepeat(DeviceIntPtr  /* dev */
-    );
-
-extern _X_EXPORT void XkbDDXKeybdCtrlProc(DeviceIntPtr /* dev */ ,
-                                          KeybdCtrl *   /* ctrl */
-    );
-
 extern _X_EXPORT void XkbDDXChangeControls(DeviceIntPtr /* dev */ ,
                                            XkbControlsPtr /* old */ ,
                                            XkbControlsPtr       /* new */
     );
 
-extern _X_EXPORT void XkbDDXUpdateDeviceIndicators(DeviceIntPtr /* dev */ ,
-                                                   XkbSrvLedInfoPtr /* sli */ ,
-                                                   CARD32       /* newState */
-    );
-
 extern _X_EXPORT void XkbDisableComputedAutoRepeats(DeviceIntPtr /* pXDev */ ,
                                                     unsigned int        /* key */
     );
@@ -489,22 +477,4 @@ extern _X_EXPORT void XkbCopyControls(XkbDescPtr /* dst */ ,
 #include "xkbstr.h"
 #include "xkbrules.h"
 
-extern _X_EXPORT unsigned int XkbDDXLoadKeymapByNames(DeviceIntPtr /* keybd */ ,
-                                                      XkbComponentNamesPtr
-                                                      /* names */ ,
-                                                      unsigned int /* want */ ,
-                                                      unsigned int /* need */ ,
-                                                      XkbDescPtr *
-                                                      /* finfoRtrn */ ,
-                                                      char *
-                                                      /* keymapNameRtrn */ ,
-                                                      int       /* keymapNameRtrnLen */
-    );
-
-extern _X_EXPORT Bool XkbDDXNamesFromRules(DeviceIntPtr /* keybd */ ,
-                                           const char * /* rules */ ,
-                                           XkbRF_VarDefsPtr /* defs */ ,
-                                           XkbComponentNamesPtr /* names */
-    );
-
 #endif                          /* _XKBSRV_H_ */
diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c
index e542a37f1..127e04d25 100644
--- a/xkb/ddxCtrls.c
+++ b/xkb/ddxCtrls.c
@@ -30,11 +30,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
+#include <X11/extensions/XI.h>
+
+#include "xkb/xkbsrv_priv.h"
+
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <xkbsrv.h>
-#include <X11/extensions/XI.h>
 
 void
 XkbDDXKeybdCtrlProc(DeviceIntPtr dev, KeybdCtrl * ctrl)
diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c
index e6520ea76..a1e119489 100644
--- a/xkb/ddxLEDs.c
+++ b/xkb/ddxLEDs.c
@@ -30,11 +30,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
+#include <X11/extensions/XI.h>
+
+#include "xkb/xkbsrv_priv.h"
+
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <xkbsrv.h>
-#include <X11/extensions/XI.h>
 
 static void
 XkbDDXUpdateIndicators(DeviceIntPtr dev, CARD32 new)
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 1705375f5..68edb45c2 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -221,4 +221,18 @@ void XkbFlushLedEvents(DeviceIntPtr dev, DeviceIntPtr kbd, XkbSrvLedInfoPtr sli,
                        xkbExtensionDeviceNotify *ed, XkbChangesPtr changes,
                        XkbEventCausePtr cause);
 
+/* XkbDDX* functions */
+unsigned int XkbDDXLoadKeymapByNames(DeviceIntPtr keybd,
+                                     XkbComponentNamesPtr names,
+                                     unsigned int want,
+                                     unsigned int need,
+                                     XkbDescPtr *finfoRtrn,
+                                     char *keymapNameRtrn,
+                                     int keymapNameRtrnLen);
+Bool XkbDDXNamesFromRules(DeviceIntPtr keybd, const char *rules,
+                          XkbRF_VarDefsPtr defs, XkbComponentNamesPtr names);
+int XkbDDXUsesSoftRepeat(DeviceIntPtr dev);
+void XkbDDXKeybdCtrlProc(DeviceIntPtr dev, KeybdCtrl *ctrl);
+void XkbDDXUpdateDeviceIndicators(DeviceIntPtr dev, XkbSrvLedInfoPtr sli,
+                                  CARD32 newState);
 #endif /* _XSERVER_XKBSRV_PRIV_H_ */