diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 32f60422cf..5d785e5db2 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -7470,14 +7470,15 @@ gdk_window_set_composited (GdkWindow *window,
 
   display = gdk_window_get_display (window);
 
-  if (!gdk_display_supports_composite (display) && composited)
+  impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
+
+  if (composited && (!gdk_display_supports_composite (display) || !impl_class->set_composited))
     {
       g_warning ("gdk_window_set_composited called but "
                  "compositing is not supported");
       return;
     }
 
-  impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
   impl_class->set_composited (window, composited);
 
   recompute_visible_regions (window, TRUE, FALSE);
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index f0094bab98..24b59d23b1 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -2912,11 +2912,6 @@ gdk_window_set_opacity (GdkWindow *window,
   [impl->toplevel setAlphaValue: opacity];
 }
 
-void
-_gdk_windowing_window_set_composited (GdkWindow *window, gboolean composited)
-{
-}
-
 static cairo_region_t *
 gdk_quartz_window_get_shape (GdkWindow *window)
 {
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index f2f27b5761..0500cf1582 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -3150,11 +3150,6 @@ gdk_window_set_opacity (GdkWindow *window,
     }
 }
 
-void
-_gdk_windowing_window_set_composited (GdkWindow *window, gboolean composited)
-{
-}
-
 static cairo_region_t *
 gdk_win32_window_get_shape (GdkWindow *window)
 {