diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index ab3a40743..df4170e69 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -277,9 +277,7 @@ typedef struct {
 
 extern _X_EXPORT DevPrivateKeyRec xkbDevicePrivateKeyRec;
 
-#define xkbDevicePrivateKey (&xkbDevicePrivateKeyRec)
-
-#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, xkbDevicePrivateKey))
+#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, &xkbDevicePrivateKeyRec))
 
 /***====================================================================***/