diff --git a/include/absinthe-toplevel.h b/include/absinthe-toplevel.h
index 033275d..2a937ea 100644
--- a/include/absinthe-toplevel.h
+++ b/include/absinthe-toplevel.h
@@ -3,6 +3,14 @@
 bool absinthe_toplevel_is_x11(struct absinthe_toplevel *toplevel);
 bool absinthe_toplevel_is_unmanaged(struct absinthe_toplevel *toplevel);
 
+void absinthe_toplevel_map(struct wl_listener *listener, void *data);
+void absinthe_toplevel_unmap(struct wl_listener *listener, void *data);
+void absinthe_toplevel_destroy(struct wl_listener *listener, void *data);
+void absinthe_toplevel_request_move(struct wl_listener *listener, void *data);
+void absinthe_toplevel_request_resize(struct wl_listener *listener, void *data);
+void absinthe_toplevel_request_maximize(struct wl_listener *listener, void *data);
+void absinthe_toplevel_request_fullscreen(struct wl_listener *listener, void *data);
+
 struct absinthe_toplevel *absinthe_toplevel_at(struct absinthe_server *server, double lx, double ly, struct wlr_surface **surface, double *sx, double *sy);
 
 void absinthe_toplevel_set_position(struct absinthe_toplevel *toplevel, int32_t x, int32_t y);
diff --git a/include/xdg-toplevel.h b/include/xdg-toplevel.h
index 1849458..edf2a62 100644
--- a/include/xdg-toplevel.h
+++ b/include/xdg-toplevel.h
@@ -2,11 +2,4 @@
 
 #include <wayland-server-core.h>
 
-void xdg_toplevel_map(struct wl_listener *listener, void *data);
-void xdg_toplevel_unmap(struct wl_listener *listener, void *data);
 void xdg_toplevel_commit(struct wl_listener *listener, void *data);
-void xdg_toplevel_destroy(struct wl_listener *listener, void *data);
-void xdg_toplevel_request_move(struct wl_listener *listener, void *data);
-void xdg_toplevel_request_resize(struct wl_listener *listener, void *data);
-void xdg_toplevel_request_maximize(struct wl_listener *listener, void *data);
-void xdg_toplevel_request_fullscreen(struct wl_listener *listener, void *data);
diff --git a/src/absinthe-toplevel.c b/src/absinthe-toplevel.c
index c932c4d..26dc8b1 100644
--- a/src/absinthe-toplevel.c
+++ b/src/absinthe-toplevel.c
@@ -2,6 +2,9 @@
 #include <wlr/util/log.h>
 
 #include "types.h"
+#include "absinthe-toplevel.h"
+#include "output.h"
+#include "layout.h"
 
 bool absinthe_toplevel_is_x11(struct absinthe_toplevel *toplevel)
 {
@@ -20,6 +23,106 @@ bool absinthe_toplevel_is_unmanaged(struct absinthe_toplevel *toplevel)
     return false;
 }
 
