diff --git a/examples/meson.build b/examples/meson.build
index 18f44fde1..26d208509 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -66,3 +66,9 @@ if libpng.found()
 		dependencies: [wayland_client, wlr_protos, wlroots, libpng]
 	)
 endif
+
+executable(
+	'toplevel-decoration',
+	'toplevel-decoration.c',
+	dependencies: [wayland_client, wlr_protos, wlroots]
+)
diff --git a/examples/toplevel-decoration.c b/examples/toplevel-decoration.c
new file mode 100644
index 000000000..e930c4170
--- /dev/null
+++ b/examples/toplevel-decoration.c
@@ -0,0 +1,253 @@
+#include <GLES2/gl2.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wayland-client.h>
+#include <wayland-egl.h>
+#include <wlr/render/egl.h>
+#include "xdg-shell-client-protocol.h"
+#include "xdg-decoration-unstable-v1-client-protocol.h"
+
+/**
+ * Usage: toplevel-decoration [mode]
+ * Creates an xdg-toplevel supporting decoration negotiation. If `mode` is
+ * specified, the client will prefer this decoration mode.
+ */
+
+static int width = 500, height = 300;
+
+static struct wl_compositor *compositor = NULL;
+static struct xdg_wm_base *wm_base = NULL;
+static struct zxdg_decoration_manager_v1 *decoration_manager = NULL;
+
+struct wlr_egl egl;
+struct wl_egl_window *egl_window;
+struct wlr_egl_surface *egl_surface;
+
+struct zxdg_toplevel_decoration_v1 *decoration;
+enum zxdg_toplevel_decoration_v1_mode client_preferred_mode, current_mode;
+
+static const char *get_mode_name(enum zxdg_toplevel_decoration_v1_mode mode) {
+	switch (mode) {
+	case ZXDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE:
+		return "client-side decorations";
+	case ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE:
+		return "server-side decorations";
+	}
+	abort();
+}
+
+static void request_preferred_mode(void) {
+	enum zxdg_toplevel_decoration_v1_mode mode = client_preferred_mode;
+	if (mode == 0) {
+		printf("Requesting compositor preferred mode\n");
+		zxdg_toplevel_decoration_v1_unset_mode(decoration);
+		return;
+	}
+	if (mode == current_mode) {
+		return;
+	}
+
+	printf("Requesting %s\n", get_mode_name(mode));
+	zxdg_toplevel_decoration_v1_set_mode(decoration, mode);
+}
+
+static void draw(void) {
+	eglMakeCurrent(egl.display, egl_surface, egl_surface, egl.context);
+
+	float color[] = {1.0, 1.0, 0.0, 1.0};
+	if (current_mode == ZXDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE) {
+		color[0] = 0.0;
+	}
+
+	glViewport(0, 0, width, height);
+	glClearColor(color[0], color[1], color[2], 1.0);
+	glClear(GL_COLOR_BUFFER_BIT);
+
+	eglSwapBuffers(egl.display, egl_surface);
+}
+
+static void xdg_surface_handle_configure(void *data,
+		struct xdg_surface *xdg_surface, uint32_t serial) {
+	xdg_surface_ack_configure(xdg_surface, serial);
+	wl_egl_window_resize(egl_window, width, height, 0, 0);
+	draw();
+}
+
+static const struct xdg_surface_listener xdg_surface_listener = {
+	.configure = xdg_surface_handle_configure,
+};
+
+static void xdg_toplevel_handle_configure(void *data,
+		struct xdg_toplevel *xdg_toplevel, int32_t w, int32_t h,
+		struct wl_array *states) {
+	width = w;
+	height = h;
+}
+
+static const struct xdg_toplevel_listener xdg_toplevel_listener = {
+	.configure = xdg_toplevel_handle_configure,
+};
+
+static void decoration_handle_configure(void *data,
+		struct zxdg_toplevel_decoration_v1 *decoration,
+		enum zxdg_toplevel_decoration_v1_mode mode) {
+	printf("Using %s\n", get_mode_name(mode));
+	current_mode = mode;
+}
+
+static const struct zxdg_toplevel_decoration_v1_listener decoration_listener = {
+	.configure = decoration_handle_configure,
+};
+
+static void pointer_handle_enter(void *data, struct wl_pointer *pointer,
+		uint32_t serial, struct wl_surface *surface,
+		wl_fixed_t sx, wl_fixed_t sy) {
+	// No-op
+}
+
+static void pointer_handle_leave(void *data, struct wl_pointer *pointer,
+		uint32_t serial, struct wl_surface *surface) {
+	// No-op
+}
+
+static void pointer_handle_motion(void *data, struct wl_pointer *pointer,
+		uint32_t time, wl_fixed_t sx, wl_fixed_t sy) {
+	// No-op
+}
+
+static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer,
+		uint32_t serial, uint32_t time, uint32_t button,
+		enum wl_pointer_button_state state) {
+	if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
+		// Toggle mode
+		if (client_preferred_mode == ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE) {
+			client_preferred_mode = ZXDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE;
+		} else {
+			client_preferred_mode = ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE;
+		}
+		request_preferred_mode();
+	}
+}
+
+static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer,
+		uint32_t time, enum wl_pointer_axis axis, wl_fixed_t value) {
+	// No-op
+}
+
+static const struct wl_pointer_listener pointer_listener = {
+	.enter = pointer_handle_enter,
+	.leave = pointer_handle_leave,
+	.motion = pointer_handle_motion,
+	.button = pointer_handle_button,
+	.axis = pointer_handle_axis,
+};
+
+static void seat_handle_capabilities(void *data, struct wl_seat *seat,
+		enum wl_seat_capability caps) {
+	if (caps & WL_SEAT_CAPABILITY_POINTER) {
+		struct wl_pointer *pointer = wl_seat_get_pointer(seat);
+		wl_pointer_add_listener(pointer, &pointer_listener, NULL);
+	}
+}
+
+static const struct wl_seat_listener seat_listener = {
+	.capabilities = seat_handle_capabilities,
+};
+
+static void handle_global(void *data, struct wl_registry *registry,
+		uint32_t name, const char *interface, uint32_t version) {
+	if (strcmp(interface, wl_compositor_interface.name) == 0) {
+		compositor = wl_registry_bind(registry, name, &wl_compositor_interface,
+			1);
+	} else if (strcmp(interface, xdg_wm_base_interface.name) == 0) {
+		wm_base = wl_registry_bind(registry, name, &xdg_wm_base_interface, 1);
+	} else if (strcmp(interface, zxdg_decoration_manager_v1_interface.name) == 0) {
+		decoration_manager = wl_registry_bind(registry, name,
+			&zxdg_decoration_manager_v1_interface, 1);
+	} else if (strcmp(interface, wl_seat_interface.name) == 0) {
+		struct wl_seat *seat =
+			wl_registry_bind(registry, name, &wl_seat_interface, 1);
+		wl_seat_add_listener(seat, &seat_listener, NULL);
+	}
+}
+
+static void handle_global_remove(void *data, struct wl_registry *registry,
+		uint32_t name) {
+	// Who cares?
+}
+
+static const struct wl_registry_listener registry_listener = {
+	.global = handle_global,
+	.global_remove = handle_global_remove,
+};
+
+int main(int argc, char **argv) {
+	if (argc == 2) {
+		char *mode = argv[1];
+		if (strcmp(mode, "client") == 0) {
+			client_preferred_mode = ZXDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE;
+		} else if (strcmp(mode, "server") == 0) {
+			client_preferred_mode = ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE;
+		} else {
+			fprintf(stderr, "Invalid decoration mode\n");
+			return EXIT_FAILURE;
+		}
+	}
+
+	struct wl_display *display = wl_display_connect(NULL);
+	if (display == NULL) {
+		fprintf(stderr, "Failed to create display\n");
+		return EXIT_FAILURE;
+	}
+
+	struct wl_registry *registry = wl_display_get_registry(display);
+	wl_registry_add_listener(registry, &registry_listener, NULL);
+	wl_display_dispatch(display);
+	wl_display_roundtrip(display);
+
+	if (compositor == NULL) {
+		fprintf(stderr, "wl-compositor not available\n");
+		return EXIT_FAILURE;
+	}
+	if (wm_base == NULL) {
+		fprintf(stderr, "xdg-shell not available\n");
+		return EXIT_FAILURE;
+	}
+	if (decoration_manager == NULL) {
+		fprintf(stderr, "xdg-decoration not available\n");
+		return EXIT_FAILURE;
+	}
+
+	wlr_egl_init(&egl, EGL_PLATFORM_WAYLAND_EXT, display, NULL,
+		WL_SHM_FORMAT_ARGB8888);
+
+	struct wl_surface *surface = wl_compositor_create_surface(compositor);
+	struct xdg_surface *xdg_surface =
+		xdg_wm_base_get_xdg_surface(wm_base, surface);
+	struct xdg_toplevel *xdg_toplevel = xdg_surface_get_toplevel(xdg_surface);
+	decoration = zxdg_decoration_manager_v1_get_toplevel_decoration(
+		decoration_manager, xdg_toplevel);
+
+	wl_display_roundtrip(display);
+	request_preferred_mode();
+
+	xdg_surface_add_listener(xdg_surface, &xdg_surface_listener, NULL);
+	xdg_toplevel_add_listener(xdg_toplevel, &xdg_toplevel_listener, NULL);
+	zxdg_toplevel_decoration_v1_add_listener(decoration, &decoration_listener,
+		NULL);
+	wl_surface_commit(surface);
+
+	egl_window = wl_egl_window_create(surface, width, height);
+	egl_surface = wlr_egl_create_surface(&egl, egl_window);
+
+	wl_display_roundtrip(display);
+
+	draw();
+
+	while (wl_display_dispatch(display) != -1) {
+		// This space is intentionally left blank
+	}
+
+	return EXIT_SUCCESS;
+}
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index 2d28fa105..51cf68db3 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -5,6 +5,7 @@
 #include <wlr/config.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_gamma_control.h>
