Cleaned up includes

include/kiwmi/desktop/desktop.h

@@ -10,8 +10,6 @@
 
 #include <wayland-server.h>
 #include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_output_layout.h>
 
 struct kiwmi_desktop {
     struct wlr_compositor *compositor;

include/kiwmi/desktop/output.h

@@ -9,9 +9,6 @@
 #define KIWMI_DESKTOP_OUTPUT_H
 
 #include <wayland-server.h>
-#include <wlr/types/wlr_output.h>
-
-#include "kiwmi/desktop/desktop.h"
 
 struct kiwmi_output {
     struct wl_list link;

include/kiwmi/input/cursor.h

@@ -8,9 +8,8 @@
 #ifndef KIWMI_INPUT_CURSOR_H
 #define KIWMI_INPUT_CURSOR_H
 
-#include <wlr/types/wlr_cursor.h>
+#include <wayland-server.h>
 #include <wlr/types/wlr_output_layout.h>
-#include <wlr/types/wlr_xcursor_manager.h>
 
 struct kiwmi_cursor {
     struct wlr_cursor *cursor;

include/kiwmi/input/input.h

@@ -10,8 +10,6 @@
 
 #include <wayland-server.h>
 
-#include "kiwmi/input/cursor.h"
-
 struct kiwmi_input {
     struct wl_list keyboards; // struct kiwmi_keyboard::link
     struct wl_listener new_input;

include/kiwmi/input/keyboard.h

@@ -9,9 +9,6 @@
 #define KIWMI_INPUT_KEYBOARD_H
 
 #include <wayland-server.h>
-#include <wlr/types/wlr_input_device.h>
-
-#include "kiwmi/server.h"
 
 struct kiwmi_keyboard {
     struct wl_list link;

include/kiwmi/server.h

@@ -8,9 +8,6 @@
 #ifndef KIWMI_SERVER_H
 #define KIWMI_SERVER_H
 
-#include <wayland-server.h>
-#include <wlr/backend.h>
-
 #include "kiwmi/desktop/desktop.h"
 #include "kiwmi/input/input.h"
 

kiwmi/desktop/desktop.c

@@ -10,14 +10,13 @@
 #include <stdbool.h>
 
 #include <wayland-server.h>
-#include <wlr/render/wlr_renderer.h>
+#include <wlr/backend.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_output_layout.h>
 
 #include "kiwmi/server.h"
 #include "kiwmi/desktop/output.h"
-#include "kiwmi/input/cursor.h"
 
 bool
 desktop_init(struct kiwmi_desktop *desktop, struct wlr_renderer *renderer)

kiwmi/desktop/output.c

@@ -13,10 +13,14 @@
 #include <wlr/backend.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/util/log.h>
 
 #include "kiwmi/server.h"
 #include "kiwmi/desktop/desktop.h"
+#include "kiwmi/input/cursor.h"
+#include "kiwmi/input/input.h"
 
 static void
 output_frame_notify(struct wl_listener *listener, void *data)

kiwmi/input/cursor.c

@@ -12,6 +12,7 @@
 #include <wayland-server.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_pointer.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/util/log.h>
 

kiwmi/input/input.c

@@ -8,10 +8,14 @@
 #include "kiwmi/input/input.h"
 
 #include <wayland-server.h>
+#include <wlr/backend.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/util/log.h>
 
 #include "kiwmi/server.h"
+#include "kiwmi/desktop/desktop.h"
+#include "kiwmi/input/cursor.h"
 #include "kiwmi/input/keyboard.h"
 
 static void

kiwmi/input/keyboard.c

@@ -11,8 +11,8 @@
 #include <stdlib.h>
 
 #include <wayland-server.h>
+#include <wlr/backend.h>
 #include <wlr/backend/multi.h>
-#include <wlr/backend/session.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/util/log.h>
 #include <xkbcommon/xkbcommon.h>

kiwmi/main.c

@@ -12,7 +12,6 @@
 #include <getopt.h>
 #include <limits.h>
 
-#include <wayland-server.h>
 #include <wlr/util/log.h>
 
 #include "kiwmi/server.h"

kiwmi/server.c

@@ -11,13 +11,9 @@
 
 #include <wayland-server.h>
 #include <wlr/backend.h>
-#include <wlr/types/wlr_xcursor_manager.h>
+#include <wlr/render/wlr_renderer.h>
 #include <wlr/util/log.h>
 
-#include "kiwmi/desktop/desktop.h"
-#include "kiwmi/input/cursor.h"
-#include "kiwmi/input/input.h"
-
 bool
 server_init(struct kiwmi_server *server)
 {