diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index e28d034bc..08989e1a4 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -209,8 +209,6 @@ typedef struct {
 
 #define	Status		int
 
-extern _X_EXPORT Bool XkbInitPrivates(void);
-
 extern _X_EXPORT void XkbSetExtension(DeviceIntPtr device,
                                       ProcessInputProc proc);
 
diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c
index 2e64c7556..59077f24b 100644
--- a/test/xi2/protocol-common.c
+++ b/test/xi2/protocol-common.c
@@ -33,13 +33,12 @@
 #include "dix/atom_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
+#include "xkb/xkbsrv_priv.h"    /* for XkbInitPrivates */
 
 #include "extinit_priv.h"
 #include "exglobals.h"
-#include "xkbsrv.h"             /* for XkbInitPrivates */
 #include "xserver-properties.h"
 #include "syncsrv.h"
-
 #include "protocol-common.h"
 
 struct devices devices;
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 15cbf2e20..0e414c084 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -113,6 +113,7 @@ void XkbMergeLockedPtrBtns(DeviceIntPtr master);
 void XkbFakeDeviceButton(DeviceIntPtr dev, int press, int button);
 void XkbUseMsg(void);
 int XkbProcessArguments(int argc, char **argv, int i);
+Bool XkbInitPrivates(void);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;