diff --git a/clients/window.c b/clients/window.c
index 9e36f2065..3ea502786 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -3836,20 +3836,6 @@ handle_surface_configure(void *data, struct xdg_surface *xdg_surface,
 	window_schedule_resize(window, width, height);
 }
 
-static void
-handle_surface_focused_set(void *data, struct xdg_surface *xdg_surface)
-{
-	struct window *window = data;
-	window->focused = 1;
-}
-
-static void
-handle_surface_focused_unset(void *data, struct xdg_surface *xdg_surface)
-{
-	struct window *window = data;
-	window->focused = 0;
-}
-
 static void
 handle_surface_request_set_maximized(void *data, struct xdg_surface *xdg_surface)
 {
@@ -3878,6 +3864,20 @@ handle_surface_request_unset_fullscreen(void *data, struct xdg_surface *xdg_surf
 	window_set_fullscreen(window, 0);
 }
 
+static void
+handle_surface_focused_set(void *data, struct xdg_surface *xdg_surface)
+{
+	struct window *window = data;
+	window->focused = 1;
+}
+
+static void
+handle_surface_focused_unset(void *data, struct xdg_surface *xdg_surface)
+{
+	struct window *window = data;
+	window->focused = 0;
+}
+
 static void
 handle_surface_delete(void *data, struct xdg_surface *xdg_surface)
 {
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index e8abeb596..dcf2520af 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -1979,22 +1979,6 @@ create_keyboard_focus_listener(struct weston_seat *seat)
 	wl_signal_add(&seat->keyboard->focus_signal, listener);
 }
 
-static void
-xdg_surface_set_transient_for(struct wl_client *client,
-                             struct wl_resource *resource,
-                             struct wl_resource *parent_resource)
-{
-	struct shell_surface *shsurf = wl_resource_get_user_data(resource);
-	struct weston_surface *parent;
-
-	if (parent_resource)
-		parent = wl_resource_get_user_data(parent_resource);
-	else
-		parent = NULL;
-
-	shell_surface_set_parent(shsurf, parent);
-}
-
 static struct shell_client *
 get_shell_client(struct wl_client *client)
 {
@@ -3179,6 +3163,22 @@ xdg_surface_destroy(struct wl_client *client,
 	wl_resource_destroy(resource);
 }
 
+static void
+xdg_surface_set_transient_for(struct wl_client *client,
+                             struct wl_resource *resource,
+                             struct wl_resource *parent_resource)
+{
+	struct shell_surface *shsurf = wl_resource_get_user_data(resource);
+	struct weston_surface *parent;
+
+	if (parent_resource)
+		parent = wl_resource_get_user_data(parent_resource);
+	else
+		parent = NULL;
+
+	shell_surface_set_parent(shsurf, parent);
+}
+
 static void
 xdg_surface_set_margin(struct wl_client *client,
 			     struct wl_resource *resource,