diff --git a/include/wlr/types/wlr_input_device.h b/include/wlr/types/wlr_input_device.h
index 57cbfaf95..17b26d451 100644
--- a/include/wlr/types/wlr_input_device.h
+++ b/include/wlr/types/wlr_input_device.h
@@ -41,6 +41,8 @@ struct wlr_input_device {
 		struct wlr_tablet_tool *tablet_tool;
 		struct wlr_tablet_pad *tablet_pad;
 	};
+
+	void *data;
 };
 
 #endif
diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h
index 0d57b08b7..bef064e5c 100644
--- a/include/wlr/types/wlr_keyboard.h
+++ b/include/wlr/types/wlr_keyboard.h
@@ -20,6 +20,8 @@ struct wlr_keyboard {
 	struct {
 		struct wl_signal key;
 	} events;
+
+	void *data;
 };
 
 void wlr_keyboard_led_update(struct wlr_keyboard *keyboard, uint32_t leds);
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index 02c336e72..e57217c22 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -51,6 +51,8 @@ struct wlr_output {
 		struct wlr_renderer *renderer;
 		struct wlr_texture *texture;
 	} cursor;
+
+	void *data;
 };
 
 void wlr_output_enable(struct wlr_output *output, bool enable);
diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h
index e49fd061f..139ba868c 100644
--- a/include/wlr/types/wlr_pointer.h
+++ b/include/wlr/types/wlr_pointer.h
@@ -17,6 +17,8 @@ struct wlr_pointer {
 		struct wl_signal button;
 		struct wl_signal axis;
 	} events;
+
+	void *data;
 };
 
 struct wlr_event_pointer_motion {
diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h
index aa2b78ec3..60d8b2f64 100644
--- a/include/wlr/types/wlr_surface.h
+++ b/include/wlr/types/wlr_surface.h
@@ -45,6 +45,8 @@ struct wlr_surface {
 
 	struct wl_listener compositor_listener; // destroy listener used by compositor
 	void *compositor_data;
+
+	void *data;
 };
 
 struct wlr_renderer;
diff --git a/include/wlr/types/wlr_tablet_pad.h b/include/wlr/types/wlr_tablet_pad.h
index fe88ec027..d23650863 100644
--- a/include/wlr/types/wlr_tablet_pad.h
+++ b/include/wlr/types/wlr_tablet_pad.h
@@ -22,6 +22,8 @@ struct wlr_tablet_pad {
 		struct wl_signal ring;
 		struct wl_signal strip;
 	} events;
+
+	void *data;
 };
 
 struct wlr_event_tablet_pad_button {
diff --git a/include/wlr/types/wlr_tablet_tool.h b/include/wlr/types/wlr_tablet_tool.h
index 6f1214637..f99cd0653 100644
--- a/include/wlr/types/wlr_tablet_tool.h
+++ b/include/wlr/types/wlr_tablet_tool.h
@@ -17,6 +17,8 @@ struct wlr_tablet_tool {
 		struct wl_signal tip;
 		struct wl_signal button;
 	} events;
+
+	void *data;
 };
 
 enum wlr_tablet_tool_axes {
diff --git a/include/wlr/types/wlr_touch.h b/include/wlr/types/wlr_touch.h
index e5398814e..740d70f6a 100644
--- a/include/wlr/types/wlr_touch.h
+++ b/include/wlr/types/wlr_touch.h
@@ -16,6 +16,8 @@ struct wlr_touch {
 		struct wl_signal motion;
 		struct wl_signal cancel;
 	} events;
+
+	void *data;
 };
 
 struct wlr_event_touch_down {
diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index 3fe6189eb..07380a969 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/include/wlr/types/wlr_xdg_shell_v6.h
@@ -6,12 +6,16 @@ struct wlr_xdg_shell_v6 {
 	struct wl_global *wl_global;
 	struct wl_list wl_resources;
 	struct wl_list surfaces;
+
+	void *data;
 };
 
 struct wlr_xdg_surface_v6 {
 	struct wl_resource *resource;
 	struct wl_resource *surface;
 	struct wl_list link;
+
+	void *data;
 };
 
 struct wlr_xdg_shell_v6 *wlr_xdg_shell_v6_init(struct wl_display *display);