diff --git a/include/wlr/types/wlr_input_inhibitor.h b/include/wlr/types/wlr_input_inhibitor.h
index b3fd19ee..49bc3ac2 100644
--- a/include/wlr/types/wlr_input_inhibitor.h
+++ b/include/wlr/types/wlr_input_inhibitor.h
@@ -23,8 +23,8 @@ struct wlr_input_inhibit_manager {
 	struct wl_listener display_destroy;
 
 	struct {
-		struct wl_signal activate;   // struct wlr_input_inhibit_manager *
-		struct wl_signal deactivate; // struct wlr_input_inhibit_manager *
+		struct wl_signal activate; // struct wlr_input_inhibit_manager
+		struct wl_signal deactivate; // struct wlr_input_inhibit_manager
 		struct wl_signal destroy;
 	} events;
 
diff --git a/include/wlr/types/wlr_input_method_v2.h b/include/wlr/types/wlr_input_method_v2.h
index 779e6852..fd299cc8 100644
--- a/include/wlr/types/wlr_input_method_v2.h
+++ b/include/wlr/types/wlr_input_method_v2.h
@@ -51,10 +51,10 @@ struct wlr_input_method_v2 {
 	struct wl_listener seat_client_destroy;
 
 	struct {
-		struct wl_signal commit; // struct wlr_input_method_v2 *
-		struct wl_signal new_popup_surface; // struct wlr_input_popup_surface_v2 *
-		struct wl_signal grab_keyboard; // struct wlr_input_method_keyboard_grab_v2 *
-		struct wl_signal destroy; // struct wlr_input_method_v2 *
+		struct wl_signal commit; // struct wlr_input_method_v2
+		struct wl_signal new_popup_surface; // struct wlr_input_popup_surface_v2
+		struct wl_signal grab_keyboard; // struct wlr_input_method_keyboard_grab_v2
+		struct wl_signal destroy; // struct wlr_input_method_v2
 	} events;
 };
 
@@ -82,7 +82,7 @@ struct wlr_input_method_keyboard_grab_v2 {
 	struct wl_listener keyboard_destroy;
 
 	struct {
-		struct wl_signal destroy; // struct wlr_input_method_keyboard_grab_v2 *
+		struct wl_signal destroy; // struct wlr_input_method_keyboard_grab_v2
 	} events;
 };
 
@@ -93,8 +93,8 @@ struct wlr_input_method_manager_v2 {
 	struct wl_listener display_destroy;
 
 	struct {
-		struct wl_signal input_method; // struct wlr_input_method_v2 *
-		struct wl_signal destroy; // struct wlr_input_method_manager_v2 *
+		struct wl_signal input_method; // struct wlr_input_method_v2
+		struct wl_signal destroy; // struct wlr_input_method_manager_v2
 	} events;
 };
 
diff --git a/include/wlr/types/wlr_layer_shell_v1.h b/include/wlr/types/wlr_layer_shell_v1.h
index e15b30c2..637db34a 100644
--- a/include/wlr/types/wlr_layer_shell_v1.h
+++ b/include/wlr/types/wlr_layer_shell_v1.h
@@ -33,10 +33,9 @@ struct wlr_layer_shell_v1 {
 	struct wl_listener display_destroy;
 
 	struct {
-		// struct wlr_layer_surface_v1 *
 		// Note: the output may be NULL. In this case, it is your
 		// responsibility to assign an output before returning.
-		struct wl_signal new_surface;
+		struct wl_signal new_surface; // struct wlr_layer_surface_v1
 		struct wl_signal destroy;
 	} events;
 
diff --git a/include/wlr/types/wlr_output_layout.h b/include/wlr/types/wlr_output_layout.h
index 41f06c25..26bb79b0 100644
--- a/include/wlr/types/wlr_output_layout.h
+++ b/include/wlr/types/wlr_output_layout.h
@@ -28,7 +28,7 @@ struct wlr_output_layout {
 	struct wl_list outputs;
 
 	struct {
-		struct wl_signal add; // struct wlr_output_layout_output *
+		struct wl_signal add; // struct wlr_output_layout_output
 		struct wl_signal change;
 		struct wl_signal destroy;
 	} events;
diff --git a/include/wlr/types/wlr_session_lock_v1.h b/include/wlr/types/wlr_session_lock_v1.h
index a955686d..981e2240 100644
--- a/include/wlr/types/wlr_session_lock_v1.h
+++ b/include/wlr/types/wlr_session_lock_v1.h
@@ -17,7 +17,7 @@ struct wlr_session_lock_manager_v1 {
 	struct wl_global *global;
 
 	struct {
-		struct wl_signal new_lock; // struct wlr_session_lock_v1 *
+		struct wl_signal new_lock; // struct wlr_session_lock_v1
 		struct wl_signal destroy;
 	} events;
 
@@ -34,7 +34,7 @@ struct wlr_session_lock_v1 {
 	struct wl_list surfaces; // struct wlr_session_lock_surface_v1.link
 
 	struct {
-		struct wl_signal new_surface; // struct wlr_session_lock_surface_v1 *
+		struct wl_signal new_surface; // struct wlr_session_lock_surface_v1
 		struct wl_signal unlock;
 		struct wl_signal destroy;
 	} events;
diff --git a/include/wlr/types/wlr_text_input_v3.h b/include/wlr/types/wlr_text_input_v3.h
index a3c6c7eb..37397c1f 100644
--- a/include/wlr/types/wlr_text_input_v3.h
+++ b/include/wlr/types/wlr_text_input_v3.h
@@ -60,10 +60,10 @@ struct wlr_text_input_v3 {
 	struct wl_listener seat_destroy;
 
 	struct {
-		struct wl_signal enable; // struct wlr_text_input_v3 *
-		struct wl_signal commit; // struct wlr_text_input_v3 *
-		struct wl_signal disable; // struct wlr_text_input_v3 *
-		struct wl_signal destroy; // struct wlr_text_input_v3 *
+		struct wl_signal enable; // struct wlr_text_input_v3
+		struct wl_signal commit; // struct wlr_text_input_v3
+		struct wl_signal disable; // struct wlr_text_input_v3
+		struct wl_signal destroy; // struct wlr_text_input_v3
 	} events;
 };
 
@@ -74,8 +74,8 @@ struct wlr_text_input_manager_v3 {
 	struct wl_listener display_destroy;
 
 	struct {
-		struct wl_signal text_input; // struct wlr_text_input_v3 *
-		struct wl_signal destroy; // struct wlr_input_method_manager_v3 *
+		struct wl_signal text_input; // struct wlr_text_input_v3
+		struct wl_signal destroy; // struct wlr_input_method_manager_v3
 	} events;
 };
 
diff --git a/include/wlr/types/wlr_virtual_keyboard_v1.h b/include/wlr/types/wlr_virtual_keyboard_v1.h
index 00200c44..cb0bb982 100644
--- a/include/wlr/types/wlr_virtual_keyboard_v1.h
+++ b/include/wlr/types/wlr_virtual_keyboard_v1.h
@@ -19,7 +19,7 @@ struct wlr_virtual_keyboard_manager_v1 {
 	struct wl_listener display_destroy;
 
 	struct {
-		struct wl_signal new_virtual_keyboard; // struct wlr_virtual_keyboard_v1 *
+		struct wl_signal new_virtual_keyboard; // struct wlr_virtual_keyboard_v1
 		struct wl_signal destroy;
 	} events;
 };
diff --git a/include/wlr/types/wlr_virtual_pointer_v1.h b/include/wlr/types/wlr_virtual_pointer_v1.h
index d00f2758..a0526854 100644
--- a/include/wlr/types/wlr_virtual_pointer_v1.h
+++ b/include/wlr/types/wlr_virtual_pointer_v1.h
@@ -21,7 +21,7 @@ struct wlr_virtual_pointer_manager_v1 {
 	struct wl_listener display_destroy;
 
 	struct {
-		struct wl_signal new_virtual_pointer; // struct wlr_virtual_pointer_v1_new_pointer_event *
+		struct wl_signal new_virtual_pointer; // struct wlr_virtual_pointer_v1_new_pointer_event
 		struct wl_signal destroy;
 	} events;
 };
diff --git a/include/wlr/types/wlr_xdg_decoration_v1.h b/include/wlr/types/wlr_xdg_decoration_v1.h
index 13bb4294..61ce4bc1 100644
--- a/include/wlr/types/wlr_xdg_decoration_v1.h
+++ b/include/wlr/types/wlr_xdg_decoration_v1.h
@@ -17,7 +17,7 @@ struct wlr_xdg_decoration_manager_v1 {
 	struct wl_listener display_destroy;
 
 	struct {
-		struct wl_signal new_toplevel_decoration; // struct wlr_xdg_toplevel_decoration *
+		struct wl_signal new_toplevel_decoration; // struct wlr_xdg_toplevel_decoration
 		struct wl_signal destroy;
 	} events;