From 2ae5cd6539253e03e065f3ecbf55179527bb5ea2 Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Tue, 11 Jul 2017 19:03:09 +1200
Subject: Moved session/ into backend/

---
 backend/session/direct.c | 244 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 244 insertions(+)
 create mode 100644 backend/session/direct.c

(limited to 'backend/session/direct.c')

diff --git a/backend/session/direct.c b/backend/session/direct.c
new file mode 100644
index 00000000..1247663b
--- /dev/null
+++ b/backend/session/direct.c
@@ -0,0 +1,244 @@
+#define _POSIX_C_SOURCE 200809L
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <signal.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/sysmacros.h>
+#include <linux/kd.h>
+#include <linux/major.h>
+#include <linux/input.h>
+#include <linux/vt.h>
+#include <wayland-server.h>
+#include <wlr/session/interface.h>
+#include <wlr/util/log.h>
+#include "session/direct-ipc.h"
+
+enum { DRM_MAJOR = 226 };
+
+const struct session_impl session_direct;
+
+struct direct_session {
+	struct wlr_session base;
+	int tty_fd;
+	int old_kbmode;
+	int sock;
+	pid_t child;
+
+	struct wl_event_source *vt_source;
+};
+
+static int direct_session_open(struct wlr_session *base, const char *path) {
+	struct direct_session *session = wl_container_of(base, session, base);
+
+	int fd = direct_ipc_open(session->sock, path);
+	if (fd < 0) {
+		wlr_log(L_ERROR, "Failed to open %s: %s%s", path, strerror(-fd),
+			fd == -EINVAL ? "; is another display server running?" : "");
+		return fd;
+	}
+
+	struct stat st;
+	if (fstat(fd, &st) < 0) {
+		close(fd);
+		return -errno;
+	}
+
+	if (major(st.st_rdev) == DRM_MAJOR) {
+		session->base.drm_fd = fd;
+	}
+
+	return fd;
+}
+
+static void direct_session_close(struct wlr_session *base, int fd) {
+	struct direct_session *session = wl_container_of(base, session, base);
+
+	struct stat st;
+	if (fstat(fd, &st) < 0) {
+		wlr_log_errno(L_ERROR, "Stat failed");
+		close(fd);
+		return;
+	}
+
+	if (major(st.st_rdev) == DRM_MAJOR) {
+		direct_ipc_dropmaster(session->sock, session->base.drm_fd);
+		session->base.drm_fd = -1;
+	} else if (major(st.st_rdev) == INPUT_MAJOR) {
+		ioctl(fd, EVIOCREVOKE, 0);
+	}
+
+	close(fd);
+}
+
+static bool direct_change_vt(struct wlr_session *base, unsigned vt) {
+	struct direct_session *session = wl_container_of(base, session, base);
+	return ioctl(session->tty_fd, VT_ACTIVATE, (int)vt) == 0;
+}
+
+static void direct_session_finish(struct wlr_session *base) {
+	struct direct_session *session = wl_container_of(base, session, base);
+	struct vt_mode mode = {
+		.mode = VT_AUTO,
+	};
+
+	errno = 0;
+
+	ioctl(session->tty_fd, KDSKBMODE, session->old_kbmode);
+	ioctl(session->tty_fd, KDSETMODE, KD_TEXT);
+	ioctl(session->tty_fd, VT_SETMODE, &mode);
+
+	if (errno) {
+		wlr_log(L_ERROR, "Failed to restore tty");
+	}
+
+	direct_ipc_finish(session->sock, session->child);
+	close(session->sock);
+
+	wl_event_source_remove(session->vt_source);
+	close(session->tty_fd);
+	free(session);
+}
+
+static int vt_handler(int signo, void *data) {
+	struct direct_session *session = data;
+
+	if (session->base.active) {
+		session->base.active = false;
+		wl_signal_emit(&session->base.session_signal, session);
+		direct_ipc_dropmaster(session->sock, session->base.drm_fd);
+		ioctl(session->tty_fd, VT_RELDISP, 1);
+	} else {
+		ioctl(session->tty_fd, VT_RELDISP, VT_ACKACQ);
+		direct_ipc_setmaster(session->sock, session->base.drm_fd);
+		session->base.active = true;
+		wl_signal_emit(&session->base.session_signal, session);
+	}
+
+	return 1;
+}
+
+static bool setup_tty(struct direct_session *session, struct wl_display *display) {
+	int fd = dup(STDIN_FILENO);
+	if (fd == -1) {
+		wlr_log_errno(L_ERROR, "Cannot open tty");
+		return false;
+	}
+
+	struct stat st;
+	if (fstat(fd, &st) == -1 || major(st.st_rdev) != TTY_MAJOR || minor(st.st_rdev) == 0) {
+		wlr_log(L_ERROR, "Not running from a virtual terminal");
+		goto error;
+	}
+
+	int tty = minor(st.st_rdev);
+	int ret, kd_mode, old_kbmode;
+
+	ret = ioctl(fd, KDGETMODE, &kd_mode);
+	if (ret) {
+		wlr_log_errno(L_ERROR, "Failed to get tty mode");
+		goto error;
+	}
+
+	if (kd_mode != KD_TEXT) {
+		wlr_log(L_ERROR,
+			"tty already in graphics mode; is another display server running?");
+		goto error;
+	}
+
+	ioctl(fd, VT_ACTIVATE, tty);
+	ioctl(fd, VT_WAITACTIVE, tty);
+
+	if (ioctl(fd, KDGKBMODE, &old_kbmode)) {
+		wlr_log_errno(L_ERROR, "Failed to read keyboard mode");
+		goto error;
+	}
+
+	if (ioctl(fd, KDSKBMODE, K_OFF)) {
+		wlr_log_errno(L_ERROR, "Failed to set keyboard mode");
+		goto error;
+	}
+
+	if (ioctl(fd, KDSETMODE, KD_GRAPHICS)) {
+		wlr_log_errno(L_ERROR, "Failed to set graphics mode on tty");
+		goto error;
+	}
+
+	struct vt_mode mode = {
+		.mode = VT_PROCESS,
+		.relsig = SIGUSR1,
+		.acqsig = SIGUSR1,
+	};
+
+	if (ioctl(fd, VT_SETMODE, &mode) < 0) {
+		wlr_log(L_ERROR, "Failed to take control of tty");
+		goto error;
+	}
+
+	struct wl_event_loop *loop = wl_display_get_event_loop(display);
+	session->vt_source = wl_event_loop_add_signal(loop, SIGUSR1,
+		vt_handler, session);
+	if (!session->vt_source) {
+		goto error;
+	}
+
+	session->base.vtnr = tty;
+	session->tty_fd = fd;
+	session->old_kbmode = old_kbmode;
+
+	return true;
+
+error:
+	close(fd);
+	return false;
+}
+
+static struct wlr_session *direct_session_start(struct wl_display *disp) {
+	struct direct_session *session = calloc(1, sizeof(*session));
+	if (!session) {
+		wlr_log_errno(L_ERROR, "Allocation failed");
+		return NULL;
+	}
+
+	session->sock = direct_ipc_start(&session->child);
+	if (session->sock == -1) {
+		goto error_session;
+	}
+
+	if (!setup_tty(session, disp)) {
+		goto error_ipc;
+	}
+
+	// XXX: Is it okay to trust the environment like this?
+	const char *seat = getenv("XDG_SEAT");
+	if (!seat) {
+		seat = "seat0";
+	}
+
+	wlr_log(L_INFO, "Successfully loaded direct session");
+
+	snprintf(session->base.seat, sizeof(session->base.seat), "%s", seat);
+	session->base.drm_fd = -1;
+	session->base.impl = &session_direct;
+	session->base.active = true;
+	wl_signal_init(&session->base.session_signal);
+	return &session->base;
+
+error_ipc:
+	direct_ipc_finish(session->sock, session->child);
+	close(session->sock);
+error_session:
+	free(session);
+	return NULL;
+}
+
+const struct session_impl session_direct = {
+	.start = direct_session_start,
+	.finish = direct_session_finish,
+	.open = direct_session_open,
+	.close = direct_session_close,
+	.change_vt = direct_change_vt,
+};
-- 
cgit v1.2.3