+void absinthe_toplevel_map(struct wl_listener *listener, void *data)
+{
+    struct absinthe_toplevel *toplevel = wl_container_of(listener, toplevel, map);
+
+    toplevel->scene_tree = wlr_scene_tree_create(&toplevel->server->scene->tree);
+    toplevel->scene_tree->node.data = toplevel;
+
+    toplevel->border_width = absinthe_toplevel_is_unmanaged(toplevel)
+        ? 0
+        : ABSINTHE_TOPLEVEL_BORDER_WIDTH;
+
+    toplevel->scene_surface = toplevel->type == ABSINTHE_TOPLEVEL_XDG
+        ? wlr_scene_xdg_surface_create(toplevel->scene_tree, toplevel->toplevel.xdg->base)
+        : wlr_scene_subsurface_tree_create(toplevel->scene_tree, toplevel->toplevel.x11->surface);
+    toplevel->scene_surface->node.data = toplevel;
+
+    for (int i = 0; i < 4; ++i) {
+        toplevel->border[i] = wlr_scene_rect_create(toplevel->scene_tree, 0, 0, unfocused_border_color);
+        toplevel->border[i]->node.data = toplevel;
+    }
+
+    toplevel->border_width = ABSINTHE_TOPLEVEL_BORDER_WIDTH;
+
+    update_focused_output(toplevel->server);
+    toplevel->output = toplevel->server->focused_output;
+    toplevel->fullscreen = false;
+
+    wl_list_insert(&toplevel->server->toplevels, &toplevel->link);
+    wl_list_insert(&toplevel->server->focus_stack, &toplevel->flink);
+
+    layout_arrange(toplevel->output);
+}
+
+void absinthe_toplevel_unmap(struct wl_listener *listener, void *data)
+{
+    struct absinthe_toplevel *toplevel = wl_container_of(listener, toplevel, unmap);
+
+    wlr_scene_node_destroy(&toplevel->scene_tree->node);
+
+    wl_list_remove(&toplevel->link);
+    wl_list_remove(&toplevel->flink);
+
+    layout_arrange(toplevel->output);
+}
+
+void absinthe_toplevel_destroy(struct wl_listener *listener, void *data)
+{
+    struct absinthe_toplevel *toplevel = wl_container_of(listener, toplevel, destroy);
+
+#ifdef XWAYLAND
+    if (absinthe_toplevel_is_x11(toplevel)) {
+        wl_list_remove(&toplevel->xwayland_activate.link);
+        wl_list_remove(&toplevel->xwayland_associate.link);
+        wl_list_remove(&toplevel->xwayland_dissociate.link);
+        wl_list_remove(&toplevel->xwayland_configure.link);
+        wl_list_remove(&toplevel->xwayland_set_hints.link);
+    } else
+#endif
+    {
+        wl_list_remove(&toplevel->map.link);
+        wl_list_remove(&toplevel->unmap.link);
+        wl_list_remove(&toplevel->commit.link);
+        wl_list_remove(&toplevel->request_move.link);
+        wl_list_remove(&toplevel->request_resize.link);
+    }
+
+    wl_list_remove(&toplevel->destroy.link);
+    wl_list_remove(&toplevel->request_maximize.link);
+    wl_list_remove(&toplevel->request_fullscreen.link);
+
+    free(toplevel);
+}
+
+void absinthe_toplevel_request_move(struct wl_listener *listener, void *data)
+{
+    struct absinthe_toplevel *toplevel = wl_container_of(listener, toplevel, request_maximize);
+    if (toplevel->toplevel.xdg->base->initialized)
+        wlr_xdg_surface_schedule_configure(toplevel->toplevel.xdg->base);
+}
+
+void absinthe_toplevel_request_resize(struct wl_listener *listener, void *data)
+{
+    struct absinthe_toplevel *toplevel = wl_container_of(listener, toplevel, request_maximize);
+    if (toplevel->toplevel.xdg->base->initialized)
+        wlr_xdg_surface_schedule_configure(toplevel->toplevel.xdg->base);
+}
+
+void absinthe_toplevel_request_maximize(struct wl_listener *listener, void *data)
+{
+    struct absinthe_toplevel *toplevel = wl_container_of(listener, toplevel, request_maximize);
+    if (toplevel->toplevel.xdg->base->initialized)
+        wlr_xdg_surface_schedule_configure(toplevel->toplevel.xdg->base);
+}
+
+void absinthe_toplevel_request_fullscreen(struct wl_listener *listener, void *data)
+{
+    struct absinthe_toplevel *toplevel = wl_container_of(listener, toplevel, request_fullscreen);
+    absinthe_toplevel_set_fullscreen(toplevel, toplevel->toplevel.xdg->requested.fullscreen);
+}
+
 struct absinthe_toplevel *absinthe_toplevel_at(struct absinthe_server *server, double lx, double ly, struct wlr_surface **surface, double *sx, double *sy)
 {
     struct wlr_scene_node *node = wlr_scene_node_at(&server->scene->tree.node, lx, ly, sx, sy);
diff --git a/src/server.c b/src/server.c
index 943db7d..0c3cce4 100644
--- a/src/server.c
+++ b/src/server.c
@@ -69,23 +69,24 @@ void server_new_xdg_toplevel(struct wl_listener *listener, void *data)
     toplevel->toplevel.xdg = xdg_toplevel;
     toplevel->toplevel.xdg->base->data = toplevel;
 
-    toplevel->map.notify = xdg_toplevel_map;
-    wl_signal_add(&xdg_toplevel->base->surface->events.map, &toplevel->map);
-    toplevel->unmap.notify = xdg_toplevel_unmap;
-    wl_signal_add(&xdg_toplevel->base->surface->events.unmap, &toplevel->unmap);
     toplevel->commit.notify = xdg_toplevel_commit;
     wl_signal_add(&xdg_toplevel->base->surface->events.commit, &toplevel->commit);
 
-    toplevel->destroy.notify = xdg_toplevel_destroy;
+    toplevel->map.notify = absinthe_toplevel_map;
+    wl_signal_add(&xdg_toplevel->base->surface->events.map, &toplevel->map);
+    toplevel->unmap.notify = absinthe_toplevel_unmap;
+    wl_signal_add(&xdg_toplevel->base->surface->events.unmap, &toplevel->unmap);
+
+    toplevel->destroy.notify = absinthe_toplevel_destroy;
     wl_signal_add(&xdg_toplevel->events.destroy, &toplevel->destroy);
 
-    toplevel->request_move.notify = xdg_toplevel_request_move;
+    toplevel->request_move.notify = absinthe_toplevel_request_move;
     wl_signal_add(&xdg_toplevel->events.request_move, &toplevel->request_move);
-    toplevel->request_resize.notify = xdg_toplevel_request_resize;
+    toplevel->request_resize.notify = absinthe_toplevel_request_resize;
     wl_signal_add(&xdg_toplevel->events.request_resize, &toplevel->request_resize);
-    toplevel->request_maximize.notify = xdg_toplevel_request_maximize;
+    toplevel->request_maximize.notify = absinthe_toplevel_request_maximize;
     wl_signal_add(&xdg_toplevel->events.request_maximize, &toplevel->request_maximize);
-    toplevel->request_fullscreen.notify = xdg_toplevel_request_fullscreen;
+    toplevel->request_fullscreen.notify = absinthe_toplevel_request_fullscreen;
     wl_signal_add(&xdg_toplevel->events.request_fullscreen, &toplevel->request_fullscreen);
 }
 
