Reorganize includes

6 files changed, 14 insertions, 16 deletions

diff --git a/swaybar/bar.c b/swaybar/bar.c
index e3e53622..c6596864 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -5,15 +5,14 @@
 #include <errno.h>
 #include <sys/wait.h>
 #include <poll.h>
-
+#include "swaybar/ipc.h"
+#include "swaybar/render.h"
+#include "swaybar/config.h"
+#include "swaybar/status_line.h"
+#include "swaybar/bar.h"
 #include "ipc-client.h"
 #include "list.h"
 #include "log.h"
-#include "bar/ipc.h"
-#include "bar/render.h"
-#include "bar/config.h"
-#include "bar/status_line.h"
-#include "bar/bar.h"
 
 static void bar_init(struct bar *bar) {
         bar->config = init_config();
diff --git a/swaybar/config.c b/swaybar/config.c
index b5dca668..c5437ee7 100644
--- a/swaybar/config.c
+++ b/swaybar/config.c
@@ -3,7 +3,7 @@
 
 #include "wayland-desktop-shell-client-protocol.h"
 #include "log.h"
-#include "bar/config.h"
+#include "swaybar/config.h"
 
 uint32_t parse_position(const char *position) {
         if (strcmp("top", position) == 0) {
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index ad4f9ef8..8d62d223 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -1,11 +1,10 @@
 #include <string.h>
 #include <json-c/json.h>
-
+#include "swaybar/config.h"
+#include "swaybar/ipc.h"
 #include "ipc-client.h"
 #include "list.h"
 #include "log.h"
-#include "bar/config.h"
-#include "bar/ipc.h"
 
 void ipc_send_workspace_command(const char *workspace_name) {
         uint32_t size = strlen("workspace ") + strlen(workspace_name) + 1;
diff --git a/swaybar/main.c b/swaybar/main.c
index d7534f5d..c9a554a3 100644
--- a/swaybar/main.c
+++ b/swaybar/main.c
@@ -3,9 +3,9 @@
 #include <string.h>
 #include <stdbool.h>
 #include <getopt.h>
+#include "swaybar/bar.h"
 #include "ipc-client.h"
 #include "log.h"
-#include "bar/bar.h"
 
 /* global bar state */
 struct bar swaybar;
diff --git a/swaybar/render.c b/swaybar/render.c
index cea36f52..83b4cec7 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -5,9 +5,9 @@
 #include "client/cairo.h"
 #include "client/pango.h"
 #include "client/window.h"
-#include "bar/config.h"
-#include "bar/status_line.h"
-#include "bar/render.h"
+#include "swaybar/config.h"
+#include "swaybar/status_line.h"
+#include "swaybar/render.h"
 
 
 /* internal spacing */
diff --git a/swaybar/status_line.c b/swaybar/status_line.c
index 33a8908f..c7055d4c 100644
--- a/swaybar/status_line.c
+++ b/swaybar/status_line.c
@@ -3,9 +3,9 @@
 #include <unistd.h>
 #include <json-c/json.h>
 
+#include "swaybar/config.h"
+#include "swaybar/status_line.h"
 #include "log.h"
-#include "bar/config.h"
-#include "bar/status_line.h"
 #include "util.h"
 
 #define I3JSON_MAXDEPTH 4