Refactor type implementations

3 files changed, 5 insertions, 8 deletions

diff --git a/include/backend.h b/include/wlr/backend/interface.h
index d42c6f17..15cfb6c3 100644
--- a/include/backend.h
+++ b/include/wlr/backend/interface.h
@@ -1,5 +1,5 @@
-#ifndef _WLR_BACKEND_INTERNAL_H
-#define _WLR_BACKEND_INTERNAL_H
+#ifndef _WLR_BACKEND_INTERFACE_H
+#define _WLR_BACKEND_INTERFACE_H
 
 #include <stdbool.h>
 #include <wlr/backend.h>
diff --git a/include/wlr/session.h b/include/wlr/session.h
index 5f210f10..bd5a96c0 100644
--- a/include/wlr/session.h
+++ b/include/wlr/session.h
@@ -4,7 +4,7 @@
 #include <wayland-server.h>
 #include <sys/types.h>
 
-struct session_interface;
+struct session_impl;
 
 // Passed to the listeners of device_paused/resumed
 struct device_arg {
@@ -13,7 +13,7 @@ struct device_arg {
 };
 
 struct wlr_session {
-	const struct session_interface *iface;
+	const struct session_impl *impl;
 
 	struct wl_signal device_paused;
 	struct wl_signal device_resumed;
diff --git a/include/session/interface.h b/include/wlr/session/interface.h
index 7345c4cf..78256dd6 100644
--- a/include/session/interface.h
+++ b/include/wlr/session/interface.h
@@ -3,7 +3,7 @@
 
 #include <wlr/session.h>
 
-struct session_interface {
+struct session_impl {
 	struct wlr_session *(*start)(struct wl_display *disp);
 	void (*finish)(struct wlr_session *session);
 	int (*open)(struct wlr_session *restrict session,
@@ -12,7 +12,4 @@ struct session_interface {
 	bool (*change_vt)(struct wlr_session *session, int vt);
 };
 
-extern const struct session_interface session_logind_iface;
-extern const struct session_interface session_direct_iface;
-
 #endif