@@ -148,11 +149,11 @@ void server_xwayland_new_surface(struct wl_listener *listener, void *data)
     toplevel->server = server;
     toplevel->toplevel.x11 = surface;
 
-    toplevel->destroy.notify = xdg_toplevel_destroy;
+    toplevel->destroy.notify = absinthe_toplevel_destroy;
     wl_signal_add(&surface->events.destroy, &toplevel->destroy);
-    toplevel->request_maximize.notify = xdg_toplevel_request_maximize;
+    toplevel->request_maximize.notify = absinthe_toplevel_request_maximize;
     wl_signal_add(&surface->events.request_maximize, &toplevel->request_maximize);
-    toplevel->request_fullscreen.notify = xdg_toplevel_request_fullscreen;
+    toplevel->request_fullscreen.notify = absinthe_toplevel_request_fullscreen;
     wl_signal_add(&surface->events.request_fullscreen, &toplevel->request_fullscreen);
 
     toplevel->xwayland_activate.notify = xwayland_activate;
diff --git a/src/xdg-toplevel.c b/src/xdg-toplevel.c
index 1aa7df2..25dc135 100644
--- a/src/xdg-toplevel.c
+++ b/src/xdg-toplevel.c
@@ -32,103 +32,3 @@ void xdg_toplevel_commit(struct wl_listener *listener, void *data)
         toplevel->performing_resize = false;
     }
 }
