6 files changed, 22 insertions, 18 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;
diff --git a/include/wlr/types/wlr_tablet_pad.h b/include/wlr/types/wlr_tablet_pad.h
index e70db516..73082c56 100644
--- a/include/wlr/types/wlr_tablet_pad.h
+++ b/include/wlr/types/wlr_tablet_pad.h
@@ -29,6 +29,7 @@ struct wlr_event_tablet_pad_button {
 	uint32_t time_msec;
 	uint32_t button;
 	enum wlr_button_state state;
+	unsigned int mode;
 };
 
 enum wlr_tablet_pad_ring_source {
@@ -41,6 +42,7 @@ struct wlr_event_tablet_pad_ring {
 	enum wlr_tablet_pad_ring_source source;
 	uint32_t ring;
 	double position;
+	unsigned int mode;
 };
 
 enum wlr_tablet_pad_strip_source {
@@ -53,6 +55,7 @@ struct wlr_event_tablet_pad_strip {
 	enum wlr_tablet_pad_strip_source source;
 	uint32_t strip;
 	double position;
+	unsigned int mode;
 };
 
 #endif
diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h
index 0d4b91ed..f34860aa 100644
--- a/include/wlr/xwayland.h
+++ b/include/wlr/xwayland.h
@@ -8,10 +8,6 @@
 #include <wlr/types/wlr_seat.h>
 #include <xcb/xcb.h>
 
-#ifdef WLR_HAS_XCB_ICCCM
-	#include <xcb/xcb_icccm.h>
-#endif
-
 struct wlr_xwm;
 struct wlr_xwayland_cursor;
 
diff --git a/include/wlr/xwm.h b/include/xwayland/xwm.h
index 7d518f7e..4b15cc84 100644
--- a/include/wlr/xwm.h
+++ b/include/xwayland/xwm.h
@@ -1,10 +1,17 @@
-#ifndef WLR_XWM_H
-#define WLR_XWM_H
+#ifndef XWAYLAND_XWM_H
+#define XWAYLAND_XWM_H
 
 #include <wayland-server-core.h>
 #include <wlr/xwayland.h>
 #include <xcb/render.h>
 
+#ifdef WLR_HAS_XCB_ICCCM
+	#include <xcb/xcb_icccm.h>
+#endif
+#ifdef WLR_HAS_XCB_ERRORS
+	#include <xcb/xcb_errors.h>
+#endif
+
 enum atom_name {
 	WL_SURFACE_ID,
 	WM_DELETE_WINDOW,
@@ -98,6 +105,9 @@ struct wlr_xwm {
 	struct wl_list unpaired_surfaces; // wlr_xwayland_surface::unpaired_link
 
 	const xcb_query_extension_reply_t *xfixes;
+#ifdef WLR_HAS_XCB_ERRORS
+	xcb_errors_context_t *errors_context;
+#endif
 
 	struct wl_listener compositor_new_surface;
 	struct wl_listener compositor_destroy;
@@ -119,7 +129,7 @@ void xwm_selection_finish(struct wlr_xwm *xwm);
 
 void xwm_set_seat(struct wlr_xwm *xwm, struct wlr_seat *seat);
 
-bool wlr_xwm_atoms_contains(struct wlr_xwm *xwm, xcb_atom_t *atoms,
+bool xwm_atoms_contains(struct wlr_xwm *xwm, xcb_atom_t *atoms,
 		size_t num_atoms, enum atom_name needle);
 
 #endif