6 files changed, 7 insertions, 5 deletions
diff --git a/include/backend/libinput.h b/include/backend/libinput.h
index 1e8b9072..f424053a 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 f4a0a3b4..02ea3482 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 7108f42c..29748b77 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 24380be8..4f29b54f 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 3c0bd04b..90967dd9 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 a934f49e..222b0c4d 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;