diff --git a/src/core/display.c b/src/core/display.c
index 7ee9c590f..334c07c08 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1966,10 +1966,10 @@ handle_window_focus_event (MetaDisplay  *display,
    * keybinding is used.
    */
 
-  if (event->mode == NotifyGrab ||
-      event->mode == NotifyUngrab ||
+  if (event->mode == XINotifyGrab ||
+      event->mode == XINotifyUngrab ||
       /* From WindowMaker, ignore all funky pointer root events */
-      event->detail > NotifyNonlinearVirtual)
+      event->detail > XINotifyNonlinearVirtual)
     {
       meta_topic (META_DEBUG_FOCUS,
                   "Ignoring focus event generated by a grab or other weirdness\n");
@@ -1988,7 +1988,7 @@ handle_window_focus_event (MetaDisplay  *display,
     }
   else if (event->evtype == XI_FocusOut)
     {
-      if (event->detail == NotifyInferior)
+      if (event->detail == XINotifyInferior)
         {
           /* This event means the client moved focus to a subwindow */
           meta_topic (META_DEBUG_FOCUS,