diff --git a/xkb/xkb.c b/xkb/xkb.c
index f604d3915c..1822e0eaa9 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -56,7 +56,7 @@ int XkbKeyboardErrorCode;
 CARD32 xkbDebugFlags = 0;
 static CARD32 xkbDebugCtrls = 0;
 
-static RESTYPE RT_XKBCLIENT;
+RESTYPE RT_XKBCLIENT = 0;
 
 /***====================================================================***/
 
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 37dbc886be..894f27eb28 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -98,6 +98,8 @@
         device->public.realInputProc = oldprocs->realInputProc; \
         device->unwrapProc = oldprocs->unwrapProc;
 
+extern RESTYPE RT_XKBCLIENT;
+
 void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *);
 
 void XkbForceUpdateDeviceLEDs(DeviceIntPtr keybd);