swaybar: move headers to include/bar

swaybar/bar.c

@@ -8,11 +8,11 @@
 #include "ipc-client.h"
 #include "list.h"
 #include "log.h"
-#include "ipc.h"
-#include "render.h"
-#include "config.h"
-#include "status_line.h"
-#include "bar.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();

swaybar/config.c

@@ -3,7 +3,7 @@
 
 #include "wayland-desktop-shell-client-protocol.h"
 #include "log.h"
-#include "config.h"
+#include "bar/config.h"
 
 uint32_t parse_color(const char *color) {
 	if (color[0] != '#') {

swaybar/ipc.c

@@ -4,8 +4,8 @@
 #include "ipc-client.h"
 #include "list.h"
 #include "log.h"
-#include "config.h"
-#include "ipc.h"
+#include "bar/config.h"
+#include "bar/ipc.h"
 
 static void ipc_parse_config(struct config *config, const char *payload) {
 	json_object *bar_config = json_tokener_parse(payload);

swaybar/main.c

@@ -5,7 +5,7 @@
 #include <getopt.h>
 #include "ipc-client.h"
 #include "log.h"
-#include "bar.h"
+#include "bar/bar.h"
 
 /* global bar state */
 struct bar swaybar;

swaybar/render.c

@@ -4,9 +4,9 @@
 
 #include "client/pango.h"
 #include "client/window.h"
-#include "config.h"
-#include "status_line.h"
-#include "render.h"
+#include "bar/config.h"
+#include "bar/status_line.h"
+#include "bar/render.h"
 
 
 /* internal spacing */

swaybar/status_line.c

@@ -4,8 +4,8 @@
 #include <json-c/json.h>
 
 #include "log.h"
-#include "config.h"
-#include "status_line.h"
+#include "bar/config.h"
+#include "bar/status_line.h"
 
 #define I3JSON_MAXDEPTH 4
 #define I3JSON_UNKNOWN 0