diff --git a/src/core/window-private.h b/src/core/window-private.h
index 93e3e2d11..b282efe36 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -682,17 +682,10 @@ void meta_window_compute_tile_match (MetaWindow *window);
 
 gboolean meta_window_updates_are_frozen (MetaWindow *window);
 
-void meta_window_set_opaque_region        (MetaWindow     *window,
-                                           cairo_region_t *region);
 void meta_window_update_opaque_region_x11 (MetaWindow *window);
-
-void meta_window_set_input_region         (MetaWindow     *window,
-                                           cairo_region_t *region);
 void meta_window_update_input_region_x11  (MetaWindow *window);
-
-void meta_window_set_shape_region         (MetaWindow     *window,
-                                           cairo_region_t *region);
 void meta_window_update_shape_region_x11  (MetaWindow *window);
+
 void meta_window_set_opacity              (MetaWindow *window,
                                            guint       opacity);
 
diff --git a/src/core/window.c b/src/core/window.c
index 1a35a1910..cc4e14d70 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -7667,7 +7667,7 @@ meta_window_update_net_wm_type (MetaWindow *window)
   meta_window_recalc_window_type (window);
 }
 
-void
+static void
 meta_window_set_opaque_region (MetaWindow     *window,
                                cairo_region_t *region)
 {
@@ -7753,17 +7753,17 @@ region_create_from_x_rectangles (const XRectangle *rects,
   return cairo_region_create_rectangles (cairo_rects, n_rects);
 }
 
-void
-meta_window_set_shape_region (MetaWindow     *window,
+static void
+meta_window_set_input_region (MetaWindow     *window,
                               cairo_region_t *region)
 {
-  g_clear_pointer (&window->shape_region, cairo_region_destroy);
+  g_clear_pointer (&window->input_region, cairo_region_destroy);
 
   if (region != NULL)
-    window->shape_region = cairo_region_reference (region);
+    window->input_region = cairo_region_reference (region);
 
   if (window->display->compositor)
-    meta_compositor_update_shape_region (window->display->compositor, window);
+    meta_compositor_update_input_region (window->display->compositor, window);
 }
 
 void
@@ -7839,17 +7839,17 @@ meta_window_update_input_region_x11 (MetaWindow *window)
   cairo_region_destroy (region);
 }
 
-void
-meta_window_set_input_region (MetaWindow     *window,
+static void
+meta_window_set_shape_region (MetaWindow     *window,
                               cairo_region_t *region)
 {
-  g_clear_pointer (&window->input_region, cairo_region_destroy);
+  g_clear_pointer (&window->shape_region, cairo_region_destroy);
 
   if (region != NULL)
-    window->input_region = cairo_region_reference (region);
+    window->shape_region = cairo_region_reference (region);
 
   if (window->display->compositor)
-    meta_compositor_update_input_region (window->display->compositor, window);
+    meta_compositor_update_shape_region (window->display->compositor, window);
 }
 
 void