diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index e5614ae2e..1a8099c09 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 ca4f56c39..8a9ae63fa 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 2e7cc5414..1f8f51c70 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 f94f01035..26d4309c9 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 0139fd604..d4d3aec02 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 ee7c82f85..3c34b643c 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 e8a3bc7d1..8cf2933b4 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 02c9cfefd..d0048ff03 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 d1213ab79..88dd2ef13 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 49b40ffdd..551f9052a 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 dfe3e37ab..5859c2b47 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 240cbbb08..a7505f94c 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"
 
diff --git a/example/pointer.c b/example/pointer.c
index 9aeb41a7a..6921d9b2e 100644
--- a/example/pointer.c
+++ b/example/pointer.c
@@ -14,7 +14,7 @@
 #include <wlr/render.h>
 #include <wlr/backend.h>
 #include <wlr/session.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_keyboard.h>
 #include <math.h>
 #include "shared.h"
 #include "cat.h"
diff --git a/example/rotation.c b/example/rotation.c
index 412a81ca4..b795b438a 100644
--- a/example/rotation.c
+++ b/example/rotation.c
@@ -15,7 +15,7 @@
 #include <wlr/render.h>
 #include <wlr/backend.h>
 #include <wlr/session.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_keyboard.h>
 #include <math.h>
 #include "shared.h"
 #include "cat.h"
