diff --git a/src/backends/x11/meta-input-settings-x11.c b/src/backends/x11/meta-input-settings-x11.c
index c571d4c9d..d9338f8ad 100644
--- a/src/backends/x11/meta-input-settings-x11.c
+++ b/src/backends/x11/meta-input-settings-x11.c
@@ -25,7 +25,6 @@
 
 #include "backends/x11/meta-input-settings-x11.h"
 
-#include <gdk/gdkx.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <X11/extensions/XInput2.h>
diff --git a/src/compositor/meta-dnd.c b/src/compositor/meta-dnd.c
index d495cb24c..afe23807b 100644
--- a/src/compositor/meta-dnd.c
+++ b/src/compositor/meta-dnd.c
@@ -21,8 +21,6 @@
 
 #include "compositor/meta-dnd-private.h"
 
-#include <gdk/gdkx.h>
-
 #include "meta/meta-backend.h"
 #include "compositor/compositor-private.h"
 #include "core/display-private.h"
diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c
index 4ebcef3c9..1b25cea48 100644
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -38,7 +38,6 @@
 #include "compositor/meta-shaped-texture-private.h"
 #include "core/boxes-private.h"
 
-#include <gdk/gdk.h>
 #include <math.h>
 
 #include "cogl/cogl.h"
@@ -785,7 +784,7 @@ do_paint_content (MetaShapedTexture   *stex,
               cairo_rectangle_int_t rect;
               cairo_region_get_rectangle (blended_tex_region, i, &rect);
 
-              if (!gdk_rectangle_intersect (&content_rect, &rect, &rect))
+              if (!meta_rectangle_intersect (&content_rect, &rect, &rect))
                 continue;
 
               paint_clipped_rectangle_node (stex, root_node,
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index ba90c4c28..29842cd76 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <gdk/gdk.h>
 #include <math.h>
 #include <string.h>
 
diff --git a/src/compositor/meta-window-group.c b/src/compositor/meta-window-group.c
index c6af609ae..f5d8b9a62 100644
--- a/src/compositor/meta-window-group.c
+++ b/src/compositor/meta-window-group.c
@@ -2,7 +2,6 @@
 
 #include "config.h"
 
-#include <gdk/gdk.h>
 #include <math.h>
 
 #include "compositor/clutter-utils.h"
diff --git a/src/core/place.c b/src/core/place.c
index f692214cf..0f1e12c81 100644
--- a/src/core/place.c
+++ b/src/core/place.c
@@ -26,7 +26,6 @@
 
 #include "core/place.h"
 
-#include <gdk/gdk.h>
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/src/meta/common.h b/src/meta/common.h
index e98418638..b02dc115f 100644
--- a/src/meta/common.h
+++ b/src/meta/common.h
@@ -29,7 +29,6 @@
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <glib.h>
-#include <gtk/gtk.h>
 
 #include "clutter/clutter.h"
 #include "meta/meta-enums.h"
diff --git a/src/x11/meta-x11-display-private.h b/src/x11/meta-x11-display-private.h
index f9a37c51f..466625e72 100644
--- a/src/x11/meta-x11-display-private.h
+++ b/src/x11/meta-x11-display-private.h
@@ -26,6 +26,7 @@
 #define META_X11_DISPLAY_PRIVATE_H
 
 #include <glib.h>
+#include <gdk/gdk.h>
 #include <X11/Xlib.h>
 
 #include "backends/meta-monitor-manager-private.h"