diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 746bfab1b..f75cd2b84 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -211,12 +211,6 @@ typedef struct {
     DeviceUnwrapProc unwrapProc;
 } xkbDeviceInfoRec, *xkbDeviceInfoPtr;
 
-extern _X_EXPORT DevPrivateKeyRec xkbDevicePrivateKeyRec;
-
-#define xkbDevicePrivateKey (&xkbDevicePrivateKeyRec)
-
-#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, xkbDevicePrivateKey))
-
 /***====================================================================***/
 
 extern _X_EXPORT int XkbReqCode;
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 2653122a0..cf01810f0 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -12,6 +12,7 @@
 #include "dix.h"
 #include "input.h"
 #include "misc.h"
+#include "privates.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
 
@@ -111,4 +112,8 @@ void XkbMergeLockedPtrBtns(DeviceIntPtr master);
 
 void XkbFakeDeviceButton(DeviceIntPtr dev, int press, int button);
 
+extern DevPrivateKeyRec xkbDevicePrivateKeyRec;
+
+#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, &xkbDevicePrivateKeyRec))
+
 #endif /* _XSERVER_XKBSRV_PRIV_H_ */