diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index 652eb662f..7466848b1 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -138,7 +138,7 @@ xnestOpenDisplay(int argc, char *argv[])
     xnestWhitePixel = WhitePixel(xnestDisplay, DefaultScreen(xnestDisplay));
 
     if (xnestParentWindow != (Window) 0)
-        xnestEventMask = StructureNotifyMask;
+        xnestEventMask = XCB_EVENT_MASK_STRUCTURE_NOTIFY;
     else
         xnestEventMask = 0L;
 
diff --git a/hw/xnest/Keyboard.h b/hw/xnest/Keyboard.h
index dc5eaa2de..96150dd57 100644
--- a/hw/xnest/Keyboard.h
+++ b/hw/xnest/Keyboard.h
@@ -16,7 +16,8 @@ is" without express or implied warranty.
 #define XNESTKEYBOARD_H
 
 #define XNEST_KEYBOARD_EVENT_MASK \
-        (KeyPressMask | KeyReleaseMask | FocusChangeMask | KeymapStateMask)
+        (XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE | \
+         XCB_EVENT_MASK_FOCUS_CHANGE | XCB_EVENT_MASK_KEYMAP_STATE)
 
 extern DeviceIntPtr xnestKeyboardDevice;