+#include <wlr/types/wlr_idle_inhibit_v1.h>
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_input_inhibitor.h>
 #include <wlr/types/wlr_layer_shell.h>
@@ -13,17 +14,14 @@
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_primary_selection.h>
+#include <wlr/types/wlr_screencopy_v1.h>
 #include <wlr/types/wlr_screenshooter.h>
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
 #include <wlr/types/wlr_wl_shell.h>
 #include <wlr/types/wlr_xcursor_manager.h>
+#include <wlr/types/wlr_xdg_decoration_v1.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include <wlr/types/wlr_xdg_shell.h>
-#include <wlr/types/wlr_list.h>
-#include <wlr/types/wlr_idle.h>
-#include <wlr/types/wlr_idle_inhibit_v1.h>
-#include <wlr/types/wlr_screencopy_v1.h>
-#include "rootston/view.h"
 #include "rootston/config.h"
 #include "rootston/output.h"
 #include "rootston/view.h"
@@ -48,6 +46,7 @@ struct roots_desktop {
 	struct wlr_screenshooter *screenshooter;
 	struct wlr_export_dmabuf_manager_v1 *export_dmabuf_manager_v1;
 	struct wlr_server_decoration_manager *server_decoration_manager;
+	struct wlr_xdg_decoration_manager_v1 *xdg_decoration_manager;
 	struct wlr_primary_selection_device_manager *primary_selection_device_manager;
 	struct wlr_idle *idle;
 	struct wlr_idle_inhibit_manager_v1 *idle_inhibit;
@@ -64,7 +63,7 @@ struct roots_desktop {
 	struct wl_listener xdg_shell_surface;
 	struct wl_listener wl_shell_surface;
 	struct wl_listener layer_shell_surface;
-	struct wl_listener decoration_new;
+	struct wl_listener xdg_toplevel_decoration;
 	struct wl_listener input_inhibit_activate;
 	struct wl_listener input_inhibit_deactivate;
 	struct wl_listener virtual_keyboard_new;
@@ -94,6 +93,7 @@ void view_apply_damage(struct roots_view *view);
 void view_damage_whole(struct roots_view *view);
 void view_update_position(struct roots_view *view, double x, double y);
 void view_update_size(struct roots_view *view, uint32_t width, uint32_t height);
+void view_update_decorated(struct roots_view *view, bool decorated);
 void view_initial_focus(struct roots_view *view);
 void view_map(struct roots_view *view, struct wlr_surface *surface);
 void view_unmap(struct roots_view *view);
@@ -101,6 +101,7 @@ void view_arrange_maximized(struct roots_view *view);
 
 void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
 void handle_xdg_shell_surface(struct wl_listener *listener, void *data);
+void handle_xdg_toplevel_decoration(struct wl_listener *listener, void *data);
 void handle_wl_shell_surface(struct wl_listener *listener, void *data);
 void handle_layer_shell_surface(struct wl_listener *listener, void *data);
 void handle_xwayland_surface(struct wl_listener *listener, void *data);
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 4e3859d5f..69cbc87c1 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -4,6 +4,7 @@
 #include <wlr/config.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_xdg_decoration_v1.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include <wlr/types/wlr_xdg_shell.h>
 
@@ -190,6 +191,14 @@ struct roots_xdg_popup {
 	struct wl_listener new_popup;
 };
 
+struct roots_xdg_toplevel_decoration {
+	struct wlr_xdg_toplevel_decoration_v1 *wlr_decoration;
+	struct roots_xdg_surface *surface;
+	struct wl_listener destroy;
+	struct wl_listener request_mode;
+	struct wl_listener surface_commit;
+};
+
 void view_get_box(const struct roots_view *view, struct wlr_box *box);
 void view_activate(struct roots_view *view, bool active);
 void view_move(struct roots_view *view, double x, double y);
diff --git a/include/wlr/types/wlr_xdg_decoration_v1.h b/include/wlr/types/wlr_xdg_decoration_v1.h
new file mode 100644
index 000000000..10d3a1aa5
--- /dev/null
+++ b/include/wlr/types/wlr_xdg_decoration_v1.h
@@ -0,0 +1,68 @@
+#ifndef WLR_TYPES_WLR_XDG_DECORATION_V1
+#define WLR_TYPES_WLR_XDG_DECORATION_V1
+
+#include <wayland-server.h>
+#include <wlr/types/wlr_xdg_shell.h>
+
+enum wlr_xdg_toplevel_decoration_v1_mode {
+	WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_NONE = 0,
+	WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE = 1,
+	WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE = 2,
+};
+
+struct wlr_xdg_decoration_manager_v1 {
+	struct wl_global *global;
+	struct wl_list resources;
+	struct wl_list decorations; // wlr_xdg_toplevel_decoration::link
+
+	struct wl_listener display_destroy;
+
+	struct {
+		struct wl_signal new_toplevel_decoration; // struct wlr_xdg_toplevel_decoration *
+	} events;
+
+	void *data;
+};
+
+struct wlr_xdg_toplevel_decoration_v1_configure {
+	struct wl_list link; // wlr_xdg_toplevel_decoration::configure_list
+	struct wlr_xdg_surface_configure *surface_configure;
+	enum wlr_xdg_toplevel_decoration_v1_mode mode;
+};
+
+struct wlr_xdg_toplevel_decoration_v1 {
+	struct wl_resource *resource;
+	struct wlr_xdg_surface *surface;
+	struct wlr_xdg_decoration_manager_v1 *manager;
+	struct wl_list link; // wlr_xdg_decoration_manager_v1::link
+
+	bool added;
+	enum wlr_xdg_toplevel_decoration_v1_mode current_mode;
+	enum wlr_xdg_toplevel_decoration_v1_mode client_pending_mode;
+	enum wlr_xdg_toplevel_decoration_v1_mode server_pending_mode;
+
+	struct wl_list configure_list; // wlr_xdg_toplevel_decoration_v1_configure::link
+
+	struct {
+		struct wl_signal destroy;
+		struct wl_signal request_mode;
+	} events;
+
+	struct wl_listener surface_destroy;
+	struct wl_listener surface_configure;
+	struct wl_listener surface_ack_configure;
+	struct wl_listener surface_commit;
+
+	void *data;
+};
+
+struct wlr_xdg_decoration_manager_v1 *
+	wlr_xdg_decoration_manager_v1_create(struct wl_display *display);
+void wlr_xdg_decoration_manager_v1_destroy(
+	struct wlr_xdg_decoration_manager_v1 *manager);
+
+uint32_t wlr_xdg_toplevel_decoration_v1_set_mode(
+	struct wlr_xdg_toplevel_decoration_v1 *decoration,
+	enum wlr_xdg_toplevel_decoration_v1_mode mode);
+
+#endif
diff --git a/include/wlr/types/wlr_xdg_shell.h b/include/wlr/types/wlr_xdg_shell.h
index 5aa6b374d..06b599899 100644
--- a/include/wlr/types/wlr_xdg_shell.h
+++ b/include/wlr/types/wlr_xdg_shell.h
@@ -125,6 +125,7 @@ struct wlr_xdg_toplevel {
 };
 
 struct wlr_xdg_surface_configure {
+	struct wlr_xdg_surface *surface;
 	struct wl_list link; // wlr_xdg_surface::configure_list
 	uint32_t serial;
 
@@ -188,6 +189,10 @@ struct wlr_xdg_surface {
 		 * surface has been hidden or is about to be destroyed.
 		 */
 		struct wl_signal unmap;
+
+		// for protocol extensions
+		struct wl_signal configure; // wlr_xdg_surface_configure
+		struct wl_signal ack_configure; // wlr_xdg_surface_configure
 	} events;
 
 	void *data;
@@ -226,6 +231,8 @@ struct wlr_xdg_surface *wlr_xdg_surface_from_resource(
 		struct wl_resource *resource);
 struct wlr_xdg_surface *wlr_xdg_surface_from_popup_resource(
 		struct wl_resource *resource);
+struct wlr_xdg_surface *wlr_xdg_surface_from_toplevel_resource(
+		struct wl_resource *resource);
 
 struct wlr_box wlr_xdg_positioner_get_geometry(
 		struct wlr_xdg_positioner *positioner);
@@ -352,7 +359,8 @@ struct wlr_xdg_surface *wlr_xdg_surface_from_wlr_surface(
  *
  * The x and y value can be <0
  */
-void wlr_xdg_surface_get_geometry(struct wlr_xdg_surface *surface, struct wlr_box *box);
+void wlr_xdg_surface_get_geometry(struct wlr_xdg_surface *surface,
+		struct wlr_box *box);
 
 /**
  * Call `iterator` on each surface and popup in the xdg-surface tree, with the
@@ -360,7 +368,13 @@ void wlr_xdg_surface_get_geometry(struct wlr_xdg_surface *surface, struct wlr_bo
  * from root to leaves (in rendering order).
  */
 void wlr_xdg_surface_for_each_surface(struct wlr_xdg_surface *surface,
-	wlr_surface_iterator_func_t iterator, void *user_data);
+		wlr_surface_iterator_func_t iterator, void *user_data);
+
+/**
+ * Schedule a surface configuration. This should only be called by protocols
+ * extending the shell.
+ */
+uint32_t wlr_xdg_surface_schedule_configure(struct wlr_xdg_surface *surface);
 
 /**
  * Call `iterator` on each popup in the xdg-surface tree, with the popup's
diff --git a/meson.build b/meson.build
index 5fd89832e..47910cad3 100644
--- a/meson.build
+++ b/meson.build
@@ -49,7 +49,7 @@ add_project_arguments('-DWL_HIDE_DEPRECATED', language: 'c')
 wayland_server = dependency('wayland-server', version: '>=1.15')
 wayland_client = dependency('wayland-client')
 wayland_egl    = dependency('wayland-egl')
-wayland_protos = dependency('wayland-protocols', version: '>=1.14')
+wayland_protos = dependency('wayland-protocols', version: '>=1.15')
 egl            = dependency('egl')
 glesv2         = dependency('glesv2')
 drm            = dependency('libdrm')
diff --git a/protocol/meson.build b/protocol/meson.build
index b7a6e80ab..ffdf01a80 100644
--- a/protocol/meson.build
+++ b/protocol/meson.build
@@ -31,9 +31,10 @@ protocols = [
 	[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
 	[wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'],
 	[wl_protocol_dir, 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml'],
-	[wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'],
-	[wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
 	[wl_protocol_dir, 'unstable/tablet/tablet-unstable-v2.xml'],
+	[wl_protocol_dir, 'unstable/xdg-decoration/xdg-decoration-unstable-v1.xml'],
+	[wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
+	[wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'],
 	'gamma-control.xml',
 	'gtk-primary-selection.xml',
 	'idle.xml',
@@ -47,9 +48,10 @@ protocols = [
 ]
 
 client_protocols = [
-	[wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'],
 	[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
 	[wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'],
+	[wl_protocol_dir, 'unstable/xdg-decoration/xdg-decoration-unstable-v1.xml'],
+	[wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'],
 	'idle.xml',
 	'screenshooter.xml',
 	'wlr-export-dmabuf-unstable-v1.xml',
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 5277dcc73..e90623e28 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -550,6 +550,23 @@ void view_update_size(struct roots_view *view, uint32_t width, uint32_t height)
 	view_damage_whole(view);
 }
 
+void view_update_decorated(struct roots_view *view, bool decorated) {
+	if (view->decorated == decorated) {
+		return;
+	}
+
+	view_damage_whole(view);
+	view->decorated = decorated;
+	if (decorated) {
+		view->border_width = 4;
+		view->titlebar_height = 12;
+	} else {
+		view->border_width = 0;
+		view->titlebar_height = 0;
+	}
+	view_damage_whole(view);
+}
+
 static bool view_at(struct roots_view *view, double lx, double ly,
 		struct wlr_surface **surface, double *sx, double *sy) {
 	if (view->type == ROOTS_WL_SHELL_VIEW &&
@@ -882,6 +899,12 @@ struct roots_desktop *desktop_create(struct roots_server *server,
 
 	desktop->screencopy = wlr_screencopy_manager_v1_create(server->wl_display);
 
+	desktop->xdg_decoration_manager =
+		wlr_xdg_decoration_manager_v1_create(server->wl_display);
+	wl_signal_add(&desktop->xdg_decoration_manager->events.new_toplevel_decoration,
+		&desktop->xdg_toplevel_decoration);
+	desktop->xdg_toplevel_decoration.notify = handle_xdg_toplevel_decoration;
+
 	return desktop;
 }
 
diff --git a/rootston/xdg_shell.c b/rootston/xdg_shell.c
index d04d37e14..e63eed855 100644
--- a/rootston/xdg_shell.c
+++ b/rootston/xdg_shell.c
@@ -263,6 +263,7 @@ static void destroy(struct roots_view *view) {
 	wl_list_remove(&roots_xdg_surface->request_resize.link);
 	wl_list_remove(&roots_xdg_surface->request_maximize.link);
 	wl_list_remove(&roots_xdg_surface->request_fullscreen.link);
+	roots_xdg_surface->view->xdg_surface->data = NULL;
 	free(roots_xdg_surface);
 }
 
@@ -437,6 +438,7 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data) {
 		&roots_surface->request_fullscreen);
 	roots_surface->new_popup.notify = handle_new_popup;
 	wl_signal_add(&surface->events.new_popup, &roots_surface->new_popup);
+	surface->data = roots_surface;
 
 	struct roots_view *view = view_create(desktop);
 	if (!view) {
@@ -463,3 +465,71 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data) {
 		view_set_fullscreen(view, true, NULL);
 	}
 }
+
+
+
+static void decoration_handle_destroy(struct wl_listener *listener,
+		void *data) {
+	struct roots_xdg_toplevel_decoration *decoration =
+		wl_container_of(listener, decoration, destroy);
+
+	view_update_decorated(decoration->surface->view, false);
+	wl_list_remove(&decoration->destroy.link);
+	wl_list_remove(&decoration->request_mode.link);
+	wl_list_remove(&decoration->surface_commit.link);
+	free(decoration);
+}
+
+static void decoration_handle_request_mode(struct wl_listener *listener,
+		void *data) {
+	struct roots_xdg_toplevel_decoration *decoration =
+		wl_container_of(listener, decoration, request_mode);
+
+	enum wlr_xdg_toplevel_decoration_v1_mode mode =
+		decoration->wlr_decoration->client_pending_mode;
+	if (mode == WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_NONE) {
+		mode = WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE;
+	}
+	wlr_xdg_toplevel_decoration_v1_set_mode(decoration->wlr_decoration, mode);
+}
+
+static void decoration_handle_surface_commit(struct wl_listener *listener,
+		void *data) {
+	struct roots_xdg_toplevel_decoration *decoration =
+		wl_container_of(listener, decoration, surface_commit);
+
+	bool decorated = decoration->wlr_decoration->current_mode ==
+		WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE;
+	view_update_decorated(decoration->surface->view, decorated);
+}
+
+void handle_xdg_toplevel_decoration(struct wl_listener *listener, void *data) {
+	struct roots_desktop *desktop =
+		wl_container_of(listener, desktop, xdg_toplevel_decoration);
+	struct wlr_xdg_toplevel_decoration_v1 *wlr_decoration = data;
+
+	wlr_log(WLR_DEBUG, "new xdg toplevel decoration");
+
+	struct roots_xdg_surface *xdg_surface = wlr_decoration->surface->data;
+	assert(xdg_surface != NULL);
+	struct wlr_xdg_surface *wlr_xdg_surface = xdg_surface->view->xdg_surface;
+
+	struct roots_xdg_toplevel_decoration *decoration =
+		calloc(1, sizeof(struct roots_xdg_toplevel_decoration));
+	if (decoration == NULL) {
+		return;
+	}
+	decoration->wlr_decoration = wlr_decoration;
+	decoration->surface = xdg_surface;
+
+	decoration->destroy.notify = decoration_handle_destroy;
+	wl_signal_add(&wlr_decoration->events.destroy, &decoration->destroy);
+	decoration->request_mode.notify = decoration_handle_request_mode;
+	wl_signal_add(&wlr_decoration->events.request_mode,
+		&decoration->request_mode);
+	decoration->surface_commit.notify = decoration_handle_surface_commit;
+	wl_signal_add(&wlr_xdg_surface->surface->events.commit,
+		&decoration->surface_commit);
+
+	decoration_handle_request_mode(&decoration->request_mode, wlr_decoration);
+}
diff --git a/types/meson.build b/types/meson.build
index 55c0e3bad..64188a398 100644
--- a/types/meson.build
+++ b/types/meson.build
@@ -53,6 +53,7 @@ lib_wlr_types = static_library(
 		'wlr_virtual_keyboard_v1.c',
 		'wlr_wl_shell.c',
 		'wlr_xcursor_manager.c',
+		'wlr_xdg_decoration_v1.c',
 		'wlr_xdg_output.c',
 		'wlr_screencopy_v1.c',
 	),
diff --git a/types/wlr_xdg_decoration_v1.c b/types/wlr_xdg_decoration_v1.c
new file mode 100644
index 000000000..d6aecb87e
--- /dev/null
+++ b/types/wlr_xdg_decoration_v1.c
@@ -0,0 +1,302 @@
+#include <assert.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wlr/types/wlr_xdg_decoration_v1.h>
+#include <wlr/util/log.h>
+#include "util/signal.h"
+#include "xdg-decoration-unstable-v1-protocol.h"
+
+#define DECORATION_MANAGER_VERSION 1
+
+static const struct zxdg_toplevel_decoration_v1_interface
+	toplevel_decoration_impl;
+
+static struct wlr_xdg_toplevel_decoration_v1 *toplevel_decoration_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource,
+		&zxdg_toplevel_decoration_v1_interface, &toplevel_decoration_impl));
+	return wl_resource_get_user_data(resource);
+}
+
+static void toplevel_decoration_handle_destroy(struct wl_client *client,
+		struct wl_resource *resource) {
+	wl_resource_destroy(resource);
+}
+
+static void toplevel_decoration_handle_set_mode(struct wl_client *client,
+		struct wl_resource *resource,
+		enum zxdg_toplevel_decoration_v1_mode mode) {
+	struct wlr_xdg_toplevel_decoration_v1 *decoration =
+		toplevel_decoration_from_resource(resource);
+
+	decoration->client_pending_mode =
+		(enum wlr_xdg_toplevel_decoration_v1_mode)mode;
+	wlr_signal_emit_safe(&decoration->events.request_mode, decoration);
+}
+
+static void toplevel_decoration_handle_unset_mode(struct wl_client *client,
+		struct wl_resource *resource) {
+	struct wlr_xdg_toplevel_decoration_v1 *decoration =
+		toplevel_decoration_from_resource(resource);
+
+	decoration->client_pending_mode = WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_NONE;
+	wlr_signal_emit_safe(&decoration->events.request_mode, decoration);
+}
+
+static const struct zxdg_toplevel_decoration_v1_interface
+		toplevel_decoration_impl = {
+	.destroy = toplevel_decoration_handle_destroy,
+	.set_mode = toplevel_decoration_handle_set_mode,
+	.unset_mode = toplevel_decoration_handle_unset_mode,
+};
+
+uint32_t wlr_xdg_toplevel_decoration_v1_set_mode(
+		struct wlr_xdg_toplevel_decoration_v1 *decoration,
+		enum wlr_xdg_toplevel_decoration_v1_mode mode) {
+	assert(mode != WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_NONE);
+	decoration->server_pending_mode = mode;
+	return wlr_xdg_surface_schedule_configure(decoration->surface);
+}
+
+static void toplevel_decoration_handle_resource_destroy(
+		struct wl_resource *resource) {
+	struct wlr_xdg_toplevel_decoration_v1 *decoration =
+		toplevel_decoration_from_resource(resource);
+	wlr_signal_emit_safe(&decoration->events.destroy, decoration);
+	wl_list_remove(&decoration->surface_commit.link);
+	wl_list_remove(&decoration->surface_destroy.link);
+	wl_list_remove(&decoration->surface_configure.link);
+	wl_list_remove(&decoration->surface_ack_configure.link);
+	struct wlr_xdg_toplevel_decoration_v1_configure *configure, *tmp;
+	wl_list_for_each_safe(configure, tmp, &decoration->configure_list, link) {
+		free(configure);
+	}
+	wl_list_remove(&decoration->link);
+	free(decoration);
+}
+
+static void toplevel_decoration_handle_surface_destroy(
+		struct wl_listener *listener, void *data) {
+	struct wlr_xdg_toplevel_decoration_v1 *decoration =
+		wl_container_of(listener, decoration, surface_destroy);
+	wl_resource_destroy(decoration->resource);
+}
+
+static void toplevel_decoration_handle_surface_configure(
+		struct wl_listener *listener, void *data) {
+	struct wlr_xdg_toplevel_decoration_v1 *decoration =
+		wl_container_of(listener, decoration, surface_configure);
+	struct wlr_xdg_surface_configure *surface_configure = data;
+
+	if (decoration->current_mode == decoration->server_pending_mode) {
+		return;
+	}
+
+	struct wlr_xdg_toplevel_decoration_v1_configure *configure =
+		calloc(1, sizeof(struct wlr_xdg_toplevel_decoration_v1_configure));
+	if (configure == NULL) {
+		return;
+	}
+	configure->surface_configure = surface_configure;
+	configure->mode = decoration->server_pending_mode;
+	wl_list_insert(decoration->configure_list.prev, &configure->link);
+
+	zxdg_toplevel_decoration_v1_send_configure(decoration->resource,
+		configure->mode);
+}
+
+static void toplevel_decoration_handle_surface_ack_configure(
+		struct wl_listener *listener, void *data) {
+	struct wlr_xdg_toplevel_decoration_v1 *decoration =
+		wl_container_of(listener, decoration, surface_ack_configure);
+	struct wlr_xdg_surface_configure *surface_configure = data;
+
+	bool found = false;
+	struct wlr_xdg_toplevel_decoration_v1_configure *configure;
+	wl_list_for_each(configure, &decoration->configure_list, link) {
+		if (configure->surface_configure == surface_configure) {
+			found = true;
+			break;
+		}
+	}
+	if (!found) {
+		return;
+	}
+
+	decoration->current_mode = configure->mode;
+
+	wl_list_remove(&configure->link);
+	free(configure);
+}
+
+static void toplevel_decoration_handle_surface_commit(
+		struct wl_listener *listener, void *data) {
+	struct wlr_xdg_toplevel_decoration_v1 *decoration =
+		wl_container_of(listener, decoration, surface_commit);
+	struct wlr_xdg_decoration_manager_v1 *manager = decoration->manager;
+
+	if (decoration->surface->added) {
+		wl_list_remove(&decoration->surface_commit.link);
+		wl_list_init(&decoration->surface_commit.link);
+
+		decoration->added = true;
+		wlr_signal_emit_safe(&manager->events.new_toplevel_decoration,
+			decoration);
+	}
+}
+
+
+static const struct zxdg_decoration_manager_v1_interface decoration_manager_impl;
+
+static struct wlr_xdg_decoration_manager_v1 *
+		decoration_manager_from_resource(struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource,
+		&zxdg_decoration_manager_v1_interface,
+		&decoration_manager_impl));
+	return wl_resource_get_user_data(resource);
+}
+
+static void decoration_manager_handle_get_toplevel_decoration(
+		struct wl_client *client, struct wl_resource *manager_resource,
+		uint32_t id, struct wl_resource *toplevel_resource) {
+	struct wlr_xdg_decoration_manager_v1 *manager =
+		decoration_manager_from_resource(manager_resource);
+	struct wlr_xdg_surface *surface =
+		wlr_xdg_surface_from_toplevel_resource(toplevel_resource);
+	assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
+
+	if (wlr_surface_has_buffer(surface->surface)) {
+		wl_resource_post_error(manager_resource,
+			ZXDG_TOPLEVEL_DECORATION_V1_ERROR_UNCONFIGURED_BUFFER,
+			"xdg_toplevel_decoration must not have a buffer at creation");
+		return;
+	}
+
+	struct wlr_xdg_toplevel_decoration_v1 *decoration =
+		calloc(1, sizeof(struct wlr_xdg_toplevel_decoration_v1));
+	if (decoration == NULL) {
+		wl_client_post_no_memory(client);
+		return;
+	}
+	decoration->manager = manager;
+	decoration->surface = surface;
+
+	uint32_t version = wl_resource_get_version(manager_resource);
+	decoration->resource = wl_resource_create(client,
+		&zxdg_toplevel_decoration_v1_interface, version, id);
+	if (decoration->resource == NULL) {
+		free(decoration);
+		wl_client_post_no_memory(client);
+		return;
+	}
+	wl_resource_set_implementation(decoration->resource,
+		&toplevel_decoration_impl, decoration,
+		toplevel_decoration_handle_resource_destroy);
+
+	wlr_log(WLR_DEBUG, "new xdg_toplevel_decoration %p (res %p)", decoration,
+		decoration->resource);
+
+	wl_list_init(&decoration->configure_list);
+	wl_signal_init(&decoration->events.destroy);
+	wl_signal_init(&decoration->events.request_mode);
+
+	wl_signal_add(&surface->events.destroy, &decoration->surface_destroy);
+	decoration->surface_destroy.notify =
+		toplevel_decoration_handle_surface_destroy;
+	wl_signal_add(&surface->events.configure, &decoration->surface_configure);
+	decoration->surface_configure.notify =
+		toplevel_decoration_handle_surface_configure;
+	wl_signal_add(&surface->events.ack_configure,
+		&decoration->surface_ack_configure);
+	decoration->surface_ack_configure.notify =
+		toplevel_decoration_handle_surface_ack_configure;
+	wl_list_init(&decoration->surface_commit.link);
+
+	wl_list_insert(&manager->decorations, &decoration->link);
+
+	if (surface->added) {
+		decoration->added = true;
+		wlr_signal_emit_safe(&manager->events.new_toplevel_decoration,
+			decoration);
+	} else {
+		wl_list_remove(&decoration->surface_commit.link);
+		wl_signal_add(&surface->surface->events.commit,
+			&decoration->surface_commit);
+		decoration->surface_commit.notify =
+			toplevel_decoration_handle_surface_commit;
+	}
+}
+
+static const struct zxdg_decoration_manager_v1_interface
+		decoration_manager_impl = {
+	.get_toplevel_decoration = decoration_manager_handle_get_toplevel_decoration,
+};
+
+void decoration_manager_handle_resource_destroy(struct wl_resource *resource) {
+	wl_list_remove(wl_resource_get_link(resource));
+}
+
+static void decoration_manager_bind(struct wl_client *client, void *data,
+		uint32_t version, uint32_t id) {
+	struct wlr_xdg_decoration_manager_v1 *manager = data;
+
+	struct wl_resource *resource = wl_resource_create(client,
+		&zxdg_decoration_manager_v1_interface, version, id);
+	if (resource == NULL) {
+		wl_client_post_no_memory(client);
+		return;
+	}
+	wl_resource_set_implementation(resource, &decoration_manager_impl,
+		manager, decoration_manager_handle_resource_destroy);
+
+	wl_list_insert(&manager->resources, wl_resource_get_link(resource));
+}
+
+static void handle_display_destroy(struct wl_listener *listener, void *data) {
+	struct wlr_xdg_decoration_manager_v1 *manager =
+		wl_container_of(listener, manager, display_destroy);
+	wlr_xdg_decoration_manager_v1_destroy(manager);
+}
+
+struct wlr_xdg_decoration_manager_v1 *
+		wlr_xdg_decoration_manager_v1_create(struct wl_display *display) {
+	struct wlr_xdg_decoration_manager_v1 *manager =
+		calloc(1, sizeof(struct wlr_xdg_decoration_manager_v1));
+	if (manager == NULL) {
+		return NULL;
+	}
+	manager->global = wl_global_create(display,
+		&zxdg_decoration_manager_v1_interface, DECORATION_MANAGER_VERSION,
+		manager, decoration_manager_bind);
+	if (manager->global == NULL) {
+		free(manager);
+		return NULL;
+	}
+	wl_list_init(&manager->resources);
+	wl_list_init(&manager->decorations);
+	wl_signal_init(&manager->events.new_toplevel_decoration);
+
+	manager->display_destroy.notify = handle_display_destroy;
+	wl_display_add_destroy_listener(display, &manager->display_destroy);
+
+	return manager;
+}
+
+void wlr_xdg_decoration_manager_v1_destroy(
+		struct wlr_xdg_decoration_manager_v1 *manager) {
+	if (manager == NULL) {
+		return;
+	}
+	wl_list_remove(&manager->display_destroy.link);
+	struct wlr_xdg_toplevel_decoration_v1 *decoration, *tmp_decoration;
+	wl_list_for_each_safe(decoration, tmp_decoration, &manager->decorations,
+			link) {
+		wl_resource_destroy(decoration->resource);
+	}
+	struct wl_resource *resource, *tmp_resource;
+	wl_resource_for_each_safe(resource, tmp_resource, &manager->resources) {
+		wl_resource_destroy(resource);
+	}
+	wl_global_destroy(manager->global);
+	free(manager);
+}
diff --git a/types/xdg_shell/wlr_xdg_surface.c b/types/xdg_shell/wlr_xdg_surface.c
index dc98a3a51..dd85c7b16 100644
--- a/types/xdg_shell/wlr_xdg_surface.c
+++ b/types/xdg_shell/wlr_xdg_surface.c
@@ -111,6 +111,7 @@ static void xdg_surface_handle_ack_configure(struct wl_client *client,
 	struct wlr_xdg_surface_configure *configure, *tmp;
 	wl_list_for_each_safe(configure, tmp, &surface->configure_list, link) {
 		if (configure->serial < serial) {
+			wlr_signal_emit_safe(&surface->events.ack_configure, configure);
 			xdg_surface_configure_destroy(configure);
 		} else if (configure->serial == serial) {
 			found = true;
@@ -140,6 +141,7 @@ static void xdg_surface_handle_ack_configure(struct wl_client *client,
 	surface->configured = true;
 	surface->configure_serial = serial;
 
+	wlr_signal_emit_safe(&surface->events.ack_configure, configure);
 	xdg_surface_configure_destroy(configure);
 }
 
@@ -157,6 +159,7 @@ static void surface_send_configure(void *user_data) {
 
 	wl_list_insert(surface->configure_list.prev, &configure->link);
 	configure->serial = surface->configure_next_serial;
+	configure->surface = surface;
 
 	switch (surface->role) {
 	case WLR_XDG_SURFACE_ROLE_NONE:
@@ -174,26 +177,15 @@ static void surface_send_configure(void *user_data) {
 		break;
 	}
 
+	wlr_signal_emit_safe(&surface->events.configure, configure);
+
 	xdg_surface_send_configure(surface->resource, configure->serial);
 }
 
-uint32_t schedule_xdg_surface_configure(
-		struct wlr_xdg_surface *surface) {
+static uint32_t schedule_configure(struct wlr_xdg_surface *surface,
+		bool pending_same) {
 	struct wl_display *display = wl_client_get_display(surface->client->client);
 	struct wl_event_loop *loop = wl_display_get_event_loop(display);
-	bool pending_same = false;
-
-	switch (surface->role) {
-	case WLR_XDG_SURFACE_ROLE_NONE:
-		assert(0 && "not reached");
-		break;
-	case WLR_XDG_SURFACE_ROLE_TOPLEVEL:
-		pending_same =
-			compare_xdg_surface_toplevel_state(surface->toplevel);
-		break;
-	case WLR_XDG_SURFACE_ROLE_POPUP:
-		break;
-	}
 
 	if (surface->configure_idle != NULL) {
 		if (!pending_same) {
@@ -218,6 +210,27 @@ uint32_t schedule_xdg_surface_configure(
 	}
 }
 
+uint32_t schedule_xdg_surface_configure(struct wlr_xdg_surface *surface) {
+	bool pending_same = false;
+
+	switch (surface->role) {
+	case WLR_XDG_SURFACE_ROLE_NONE:
+		assert(0 && "not reached");
+		break;
+	case WLR_XDG_SURFACE_ROLE_TOPLEVEL:
+		pending_same = compare_xdg_surface_toplevel_state(surface->toplevel);
+		break;
+	case WLR_XDG_SURFACE_ROLE_POPUP:
+		break;
+	}
+
+	return schedule_configure(surface, pending_same);
+}
+
+uint32_t wlr_xdg_surface_schedule_configure(struct wlr_xdg_surface *surface) {
+	return schedule_configure(surface, false);
+}
+
 static void xdg_surface_handle_get_popup(struct wl_client *client,
 		struct wl_resource *resource, uint32_t id,
 		struct wl_resource *parent_resource,
@@ -401,6 +414,8 @@ struct wlr_xdg_surface *create_xdg_surface(
 	wl_signal_init(&xdg_surface->events.new_popup);
 	wl_signal_init(&xdg_surface->events.map);
 	wl_signal_init(&xdg_surface->events.unmap);
+	wl_signal_init(&xdg_surface->events.configure);
+	wl_signal_init(&xdg_surface->events.ack_configure);
 
 	wl_signal_add(&xdg_surface->surface->events.destroy,
 		&xdg_surface->surface_destroy);
diff --git a/types/xdg_shell/wlr_xdg_toplevel.c b/types/xdg_shell/wlr_xdg_toplevel.c
index 0a1b9bfd4..84c678206 100644
--- a/types/xdg_shell/wlr_xdg_toplevel.c
+++ b/types/xdg_shell/wlr_xdg_toplevel.c
@@ -200,7 +200,7 @@ void handle_xdg_surface_toplevel_committed(struct wlr_xdg_surface *surface) {
 
 static const struct xdg_toplevel_interface xdg_toplevel_implementation;
 
-static struct wlr_xdg_surface *xdg_surface_from_xdg_toplevel_resource(
+struct wlr_xdg_surface *wlr_xdg_surface_from_toplevel_resource(
 		struct wl_resource *resource) {
 	assert(wl_resource_instance_of(resource, &xdg_toplevel_interface,
 		&xdg_toplevel_implementation));
@@ -210,11 +210,11 @@ static struct wlr_xdg_surface *xdg_surface_from_xdg_toplevel_resource(
 static void xdg_toplevel_handle_set_parent(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *parent_resource) {
 	struct wlr_xdg_surface *surface =
-		xdg_surface_from_xdg_toplevel_resource(resource);
+		wlr_xdg_surface_from_toplevel_resource(resource);
 	struct wlr_xdg_surface *parent = NULL;
 
 	if (parent_resource != NULL) {
-		parent = xdg_surface_from_xdg_toplevel_resource(parent_resource);
+		parent = wlr_xdg_surface_from_toplevel_resource(parent_resource);
 	}
 
 	surface->toplevel->parent = parent;
@@ -224,7 +224,7 @@ static void xdg_toplevel_handle_set_parent(struct wl_client *client,
 static void xdg_toplevel_handle_set_title(struct wl_client *client,
 		struct wl_resource *resource, const char *title) {
 	struct wlr_xdg_surface *surface =
-		xdg_surface_from_xdg_toplevel_resource(resource);
+		wlr_xdg_surface_from_toplevel_resource(resource);
 	char *tmp;
 
 	tmp = strdup(title);
@@ -240,7 +240,7 @@ static void xdg_toplevel_handle_set_title(struct wl_client *client,
 static void xdg_toplevel_handle_set_app_id(struct wl_client *client,
 		struct wl_resource *resource, const char *app_id) {
 	struct wlr_xdg_surface *surface =
-		xdg_surface_from_xdg_toplevel_resource(resource);
+		wlr_xdg_surface_from_toplevel_resource(resource);
 	char *tmp;
 
 	tmp = strdup(app_id);
@@ -257,7 +257,7 @@ static void xdg_toplevel_handle_show_window_menu(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *seat_resource,
 		uint32_t serial, int32_t x, int32_t y) {
 	struct wlr_xdg_surface *surface =
-		xdg_surface_from_xdg_toplevel_resource(resource);
+		wlr_xdg_surface_from_toplevel_resource(resource);
 	struct wlr_seat_client *seat =
 		wlr_seat_client_from_resource(seat_resource);
 
@@ -288,7 +288,7 @@ static void xdg_toplevel_handle_move(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *seat_resource,
 		uint32_t serial) {
 	struct wlr_xdg_surface *surface =
-		xdg_surface_from_xdg_toplevel_resource(resource);
+		wlr_xdg_surface_from_toplevel_resource(resource);
 	struct wlr_seat_client *seat =
 		wlr_seat_client_from_resource(seat_resource);
 
@@ -317,7 +317,7 @@ static void xdg_toplevel_handle_resize(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *seat_resource,
 		uint32_t serial, uint32_t edges) {
 	struct wlr_xdg_surface *surface =
-		xdg_surface_from_xdg_toplevel_resource(resource);
+		wlr_xdg_surface_from_toplevel_resource(resource);
 	struct wlr_seat_client *seat =
 		wlr_seat_client_from_resource(seat_resource);
 
@@ -346,7 +346,7 @@ static void xdg_toplevel_handle_resize(struct wl_client *client,
 static void xdg_toplevel_handle_set_max_size(struct wl_client *client,
 		struct wl_resource *resource, int32_t width, int32_t height) {
 	struct wlr_xdg_surface *surface =
-		xdg_surface_from_xdg_toplevel_resource(resource);
+		wlr_xdg_surface_from_toplevel_resource(resource);
 	surface->toplevel->client_pending.max_width = width;
 	surface->toplevel->client_pending.max_height = height;
 }
@@ -354,7 +354,7 @@ static void xdg_toplevel_handle_set_max_size(struct wl_client *client,
 static void xdg_toplevel_handle_set_min_size(struct wl_client *client,
 		struct wl_resource *resource, int32_t width, int32_t height) {
 	struct wlr_xdg_surface *surface =
-		xdg_surface_from_xdg_toplevel_resource(resource);
+		wlr_xdg_surface_from_toplevel_resource(resource);
 	surface->toplevel->client_pending.min_width = width;
 	surface->toplevel->client_pending.min_height = height;
 }
@@ -362,7 +362,7 @@ static void xdg_toplevel_handle_set_min_size(struct wl_client *client,
 static void xdg_toplevel_handle_set_maximized(struct wl_client *client,
 		struct wl_resource *resource) {
 	struct wlr_xdg_surface *surface =
-		xdg_surface_from_xdg_toplevel_resource(resource);
+		wlr_xdg_surface_from_toplevel_resource(resource);
 	surface->toplevel->client_pending.maximized = true;
 	wlr_signal_emit_safe(&surface->toplevel->events.request_maximize, surface);
 }
@@ -370,7 +370,7 @@ static void xdg_toplevel_handle_set_maximized(struct wl_client *client,
 static void xdg_toplevel_handle_unset_maximized(struct wl_client *client,
 		struct wl_resource *resource) {
 	struct wlr_xdg_surface *surface =
-		xdg_surface_from_xdg_toplevel_resource(resource);
+		wlr_xdg_surface_from_toplevel_resource(resource);
 	surface->toplevel->client_pending.maximized = false;
 	wlr_signal_emit_safe(&surface->toplevel->events.request_maximize, surface);
 }
@@ -378,7 +378,7 @@ static void xdg_toplevel_handle_unset_maximized(struct wl_client *client,
 static void xdg_toplevel_handle_set_fullscreen(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *output_resource) {
 	struct wlr_xdg_surface *surface =
-		xdg_surface_from_xdg_toplevel_resource(resource);
+		wlr_xdg_surface_from_toplevel_resource(resource);
 
 	struct wlr_output *output = NULL;
 	if (output_resource != NULL) {
@@ -399,7 +399,7 @@ static void xdg_toplevel_handle_set_fullscreen(struct wl_client *client,
 static void xdg_toplevel_handle_unset_fullscreen(struct wl_client *client,
 		struct wl_resource *resource) {
 	struct wlr_xdg_surface *surface =
-		xdg_surface_from_xdg_toplevel_resource(resource);
+		wlr_xdg_surface_from_toplevel_resource(resource);
 
 	surface->toplevel->client_pending.fullscreen = false;
 
@@ -415,7 +415,7 @@ static void xdg_toplevel_handle_unset_fullscreen(struct wl_client *client,
 static void xdg_toplevel_handle_set_minimized(struct wl_client *client,
 		struct wl_resource *resource) {
 	struct wlr_xdg_surface *surface =
-		xdg_surface_from_xdg_toplevel_resource(resource);
+		wlr_xdg_surface_from_toplevel_resource(resource);
 	wlr_signal_emit_safe(&surface->toplevel->events.request_minimize, surface);
 }
 
@@ -443,7 +443,7 @@ static const struct xdg_toplevel_interface xdg_toplevel_implementation = {
 
 static void xdg_toplevel_handle_resource_destroy(struct wl_resource *resource) {
 	struct wlr_xdg_surface *surface =
-		xdg_surface_from_xdg_toplevel_resource(resource);
+		wlr_xdg_surface_from_toplevel_resource(resource);
 	if (surface != NULL) {
 		destroy_xdg_toplevel(surface);
 	}