diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h
index d6791247..0b18a131 100644
--- a/include/wlr/types/wlr_wl_shell.h
+++ b/include/wlr/types/wlr_wl_shell.h
@@ -21,7 +21,7 @@ struct wlr_wl_shell_surface_transient_state {
 	struct wlr_wl_shell_surface *parent;
 	int32_t x;
 	int32_t y;
-	uint32_t flags;
+	enum wl_shell_surface_transient flags;
 };
 
 struct wlr_wl_shell_surface_popup_state {
@@ -84,13 +84,13 @@ struct wlr_wl_shell_surface_resize_event {
 	struct wlr_wl_shell_surface *surface;
 	struct wlr_seat_handle *seat_handle;
 	uint32_t serial;
-	uint32_t edges;
+	enum wl_shell_surface_resize edges;
 };
 
 struct wlr_wl_shell_surface_set_fullscreen_event {
 	struct wl_client *client;
 	struct wlr_wl_shell_surface *surface;
-	uint32_t method;
+	enum wl_shell_surface_fullscreen_method method;
 	uint32_t framerate;
 	struct wlr_output *output;
 };
diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c
index 5bf1ec80..9283a635 100644
--- a/types/wlr_wl_shell.c
+++ b/types/wlr_wl_shell.c
@@ -47,7 +47,7 @@ static void shell_surface_move(struct wl_client *client,
 
 static void shell_surface_resize(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *seat_resource,
-		uint32_t serial, uint32_t edges) {
+		uint32_t serial, enum wl_shell_surface_resize edges) {
 	wlr_log(L_DEBUG, "got shell surface resize");
 	struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
 	struct wlr_seat_handle *seat_handle =
@@ -93,7 +93,7 @@ static void shell_surface_set_toplevel(struct wl_client *client,
 
 static void shell_surface_set_transient(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *parent_resource,
-		int32_t x, int32_t y, uint32_t flags) {
+		int32_t x, int32_t y, enum wl_shell_surface_transient flags) {
 	wlr_log(L_DEBUG, "got shell surface transient");
 	struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
 	struct wlr_wl_shell_surface *parent =
@@ -116,7 +116,8 @@ static void shell_surface_set_transient(struct wl_client *client,
 }
 
 static void shell_surface_set_fullscreen(struct wl_client *client,
-		struct wl_resource *resource, uint32_t method, uint32_t framerate,
+		struct wl_resource *resource,
+		enum wl_shell_surface_fullscreen_method method, uint32_t framerate,
 		struct wl_resource *output_resource) {
 	wlr_log(L_DEBUG, "got shell surface fullscreen");
 	struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
@@ -149,7 +150,7 @@ static void shell_surface_set_fullscreen(struct wl_client *client,
 static void shell_surface_set_popup(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *seat_resource,
 		uint32_t serial, struct wl_resource *parent_resource, int32_t x, int32_t y,
-		uint32_t flags) {
+		enum wl_shell_surface_transient flags) {
 	wlr_log(L_DEBUG, "got shell surface popup");
 	struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
 	struct wlr_seat_handle *seat_handle =