2 files changed, 8 insertions, 8 deletions
diff --git a/include/sway/input.h b/include/sway/input.h
index 4ed9bffe..eb92e470 100644
--- a/include/sway/input.h
+++ b/include/sway/input.h
@@ -1,18 +1,19 @@
 #ifndef _SWAY_INPUT_H
 #define _SWAY_INPUT_H
-
 #include <libinput.h>
+#include "sway/server.h"
 #include "config.h"
 #include "list.h"
 
+struct sway_input {
+	list_t *input_devices;
+};
+
 struct input_config *new_input_config(const char* identifier);
 
 char* libinput_dev_unique_id(struct libinput_device *dev);
 
-/**
- * Global input device list.
- */
-extern list_t *input_devices;
+struct sway_input *sway_input_create(struct sway_server *server);
 
 /**
  * Pointer used when reading input blocked.
diff --git a/include/sway/server.h b/include/sway/server.h
index 9cd760ac..22069f9c 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -10,9 +10,6 @@
 #include <wlr/xwayland.h>
 
 struct sway_server {
-	// TODO WLR
-	//struct roots_input *input;
-
 	struct wl_display *wl_display;
 	struct wl_event_loop *wl_event_loop;
 
@@ -20,6 +17,8 @@ struct sway_server {
 	struct wlr_renderer *renderer;
 
 	struct wlr_data_device_manager *data_device_manager;
+
+	struct sway_input *input;
 };
 
 bool server_init(struct sway_server *server);