diff --git a/render.c b/render.c
index f5e7f627..c91a39b2 100644
--- a/render.c
+++ b/render.c
@@ -1489,7 +1489,7 @@ render_ime_preedit(struct terminal *term, struct buffer *buf)
 static void
 render_overlay(struct terminal *term)
 {
-    struct wl_surf_subsurf *overlay = &term->window->overlay;
+    struct wl_surf *overlay = &term->window->overlay;
     bool unicode_mode_active = false;
 
     /* Check if unicode mode is active on at least one seat focusing
@@ -1934,7 +1934,7 @@ render_csd_title(struct terminal *term, const struct csd_data *info,
 {
     xassert(term->window->csd_mode == CSD_YES);
 
-    struct wl_surf_subsurf *surf = &term->window->csd.surface[CSD_SURF_TITLE];
+    struct wl_surf *surf = &term->window->csd.surface[CSD_SURF_TITLE];
     if (info->width == 0 || info->height == 0)
         return;
 
diff --git a/wayland.c b/wayland.c
index e48d59aa..7423e2a8 100644
--- a/wayland.c
+++ b/wayland.c
@@ -1839,7 +1839,7 @@ wayl_win_csd_borders_visible(const struct wl_window *win)
 bool
 wayl_win_subsurface_new_with_custom_parent(
     struct wl_window *win, struct wl_surface *parent,
-    struct wl_surf_subsurf *surf, bool allow_pointer_input)
+    struct wl_surf *surf, bool allow_pointer_input)
 {
     struct wayland *wayl = win->term->wl;
 
@@ -1877,7 +1877,7 @@ wayl_win_subsurface_new_with_custom_parent(
 }
 
 bool
-wayl_win_subsurface_new(struct wl_window *win, struct wl_surf_subsurf *surf,
+wayl_win_subsurface_new(struct wl_window *win, struct wl_surf *surf,
                         bool allow_pointer_input)
 {
     return wayl_win_subsurface_new_with_custom_parent(
@@ -1885,7 +1885,7 @@ wayl_win_subsurface_new(struct wl_window *win, struct wl_surf_subsurf *surf,
 }
 
 void
-wayl_win_subsurface_destroy(struct wl_surf_subsurf *surf)
+wayl_win_subsurface_destroy(struct wl_surf *surf)
 {
     if (surf == NULL)
         return;
diff --git a/wayland.h b/wayland.h
index e86c6a3d..53b86ea3 100644
--- a/wayland.h
+++ b/wayland.h
@@ -289,14 +289,14 @@ struct monitor {
     bool use_output_release;
 };
 
-struct wl_surf_subsurf {
+struct wl_surf {
     struct wl_surface *surf;
     struct wl_subsurface *sub;
 };
 
 struct wl_url {
     const struct url *url;
-    struct wl_surf_subsurf surf;
+    struct wl_surf surf;
 };
 
 enum csd_mode {CSD_UNKNOWN, CSD_NO, CSD_YES};
@@ -333,7 +333,7 @@ struct wl_window {
     enum csd_mode csd_mode;
 
     struct {
-        struct wl_surf_subsurf surface[CSD_SURF_COUNT];
+        struct wl_surf surface[CSD_SURF_COUNT];
         struct fcft_font *font;
         int move_timeout_fd;
         uint32_t serial;
@@ -344,10 +344,10 @@ struct wl_window {
         bool minimize:1;
     } wm_capabilities;
 
-    struct wl_surf_subsurf search;
-    struct wl_surf_subsurf scrollback_indicator;
-    struct wl_surf_subsurf render_timer;
-    struct wl_surf_subsurf overlay;
+    struct wl_surf search;
+    struct wl_surf scrollback_indicator;
+    struct wl_surf render_timer;
+    struct wl_surf overlay;
 
     struct wl_callback *frame_callback;
 
@@ -439,12 +439,12 @@ bool wayl_win_csd_titlebar_visible(const struct wl_window *win);
 bool wayl_win_csd_borders_visible(const struct wl_window *win);
 
 bool wayl_win_subsurface_new(
-    struct wl_window *win, struct wl_surf_subsurf *surf,
+    struct wl_window *win, struct wl_surf *surf,
     bool allow_pointer_input);
 bool wayl_win_subsurface_new_with_custom_parent(
     struct wl_window *win, struct wl_surface *parent,
-    struct wl_surf_subsurf *surf, bool allow_pointer_input);
-void wayl_win_subsurface_destroy(struct wl_surf_subsurf *surf);
+    struct wl_surf *surf, bool allow_pointer_input);
+void wayl_win_subsurface_destroy(struct wl_surf *surf);
 
 #if defined(HAVE_XDG_ACTIVATION)
 bool wayl_get_activation_token(