-
-void xdg_toplevel_map(struct wl_listener *listener, void *data)
-{
-    struct absinthe_toplevel *toplevel = wl_container_of(listener, toplevel, map);
-
-    toplevel->scene_tree = wlr_scene_tree_create(&toplevel->server->scene->tree);
-    toplevel->scene_tree->node.data = toplevel;
-
-    toplevel->border_width = absinthe_toplevel_is_unmanaged(toplevel)
-        ? 0
-        : ABSINTHE_TOPLEVEL_BORDER_WIDTH;
-
-    toplevel->scene_surface = toplevel->type == ABSINTHE_TOPLEVEL_XDG
-        ? wlr_scene_xdg_surface_create(toplevel->scene_tree, toplevel->toplevel.xdg->base)
-        : wlr_scene_subsurface_tree_create(toplevel->scene_tree, toplevel->toplevel.x11->surface);
-    toplevel->scene_surface->node.data = toplevel;
-
-    for (int i = 0; i < 4; ++i) {
-        toplevel->border[i] = wlr_scene_rect_create(toplevel->scene_tree, 0, 0, unfocused_border_color);
-        toplevel->border[i]->node.data = toplevel;
-    }
-
-    toplevel->border_width = ABSINTHE_TOPLEVEL_BORDER_WIDTH;
-
-    update_focused_output(toplevel->server);
-    toplevel->output = toplevel->server->focused_output;
-    toplevel->fullscreen = false;
-
-    wl_list_insert(&toplevel->server->toplevels, &toplevel->link);
-    wl_list_insert(&toplevel->server->focus_stack, &toplevel->flink);
-
-    layout_arrange(toplevel->output);
-}
-
-void xdg_toplevel_unmap(struct wl_listener *listener, void *data)
-{
-    struct absinthe_toplevel *toplevel = wl_container_of(listener, toplevel, unmap);
-
-    wlr_scene_node_destroy(&toplevel->scene_tree->node);
-
-    wl_list_remove(&toplevel->link);
-    wl_list_remove(&toplevel->flink);
-
-    layout_arrange(toplevel->output);
-}
-
-void xdg_toplevel_destroy(struct wl_listener *listener, void *data)
-{
-    struct absinthe_toplevel *toplevel = wl_container_of(listener, toplevel, destroy);
-
-#ifdef XWAYLAND
-    if (absinthe_toplevel_is_x11(toplevel)) {
-        wl_list_remove(&toplevel->xwayland_activate.link);
-        wl_list_remove(&toplevel->xwayland_associate.link);
-        wl_list_remove(&toplevel->xwayland_dissociate.link);
-        wl_list_remove(&toplevel->xwayland_configure.link);
-        wl_list_remove(&toplevel->xwayland_set_hints.link);
-    } else
-#endif
-    {
-        wl_list_remove(&toplevel->map.link);
-        wl_list_remove(&toplevel->unmap.link);
-        wl_list_remove(&toplevel->commit.link);
-        wl_list_remove(&toplevel->request_move.link);
-        wl_list_remove(&toplevel->request_resize.link);
-    }
-
-    wl_list_remove(&toplevel->destroy.link);
-    wl_list_remove(&toplevel->request_maximize.link);
-    wl_list_remove(&toplevel->request_fullscreen.link);
-
-    free(toplevel);
-}
-
-void xdg_toplevel_request_move(struct wl_listener *listener, void *data)
-{
-    struct absinthe_toplevel *toplevel = wl_container_of(listener, toplevel, request_maximize);
-    if (toplevel->toplevel.xdg->base->initialized)
-        wlr_xdg_surface_schedule_configure(toplevel->toplevel.xdg->base);
-}
-
-void xdg_toplevel_request_resize(struct wl_listener *listener, void *data)
-{
-    struct absinthe_toplevel *toplevel = wl_container_of(listener, toplevel, request_maximize);
-    if (toplevel->toplevel.xdg->base->initialized)
-        wlr_xdg_surface_schedule_configure(toplevel->toplevel.xdg->base);
-}
-
-void xdg_toplevel_request_maximize(struct wl_listener *listener, void *data)
-{
-    struct absinthe_toplevel *toplevel = wl_container_of(listener, toplevel, request_maximize);
-    if (toplevel->toplevel.xdg->base->initialized)
-        wlr_xdg_surface_schedule_configure(toplevel->toplevel.xdg->base);
-}
-
-void xdg_toplevel_request_fullscreen(struct wl_listener *listener, void *data)
-{
-    struct absinthe_toplevel *toplevel = wl_container_of(listener, toplevel, request_fullscreen);
-    absinthe_toplevel_set_fullscreen(toplevel, toplevel->toplevel.xdg->requested.fullscreen);
-}
diff --git a/src/xwayland.c b/src/xwayland.c
index 3bc533e..33b0159 100644
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -16,9 +16,9 @@ void xwayland_associate(struct wl_listener *listener, void *data)
 {
     struct absinthe_toplevel *toplevel = wl_container_of(listener, toplevel, xwayland_associate);
 
-    toplevel->map.notify = xdg_toplevel_map;
+    toplevel->map.notify = absinthe_toplevel_map;
     wl_signal_add(&toplevel->toplevel.x11->surface->events.map, &toplevel->map);
-    toplevel->unmap.notify = xdg_toplevel_unmap;
+    toplevel->unmap.notify = absinthe_toplevel_unmap;
     wl_signal_add(&toplevel->toplevel.x11->surface->events.unmap, &toplevel->unmap);
 }