diff --git a/src/wayland-client.c b/src/wayland-client.c
index 498a4297..9057b4f7 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -499,8 +499,8 @@ handle_event(struct wl_display *display,
 WL_EXPORT void
 wl_display_iterate(struct wl_display *display, uint32_t mask)
 {
-	uint32_t p[2], object, opcode, size;
-	int len;
+	uint32_t p[2], object;
+	int len, opcode, size;
 
 	mask &= display->mask;
 	if (mask == 0) {
@@ -512,7 +512,7 @@ wl_display_iterate(struct wl_display *display, uint32_t mask)
 	len = wl_connection_data(display->connection, mask);
 
 	while (len > 0) {
-		if (len < sizeof p)
+		if ((size_t) len < sizeof p)
 			break;
 		
 		wl_connection_copy(display->connection, p, sizeof p);
diff --git a/src/wayland-server.c b/src/wayland-server.c
index 8c7323d2..a649d66a 100644
--- a/src/wayland-server.c
+++ b/src/wayland-server.c
@@ -202,7 +202,7 @@ wl_client_connection_data(int fd, uint32_t mask, void *data)
 		return 1;
 	}
 
-	while (len >= sizeof p) {
+	while ((size_t) len >= sizeof p) {
 		wl_connection_copy(connection, p, sizeof p);
 		opcode = p[1] & 0xffff;
 		size = p[1] >> 16;