diff --git a/src/freedreno/ir3/ir3.h b/src/freedreno/ir3/ir3.h
index 27a52c54ad4..53e56edb3c4 100644
--- a/src/freedreno/ir3/ir3.h
+++ b/src/freedreno/ir3/ir3.h
@@ -248,7 +248,7 @@ struct ir3_instruction {
 			int src_offset;
 			int dst_offset;
 			int iim_val : 3;      /* for ldgb/stgb, # of components */
-			int d : 3;
+			unsigned d : 3;
 			bool typed : 1;
 		} cat6;
 		struct {
diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_program.c b/src/gallium/drivers/freedreno/a4xx/fd4_program.c
index 952b56cefcb..970f918faae 100644
--- a/src/gallium/drivers/freedreno/a4xx/fd4_program.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_program.c
@@ -79,7 +79,7 @@ emit_shader(struct fd_ringbuffer *ring, const struct ir3_shader_variant *so)
 {
 	const struct ir3_info *si = &so->info;
 	enum a4xx_state_block sb = fd4_stage2shadersb(so->type);
-	enum adreno_state_src src;
+	enum a4xx_state_src src;
 	uint32_t i, sz, *bin;
 
 	if (fd_mesa_debug & FD_DBG_DIRECT) {