diff --git a/include/sway/cursor.h b/include/sway/input/cursor.h
similarity index 94%
rename from include/sway/cursor.h
rename to include/sway/input/cursor.h
index 647bc8f1..91421964 100644
--- a/include/sway/cursor.h
+++ b/include/sway/input/cursor.h
@@ -1,7 +1,7 @@
 #ifndef _SWAY_CURSOR_H
 #define _SWAY_CURSOR_H
 
-#include "sway/seat.h"
+#include "sway/input/seat.h"
 
 struct sway_cursor {
 	struct wlr_cursor *cursor;
diff --git a/include/sway/input-manager.h b/include/sway/input/input-manager.h
similarity index 95%
rename from include/sway/input-manager.h
rename to include/sway/input/input-manager.h
index 4c01a043..5dc75ba7 100644
--- a/include/sway/input-manager.h
+++ b/include/sway/input/input-manager.h
@@ -2,7 +2,7 @@
 #define _SWAY_INPUT_MANAGER_H
 #include <libinput.h>
 #include "sway/server.h"
-#include "config.h"
+#include "sway/config.h"
 #include "list.h"
 
 struct sway_input_manager {
diff --git a/include/sway/seat.h b/include/sway/input/seat.h
similarity index 91%
rename from include/sway/seat.h
rename to include/sway/input/seat.h
index 2f8ca72e..a84b7efd 100644
--- a/include/sway/seat.h
+++ b/include/sway/input/seat.h
@@ -2,7 +2,7 @@
 #define _SWAY_SEAT_H
 
 #include <wlr/types/wlr_seat.h>
-#include "sway/input-manager.h"
+#include "sway/input/input-manager.h"
 
 struct sway_seat {
 	struct wlr_seat *seat;
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 819007d5..85b7865d 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -1,6 +1,6 @@
 #define _XOPEN_SOURCE 700
 #include <wlr/types/wlr_cursor.h>
-#include "sway/cursor.h"
+#include "sway/input/cursor.h"
 #include "log.h"
 
 static void handle_cursor_motion(struct wl_listener *listener, void *data) {
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index b5ab8cc1..4f52e59a 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -6,8 +6,8 @@
 #include <string.h>
 #include <libinput.h>
 #include "sway/config.h"
-#include "sway/input-manager.h"
-#include "sway/seat.h"
+#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
 #include "sway/server.h"
 #include "list.h"
 #include "log.h"
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 459b2ee2..1a2b728c 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -1,8 +1,8 @@
 #define _XOPEN_SOURCE 700
 #include <wlr/types/wlr_cursor.h>
-#include "sway/seat.h"
-#include "sway/cursor.h"
-#include "sway/input-manager.h"
+#include "sway/input/seat.h"
+#include "sway/input/cursor.h"
+#include "sway/input/input-manager.h"
 #include "log.h"
 
 struct sway_seat *sway_seat_create(struct wl_display *display,
diff --git a/sway/server.c b/sway/server.c
index 174beac6..7b9a5e8e 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -11,7 +11,7 @@
 // TODO WLR: make Xwayland optional
 #include <wlr/xwayland.h>
 #include "sway/server.h"
-#include "sway/input-manager.h"
+#include "sway/input/input-manager.h"
 #include "log.h"
 
 bool server_init(struct sway_server *server) {