From 95405911051dbb233902c95f824dccdde1e419fd Mon Sep 17 00:00:00 2001
From: Carl Smedstad <carl.smedstad@protonmail.com>
Date: Sun, 6 Nov 2022 20:31:41 +0100
Subject: Add missing includes & remove duplicates

---
 include/sway/desktop/launcher.h | 1 +
 include/sway/input/text_input.h | 1 -
 include/sway/tree/node.h        | 1 +
 include/sway/tree/view.h        | 2 +-
 include/sway/tree/workspace.h   | 1 +
 include/swaybar/tray/item.h     | 1 +
 include/swaynag/types.h         | 4 ++++
 sway/commands/exec_always.c     | 1 -
 8 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/sway/desktop/launcher.h b/include/sway/desktop/launcher.h
index 3b577f74..d5651adf 100644
--- a/include/sway/desktop/launcher.h
+++ b/include/sway/desktop/launcher.h
@@ -2,6 +2,7 @@
 #define _SWAY_LAUNCHER_H
 
 #include <stdlib.h>
+#include <wayland-server-core.h>
 
 struct launcher_ctx {
 	pid_t pid;
diff --git a/include/sway/input/text_input.h b/include/sway/input/text_input.h
index c70fd935..4de96d44 100644
--- a/include/sway/input/text_input.h
+++ b/include/sway/input/text_input.h
@@ -4,7 +4,6 @@
 #include <wlr/types/wlr_text_input_v3.h>
 #include <wlr/types/wlr_input_method_v2.h>
 #include <wlr/types/wlr_compositor.h>
-#include "sway/input/seat.h"
 
 /**
  * The relay structure manages the relationship between text-input and
diff --git a/include/sway/tree/node.h b/include/sway/tree/node.h
index 470ee3b5..03a389a4 100644
--- a/include/sway/tree/node.h
+++ b/include/sway/tree/node.h
@@ -1,5 +1,6 @@
 #ifndef _SWAY_NODE_H
 #define _SWAY_NODE_H
+#include <wayland-server-core.h>
 #include <stdbool.h>
 #include "list.h"
 
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 1b033ee5..273ff364 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -2,7 +2,7 @@
 #define _SWAY_VIEW_H
 #include <wayland-server-core.h>
 #include <wlr/types/wlr_compositor.h>
-#include "config.h"
+#include "sway/config.h"
 #if HAVE_XWAYLAND
 #include <wlr/xwayland.h>
 #endif
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h
index b3d93a81..b0fef4ca 100644
--- a/include/sway/tree/workspace.h
+++ b/include/sway/tree/workspace.h
@@ -2,6 +2,7 @@
 #define _SWAY_WORKSPACE_H
 
 #include <stdbool.h>
+#include "sway/config.h"
 #include "sway/tree/container.h"
 #include "sway/tree/node.h"
 
diff --git a/include/swaybar/tray/item.h b/include/swaybar/tray/item.h
index c02a5582..73937a0c 100644
--- a/include/swaybar/tray/item.h
+++ b/include/swaybar/tray/item.h
@@ -4,6 +4,7 @@
 #include <cairo.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <wayland-util.h>
 #include "swaybar/tray/tray.h"
 #include "list.h"
 
diff --git a/include/swaynag/types.h b/include/swaynag/types.h
index 31c6ac08..9c3c50db 100644
--- a/include/swaynag/types.h
+++ b/include/swaynag/types.h
@@ -1,6 +1,10 @@
 #ifndef _SWAYNAG_TYPES_H
 #define _SWAYNAG_TYPES_H
 
+#include <stdint.h>
+#include <pango/pangocairo.h>
+#include "list.h"
+
 struct swaynag_type {
 	char *name;
 
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index e6b09e64..bb982621 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -9,7 +9,6 @@
 #include "sway/config.h"
 #include "sway/server.h"
 #include "sway/desktop/launcher.h"
-#include "sway/server.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
 #include "sway/tree/workspace.h"
-- 
cgit v1.2.3-54-g00ecf