From cb4d50e22c217027d641fc36cd022d12bba8d1ad Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Tue, 11 Jul 2017 19:18:34 +1200
Subject: Changed header paths.

---
 backend/backend.c                       | 2 +-
 backend/drm/backend.c                   | 2 +-
 backend/libinput/backend.c              | 2 +-
 backend/libinput/events.c               | 2 +-
 backend/libinput/keyboard.c             | 2 +-
 backend/libinput/pointer.c              | 2 +-
 backend/libinput/tablet_pad.c           | 2 +-
 backend/libinput/tablet_tool.c          | 2 +-
 backend/libinput/touch.c                | 2 +-
 backend/multi/backend.c                 | 2 +-
 backend/session/direct-ipc.c            | 2 +-
 backend/session/direct.c                | 4 ++--
 backend/session/logind.c                | 2 +-
 backend/session/session.c               | 4 ++--
 backend/udev.c                          | 2 +-
 examples/compositor/main.c              | 2 +-
 examples/pointer.c                      | 2 +-
 examples/rotation.c                     | 2 +-
 examples/shared.c                       | 2 +-
 examples/shared.h                       | 2 +-
 examples/simple.c                       | 2 +-
 examples/tablet.c                       | 2 +-
 examples/touch.c                        | 2 +-
 include/backend/drm.h                   | 2 +-
 include/backend/multi.h                 | 2 +-
 include/backend/udev.h                  | 2 +-
 include/wlr/backend.h                   | 2 +-
 include/wlr/backend/drm.h               | 2 +-
 include/wlr/backend/libinput.h          | 2 +-
 include/wlr/backend/multi.h             | 2 +-
 include/wlr/backend/session/interface.h | 2 +-
 31 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'backend/session/direct.c')

diff --git a/backend/backend.c b/backend/backend.c
index 93f764f6..b47b7f13 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 d52adba9..a2c71317 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 a3523dc0..68f1752b 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 6cd33e3d..9fe81782 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 f19d7120..957cc3f2 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 57c417c8..59e219d8 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 5517fa63..9bf45ba6 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 95bdd3fd..9bbb0e34 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 c002b6a0..e0e866b0 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 2e8f117c..8026e970 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 885662e0..71e22148 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 1247663b..82aa8e00 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 6744215a..20d9b5ed 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 3f4c7910..a07d3cda 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 1fecaee4..1cc53f60 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 e13fda24..c618961d 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 c7518841..d159caf5 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 36e95f50..bcf855d9 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 823d8e0c..bd5f7ec5 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 1633f2c8..2379eef9 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 45cb2b93..8e098e18 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 d7f7d042..0be6dcb9 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 97009e81..15ad9d49 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 dc12c258..ecdd945b 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 617d4c98..5ac9cc1d 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 a2834063..080422c0 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 74cb34a9..3910e406 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 a486757d..7332d608 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 29748b77..bba68888 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 00b34722..8b68284d 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 4938110d..16814446 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);
-- 
cgit v1.2.3