diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c
index de46d20bd9f..7a268cecebb 100644
--- a/src/gallium/drivers/panfrost/pan_cmdstream.c
+++ b/src/gallium/drivers/panfrost/pan_cmdstream.c
@@ -370,7 +370,7 @@ panfrost_emit_blend(struct panfrost_batch *batch, void *rts,
 
          pan_pack(&packed->opaque[2], INTERNAL_BLEND, cfg) {
             cfg.mode = MALI_BLEND_MODE_SHADER;
-            cfg.shader.pc = (u32)blend_shaders[i];
+            cfg.shader.pc = (uint32_t)blend_shaders[i];
 
 #if PAN_ARCH <= 7
             unsigned ret_offset = fs->info.bifrost.blend[i].return_offset;
diff --git a/src/gallium/drivers/panfrost/pan_jm.c b/src/gallium/drivers/panfrost/pan_jm.c
index af6c0b2dc0f..e68849ebee4 100644
--- a/src/gallium/drivers/panfrost/pan_jm.c
+++ b/src/gallium/drivers/panfrost/pan_jm.c
@@ -163,7 +163,7 @@ jm_submit_jc(struct panfrost_batch *batch, uint64_t first_job_desc,
    bo_handles[submit.bo_handle_count++] =
       panfrost_bo_handle(dev->sample_positions);
 
-   submit.bo_handles = (u64)(uintptr_t)bo_handles;
+   submit.bo_handles = (uint64_t)(uintptr_t)bo_handles;
    if (ctx->is_noop)
       ret = 0;
    else
diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h
index 20212426df8..da0d43fff50 100644
--- a/src/panfrost/include/panfrost-job.h
+++ b/src/panfrost/include/panfrost-job.h
@@ -32,11 +32,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
-
 #define MALI_FORMAT_COMPRESSED     (0 << 5)
 #define MALI_EXTRACT_TYPE(fmt)     ((fmt)&0xe0)
 #define MALI_EXTRACT_INDEX(pixfmt) (((pixfmt) >> 12) & 0xFF)
diff --git a/src/panfrost/lib/genxml/cs_builder.h b/src/panfrost/lib/genxml/cs_builder.h
index cb7448cd9b0..c96afc31474 100644
--- a/src/panfrost/lib/genxml/cs_builder.h
+++ b/src/panfrost/lib/genxml/cs_builder.h
@@ -1402,7 +1402,7 @@ enum cs_res_id {
 };
 
 static inline void
-cs_req_res(struct cs_builder *b, u32 res_mask)
+cs_req_res(struct cs_builder *b, uint32_t res_mask)
 {
    cs_emit(b, REQ_RESOURCE, I) {
       I.compute = res_mask & CS_COMPUTE_RES;
diff --git a/src/panfrost/lib/genxml/decode.c b/src/panfrost/lib/genxml/decode.c
index b31c4e95897..321f3051186 100644
--- a/src/panfrost/lib/genxml/decode.c
+++ b/src/panfrost/lib/genxml/decode.c
@@ -97,7 +97,7 @@ pandecode_sample_locations(struct pandecode_context *ctx, const void *fb)
 {
    pan_section_unpack(fb, FRAMEBUFFER, PARAMETERS, params);
 
-   const u16 *PANDECODE_PTR_VAR(ctx, samples, params.sample_locations);
+   const uint16_t *PANDECODE_PTR_VAR(ctx, samples, params.sample_locations);
 
    pandecode_log(ctx, "Sample locations @%" PRIx64 ":\n",
                  params.sample_locations);
diff --git a/src/panfrost/lib/genxml/decode_jm.c b/src/panfrost/lib/genxml/decode_jm.c
index f108cd5b9b3..6589da8c567 100644
--- a/src/panfrost/lib/genxml/decode_jm.c
+++ b/src/panfrost/lib/genxml/decode_jm.c
@@ -123,8 +123,8 @@ pandecode_attribute_meta(struct pandecode_context *ctx, int count,
 }
 
 /* return bits [lo, hi) of word */
-static u32
-bits(u32 word, u32 lo, u32 hi)
+static uint32_t
+bits(uint32_t word, uint32_t lo, uint32_t hi)
 {
    if (hi - lo >= 32)
       return word; // avoid undefined behavior with the shift