3 files changed, 2 insertions, 12 deletions
diff --git a/src/include/compositor.h b/src/include/compositor.h
index 0eebe569..7ff380ad 100644
--- a/src/include/compositor.h
+++ b/src/include/compositor.h
@@ -23,8 +23,8 @@
 #define META_COMPOSITOR_H
 
 #include <glib.h>
-#include <gtk/gtk.h>
 #include <X11/Xlib.h>
+#include <cairo/cairo.h>
 
 #include "types.h"
 #include "boxes.h"
@@ -51,13 +51,8 @@ void meta_compositor_set_updates (MetaCompositor *compositor,
 void meta_compositor_process_event (MetaCompositor *compositor,
 XEvent *event,
 MetaWindow *window);
-#if GTK_CHECK_VERSION (3, 0, 0)
 cairo_surface_t *meta_compositor_get_window_surface (MetaCompositor *compositor,
 MetaWindow *window);
-#else
-Pixmap meta_compositor_get_window_pixmap (MetaCompositor *compositor,
- MetaWindow *window);
-#endif
 void meta_compositor_set_active_window (MetaCompositor *compositor,
 MetaScreen *screen,
 MetaWindow *window);
diff --git a/src/include/errors.h b/src/include/errors.h
index 338dd784..825cd9ff 100644
--- a/src/include/errors.h
+++ b/src/include/errors.h
@@ -33,7 +33,6 @@ typedef void (* ErrorHandler) (Display *dpy,
 XErrorEvent *error,
 gpointer data);
 
-void meta_errors_init (void);
 void meta_errors_register_foreign_display (Display *foreign_dpy,
 ErrorHandler handler,
 gpointer data);
diff --git a/src/include/ui.h b/src/include/ui.h
index 4705eda2..fc7b6b0a 100644
--- a/src/include/ui.h
+++ b/src/include/ui.h
@@ -29,8 +29,8 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <glib.h>
-#include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <cairo/cairo.h>
 
 /* This is between GTK_PRIORITY_RESIZE (+10) and GDK_PRIORITY_REDRAW (+20) */
 #define META_PRIORITY_RESIZE (G_PRIORITY_HIGH_IDLE + 15)
@@ -177,11 +177,7 @@ int meta_ui_get_drag_threshold (MetaUI *ui);
 
 MetaUIDirection meta_ui_get_direction (void);
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 GdkPixbuf *meta_ui_get_pixbuf_from_surface (cairo_surface_t *surface);
-#else
-GdkPixbuf *meta_ui_get_pixbuf_from_pixmap (Pixmap pmap);
-#endif
 
 #include "tabpopup.h"
 #include "tile-preview.h"