--- gail/gailtreeview.c.orig	2007-10-05 23:23:28.000000000 -0400
+++ gail/gailtreeview.c	2007-10-05 23:23:51.000000000 -0400
@@ -19,7 +19,6 @@
 
 #include <string.h>
 #include <gtk/gtk.h>
-#include <gdk/gdkx.h>
 #include <gtk/gtktreeviewcolumn.h>
 #include "gailtreeview.h"
 #include "gailrenderercell.h"
@@ -2228,7 +2227,7 @@
       gtk_widget_grab_focus (widget);
       toplevel = gtk_widget_get_toplevel (widget);
       if (GTK_WIDGET_TOPLEVEL (toplevel))
-        gtk_window_present_with_time (GTK_WINDOW (toplevel), gdk_x11_get_server_time (widget->window));
+        gtk_window_present (GTK_WINDOW (toplevel));
 
       return TRUE;
     }
--- gail/gailwidget.c.orig	2007-10-05 23:43:43.000000000 -0400
+++ gail/gailwidget.c	2007-10-05 23:43:58.000000000 -0400
@@ -19,7 +19,6 @@
 
 #include <string.h>
 #include <gtk/gtk.h>
-#include <gdk/gdkx.h>
 #include "gailwidget.h"
 #include "gailnotebookpage.h"
 #include "gail-private-macros.h"
@@ -772,7 +771,7 @@
       gtk_widget_grab_focus (widget);
       toplevel = gtk_widget_get_toplevel (widget);
       if (GTK_WIDGET_TOPLEVEL (toplevel))
-        gtk_window_present_with_time (GTK_WINDOW (toplevel), gdk_x11_get_server_time (widget->window));
+        gtk_window_present (GTK_WINDOW (toplevel));
       return TRUE;
     }
   else
--- gail/gailwindow.c.orig	2007-10-05 23:48:16.000000000 -0400
+++ gail/gailwindow.c	2007-10-05 23:49:10.000000000 -0400
@@ -1051,7 +1051,7 @@
   return get_window_zorder (widget->window);
 }
 
-#elif defined (GDK_WINDOWING_WIN32)
+#elif defined (GDK_WINDOWING_WIN32) || defined (GDK_WINDOWING_QUARTZ)
 
 static gint
 gail_window_get_mdi_zorder (AtkComponent *component)