merge in latest commits

sway/commands/bar/binding_mode_indicator.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_binding_mode_indicator(int argc, char **argv) {

sway/commands/bar/bindsym.c

@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
-#include "config.h"
+#include "sway/commands.h"
+#include "sway/config.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"

sway/commands/bar/colors.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_colors(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/bar/font.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
 

sway/commands/bar/height.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_height(int argc, char **argv) {

sway/commands/bar/hidden_state.c

@@ -1,7 +1,7 @@
 #include <string.h>
-#include "commands.h"
-#include "config.h"
-#include "ipc-server.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/ipc-server.h"
 #include "log.h"
 
 static struct cmd_results *bar_set_hidden_state(struct bar_config *bar, const char *hidden_state) {

sway/commands/bar/id.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_id(int argc, char **argv) {

sway/commands/bar/mode.c

@@ -1,7 +1,7 @@
 #include <string.h>
-#include "commands.h"
-#include "config.h"
-#include "ipc-server.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/ipc-server.h"
 #include "log.h"
 
 static struct cmd_results *bar_set_mode(struct bar_config *bar, const char *mode) {

sway/commands/bar/modifier.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
 #include "util.h"

sway/commands/bar/output.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "list.h"
 #include "log.h"
 

sway/commands/bar/pango_markup.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) {

sway/commands/bar/position.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_position(int argc, char **argv) {

sway/commands/bar/separator_symbol.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_separator_symbol(int argc, char **argv) {

sway/commands/bar/status_command.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
 

sway/commands/bar/strip_workspace_numbers.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_strip_workspace_numbers(int argc, char **argv) {

sway/commands/bar/swaybar_command.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
 

sway/commands/bar/tray_output.c

@@ -1,4 +1,4 @@
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_tray_output(int argc, char **argv) {

sway/commands/bar/tray_padding.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_tray_padding(int argc, char **argv) {

sway/commands/bar/workspace_buttons.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) {

sway/commands/bar/wrap_scroll.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_wrap_scroll(int argc, char **argv) {