diff --git a/src/data-device.c b/src/data-device.c
index 46e5549b..7c268091 100644
--- a/src/data-device.c
+++ b/src/data-device.c
@@ -253,7 +253,7 @@ data_device_end_drag_grab(struct wl_input_device *device)
 
 static void
 drag_grab_button(struct wl_pointer_grab *grab,
-		 uint32_t time, uint32_t button, int32_t state)
+		 uint32_t time, uint32_t button, uint32_t state)
 {
 	struct wl_input_device *device =
 		container_of(grab, struct wl_input_device, drag_grab);
diff --git a/src/wayland-server.c b/src/wayland-server.c
index d0c31bf6..678ab39e 100644
--- a/src/wayland-server.c
+++ b/src/wayland-server.c
@@ -495,7 +495,7 @@ default_grab_motion(struct wl_pointer_grab *grab,
 
 static void
 default_grab_button(struct wl_pointer_grab *grab,
-		    uint32_t time, uint32_t button, int32_t state)
+		    uint32_t time, uint32_t button, uint32_t state)
 {
 	struct wl_input_device *device = grab->input_device;
 	struct wl_resource *resource;
@@ -524,7 +524,7 @@ static const struct wl_pointer_grab_interface
 
 static void
 default_grab_key(struct wl_keyboard_grab *grab,
-		 uint32_t time, uint32_t key, int32_t state)
+		 uint32_t time, uint32_t key, uint32_t state)
 {
 	struct wl_input_device *device = grab->input_device;
 	struct wl_resource *resource;
diff --git a/src/wayland-server.h b/src/wayland-server.h
index 6be68976..ec4bd380 100644
--- a/src/wayland-server.h
+++ b/src/wayland-server.h
@@ -189,7 +189,7 @@ struct wl_pointer_grab_interface {
 	void (*motion)(struct wl_pointer_grab *grab,
 		       uint32_t time, int32_t x, int32_t y);
 	void (*button)(struct wl_pointer_grab *grab,
-		       uint32_t time, uint32_t button, int32_t state);
+		       uint32_t time, uint32_t button, uint32_t state);
 };
 
 struct wl_pointer_grab {
@@ -202,7 +202,7 @@ struct wl_pointer_grab {
 struct wl_keyboard_grab;
 struct wl_keyboard_grab_interface {
 	void (*key)(struct wl_keyboard_grab *grab, uint32_t time,
-		    uint32_t key, int32_t state);
+		    uint32_t key, uint32_t state);
 };
 
 struct wl_keyboard_grab {