From 7efc56adfc205de3a65cbed71bcc159e61baed6f Mon Sep 17 00:00:00 2001
From: Charlotte Meyer <dev@buffet.sh>
Date: Thu, 21 Mar 2019 22:12:54 +0100
Subject: [PATCH] Cleaned up includes

---
 include/kiwmi/desktop/desktop.h | 2 --
 include/kiwmi/desktop/output.h  | 3 ---
 include/kiwmi/input/cursor.h    | 3 +--
 include/kiwmi/input/input.h     | 2 --
 include/kiwmi/input/keyboard.h  | 3 ---
 include/kiwmi/server.h          | 3 ---
 kiwmi/desktop/desktop.c         | 3 +--
 kiwmi/desktop/output.c          | 4 ++++
 kiwmi/input/cursor.c            | 1 +
 kiwmi/input/input.c             | 4 ++++
 kiwmi/input/keyboard.c          | 2 +-
 kiwmi/main.c                    | 1 -
 kiwmi/server.c                  | 6 +-----
 13 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/include/kiwmi/desktop/desktop.h b/include/kiwmi/desktop/desktop.h
index c81fdd2..392fbf1 100644
--- a/include/kiwmi/desktop/desktop.h
+++ b/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;
diff --git a/include/kiwmi/desktop/output.h b/include/kiwmi/desktop/output.h
index c46d49f..942aa52 100644
--- a/include/kiwmi/desktop/output.h
+++ b/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;
diff --git a/include/kiwmi/input/cursor.h b/include/kiwmi/input/cursor.h
index 100f0b8..25dddd0 100644
--- a/include/kiwmi/input/cursor.h
+++ b/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;
diff --git a/include/kiwmi/input/input.h b/include/kiwmi/input/input.h
index 76bc5e8..2bbe0f5 100644
--- a/include/kiwmi/input/input.h
+++ b/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;
diff --git a/include/kiwmi/input/keyboard.h b/include/kiwmi/input/keyboard.h
index 32db941..781910a 100644
--- a/include/kiwmi/input/keyboard.h
+++ b/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;
diff --git a/include/kiwmi/server.h b/include/kiwmi/server.h
index 873d37a..23ff90c 100644
--- a/include/kiwmi/server.h
+++ b/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"
 
diff --git a/kiwmi/desktop/desktop.c b/kiwmi/desktop/desktop.c
index 16c28a9..08681f7 100644
--- a/kiwmi/desktop/desktop.c
+++ b/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)
diff --git a/kiwmi/desktop/output.c b/kiwmi/desktop/output.c
index 3f37420..9dfb494 100644
--- a/kiwmi/desktop/output.c
+++ b/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)
diff --git a/kiwmi/input/cursor.c b/kiwmi/input/cursor.c
index 0136072..37cb16e 100644
--- a/kiwmi/input/cursor.c
+++ b/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>
 
diff --git a/kiwmi/input/input.c b/kiwmi/input/input.c
index 5233718..ccb6382 100644
--- a/kiwmi/input/input.c
+++ b/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
diff --git a/kiwmi/input/keyboard.c b/kiwmi/input/keyboard.c
index a5c23e5..1d0d10e 100644
--- a/kiwmi/input/keyboard.c
+++ b/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>
diff --git a/kiwmi/main.c b/kiwmi/main.c
index b7ca2f7..ece30e2 100644
--- a/kiwmi/main.c
+++ b/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"
diff --git a/kiwmi/server.c b/kiwmi/server.c
index b4bfcb2..9eace5a 100644
--- a/kiwmi/server.c
+++ b/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)
 {