diff --git a/unix/xserver/hw/vnc/InputXKB.cc b/unix/xserver/hw/vnc/InputXKB.cc
index 39d9252..65c4400 100644
--- a/unix/xserver/hw/vnc/InputXKB.cc
+++ b/unix/xserver/hw/vnc/InputXKB.cc
@@ -42,12 +42,21 @@
 #undef class
 }
 
+#if XORG < 19
+static DevPrivateKey vncXkbScreenPrivateKey = &vncXkbScreenPrivateKey;
+#else
 static DevPrivateKeyRec vncXkbPrivateKeyRec;
 #define vncXkbScreenPrivateKey (&vncXkbPrivateKeyRec)
+#endif
+
 #define vncXkbScreenPrivate(pScreen) \
 	(*(InputDevice**) dixLookupPrivate(&(pScreen)->devPrivates, \
 	                                   vncXkbScreenPrivateKey))
 
+#ifndef KEYBOARD_OR_FLOAT
+#define KEYBOARD_OR_FLOAT MASTER_KEYBOARD
+#endif
+
 /* Stolen from libX11 */
 static Bool
 XkbTranslateKeyCode(register XkbDescPtr xkb, KeyCode key,