reverted includes of "sway/config.h" and replaced with "config.h" from meson build

include/sway/criteria.h

@@ -2,6 +2,7 @@
 #define _SWAY_CRITERIA_H
 
 #include <pcre.h>
+#include "config.h"
 #include "list.h"
 #include "tree/view.h"
 

include/sway/tree/layout.h

@@ -3,6 +3,7 @@
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/render/wlr_texture.h>
 #include "sway/tree/container.h"
+#include "config.h"
 
 enum movement_direction {
 	MOVE_LEFT,

include/sway/tree/view.h

@@ -3,6 +3,7 @@
 #include <wayland-server.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
+#include "config.h"
 #ifdef HAVE_XWAYLAND
 #include <wlr/xwayland.h>
 #endif

sway/commands/swap.c

@@ -1,6 +1,6 @@
 #include <strings.h>
 #include <wlr/util/log.h>
-#include "sway/config.h"
+#include "config.h"
 #include "sway/commands.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/layout.h"

sway/desktop/output.c

@@ -14,6 +14,7 @@
 #include <wlr/types/wlr_surface.h>
 #include <wlr/util/region.h>
 #include "log.h"
+#include "config.h"
 #include "sway/config.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"

sway/desktop/render.c

@@ -14,6 +14,7 @@
 #include <wlr/types/wlr_surface.h>
 #include <wlr/util/region.h>
 #include "log.h"
+#include "config.h"
 #include "sway/config.h"
 #include "sway/debug.h"
 #include "sway/input/input-manager.h"

sway/input/cursor.c

@@ -11,7 +11,7 @@
 #include <wlr/types/wlr_idle.h>
 #include "list.h"
 #include "log.h"
-#include "sway/config.h"
+#include "config.h"
 #include "sway/desktop.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"

sway/input/seat.c

@@ -12,7 +12,7 @@
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include "log.h"
-#include "sway/config.h"
+#include "config.h"
 #include "sway/debug.h"
 #include "sway/desktop.h"
 #include "sway/input/cursor.h"

sway/server.c

@@ -25,6 +25,7 @@
 #include "sway/input/input-manager.h"
 #include "sway/server.h"
 #include "sway/tree/layout.h"
+#include "config.h"
 #ifdef HAVE_XWAYLAND
 #include "sway/xwayland.h"
 #endif

sway/tree/layout.c

@@ -6,7 +6,7 @@
 #include <string.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_layout.h>
-#include "sway/config.h"
+#include "config.h"
 #include "sway/debug.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"

sway/tree/view.c

@@ -3,12 +3,12 @@
 #include <wayland-server.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_output_layout.h>
-#include "sway/config.h"
 #ifdef HAVE_XWAYLAND
 #include <wlr/xwayland.h>
 #endif
 #include "list.h"
 #include "log.h"
+#include "config.h"
 #include "sway/criteria.h"
 #include "sway/commands.h"
 #include "sway/ipc-server.h"