3 files changed, 6 insertions, 11 deletions
diff --git a/include/backend/x11.h b/include/backend/x11.h
index 9e1c8146..840509bf 100644
--- a/include/backend/x11.h
+++ b/include/backend/x11.h
@@ -17,11 +17,6 @@ struct wlr_x11_output {
 	EGLSurface surf;
 };
 
-struct wlr_x11_atom {
-	xcb_intern_atom_cookie_t cookie;
-	xcb_intern_atom_reply_t *reply;
-};
-
 struct wlr_x11_backend {
 	struct wlr_backend backend;
 	struct wl_display *wl_display;
@@ -44,10 +39,10 @@ struct wlr_x11_backend {
 	struct wl_event_source *frame_timer;
 
 	struct {
-		struct wlr_x11_atom wm_protocols;
-		struct wlr_x11_atom wm_delete_window;
-		struct wlr_x11_atom net_wm_name;
-		struct wlr_x11_atom utf8_string;
+		xcb_atom_t wm_protocols;
+		xcb_atom_t wm_delete_window;
+		xcb_atom_t net_wm_name;
+		xcb_atom_t utf8_string;
 	} atoms;
 
 	// The time we last received an event
diff --git a/include/wlr/interfaces/wlr_input_device.h b/include/wlr/interfaces/wlr_input_device.h
index 2a681ff8..a5c513b7 100644
--- a/include/wlr/interfaces/wlr_input_device.h
+++ b/include/wlr/interfaces/wlr_input_device.h
@@ -10,7 +10,7 @@ struct wlr_input_device_impl {
 void wlr_input_device_init(
 		struct wlr_input_device *wlr_device,
 		enum wlr_input_device_type type,
-		struct wlr_input_device_impl *impl,
+		const struct wlr_input_device_impl *impl,
 		const char *name, int vendor, int product);
 void wlr_input_device_destroy(struct wlr_input_device *dev);
 
diff --git a/include/wlr/types/wlr_input_device.h b/include/wlr/types/wlr_input_device.h
index 306a1166..6d8e3631 100644
--- a/include/wlr/types/wlr_input_device.h
+++ b/include/wlr/types/wlr_input_device.h
@@ -24,7 +24,7 @@ enum wlr_input_device_type {
 struct wlr_input_device_impl;
 
 struct wlr_input_device {
-	struct wlr_input_device_impl *impl;
+	const struct wlr_input_device_impl *impl;
 
 	enum wlr_input_device_type type;
 	int vendor, product;