diff --git a/sway/commands/input/xkb_file.c b/sway/commands/input/xkb_file.c
index 063f544d..ef59bffc 100644
--- a/sway/commands/input/xkb_file.c
+++ b/sway/commands/input/xkb_file.c
@@ -1,7 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "log.h"
 
 struct cmd_results *input_cmd_xkb_file(int argc, char **argv) {
diff --git a/sway/commands/input/xkb_layout.c b/sway/commands/input/xkb_layout.c
index 0879e2da..22626517 100644
--- a/sway/commands/input/xkb_layout.c
+++ b/sway/commands/input/xkb_layout.c
@@ -1,7 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "log.h"
 
 struct cmd_results *input_cmd_xkb_layout(int argc, char **argv) {
diff --git a/sway/commands/input/xkb_model.c b/sway/commands/input/xkb_model.c
index 9e384156..f4a33de3 100644
--- a/sway/commands/input/xkb_model.c
+++ b/sway/commands/input/xkb_model.c
@@ -1,7 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "log.h"
 
 struct cmd_results *input_cmd_xkb_model(int argc, char **argv) {
diff --git a/sway/commands/input/xkb_numlock.c b/sway/commands/input/xkb_numlock.c
index d5b75672..87d3e60c 100644
--- a/sway/commands/input/xkb_numlock.c
+++ b/sway/commands/input/xkb_numlock.c
@@ -1,8 +1,6 @@
-#include <string.h>
-#include <strings.h>
+#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
 
 struct cmd_results *input_cmd_xkb_numlock(int argc, char **argv) {
diff --git a/sway/commands/input/xkb_options.c b/sway/commands/input/xkb_options.c
index 8197dd1d..d609293f 100644
--- a/sway/commands/input/xkb_options.c
+++ b/sway/commands/input/xkb_options.c
@@ -1,7 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "log.h"
 
 struct cmd_results *input_cmd_xkb_options(int argc, char **argv) {
diff --git a/sway/commands/input/xkb_rules.c b/sway/commands/input/xkb_rules.c
index 01ccd06f..3b59622c 100644
--- a/sway/commands/input/xkb_rules.c
+++ b/sway/commands/input/xkb_rules.c
@@ -1,7 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "log.h"
 
 struct cmd_results *input_cmd_xkb_rules(int argc, char **argv) {
diff --git a/sway/commands/input/xkb_variant.c b/sway/commands/input/xkb_variant.c
index 37c82fbd..d0e21d77 100644
--- a/sway/commands/input/xkb_variant.c
+++ b/sway/commands/input/xkb_variant.c
@@ -1,7 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "log.h"
 
 struct cmd_results *input_cmd_xkb_variant(int argc, char **argv) {