aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/ipc-client.c11
-rw-r--r--common/log.c16
-rw-r--r--common/util.c7
-rw-r--r--include/sway/border.h (renamed from include/border.h)0
-rw-r--r--include/sway/commands.h (renamed from include/commands.h)0
-rw-r--r--include/sway/config.h (renamed from include/config.h)0
-rw-r--r--include/sway/container.h (renamed from include/container.h)0
-rw-r--r--include/sway/criteria.h (renamed from include/criteria.h)0
-rw-r--r--include/sway/extensions.h (renamed from include/extensions.h)0
-rw-r--r--include/sway/focus.h (renamed from include/focus.h)0
-rw-r--r--include/sway/handlers.h (renamed from include/handlers.h)0
-rw-r--r--include/sway/input.h (renamed from include/input.h)0
-rw-r--r--include/sway/input_state.h (renamed from include/input_state.h)0
-rw-r--r--include/sway/ipc-json.h (renamed from include/ipc-json.h)0
-rw-r--r--include/sway/ipc-server.h (renamed from include/ipc-server.h)0
-rw-r--r--include/sway/layout.h (renamed from include/layout.h)0
-rw-r--r--include/sway/output.h (renamed from include/output.h)0
-rw-r--r--include/sway/resize.h (renamed from include/resize.h)0
-rw-r--r--include/sway/workspace.h (renamed from include/workspace.h)0
-rw-r--r--include/swaybar/bar.h (renamed from include/bar/bar.h)0
-rw-r--r--include/swaybar/config.h (renamed from include/bar/config.h)0
-rw-r--r--include/swaybar/ipc.h (renamed from include/bar/ipc.h)0
-rw-r--r--include/swaybar/render.h (renamed from include/bar/render.h)0
-rw-r--r--include/swaybar/status_line.h (renamed from include/bar/status_line.h)0
-rw-r--r--include/swaylock/swaylock.h (renamed from include/lock/lock.h)0
-rw-r--r--sway/border.c6
-rw-r--r--sway/commands.c30
-rw-r--r--sway/config.c14
-rw-r--r--sway/container.c20
-rw-r--r--sway/criteria.c6
-rw-r--r--sway/debug_log.c2
-rw-r--r--sway/extensions.c8
-rw-r--r--sway/focus.c15
-rw-r--r--sway/handlers.c35
-rw-r--r--sway/input.c4
-rw-r--r--sway/input_state.c5
-rw-r--r--sway/ipc-json.c4
-rw-r--r--sway/ipc-server.c12
-rw-r--r--sway/layout.c20
-rw-r--r--sway/main.c18
-rw-r--r--sway/output.c2
-rw-r--r--sway/resize.c10
-rw-r--r--sway/workspace.c20
-rw-r--r--swaybar/bar.c11
-rw-r--r--swaybar/config.c2
-rw-r--r--swaybar/ipc.c5
-rw-r--r--swaybar/main.c2
-rw-r--r--swaybar/render.c6
-rw-r--r--swaybar/status_line.c4
-rw-r--r--swaylock/main.c3
50 files changed, 145 insertions, 153 deletions
diff --git a/common/ipc-client.c b/common/ipc-client.c
index e155c168..106f9d86 100644
--- a/common/ipc-client.c
+++ b/common/ipc-client.c
@@ -1,16 +1,13 @@
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <getopt.h>
-#include <stdint.h>
-#include <sys/un.h>
#include <sys/socket.h>
+#include <sys/un.h>
#include <unistd.h>
-#include "log.h"
-#include "stringop.h"
-#include "ipc.h"
-#include "readline.h"
#include "ipc-client.h"
+#include "readline.h"
+#include "log.h"
static const char ipc_magic[] = {'i', '3', '-', 'i', 'p', 'c'};
static const size_t ipc_header_size = sizeof(ipc_magic)+8;
diff --git a/common/log.c b/common/log.c
index 1da2ba2f..4f0baa3f 100644
--- a/common/log.c
+++ b/common/log.c
@@ -1,17 +1,15 @@
-#include "log.h"
-#include "sway.h"
-#include "readline.h"
+#include <errno.h>
+#include <libgen.h>
+#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
-#include <libgen.h>
-#include <fcntl.h>
#include <unistd.h>
-#include <signal.h>
-#include <time.h>
-#include <errno.h>
#include <string.h>
-#include <stringop.h>
+#include <time.h>
+#include "log.h"
+#include "sway.h"
+#include "readline.h"
static int colored = 1;
static log_importance_t loglevel_default = L_ERROR;
diff --git a/common/util.c b/common/util.c
index f0b0fdf0..f2302676 100644
--- a/common/util.c
+++ b/common/util.c
@@ -1,10 +1,13 @@
#include <math.h>
+#include <stdint.h>
#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
+#include <string.h>
+#include <wlc/wlc.h>
+#include <xkbcommon/xkbcommon-names.h>
+#include "log.h"
#include "readline.h"
#include "util.h"
-#include "log.h"
int wrap(int i, int max) {
return ((i % max) + max) % max;
diff --git a/include/border.h b/include/sway/border.h
index c30c9da3..c30c9da3 100644
--- a/include/border.h
+++ b/include/sway/border.h
diff --git a/include/commands.h b/include/sway/commands.h
index cd0610f4..cd0610f4 100644
--- a/include/commands.h
+++ b/include/sway/commands.h
diff --git a/include/config.h b/include/sway/config.h
index 56deaf01..56deaf01 100644
--- a/include/config.h
+++ b/include/sway/config.h
diff --git a/include/container.h b/include/sway/container.h
index 4dd7f3a0..4dd7f3a0 100644
--- a/include/container.h
+++ b/include/sway/container.h
diff --git a/include/criteria.h b/include/sway/criteria.h
index 5c71d172..5c71d172 100644
--- a/include/criteria.h
+++ b/include/sway/criteria.h
diff --git a/include/extensions.h b/include/sway/extensions.h
index f6b0c00e..f6b0c00e 100644
--- a/include/extensions.h
+++ b/include/sway/extensions.h
diff --git a/include/focus.h b/include/sway/focus.h
index b532edc2..b532edc2 100644
--- a/include/focus.h
+++ b/include/sway/focus.h
diff --git a/include/handlers.h b/include/sway/handlers.h
index 956b98f4..956b98f4 100644
--- a/include/handlers.h
+++ b/include/sway/handlers.h
diff --git a/include/input.h b/include/sway/input.h
index 4ed9bffe..4ed9bffe 100644
--- a/include/input.h
+++ b/include/sway/input.h
diff --git a/include/input_state.h b/include/sway/input_state.h
index 903301fb..903301fb 100644
--- a/include/input_state.h
+++ b/include/sway/input_state.h
diff --git a/include/ipc-json.h b/include/sway/ipc-json.h
index 02b07a23..02b07a23 100644
--- a/include/ipc-json.h
+++ b/include/sway/ipc-json.h
diff --git a/include/ipc-server.h b/include/sway/ipc-server.h
index 1d199134..1d199134 100644
--- a/include/ipc-server.h
+++ b/include/sway/ipc-server.h
diff --git a/include/layout.h b/include/sway/layout.h
index b982365c..b982365c 100644
--- a/include/layout.h
+++ b/include/sway/layout.h
diff --git a/include/output.h b/include/sway/output.h
index e8afd5ed..e8afd5ed 100644
--- a/include/output.h
+++ b/include/sway/output.h
diff --git a/include/resize.h b/include/sway/resize.h
index 0d382994..0d382994 100644
--- a/include/resize.h
+++ b/include/sway/resize.h
diff --git a/include/workspace.h b/include/sway/workspace.h
index c268fafa..c268fafa 100644
--- a/include/workspace.h
+++ b/include/sway/workspace.h
diff --git a/include/bar/bar.h b/include/swaybar/bar.h
index a3c511d9..a3c511d9 100644
--- a/include/bar/bar.h
+++ b/include/swaybar/bar.h
diff --git a/include/bar/config.h b/include/swaybar/config.h
index 934116ca..934116ca 100644
--- a/include/bar/config.h
+++ b/include/swaybar/config.h
diff --git a/include/bar/ipc.h b/include/swaybar/ipc.h
index c11931d0..c11931d0 100644
--- a/include/bar/ipc.h
+++ b/include/swaybar/ipc.h
diff --git a/include/bar/render.h b/include/swaybar/render.h
index 114f43f4..114f43f4 100644
--- a/include/bar/render.h
+++ b/include/swaybar/render.h
diff --git a/include/bar/status_line.h b/include/swaybar/status_line.h
index 9b77e8a7..9b77e8a7 100644
--- a/include/bar/status_line.h
+++ b/include/swaybar/status_line.h
diff --git a/include/lock/lock.h b/include/swaylock/swaylock.h
index 1cf66e89..1cf66e89 100644
--- a/include/lock/lock.h
+++ b/include/swaylock/swaylock.h
diff --git a/sway/border.c b/sway/border.c
index 5cb02274..65f69411 100644
--- a/sway/border.c
+++ b/sway/border.c
@@ -1,12 +1,12 @@
-#include "border.h"
#include <wlc/wlc-render.h>
#include <cairo/cairo.h>
#include <pango/pangocairo.h>
#include <stdlib.h>
#include <stdio.h>
#include <arpa/inet.h>
-#include "container.h"
-#include "config.h"
+#include "sway/border.h"
+#include "sway/container.h"
+#include "sway/config.h"
#include "client/pango.h"
void cairo_set_source_u32(cairo_t *cairo, uint32_t color) {
diff --git a/sway/commands.c b/sway/commands.c
index 5a5bcd22..347b463b 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -16,24 +16,24 @@
#include <limits.h>
#include <float.h>
#include <libinput.h>
+#include "sway/layout.h"
+#include "sway/focus.h"
+#include "sway/workspace.h"
+#include "sway/commands.h"
+#include "sway/container.h"
+#include "sway/output.h"
+#include "sway/handlers.h"
+#include "sway/resize.h"
+#include "sway/input_state.h"
+#include "sway/criteria.h"
+#include "sway/ipc-server.h"
+#include "sway/input.h"
+#include "sway/border.h"
#include "stringop.h"
-#include "layout.h"
-#include "focus.h"
-#include "log.h"
-#include "util.h"
-#include "workspace.h"
-#include "commands.h"
-#include "container.h"
-#include "output.h"
-#include "handlers.h"
#include "sway.h"
-#include "resize.h"
-#include "input_state.h"
-#include "criteria.h"
-#include "ipc-server.h"
+#include "util.h"
#include "list.h"
-#include "input.h"
-#include "border.h"
+#include "log.h"
typedef struct cmd_results *sway_cmd(int argc, char **argv);
diff --git a/sway/config.c b/sway/config.c
index bed233bd..a187fe3e 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -12,17 +12,17 @@
#include <limits.h>
#include <float.h>
#include "wayland-desktop-shell-server-protocol.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/layout.h"
+#include "sway/input_state.h"
+#include "sway/criteria.h"
+#include "sway/input.h"
+#include "sway/border.h"
#include "readline.h"
#include "stringop.h"
#include "list.h"
#include "log.h"
-#include "commands.h"
-#include "config.h"
-#include "layout.h"
-#include "input_state.h"
-#include "criteria.h"
-#include "input.h"
-#include "border.h"
struct sway_config *config = NULL;
diff --git a/sway/container.c b/sway/container.c
index c922bac3..5614293c 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -3,17 +3,17 @@
#include <stdbool.h>
#include <strings.h>
#include <string.h>
-#include "config.h"
-#include "stringop.h"
-#include "container.h"
-#include "workspace.h"
-#include "focus.h"
-#include "border.h"
-#include "layout.h"
-#include "input_state.h"
+#include "sway/config.h"
+#include "sway/container.h"
+#include "sway/workspace.h"
+#include "sway/focus.h"
+#include "sway/border.h"
+#include "sway/layout.h"
+#include "sway/input_state.h"
+#include "sway/ipc-server.h"
+#include "sway/output.h"
#include "log.h"
-#include "ipc-server.h"
-#include "output.h"
+#include "stringop.h"
#define ASSERT_NONNULL(PTR) \
sway_assert (PTR, #PTR "must be non-null")
diff --git a/sway/criteria.c b/sway/criteria.c
index 53435d29..739a183e 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -2,12 +2,12 @@
#include <stdio.h>
#include <stdbool.h>
#include <regex.h>
-#include "criteria.h"
+#include "sway/criteria.h"
+#include "sway/container.h"
+#include "sway/config.h"
#include "stringop.h"
#include "list.h"
#include "log.h"
-#include "container.h"
-#include "config.h"
enum criteria_type { // *must* keep in sync with criteria_strings[]
CRIT_CLASS,
diff --git a/sway/debug_log.c b/sway/debug_log.c
index 7c988464..8d891a44 100644
--- a/sway/debug_log.c
+++ b/sway/debug_log.c
@@ -10,7 +10,7 @@
#include <errno.h>
#include <string.h>
#include <stringop.h>
-#include "workspace.h"
+#include "sway/workspace.h"
/* XXX:DEBUG:XXX */
static void container_log(const swayc_t *c, int depth) {
diff --git a/sway/extensions.c b/sway/extensions.c
index 4611f33e..70ec537d 100644
--- a/sway/extensions.c
+++ b/sway/extensions.c
@@ -4,11 +4,11 @@
#include <wlc/wlc-render.h>
#include "wayland-desktop-shell-server-protocol.h"
#include "wayland-swaylock-server-protocol.h"
-#include "layout.h"
+#include "sway/layout.h"
+#include "sway/input_state.h"
+#include "sway/extensions.h"
+#include "sway/ipc-server.h"
#include "log.h"
-#include "input_state.h"
-#include "extensions.h"
-#include "ipc-server.h"
struct desktop_shell_state desktop_shell;
diff --git a/sway/focus.c b/sway/focus.c
index 145e5584..9207260d 100644
--- a/sway/focus.c
+++ b/sway/focus.c
@@ -1,13 +1,12 @@
#include <wlc/wlc.h>
-
-#include "focus.h"
+#include "sway/focus.h"
+#include "sway/workspace.h"
+#include "sway/layout.h"
+#include "sway/config.h"
+#include "sway/input_state.h"
+#include "sway/ipc-server.h"
+#include "sway/border.h"
#include "log.h"
-#include "workspace.h"
-#include "layout.h"
-#include "config.h"
-#include "input_state.h"
-#include "ipc-server.h"
-#include "border.h"
bool locked_container_focus = false;
bool suspend_workspace_cleanup = false;
diff --git a/sway/handlers.c b/sway/handlers.c
index 846d0005..47af7bd5 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -7,25 +7,24 @@
#include <wlc/wlc-render.h>
#include <wlc/wlc-wayland.h>
#include <ctype.h>
-
-#include "handlers.h"
-#include "border.h"
-#include "log.h"
-#include "layout.h"
-#include "config.h"
-#include "commands.h"
-#include "stringop.h"
-#include "workspace.h"
-#include "container.h"
-#include "output.h"
-#include "focus.h"
-#include "input_state.h"
-#include "resize.h"
-#include "extensions.h"
-#include "criteria.h"
-#include "ipc-server.h"
+#include "sway/handlers.h"
+#include "sway/border.h"
+#include "sway/layout.h"
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "sway/workspace.h"
+#include "sway/container.h"
+#include "sway/output.h"
+#include "sway/focus.h"
+#include "sway/input_state.h"
+#include "sway/resize.h"
+#include "sway/extensions.h"
+#include "sway/criteria.h"
+#include "sway/ipc-server.h"
+#include "sway/input.h"
#include "list.h"
-#include "input.h"
+#include "stringop.h"
+#include "log.h"
// Event should be sent to client
#define EVENT_PASSTHROUGH false
diff --git a/sway/input.c b/sway/input.c
index 1f3e99e7..ae24cb49 100644
--- a/sway/input.c
+++ b/sway/input.c
@@ -4,8 +4,8 @@
#include <stdio.h>
#include <string.h>
#include <libinput.h>
-#include "config.h"
-#include "input.h"
+#include "sway/config.h"
+#include "sway/input.h"
#include "list.h"
#include "log.h"
diff --git a/sway/input_state.c b/sway/input_state.c
index 7e31d3d9..68df17de 100644
--- a/sway/input_state.c
+++ b/sway/input_state.c
@@ -1,10 +1,9 @@
#include <string.h>
#include <stdbool.h>
#include <ctype.h>
+#include "sway/input_state.h"
+#include "sway/config.h"
#include "log.h"
-#include "config.h"
-
-#include "input_state.h"
#define KEY_STATE_MAX_LENGTH 64
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 1debca7b..3f03b9f1 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -2,9 +2,9 @@
#include <ctype.h>
#include <string.h>
#include <stdint.h>
-#include "container.h"
+#include "sway/container.h"
+#include "sway/ipc-json.h"
#include "util.h"
-#include "ipc-json.h"
static json_object *ipc_json_create_rect(swayc_t *c) {
json_object *rect = json_object_new_object();
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 7039e348..70007f57 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -13,15 +13,15 @@
#include <json-c/json.h>
#include <list.h>
#include <libinput.h>
-#include "ipc-json.h"
-#include "ipc-server.h"
+#include "sway/ipc-json.h"
+#include "sway/ipc-server.h"
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "sway/input.h"
+#include "stringop.h"
#include "log.h"
-#include "config.h"
-#include "commands.h"
#include "list.h"
-#include "stringop.h"
#include "util.h"
-#include "input.h"
static int ipc_socket = -1;
static struct wlc_event_source *ipc_event_source = NULL;
diff --git a/sway/layout.c b/sway/layout.c
index 01c8e4e3..cf6a111e 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -2,17 +2,17 @@
#include <stdbool.h>
#include <math.h>
#include <wlc/wlc.h>
-#include "extensions.h"
-#include "log.h"
+#include "sway/extensions.h"
+#include "sway/config.h"
+#include "sway/container.h"
+#include "sway/workspace.h"
+#include "sway/focus.h"
+#include "sway/output.h"
+#include "sway/ipc-server.h"
+#include "sway/border.h"
+#include "sway/layout.h"
#include "list.h"
-#include "config.h"
-#include "container.h"
-#include "workspace.h"
-#include "focus.h"
-#include "output.h"
-#include "ipc-server.h"
-#include "border.h"
-#include "layout.h"
+#include "log.h"
swayc_t root_container;
list_t *scratchpad;
diff --git a/sway/main.c b/sway/main.c
index 51b12d20..972b260b 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -8,17 +8,17 @@
#include <signal.h>
#include <unistd.h>
#include <getopt.h>
-#include "extensions.h"
-#include "layout.h"
-#include "stringop.h"
-#include "config.h"
-#include "log.h"
-#include "readline.h"
-#include "handlers.h"
+#include "sway/extensions.h"
+#include "sway/layout.h"
+#include "sway/config.h"
+#include "sway/handlers.h"
+#include "sway/input.h"
+#include "sway/ipc-server.h"
#include "ipc-client.h"
-#include "ipc-server.h"
-#include "input.h"
+#include "readline.h"
+#include "stringop.h"
#include "sway.h"
+#include "log.h"
static bool terminate_request = false;
static int exit_value = 0;
diff --git a/sway/output.c b/sway/output.c
index 97b8a4a6..b337b143 100644
--- a/sway/output.c
+++ b/sway/output.c
@@ -1,7 +1,7 @@
#include <strings.h>
#include <ctype.h>
#include <stdlib.h>
-#include "output.h"
+#include "sway/output.h"
#include "log.h"
#include "list.h"
diff --git a/sway/resize.c b/sway/resize.c
index 18bb86bb..b32d2431 100644
--- a/sway/resize.c
+++ b/sway/resize.c
@@ -1,11 +1,11 @@
#include <wlc/wlc.h>
#include <math.h>
-#include "layout.h"
-#include "focus.h"
+#include "sway/layout.h"
+#include "sway/focus.h"
+#include "sway/input_state.h"
+#include "sway/handlers.h"
+#include "sway/resize.h"
#include "log.h"
-#include "input_state.h"
-#include "handlers.h"
-#include "resize.h"
static bool set_size_floating(int new_dimension, bool use_width) {
swayc_t *view = get_focused_float(swayc_active_workspace());
diff --git a/sway/workspace.c b/sway/workspace.c
index 9c3e69a9..7b24d7d9 100644
--- a/sway/workspace.c
+++ b/sway/workspace.c
@@ -6,18 +6,18 @@
#include <string.h>
#include <strings.h>
#include <sys/types.h>
-#include "ipc-server.h"
-#include "extensions.h"
-#include "workspace.h"
-#include "layout.h"
-#include "list.h"
-#include "log.h"
-#include "container.h"
-#include "handlers.h"
-#include "config.h"
+#include "sway/ipc-server.h"
+#include "sway/extensions.h"
+#include "sway/workspace.h"
+#include "sway/layout.h"
+#include "sway/container.h"
+#include "sway/handlers.h"
+#include "sway/config.h"
+#include "sway/focus.h"
#include "stringop.h"
-#include "focus.h"
#include "util.h"
+#include "list.h"
+#include "log.h"
#include "ipc.h"
char *prev_workspace_name = NULL;
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
diff --git a/swaylock/main.c b/swaylock/main.c
index 3049934e..0637453c 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -12,13 +12,12 @@
#include <signal.h>
#include <stdbool.h>
#include <unistd.h>
-
#include "client/window.h"
#include "client/registry.h"
#include "client/cairo.h"
+#include "swaylock/swaylock.h"
#include "ipc-client.h"
#include "log.h"
-#include "lock/lock.h"
struct registry *registry;
struct render_data render_data;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 04:01:11 +0000