10 files changed, 19 insertions, 9 deletions
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 efaf61b9..5ac9cc1d 100644
--- a/include/backend/multi.h
+++ b/include/backend/multi.h
@@ -3,10 +3,14 @@
 
 #include <wlr/backend/interface.h>
 #include <wlr/backend/multi.h>
+#include <wlr/backend/udev.h>
 #include <wlr/util/list.h>
+#include <wlr/backend/session.h>
 
 struct wlr_backend_state {
 	struct wlr_backend *backend;
+	struct wlr_session *session;
+	struct wlr_udev *udev;
 	list_t *backends;
 };
 
diff --git a/include/session/direct-ipc.h b/include/backend/session/direct-ipc.h
index 96504f04..96504f04 100644
--- a/include/session/direct-ipc.h
+++ b/include/backend/session/direct-ipc.h
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 db85c169..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;
@@ -19,8 +19,7 @@ struct wlr_backend {
 	} events;
 };
 
-struct wlr_backend *wlr_backend_autocreate(struct wl_display *display,
-		struct wlr_session *session);
+struct wlr_backend *wlr_backend_autocreate(struct wl_display *display);
 bool wlr_backend_init(struct wlr_backend *backend);
 void wlr_backend_destroy(struct wlr_backend *backend);
 
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 a07ca770..e8e46bed 100644
--- a/include/wlr/backend/multi.h
+++ b/include/wlr/backend/multi.h
@@ -2,9 +2,16 @@
 #define _WLR_BACKEND_MULTI_H
 
 #include <wlr/backend.h>
+#include <wlr/backend/udev.h>
+#include <wlr/backend/session.h>
 
-struct wlr_backend *wlr_multi_backend_create();
+struct wlr_backend *wlr_multi_backend_create(struct wlr_session *session,
+		struct wlr_udev *udev);
 void wlr_multi_backend_add(struct wlr_backend *multi,
 		struct wlr_backend *backend);
 
+bool wlr_backend_is_multi(struct wlr_backend *backend);
+
+struct wlr_session *wlr_multi_get_session(struct wlr_backend *base);
+
 #endif
diff --git a/include/wlr/session.h b/include/wlr/backend/session.h
index 7961e620..7961e620 100644
--- a/include/wlr/session.h
+++ b/include/wlr/backend/session.h
diff --git a/include/wlr/session/interface.h b/include/wlr/backend/session/interface.h
index 4938110d..16814446 100644
--- a/include/wlr/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);