diff --git a/example/shared.c b/example/shared.c
index 6af3042b9..c76a91955 100644
--- a/example/shared.c
+++ b/example/shared.c
@@ -9,7 +9,8 @@
 #include <wayland-server-protocol.h>
 #include <wlr/backend.h>
 #include <wlr/session.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_input_device.h>
 #include "shared.h"
 
 static void keyboard_led_update(struct keyboard_state *kbstate) {
diff --git a/example/shared.h b/example/shared.h
index 6d533443e..b07f820a8 100644
--- a/example/shared.h
+++ b/example/shared.h
@@ -7,7 +7,8 @@
 #include <wayland-server-protocol.h>
 #include <wlr/backend.h>
 #include <wlr/session.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_input_device.h>
 
 struct output_state {
 	struct compositor_state *compositor;
diff --git a/example/simple.c b/example/simple.c
index 34d9c9b1b..cb3a194c9 100644
--- a/example/simple.c
+++ b/example/simple.c
@@ -8,7 +8,7 @@
 #include <GLES3/gl3.h>
 #include <wlr/backend.h>
 #include <wlr/session.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_output.h>
 #include <xkbcommon/xkbcommon.h>
 #include "shared.h"
 
diff --git a/example/tablet.c b/example/tablet.c
index 4d64b6384..fb0cb65c7 100644
--- a/example/tablet.c
+++ b/example/tablet.c
@@ -14,7 +14,9 @@
 #include <wlr/render.h>
 #include <wlr/backend.h>
 #include <wlr/session.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_tablet_tool.h>
+#include <wlr/types/wlr_tablet_pad.h>
 #include <math.h>
 #include "shared.h"
 #include "cat.h"
diff --git a/example/touch.c b/example/touch.c
index 2b6cb1739..554c46c05 100644
--- a/example/touch.c
+++ b/example/touch.c
@@ -17,7 +17,6 @@
 #include <wlr/render.h>
 #include <wlr/backend.h>
 #include <wlr/session.h>
-#include <wlr/types.h>
 #include "shared.h"
 #include "cat.h"
 
diff --git a/include/backend/libinput.h b/include/backend/libinput.h
index 1e8b90724..f424053ac 100644
--- a/include/backend/libinput.h
+++ b/include/backend/libinput.h
@@ -4,8 +4,8 @@
 #include <wlr/backend/interface.h>
 #include <wlr/common/list.h>
 #include <wayland-server-core.h>
+#include <wlr/interfaces/wlr_input_device.h>
 #include "backend/udev.h"
-#include "types.h"
 
 struct wlr_backend_state {
 	struct wlr_backend *backend;
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index f4a0a3b43..02ea34829 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -6,6 +6,7 @@
 #include <wayland-egl.h>
 #include <wlr/common/list.h>
 #include <wlr/backend/wayland.h>
+#include <wlr/types/wlr_input_device.h>
 #include "backend/egl.h"
 
 struct wlr_backend_state {
diff --git a/include/wlr/backend/libinput.h b/include/wlr/backend/libinput.h
index 7108f42cc..29748b779 100644
--- a/include/wlr/backend/libinput.h
+++ b/include/wlr/backend/libinput.h
@@ -6,7 +6,7 @@
 #include <wlr/session.h>
 #include <wlr/backend.h>
 #include <wlr/backend/udev.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_input_device.h>
 
 struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display,
 		struct wlr_session *session, struct wlr_udev *udev);
diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h
index 24380be8f..4f29b54f6 100644
--- a/include/wlr/interfaces/wlr_output.h
+++ b/include/wlr/interfaces/wlr_output.h
@@ -1,6 +1,6 @@
 #ifndef _WLR_INTERFACE_OUTPUT_H
 #define _WLR_INTERFACE_OUTPUT_H
-#include <wlr/interfaces/wlr_output.h>
+#include <wlr/types/wlr_output.h>
 #include <stdbool.h>
 
 struct wlr_output_impl {
@@ -18,5 +18,6 @@ struct wlr_output_impl {
 struct wlr_output *wlr_output_create(struct wlr_output_impl *impl,
 		struct wlr_output_state *state);
 void wlr_output_free(struct wlr_output *output);
+void wlr_output_update_matrix(struct wlr_output *output);
 
 #endif
diff --git a/include/wlr/render.h b/include/wlr/render.h
index 3c0bd04b6..90967dd9a 100644
--- a/include/wlr/render.h
+++ b/include/wlr/render.h
@@ -2,7 +2,7 @@
 #define _WLR_RENDER_H
 #include <stdint.h>
 #include <wayland-server-protocol.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_output.h>
 
 struct wlr_surface;
 struct wlr_renderer;
diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h
index a934f49e7..222b0c4d1 100644
--- a/include/wlr/render/interface.h
+++ b/include/wlr/render/interface.h
@@ -3,7 +3,7 @@
 #include <wayland-server-protocol.h>
 #include <stdbool.h>
 #include <wlr/render.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_output.h>
 
 struct wlr_renderer_impl;
 struct wlr_renderer_state;
diff --git a/types/wlr_input_device.c b/types/wlr_input_device.c
index dbb25487d..3a9611cce 100644
--- a/types/wlr_input_device.c
+++ b/types/wlr_input_device.c
@@ -2,10 +2,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-server.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_input_device.h>
+#include <wlr/interfaces/wlr_input_device.h>
+#include <wlr/interfaces/wlr_keyboard.h>
+#include <wlr/interfaces/wlr_pointer.h>
+#include <wlr/interfaces/wlr_touch.h>
+#include <wlr/interfaces/wlr_tablet_tool.h>
+#include <wlr/interfaces/wlr_tablet_pad.h>
 #include <wlr/common/list.h>
 #include "common/log.h"
-#include "types.h"
 
 struct wlr_input_device *wlr_input_device_create(
 		enum wlr_input_device_type type,
@@ -32,6 +37,18 @@ void wlr_input_device_destroy(struct wlr_input_device *dev) {
 		case WLR_INPUT_DEVICE_KEYBOARD:
 			wlr_keyboard_destroy(dev->keyboard);
 			break;
+		case WLR_INPUT_DEVICE_POINTER:
+			wlr_pointer_destroy(dev->pointer);
+			break;
+		case WLR_INPUT_DEVICE_TOUCH:
+			wlr_touch_destroy(dev->touch);
+			break;
+		case WLR_INPUT_DEVICE_TABLET_TOOL:
+			wlr_tablet_tool_destroy(dev->tablet_tool);
+			break;
+		case WLR_INPUT_DEVICE_TABLET_PAD:
+			wlr_tablet_pad_destroy(dev->tablet_pad);
+			break;
 		default:
 			wlr_log(L_DEBUG, "Warning: leaking memory %p %p %d",
 					dev->_device, dev, dev->type);
diff --git a/types/wlr_keyboard.c b/types/wlr_keyboard.c
index c2ad5c490..bd6718a77 100644
--- a/types/wlr_keyboard.c
+++ b/types/wlr_keyboard.c
@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-server.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_keyboard.h>
+#include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/common/list.h>
-#include "types.h"
 
 struct wlr_keyboard *wlr_keyboard_create(struct wlr_keyboard_impl *impl,
 		struct wlr_keyboard_state *state) {
diff --git a/types/wlr_output.c b/types/wlr_output.c
index 28996fa75..f639a2c4e 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -2,9 +2,9 @@
 #include <string.h>
 #include <tgmath.h>
 #include <wayland-server.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_output.h>
+#include <wlr/interfaces/wlr_output.h>
 #include <wlr/common/list.h>
-#include "types.h"
 
 static const float transforms[][4] = {
 	[WL_OUTPUT_TRANSFORM_NORMAL] = {
diff --git a/types/wlr_pointer.c b/types/wlr_pointer.c
index 9c40fe2f8..2c9b8735d 100644
--- a/types/wlr_pointer.c
+++ b/types/wlr_pointer.c
@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-server.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_pointer.h>
+#include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/common/list.h>
-#include "types.h"
 
 struct wlr_pointer *wlr_pointer_create(struct wlr_pointer_impl *impl,
 		struct wlr_pointer_state *state) {
diff --git a/types/wlr_tablet_pad.c b/types/wlr_tablet_pad.c
index 3143345f6..97c53bb4c 100644
--- a/types/wlr_tablet_pad.c
+++ b/types/wlr_tablet_pad.c
@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-server.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_tablet_pad.h>
+#include <wlr/interfaces/wlr_tablet_pad.h>
 #include <wlr/common/list.h>
-#include "types.h"
 
 struct wlr_tablet_pad *wlr_tablet_pad_create(struct wlr_tablet_pad_impl *impl,
 		struct wlr_tablet_pad_state *state) {
diff --git a/types/wlr_tablet_tool.c b/types/wlr_tablet_tool.c
index 1c1d21eee..cca3e31de 100644
--- a/types/wlr_tablet_tool.c
+++ b/types/wlr_tablet_tool.c
@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-server.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_tablet_tool.h>
+#include <wlr/interfaces/wlr_tablet_tool.h>
 #include <wlr/common/list.h>
-#include "types.h"
 
 struct wlr_tablet_tool *wlr_tablet_tool_create(struct wlr_tablet_tool_impl *impl,
 		struct wlr_tablet_tool_state *state) {
diff --git a/types/wlr_touch.c b/types/wlr_touch.c
index 0970f70f9..a6b7d9ea4 100644
--- a/types/wlr_touch.c
+++ b/types/wlr_touch.c
@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-server.h>
-#include <wlr/types.h>
+#include <wlr/types/wlr_touch.h>
+#include <wlr/interfaces/wlr_touch.h>
 #include <wlr/common/list.h>
-#include "types.h"
 
 struct wlr_touch *wlr_touch_create(struct wlr_touch_impl *impl,
 		struct wlr_touch_state *state) {