diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 4d09e0780..682e8c85a 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -11,7 +11,7 @@
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/types/wlr_list.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include <wlr/render/egl.h>
 #include "backend/drm/drm.h"
 
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 7af242bc5..5189ec909 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -18,7 +18,7 @@
 #include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include <wlr/render/matrix.h>
 #include <wlr/render/gles2.h>
 #include <wlr/render.h>
diff --git a/backend/headless/backend.c b/backend/headless/backend.c
index 703dc8cd4..a79e4af86 100644
--- a/backend/headless/backend.c
+++ b/backend/headless/backend.c
@@ -2,7 +2,7 @@
 #include <wlr/render/egl.h>
 #include <wlr/render/gles2.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/interfaces/wlr_input_device.h>
 #include "backend/headless.h"
diff --git a/backend/headless/input_device.c b/backend/headless/input_device.c
index 6b2bc4e7c..5d7ca34b6 100644
--- a/backend/headless/input_device.c
+++ b/backend/headless/input_device.c
@@ -6,7 +6,7 @@
 #include <wlr/interfaces/wlr_tablet_tool.h>
 #include <wlr/interfaces/wlr_tablet_pad.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "backend/headless.h"
 
 static void input_device_destroy(struct wlr_input_device *wlr_dev) {
diff --git a/backend/headless/output.c b/backend/headless/output.c
index f31b7d37b..63f0b6b4b 100644
--- a/backend/headless/output.c
+++ b/backend/headless/output.c
@@ -4,7 +4,7 @@
 #include <GLES2/gl2.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "backend/headless.h"
 
 static EGLSurface egl_create_surface(struct wlr_egl *egl, unsigned int width,
diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c
index 5b815a0cd..1ec730097 100644
--- a/backend/libinput/backend.c
+++ b/backend/libinput/backend.c
@@ -4,7 +4,7 @@
 #include <wlr/backend/session.h>
 #include <wlr/backend/interface.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "backend/libinput.h"
 
 static int wlr_libinput_open_restricted(const char *path,
diff --git a/backend/libinput/events.c b/backend/libinput/events.c
index 4bcfa5390..248b82139 100644
--- a/backend/libinput/events.c
+++ b/backend/libinput/events.c
@@ -5,7 +5,7 @@
 #include <wlr/interfaces/wlr_input_device.h>
 #include <wlr/util/log.h>
 #include <wayland-util.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "backend/libinput.h"
 
 struct wlr_input_device *get_appropriate_device(
diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c
index f80f4f84e..560e95b56 100644
--- a/backend/libinput/pointer.c
+++ b/backend/libinput/pointer.c
@@ -5,7 +5,7 @@
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "backend/libinput.h"
 
 struct wlr_pointer *wlr_libinput_pointer_create(
diff --git a/backend/libinput/tablet_pad.c b/backend/libinput/tablet_pad.c
index 54315581c..e8ffc6dda 100644
--- a/backend/libinput/tablet_pad.c
+++ b/backend/libinput/tablet_pad.c
@@ -5,7 +5,7 @@
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/interfaces/wlr_tablet_pad.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "backend/libinput.h"
 
 struct wlr_tablet_pad *wlr_libinput_tablet_pad_create(
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c
index 2f28540b5..0f2ea70a9 100644
--- a/backend/libinput/tablet_tool.c
+++ b/backend/libinput/tablet_tool.c
@@ -5,7 +5,7 @@
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/interfaces/wlr_tablet_tool.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "backend/libinput.h"
 
 struct wlr_tablet_tool *wlr_libinput_tablet_tool_create(
diff --git a/backend/libinput/touch.c b/backend/libinput/touch.c
index d496d7927..fb2b8e3f5 100644
--- a/backend/libinput/touch.c
+++ b/backend/libinput/touch.c
@@ -5,7 +5,7 @@
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/interfaces/wlr_touch.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "backend/libinput.h"
 
 struct wlr_touch *wlr_libinput_touch_create(
diff --git a/backend/multi/backend.c b/backend/multi/backend.c
index 02738f59b..1005e6b71 100644
--- a/backend/multi/backend.c
+++ b/backend/multi/backend.c
@@ -4,7 +4,7 @@
 #include <wlr/backend/interface.h>
 #include <wlr/backend/session.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "backend/multi.h"
 #include "backend/drm/drm.h"
 
diff --git a/backend/session/direct-freebsd.c b/backend/session/direct-freebsd.c
index fe4ff653b..ceaae2be2 100644
--- a/backend/session/direct-freebsd.c
+++ b/backend/session/direct-freebsd.c
@@ -15,7 +15,7 @@
 #include <wayland-server.h>
 #include <wlr/backend/session/interface.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "backend/session/direct-ipc.h"
 
 const struct session_impl session_direct;
diff --git a/backend/session/direct.c b/backend/session/direct.c
index 245683eab..1f60ed237 100644
--- a/backend/session/direct.c
+++ b/backend/session/direct.c
@@ -15,7 +15,7 @@
 #include <wayland-server.h>
 #include <wlr/backend/session/interface.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "backend/session/direct-ipc.h"
 
 enum { DRM_MAJOR = 226 };
diff --git a/backend/session/logind.c b/backend/session/logind.c
index f6150817e..b2206e15b 100644
--- a/backend/session/logind.c
+++ b/backend/session/logind.c
@@ -13,7 +13,7 @@
 #include <wlr/config.h>
 #include <wlr/backend/session/interface.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 
 #ifdef WLR_HAS_SYSTEMD
 	#include <systemd/sd-bus.h>
diff --git a/backend/session/session.c b/backend/session/session.c
index 4b81e2307..ac55a1910 100644
--- a/backend/session/session.c
+++ b/backend/session/session.c
@@ -13,7 +13,7 @@
 #include <wlr/backend/session.h>
 #include <wlr/backend/session/interface.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 
 extern const struct session_impl session_logind;
 extern const struct session_impl session_direct;
diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c
index 2907057c0..60c8ede91 100644
--- a/backend/wayland/backend.c
+++ b/backend/wayland/backend.c
@@ -11,7 +11,7 @@
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/interfaces/wlr_input_device.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "backend/wayland.h"
 #include "xdg-shell-unstable-v6-client-protocol.h"
 
diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index b1cc68361..fed4c63a7 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -10,7 +10,7 @@
 #include <GLES2/gl2.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "backend/wayland.h"
 #include "xdg-shell-unstable-v6-client-protocol.h"
 
diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c
index 18114119e..f63281064 100644
--- a/backend/wayland/wl_seat.c
+++ b/backend/wayland/wl_seat.c
@@ -10,7 +10,7 @@
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_touch.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "backend/wayland.h"
 
 static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer,
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index 5608a2ea9..2715b3664 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -22,7 +22,7 @@
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "backend/x11.h"
 
 static struct wlr_backend_impl backend_impl;
diff --git a/include/wlr/util/signal.h b/include/util/signal.h
similarity index 100%
rename from include/wlr/util/signal.h
rename to include/util/signal.h
diff --git a/render/gles2/texture.c b/render/gles2/texture.c
index 54cee6277..a594f23e5 100644
--- a/render/gles2/texture.c
+++ b/render/gles2/texture.c
@@ -10,7 +10,7 @@
 #include <wlr/render/interface.h>
 #include <wlr/render/matrix.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "render/gles2.h"
 
 static struct pixel_format external_pixel_format = {
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 753a85e53..68da45e05 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -16,7 +16,6 @@
 #include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
 #include "rootston/server.h"
 #include "rootston/seat.h"
 #include "rootston/xcursor.h"
@@ -384,7 +383,7 @@ struct roots_subsurface *subsurface_create(struct roots_view *view,
 
 void view_finish(struct roots_view *view) {
 	view_damage_whole(view);
-	wlr_signal_emit_safe(&view->events.destroy, view);
+	wl_signal_emit(&view->events.destroy, view);
 
 	wl_list_remove(&view->new_subsurface.link);
 
diff --git a/types/wlr_compositor.c b/types/wlr_compositor.c
index bab41b856..bd56b0fba 100644
--- a/types/wlr_compositor.c
+++ b/types/wlr_compositor.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <wayland-server.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_region.h>
 #include <wlr/types/wlr_compositor.h>
diff --git a/types/wlr_cursor.c b/types/wlr_cursor.c
index 564ead46c..4f3d87274 100644
--- a/types/wlr_cursor.c
+++ b/types/wlr_cursor.c
@@ -3,7 +3,7 @@
 #include <assert.h>
 #include <limits.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include <wayland-server.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_layout.h>
diff --git a/types/wlr_data_device.c b/types/wlr_data_device.c
index ae3219f1b..7153dd53a 100644
--- a/types/wlr_data_device.c
+++ b/types/wlr_data_device.c
@@ -6,7 +6,7 @@
 #include <unistd.h>
 #include <wayland-server.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include <wlr/types/wlr_seat.h>
 #include <wlr/types/wlr_data_device.h>
 
diff --git a/types/wlr_gamma_control.c b/types/wlr_gamma_control.c
index f7644230a..214dfd21f 100644
--- a/types/wlr_gamma_control.c
+++ b/types/wlr_gamma_control.c
@@ -4,7 +4,7 @@
 #include <wlr/types/wlr_gamma_control.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "gamma-control-protocol.h"
 
 static void resource_destroy(struct wl_client *client,
diff --git a/types/wlr_idle.c b/types/wlr_idle.c
index b30bb9d74..1976004f8 100644
--- a/types/wlr_idle.c
+++ b/types/wlr_idle.c
@@ -4,7 +4,7 @@
 #include <wayland-server.h>
 #include <wlr/types/wlr_idle.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "idle-protocol.h"
 
 static void idle_timeout_destroy(struct wlr_idle_timeout *timer) {
diff --git a/types/wlr_input_device.c b/types/wlr_input_device.c
index f88b71977..372b3a7b7 100644
--- a/types/wlr_input_device.c
+++ b/types/wlr_input_device.c
@@ -10,7 +10,7 @@
 #include <wlr/interfaces/wlr_tablet_tool.h>
 #include <wlr/interfaces/wlr_tablet_pad.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 
 void wlr_input_device_init(struct wlr_input_device *dev,
 		enum wlr_input_device_type type,
diff --git a/types/wlr_keyboard.c b/types/wlr_keyboard.c
index 9fac1843a..6f09d599b 100644
--- a/types/wlr_keyboard.c
+++ b/types/wlr_keyboard.c
@@ -7,7 +7,7 @@
 #include <wlr/types/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 
 int os_create_anonymous_file(off_t size);
 
diff --git a/types/wlr_output.c b/types/wlr_output.c
index bac8b7cee..7dcf4c789 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -13,7 +13,7 @@
 #include <wlr/render/matrix.h>
 #include <wlr/render.h>
 #include <wlr/util/region.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 
 static void wl_output_send_to_resource(struct wl_resource *resource) {
 	assert(resource);
diff --git a/types/wlr_output_damage.c b/types/wlr_output_damage.c
index 2c6e24f0f..c231a900e 100644
--- a/types/wlr_output_damage.c
+++ b/types/wlr_output_damage.c
@@ -2,7 +2,7 @@
 #include <stddef.h>
 #include <time.h>
 #include <wayland-server.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_damage.h>
diff --git a/types/wlr_output_layout.c b/types/wlr_output_layout.c
index ea8581b34..ea7b81c5b 100644
--- a/types/wlr_output_layout.c
+++ b/types/wlr_output_layout.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_box.h>
diff --git a/types/wlr_primary_selection.c b/types/wlr_primary_selection.c
index 7eb5d97a5..45d71f19b 100644
--- a/types/wlr_primary_selection.c
+++ b/types/wlr_primary_selection.c
@@ -7,7 +7,7 @@
 #include <wlr/types/wlr_primary_selection.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 
 static void offer_handle_receive(struct wl_client *client,
 		struct wl_resource *resource, const char *mime_type, int32_t fd) {
diff --git a/types/wlr_seat.c b/types/wlr_seat.c
index b9d8b1b8a..3ad4d81d1 100644
--- a/types/wlr_seat.c
+++ b/types/wlr_seat.c
@@ -7,7 +7,7 @@
 #include <wlr/types/wlr_seat.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_primary_selection.h>
 
diff --git a/types/wlr_server_decoration.c b/types/wlr_server_decoration.c
index f648cce72..ffa0477c2 100644
--- a/types/wlr_server_decoration.c
+++ b/types/wlr_server_decoration.c
@@ -4,7 +4,7 @@
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_server_decoration.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 
 static void server_decoration_handle_release(struct wl_client *client,
 		struct wl_resource *resource) {
diff --git a/types/wlr_surface.c b/types/wlr_surface.c
index e430339b0..b761bab58 100644
--- a/types/wlr_surface.c
+++ b/types/wlr_surface.c
@@ -3,7 +3,7 @@
 #include <wayland-server.h>
 #include <wlr/util/log.h>
 #include <wlr/util/region.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include <wlr/render/interface.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/render/egl.h>
diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c
index 0c4e01fdb..e9d52cc96 100644
--- a/types/wlr_wl_shell.c
+++ b/types/wlr_wl_shell.c
@@ -5,7 +5,7 @@
 #include <assert.h>
 #include <wayland-server.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_wl_shell.h>
 #include <wayland-server-protocol.h>
diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c
index b6eee8752..30870d3b6 100644
--- a/types/wlr_xdg_shell_v6.c
+++ b/types/wlr_xdg_shell_v6.c
@@ -10,7 +10,7 @@
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "xdg-shell-unstable-v6-protocol.h"
 
 static const char *wlr_desktop_xdg_toplevel_role = "xdg_toplevel";
diff --git a/util/signal.c b/util/signal.c
index 91c4f571d..39618465d 100644
--- a/util/signal.c
+++ b/util/signal.c
@@ -1,4 +1,4 @@
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 
 static void handle_noop(struct wl_listener *listener, void *data) {
 	// Do nothing
diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c
index 7c57b6c0e..74555edbb 100644
--- a/xwayland/xwayland.c
+++ b/xwayland/xwayland.c
@@ -18,7 +18,7 @@
 #include <wayland-server.h>
 #include <wlr/xwayland.h>
 #include <wlr/util/log.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include "sockets.h"
 #include "wlr/xwm.h"
 
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index 86d8bde78..425188c78 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -10,7 +10,7 @@
 #include <wlr/config.h>
 #include <wlr/util/log.h>
 #include <wlr/util/edges.h>
-#include <wlr/util/signal.h>
+#include "util/signal.h"
 #include <wlr/types/wlr_surface.h>
 #include <wlr/xwayland.h>
 #include <wlr/xcursor.h>