3 files changed, 16 insertions, 40 deletions
diff --git a/include/wlr/interfaces/wlr_input_device.h b/include/wlr/interfaces/wlr_input_device.h
deleted file mode 100644
index ab314807..00000000
--- a/include/wlr/interfaces/wlr_input_device.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This an unstable interface of wlroots. No guarantees are made regarding the
- * future consistency of this API.
- */
-#ifndef WLR_USE_UNSTABLE
-#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features"
-#endif
-
-#ifndef WLR_INTERFACES_WLR_INPUT_DEVICE_H
-#define WLR_INTERFACES_WLR_INPUT_DEVICE_H
-
-#include <wlr/types/wlr_input_device.h>
-
-struct wlr_input_device_impl {
-	void (*destroy)(struct wlr_input_device *wlr_device);
-};
-
-void wlr_input_device_init(struct wlr_input_device *wlr_device,
-	enum wlr_input_device_type type, const struct wlr_input_device_impl *impl,
-	const char *name);
-
-/**
- * Cleans up all of the provided wlr_input_device resources and signals the
- * destroy event.
- */
-void wlr_input_device_finish(struct wlr_input_device *wlr_device);
-
-/**
- * Calls the specialized input device destroy function.
- * If the wlr_input_device is not owned by a specialized input device, the
- * function will finish the wlr_input_device, and either call its implementation
- * destroy function if one has been given, or free the wlr_input_device.
- */
-void wlr_input_device_destroy(struct wlr_input_device *dev);
-
-#endif
diff --git a/include/wlr/types/wlr_input_device.h b/include/wlr/types/wlr_input_device.h
index cbc877df..1690a5b9 100644
--- a/include/wlr/types/wlr_input_device.h
+++ b/include/wlr/types/wlr_input_device.h
@@ -28,8 +28,6 @@ enum wlr_input_device_type {
 struct wlr_input_device_impl;
 
 struct wlr_input_device {
-	const struct wlr_input_device_impl *impl;
-
 	enum wlr_input_device_type type;
 	unsigned int vendor, product;
 	char *name;
@@ -55,4 +53,19 @@ struct wlr_input_device {
 	void *data;
 };
 
+void wlr_input_device_init(struct wlr_input_device *wlr_device,
+	enum wlr_input_device_type type, const char *name);
+
+/**
+ * Clean up all of the provided wlr_input_device resources
+ */
+void wlr_input_device_finish(struct wlr_input_device *wlr_device);
+
+/**
+ * Calls the specialized input device destroy function.
+ * If the wlr_input_device is not owned by a specialized input device, the
+ * function will finish the wlr_input_device and free it.
+ */
+void wlr_input_device_destroy(struct wlr_input_device *dev);
+
 #endif
diff --git a/include/wlr/types/wlr_virtual_keyboard_v1.h b/include/wlr/types/wlr_virtual_keyboard_v1.h
index 8be6158d..a818f141 100644
--- a/include/wlr/types/wlr_virtual_keyboard_v1.h
+++ b/include/wlr/types/wlr_virtual_keyboard_v1.h
@@ -10,8 +10,7 @@
 #define WLR_TYPES_WLR_VIRTUAL_KEYBOARD_V1_H
 
 #include <wayland-server-core.h>
-#include <wlr/interfaces/wlr_input_device.h>
-#include <wlr/interfaces/wlr_keyboard.h>
+#include <wlr/types/wlr_keyboard.h>
 
 struct wlr_virtual_keyboard_manager_v1 {
 	struct wl_global *global;