diff --git a/backend/backend.c b/backend/backend.c
index 93f764f6b..b47b7f138 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <errno.h>
 #include <libinput.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/backend/interface.h>
 #include <wlr/backend/drm.h>
 #include <wlr/backend/libinput.h>
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index d52adba96..a2c71317e 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -7,7 +7,7 @@
 #include <wayland-server.h>
 #include <xf86drm.h>
 #include <sys/stat.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/list.h>
diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c
index a3523dc0b..68f1752bc 100644
--- a/backend/libinput/backend.c
+++ b/backend/libinput/backend.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <libinput.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/backend/interface.h>
 #include <wlr/util/log.h>
 #include "backend/udev.h"
diff --git a/backend/libinput/events.c b/backend/libinput/events.c
index 6cd33e3d0..9fe81782d 100644
--- a/backend/libinput/events.c
+++ b/backend/libinput/events.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <libinput.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/interfaces/wlr_input_device.h>
 #include <wlr/util/list.h>
 #include <wlr/util/log.h>
diff --git a/backend/libinput/keyboard.c b/backend/libinput/keyboard.c
index f19d7120b..957cc3f2b 100644
--- a/backend/libinput/keyboard.c
+++ b/backend/libinput/keyboard.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <libinput.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/util/log.h>
diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c
index 57c417c81..59e219d82 100644
--- a/backend/libinput/pointer.c
+++ b/backend/libinput/pointer.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <libinput.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/util/log.h>
diff --git a/backend/libinput/tablet_pad.c b/backend/libinput/tablet_pad.c
index 5517fa63e..9bf45ba60 100644
--- a/backend/libinput/tablet_pad.c
+++ b/backend/libinput/tablet_pad.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <libinput.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/interfaces/wlr_tablet_pad.h>
 #include <wlr/util/log.h>
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c
index 95bdd3fdc..9bbb0e349 100644
--- a/backend/libinput/tablet_tool.c
+++ b/backend/libinput/tablet_tool.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <libinput.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/interfaces/wlr_tablet_tool.h>
 #include <wlr/util/log.h>
diff --git a/backend/libinput/touch.c b/backend/libinput/touch.c
index c002b6a0d..e0e866b0d 100644
--- a/backend/libinput/touch.c
+++ b/backend/libinput/touch.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <libinput.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/interfaces/wlr_touch.h>
 #include <wlr/util/log.h>
diff --git a/backend/multi/backend.c b/backend/multi/backend.c
index 2e8f117c4..8026e9700 100644
--- a/backend/multi/backend.c
+++ b/backend/multi/backend.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <wlr/backend/interface.h>
 #include <wlr/backend/udev.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/util/log.h>
 #include "backend/multi.h"
 
diff --git a/backend/session/direct-ipc.c b/backend/session/direct-ipc.c
index 885662e03..71e221483 100644
--- a/backend/session/direct-ipc.c
+++ b/backend/session/direct-ipc.c
@@ -13,7 +13,7 @@
 #include <xf86drm.h>
 #include <linux/major.h>
 #include <wlr/util/log.h>
-#include "session/direct-ipc.h"
+#include "backend/session/direct-ipc.h"
 
 enum { DRM_MAJOR = 226 };
 
diff --git a/backend/session/direct.c b/backend/session/direct.c
index 1247663b7..82aa8e00d 100644
--- a/backend/session/direct.c
+++ b/backend/session/direct.c
@@ -13,9 +13,9 @@
 #include <linux/input.h>
 #include <linux/vt.h>
 #include <wayland-server.h>
-#include <wlr/session/interface.h>
+#include <wlr/backend/session/interface.h>
 #include <wlr/util/log.h>
-#include "session/direct-ipc.h"
+#include "backend/session/direct-ipc.h"
 
 enum { DRM_MAJOR = 226 };
 
diff --git a/backend/session/logind.c b/backend/session/logind.c
index 6744215a9..20d9b5ede 100644
--- a/backend/session/logind.c
+++ b/backend/session/logind.c
@@ -11,7 +11,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <wayland-server.h>
-#include <wlr/session/interface.h>
+#include <wlr/backend/session/interface.h>
 #include <wlr/util/log.h>
 
 enum { DRM_MAJOR = 226 };
diff --git a/backend/session/session.c b/backend/session/session.c
index 3f4c7910d..a07d3cda4 100644
--- a/backend/session/session.c
+++ b/backend/session/session.c
@@ -1,7 +1,7 @@
 #include <stddef.h>
 #include <stdarg.h>
-#include <wlr/session.h>
-#include <wlr/session/interface.h>
+#include <wlr/backend/session.h>
+#include <wlr/backend/session/interface.h>
 #include <wlr/util/log.h>
 
 extern const struct session_impl session_logind;
diff --git a/backend/udev.c b/backend/udev.c
index 1fecaee40..1cc53f608 100644
--- a/backend/udev.c
+++ b/backend/udev.c
@@ -8,7 +8,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 #include <wayland-server.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/util/log.h>
 #include "backend/udev.h"
 
diff --git a/examples/compositor/main.c b/examples/compositor/main.c
index e13fda243..c618961d5 100644
--- a/examples/compositor/main.c
+++ b/examples/compositor/main.c
@@ -6,7 +6,7 @@
 #include <inttypes.h>
 #include <wayland-server.h>
 #include <wlr/backend.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/render.h>
 #include <wlr/render/gles2.h>
 #include <wlr/types/wlr_output.h>
diff --git a/examples/pointer.c b/examples/pointer.c
index c75188416..d159caf5c 100644
--- a/examples/pointer.c
+++ b/examples/pointer.c
@@ -14,7 +14,7 @@
 #include <wlr/render/gles2.h>
 #include <wlr/render.h>
 #include <wlr/backend.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/types/wlr_keyboard.h>
 #include <wlr/util/log.h>
 #include "shared.h"
