12 files changed, 20 insertions, 22 deletions
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index e5614ae2..1a8099c0 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -8,9 +8,9 @@
 #include <xf86drm.h>
 #include <sys/stat.h>
 #include <wlr/session.h>
-#include <wlr/types.h>
 #include <wlr/common/list.h>
 #include <wlr/backend/interface.h>
+#include <wlr/interfaces/wlr_output.h>
 #include "backend/udev.h"
 #include "backend/drm.h"
 #include "common/log.h"
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index ca4f56c3..8a9ae63f 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -13,9 +13,9 @@
 #include <GLES3/gl3.h>
 #include <wayland-server.h>
 #include <wlr/backend/interface.h>
+#include <wlr/interfaces/wlr_output.h>
 #include "backend/drm.h"
 #include "common/log.h"
-#include "types.h"
 
 static const char *conn_name[] = {
 	[DRM_MODE_CONNECTOR_Unknown]     = "Unknown",
diff --git a/backend/libinput/events.c b/backend/libinput/events.c
index 2e7cc541..1f8f51c7 100644
--- a/backend/libinput/events.c
+++ b/backend/libinput/events.c
@@ -2,11 +2,10 @@
 #include <assert.h>
 #include <libinput.h>
 #include <wlr/session.h>
-#include <wlr/types.h>
 #include <wlr/common/list.h>
+#include <wlr/interfaces/wlr_input_device.h>
 #include "backend/libinput.h"
 #include "common/log.h"
-#include "types.h"
 
 struct wlr_input_device *get_appropriate_device(
 		enum wlr_input_device_type desired_type,
diff --git a/backend/libinput/keyboard.c b/backend/libinput/keyboard.c
index f94f0103..26d4309c 100644
--- a/backend/libinput/keyboard.c
+++ b/backend/libinput/keyboard.c
@@ -2,11 +2,11 @@
 #include <assert.h>
 #include <libinput.h>
 #include <wlr/session.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_input_device.h>
+#include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/common/list.h>
 #include "backend/libinput.h"
 #include "common/log.h"
-#include "types.h"
 
 struct wlr_keyboard_state {
 	struct libinput_device *device;
diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c
index 0139fd60..d4d3aec0 100644
--- a/backend/libinput/pointer.c
+++ b/backend/libinput/pointer.c
@@ -2,11 +2,11 @@
 #include <assert.h>
 #include <libinput.h>
 #include <wlr/session.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_input_device.h>
+#include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/common/list.h>
 #include "backend/libinput.h"
 #include "common/log.h"
-#include "types.h"
 
 struct wlr_pointer *wlr_libinput_pointer_create(
 		struct libinput_device *device) {
diff --git a/backend/libinput/tablet_pad.c b/backend/libinput/tablet_pad.c
index ee7c82f8..3c34b643 100644
--- a/backend/libinput/tablet_pad.c
+++ b/backend/libinput/tablet_pad.c
@@ -2,11 +2,11 @@
 #include <assert.h>
 #include <libinput.h>
 #include <wlr/session.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_input_device.h>
+#include <wlr/interfaces/wlr_tablet_pad.h>
 #include <wlr/common/list.h>
 #include "backend/libinput.h"
 #include "common/log.h"
-#include "types.h"
 
 struct wlr_tablet_pad *wlr_libinput_tablet_pad_create(
 		struct libinput_device *device) {
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c
index e8a3bc7d..8cf2933b 100644
--- a/backend/libinput/tablet_tool.c
+++ b/backend/libinput/tablet_tool.c
@@ -2,11 +2,11 @@
 #include <assert.h>
 #include <libinput.h>
 #include <wlr/session.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_input_device.h>
+#include <wlr/interfaces/wlr_tablet_tool.h>
 #include <wlr/common/list.h>
 #include "backend/libinput.h"
 #include "common/log.h"
-#include "types.h"
 
 struct wlr_tablet_tool *wlr_libinput_tablet_tool_create(
 		struct libinput_device *device) {
diff --git a/backend/libinput/touch.c b/backend/libinput/touch.c
index 02c9cfef..d0048ff0 100644
--- a/backend/libinput/touch.c
+++ b/backend/libinput/touch.c
@@ -2,11 +2,11 @@
 #include <assert.h>
 #include <libinput.h>
 #include <wlr/session.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_input_device.h>
+#include <wlr/interfaces/wlr_touch.h>
 #include <wlr/common/list.h>
 #include "backend/libinput.h"
 #include "common/log.h"
-#include "types.h"
 
 struct wlr_touch *wlr_libinput_touch_create(
 		struct libinput_device *device) {
diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c
index d1213ab7..88dd2ef1 100644
--- a/backend/wayland/backend.c
+++ b/backend/wayland/backend.c
@@ -3,10 +3,10 @@
 #include <wayland-server.h>
 #include <assert.h>
 #include <wlr/backend/interface.h>
-#include <wlr/types.h>
+#include <wlr/interfaces/wlr_output.h>
+#include <wlr/interfaces/wlr_input_device.h>
 #include "backend/wayland.h"
 #include "common/log.h"
-#include "types.h"
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index 49b40ffd..551f9052 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -4,9 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-client.h>
-#include <wlr/types.h>
 #include <GLES3/gl3.h>
-#include "types.h"
+#include <wlr/interfaces/wlr_output.h>
 #include "backend/wayland.h"
 #include "common/log.h"
 
diff --git a/backend/wayland/registry.c b/backend/wayland/registry.c
index dfe3e37a..5859c2b4 100644
--- a/backend/wayland/registry.c
+++ b/backend/wayland/registry.c
@@ -2,8 +2,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-client.h>
-#include <wlr/types.h>
-#include "types.h"
 #include "backend/wayland.h"
 #include "common/log.h"
 
diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c
index 240cbbb0..a7505f94 100644
--- a/backend/wayland/wl_seat.c
+++ b/backend/wayland/wl_seat.c
@@ -4,8 +4,10 @@
 #include <stdint.h>
 #include <string.h>
 #include <wayland-client.h>
-#include <wlr/types.h>
-#include "types.h"
+#include <wlr/interfaces/wlr_output.h>
+#include <wlr/interfaces/wlr_input_device.h>
+#include <wlr/interfaces/wlr_pointer.h>
+#include <wlr/interfaces/wlr_keyboard.h>
 #include "backend/wayland.h"
 #include "common/log.h"