diff --git a/ChangeLog b/ChangeLog
index 41bbd6dea2f30d72cc0690bd7b937a1d0647ad34..6a1fba209d7f3032806b821e2bbc22fc3b06a668 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-19	Benedikt Meurer <benny@xfce.org>
+
+	* thunar/thunar-statusbar.c: Drop the dependency on X11.
+	* thunar/thunar-desktop-window.c: Include <gdk/gdkx.h> explicitly (since
+	  that's no longer done by libexo -> libxfcegui4).
+
 2005-08-18	Benedikt Meurer <benny@xfce.org>
 
 	* thunarx/thunarx-gdk-pixbuf-extensions.{c,h}: Add new function
diff --git a/thunar/thunar-desktop-window.c b/thunar/thunar-desktop-window.c
index b7d7a1f9cd5873aee2f8c613c2f898e55b897070..87221c485a255f5ad82c7428ba41b964033fb872 100644
--- a/thunar/thunar-desktop-window.c
+++ b/thunar/thunar-desktop-window.c
@@ -25,6 +25,10 @@
 #include <thunar/thunar-desktop-window.h>
 #include <thunar/thunar-desktop-view.h>
 
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
 
 
 static void     thunar_desktop_window_class_init    (ThunarDesktopWindowClass *klass);
diff --git a/thunar/thunar-statusbar.c b/thunar/thunar-statusbar.c
index bc52e7ae2e2ec2803fe8033ec6f5cbe8fc1a7351..2a1736c65cad1d494ad13b40c255d07f6264859e 100644
--- a/thunar/thunar-statusbar.c
+++ b/thunar/thunar-statusbar.c
@@ -33,8 +33,9 @@
 
 #include <thunar/thunar-statusbar.h>
 
-#ifdef HAVE_CAIRO
+#if !GTK_CHECK_VERSION(2,7,1) && defined(GDK_WINDOWING_X11) && defined(HAVE_CAIRO)
 #include <cairo/cairo-xlib.h>
+#include <gdk/gdkx.h>
 #endif
 
 
@@ -396,7 +397,7 @@ create_lucent_pixbuf (GdkPixbuf *src)
 
 
 
-#if GTK_CHECK_VERSION(2,7,2)
+#if GTK_CHECK_VERSION(2,7,1)
 static cairo_t*
 get_cairo_context (GdkWindow *window)
 {
@@ -412,7 +413,7 @@ get_cairo_context (GdkWindow *window)
 
   return cr;
 }
-#elif defined(HAVE_CAIRO)
+#elif defined(GDK_WINDOWING_X11) && defined(HAVE_CAIRO)
 static cairo_t*
 get_cairo_context (GdkWindow *window)
 {
@@ -479,7 +480,7 @@ thunar_statusbar_icon_expose_event (GtkWidget      *widget,
       g_object_unref (G_OBJECT (icon));
     }
 
-#if defined(HAVE_CAIRO) || GTK_CHECK_VERSION(2,7,1)
+#if GTK_CHECK_VERSION(2,7,1) || (defined(GDK_WINDOWING_X11) && defined(HAVE_CAIRO))
   /* render the animation */
   if (thunar_statusbar_icon_get_loading (statusbar_icon))
     {