merge in latest commits

sway/commands/input/accel_profile.c

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

sway/commands/input/click_method.c

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

sway/commands/input/drag_lock.c

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

sway/commands/input/dwt.c

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

sway/commands/input/events.c

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

sway/commands/input/middle_emulation.c

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

sway/commands/input/natural_scroll.c

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

sway/commands/input/pointer_accel.c

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

sway/commands/input/scroll_method.c

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

sway/commands/input/tap.c

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