diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 70933b000..6432dd593 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -209,9 +209,6 @@ typedef struct {
 
 #define	Status		int
 
-extern _X_EXPORT void XkbUseMsg(void
-    );
-
 extern _X_EXPORT int XkbProcessArguments(int /* argc */ ,
                                          char ** /* argv */ ,
                                          int    /* i */
diff --git a/os/utils.c b/os/utils.c
index 56d1a5a58..8fc3dd47c 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -112,9 +112,9 @@ __stdcall unsigned long GetTickCount(void);
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
 #include "os/serverlock.h"
+#include "xkb/xkbsrv_priv.h"
 
 #include "dixstruct.h"
-#include "xkbsrv.h"
 #include "picture.h"
 #include "miinitext.h"
 #include "present.h"
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 68edb45c2..5a350777f 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -111,6 +111,7 @@ int XkbGetEffectiveGroup(XkbSrvInfoPtr xkbi, XkbStatePtr xkbstate, CARD8 keycode
 void XkbMergeLockedPtrBtns(DeviceIntPtr master);
 
 void XkbFakeDeviceButton(DeviceIntPtr dev, int press, int button);
+void XkbUseMsg(void);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;