diff --git a/include/sway/criteria.h b/include/sway/criteria.h
index 23efe9d4e..b4ff7d497 100644
--- a/include/sway/criteria.h
+++ b/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"
 
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h
index 580acd166..a4c31bf61 100644
--- a/include/sway/tree/layout.h
+++ b/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,
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index d4416dd39..1972447be 100644
--- a/include/sway/tree/view.h
+++ b/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
diff --git a/sway/commands/swap.c b/sway/commands/swap.c
index 8b8e9d791..4e3a9cce4 100644
--- a/sway/commands/swap.c
+++ b/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"
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 05daad7b2..1512408e9 100644
--- a/sway/desktop/output.c
+++ b/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"
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 2e6b66491..3e7bd94bf 100644
--- a/sway/desktop/render.c
+++ b/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"
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 3de36e1c6..2468a3416 100644
--- a/sway/input/cursor.c
+++ b/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"
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 2d62b1010..cc0b16cfd 100644
--- a/sway/input/seat.c
+++ b/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"
diff --git a/sway/server.c b/sway/server.c
index 1521597fe..10ca9614c 100644
--- a/sway/server.c
+++ b/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
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 91f6accd2..2b3263f8f 100644
--- a/sway/tree/layout.c
+++ b/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"
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 7cc15ae3d..f672417e4 100644
--- a/sway/tree/view.c
+++ b/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"