diff --git a/panels/keybindings/eggcellrendererkeys.c b/panels/keybindings/eggcellrendererkeys.c
index 776a5391e..4476bcb9e 100644
--- a/panels/keybindings/eggcellrendererkeys.c
+++ b/panels/keybindings/eggcellrendererkeys.c
@@ -326,7 +326,7 @@ is_modifier (guint keycode)
   XModifierKeymap *mod_keymap;
   gboolean retval = FALSE;
 
-  mod_keymap = XGetModifierMapping (gdk_display);
+  mod_keymap = XGetModifierMapping (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
 
   map_size = 8 * mod_keymap->max_keypermod;
   i = 0;
diff --git a/typing-break/drw-monitor.c b/typing-break/drw-monitor.c
index 5f0270c0d..e9dc57b46 100644
--- a/typing-break/drw-monitor.c
+++ b/typing-break/drw-monitor.c
@@ -146,7 +146,9 @@ drw_monitor_timeout (DrwMonitor *monitor)
 
 	priv = monitor->priv;
 	
-	if (XScreenSaverQueryInfo (GDK_DISPLAY (), DefaultRootWindow (GDK_DISPLAY ()), priv->ss_info) != 0) {
+	if (XScreenSaverQueryInfo (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+	                           DefaultRootWindow (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())),
+	                           priv->ss_info) != 0) {
 		if (priv->ss_info->idle < priv->last_idle) {
  			now = time (NULL);
  
@@ -172,7 +174,8 @@ drw_monitor_setup (DrwMonitor *monitor)
 
 	priv = monitor->priv;
 
-	if (!XScreenSaverQueryExtension (GDK_DISPLAY (), &event_base, &error_base)) {
+	if (!XScreenSaverQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+	                                 &event_base, &error_base)) {
 		return FALSE;
 	}
 
diff --git a/typing-break/drw-selection.c b/typing-break/drw-selection.c
index 99b0980e8..9607df917 100644
--- a/typing-break/drw-selection.c
+++ b/typing-break/drw-selection.c
@@ -70,7 +70,7 @@ drw_selection_clear (GtkWidget         *widget,
 static gboolean
 drw_selection_find_existing (DrwSelection *drw_selection)
 {
-	Display *xdisplay = GDK_DISPLAY ();
+	Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 	Window old;
 
 	gdk_error_trap_push ();
@@ -120,7 +120,7 @@ drw_selection_claim (DrwSelection *drw_selection)
 static void
 drw_selection_negotiate (DrwSelection *drw_selection)
 {
-	Display *xdisplay = GDK_DISPLAY ();
+	Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 	gboolean found = FALSE;
 
 	/* We don't need both the XGrabServer() and the loop here;
diff --git a/typing-break/main.c b/typing-break/main.c
index 5ecd32231..ef0a3395e 100644
--- a/typing-break/main.c
+++ b/typing-break/main.c
@@ -35,7 +35,7 @@ gboolean debug = FALSE;
 static gboolean
 have_tray (void)
 {
-	Screen *xscreen = DefaultScreenOfDisplay (gdk_display);
+	Screen *xscreen = DefaultScreenOfDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
 	Atom    selection_atom;
 	char   *selection_atom_name;