diff --git a/examples/rotation.c b/examples/rotation.c
index 36e95f50b..bcf855d96 100644
--- a/examples/rotation.c
+++ b/examples/rotation.c
@@ -14,7 +14,7 @@
 #include <wlr/render/gles2.h>
 #include <wlr/render.h>
 #include <wlr/backend.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/types/wlr_keyboard.h>
 #include <math.h>
 #include "shared.h"
diff --git a/examples/shared.c b/examples/shared.c
index 823d8e0ca..bd5f7ec56 100644
--- a/examples/shared.c
+++ b/examples/shared.c
@@ -8,7 +8,7 @@
 #include <xkbcommon/xkbcommon.h>
 #include <wayland-server-protocol.h>
 #include <wlr/backend.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/util/log.h>
diff --git a/examples/shared.h b/examples/shared.h
index 1633f2c8c..2379eef9c 100644
--- a/examples/shared.h
+++ b/examples/shared.h
@@ -8,7 +8,7 @@
 #include <xkbcommon/xkbcommon.h>
 #include <wayland-server-protocol.h>
 #include <wlr/backend.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_input_device.h>
 
diff --git a/examples/simple.c b/examples/simple.c
index 45cb2b939..8e098e181 100644
--- a/examples/simple.c
+++ b/examples/simple.c
@@ -7,7 +7,7 @@
 #include <wayland-server.h>
 #include <GLES2/gl2.h>
 #include <wlr/backend.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/types/wlr_output.h>
 #include <xkbcommon/xkbcommon.h>
 #include "shared.h"
diff --git a/examples/tablet.c b/examples/tablet.c
index d7f7d042d..0be6dcb9d 100644
--- a/examples/tablet.c
+++ b/examples/tablet.c
@@ -13,7 +13,7 @@
 #include <wlr/render/gles2.h>
 #include <wlr/render.h>
 #include <wlr/backend.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/types/wlr_tablet_pad.h>
diff --git a/examples/touch.c b/examples/touch.c
index 97009e810..15ad9d492 100644
--- a/examples/touch.c
+++ b/examples/touch.c
@@ -15,7 +15,7 @@
 #include <wlr/render/gles2.h>
 #include <wlr/render.h>
 #include <wlr/backend.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/util/list.h>
 #include "shared.h"
 #include "cat.h"
diff --git a/include/backend/drm.h b/include/backend/drm.h
index dc12c258f..ecdd945ba 100644
--- a/include/backend/drm.h
+++ b/include/backend/drm.h
@@ -10,7 +10,7 @@
 #include <libudev.h>
 #include <gbm.h>
 
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/backend/drm.h>
 #include <wlr/util/list.h>
 
diff --git a/include/backend/multi.h b/include/backend/multi.h
index 617d4c982..5ac9cc1d7 100644
--- a/include/backend/multi.h
+++ b/include/backend/multi.h
@@ -5,7 +5,7 @@
 #include <wlr/backend/multi.h>
 #include <wlr/backend/udev.h>
 #include <wlr/util/list.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 
 struct wlr_backend_state {
 	struct wlr_backend *backend;
diff --git a/include/backend/udev.h b/include/backend/udev.h
index a2834063a..080422c0d 100644
--- a/include/backend/udev.h
+++ b/include/backend/udev.h
@@ -3,7 +3,7 @@
 
 #include <sys/types.h>
 #include <libudev.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wayland-server.h>
 #include <wlr/backend/udev.h>
 
diff --git a/include/wlr/backend.h b/include/wlr/backend.h
index 74cb34a96..3910e4063 100644
--- a/include/wlr/backend.h
+++ b/include/wlr/backend.h
@@ -2,7 +2,7 @@
 #define _WLR_BACKEND_H
 
 #include <wayland-server.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 
 struct wlr_backend_impl;
 struct wlr_backend_state;
diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h
index a486757db..7332d608d 100644
--- a/include/wlr/backend/drm.h
+++ b/include/wlr/backend/drm.h
@@ -2,7 +2,7 @@
 #define WLR_BACKEND_DRM_H
 
 #include <wayland-server.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/backend.h>
 #include <wlr/backend/udev.h>
 
diff --git a/include/wlr/backend/libinput.h b/include/wlr/backend/libinput.h
index 29748b779..bba688888 100644
--- a/include/wlr/backend/libinput.h
+++ b/include/wlr/backend/libinput.h
@@ -3,7 +3,7 @@
 
 #include <libinput.h>
 #include <wayland-server.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 #include <wlr/backend.h>
 #include <wlr/backend/udev.h>
 #include <wlr/types/wlr_input_device.h>
diff --git a/include/wlr/backend/multi.h b/include/wlr/backend/multi.h
index 00b34722e..8b68284de 100644
--- a/include/wlr/backend/multi.h
+++ b/include/wlr/backend/multi.h
@@ -3,7 +3,7 @@
 
 #include <wlr/backend.h>
 #include <wlr/backend/udev.h>
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 
 struct wlr_backend *wlr_multi_backend_create(struct wlr_session *session,
 		struct wlr_udev *udev);
diff --git a/include/wlr/backend/session/interface.h b/include/wlr/backend/session/interface.h
index 4938110d7..16814446b 100644
--- a/include/wlr/backend/session/interface.h
+++ b/include/wlr/backend/session/interface.h
@@ -1,7 +1,7 @@
 #ifndef WLR_SESSION_INTERFACE_H
 #define WLR_SESSION_INTERFACE_H
 
-#include <wlr/session.h>
+#include <wlr/backend/session.h>
 
 struct session_impl {
 	struct wlr_session *(*start)(struct wl_display *disp);