diff --git a/hw/xfree86/xkb/xkbKillSrv.c b/hw/xfree86/xkb/xkbKillSrv.c
index d03674a943..26bc93b72c 100644
--- a/hw/xfree86/xkb/xkbKillSrv.c
+++ b/hw/xfree86/xkb/xkbKillSrv.c
@@ -34,11 +34,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>
 
 #include "xf86.h"
 
diff --git a/hw/xfree86/xkb/xkbPrivate.c b/hw/xfree86/xkb/xkbPrivate.c
index 779fda187e..6e4a8d24ec 100644
--- a/hw/xfree86/xkb/xkbPrivate.c
+++ b/hw/xfree86/xkb/xkbPrivate.c
@@ -7,9 +7,10 @@
 
 #include <stdio.h>
 #include <X11/X.h>
-#include "windowstr.h"
-#include <xkbsrv.h>
 
+#include "xkb/xkbsrv_priv.h"
+
+#include "windowstr.h"
 #include "os.h"
 #include "xf86.h"
 
diff --git a/hw/xfree86/xkb/xkbVT.c b/hw/xfree86/xkb/xkbVT.c
index 463ff2362b..842ce936f1 100644
--- a/hw/xfree86/xkb/xkbVT.c
+++ b/hw/xfree86/xkb/xkbVT.c
@@ -34,11 +34,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>
 
 #include "xf86.h"
 
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 96ba07c583..6ecad2f721 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -557,21 +557,6 @@ extern _X_EXPORT void XkbDDXUpdateDeviceIndicators(DeviceIntPtr /* dev */ ,
                                                    CARD32       /* newState */
     );
 
-extern _X_EXPORT int XkbDDXTerminateServer(DeviceIntPtr /* dev */ ,
-                                           KeyCode /* key */ ,
-                                           XkbAction *  /* act */
-    );
-
-extern _X_EXPORT int XkbDDXSwitchScreen(DeviceIntPtr /* dev */ ,
-                                        KeyCode /* key */ ,
-                                        XkbAction *     /* act */
-    );
-
-extern _X_EXPORT int XkbDDXPrivate(DeviceIntPtr /* dev */ ,
-                                   KeyCode /* key */ ,
-                                   XkbAction *  /* act */
-    );
-
 extern _X_EXPORT void XkbDisableComputedAutoRepeats(DeviceIntPtr /* pXDev */ ,
                                                     unsigned int        /* key */
     );
diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c
index e4531388c2..4aa5448fa9 100644
--- a/xkb/ddxKillSrv.c
+++ b/xkb/ddxKillSrv.c
@@ -30,10 +30,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
+
+#include "xkb/xkbsrv_priv.h"
+
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <xkbsrv.h>
 
 int
 XkbDDXTerminateServer(DeviceIntPtr dev, KeyCode key, XkbAction *act)
diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c
index 26faaa5638..9ecd23f0ba 100644
--- a/xkb/ddxPrivate.c
+++ b/xkb/ddxPrivate.c
@@ -2,8 +2,10 @@
 #include <dix-config.h>
 
 #include <X11/X.h>
+
+#include "xkb/xkbsrv_priv.h"
+
 #include "windowstr.h"
-#include <xkbsrv.h>
 
 int
 XkbDDXPrivate(DeviceIntPtr dev, KeyCode key, XkbAction *act)
diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c
index 91b6900716..9a10d13101 100644
--- a/xkb/ddxVT.c
+++ b/xkb/ddxVT.c
@@ -30,10 +30,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
+
+#include "xkb/xkbsrv_priv.h"
+
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <xkbsrv.h>
 
 int
 XkbDDXSwitchScreen(DeviceIntPtr dev, KeyCode key, XkbAction *act)
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 408a62c7c0..7814cd322d 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -132,6 +132,11 @@ void AccessXCancelRepeatKey(XkbSrvInfoPtr xkbi, KeyCode key);
 void AccessXComputeCurveFactor(XkbSrvInfoPtr xkbi, XkbControlsPtr ctrls);
 int XkbDDXAccessXBeep(DeviceIntPtr dev, unsigned int what, unsigned int which);
 
+/* DDX entry points - DDX needs to implement these */
+int XkbDDXTerminateServer(DeviceIntPtr dev, KeyCode key, XkbAction *act);
+int XkbDDXSwitchScreen(DeviceIntPtr dev, KeyCode key, XkbAction *act);
+int XkbDDXPrivate(DeviceIntPtr dev, KeyCode key, XkbAction *act);
+
 /* client resources */
 XkbInterestPtr XkbFindClientResource(DevicePtr inDev, ClientPtr client);
 XkbInterestPtr XkbAddClientResource(DevicePtr inDev, ClientPtr client, XID id);