diff --git a/src/gallium/auxiliary/draw/draw_gs.c b/src/gallium/auxiliary/draw/draw_gs.c
index baa09ec7ba7..db508ed81ae 100644
--- a/src/gallium/auxiliary/draw/draw_gs.c
+++ b/src/gallium/auxiliary/draw/draw_gs.c
@@ -554,7 +554,7 @@ gs_tri_adj(struct draw_geometry_shader *shader,
 
 
 #define FUNC         gs_run_elts
-#define LOCAL_VARS   const ushort *elts = input_prims->elts;
+#define LOCAL_VARS   const uint16_t *elts = input_prims->elts;
 #define GET_ELT(idx) (elts[idx])
 #include "draw_gs_tmp.h"
 
diff --git a/src/gallium/auxiliary/draw/draw_mesh_prim.c b/src/gallium/auxiliary/draw/draw_mesh_prim.c
index c46afa10eed..6670b0e09ad 100644
--- a/src/gallium/auxiliary/draw/draw_mesh_prim.c
+++ b/src/gallium/auxiliary/draw/draw_mesh_prim.c
@@ -168,7 +168,7 @@ prim_tri(struct draw_mesh_prim *asmblr,
 #include "draw_mesh_prim_tmp.h"
 
 #define FUNC assembler_run_elts
-#define LOCAL_VARS   const ushort *elts = input_prims->elts;
+#define LOCAL_VARS   const uint16_t *elts = input_prims->elts;
 #define GET_ELT(idx) (elts[start + (idx)])
 #include "draw_mesh_prim_tmp.h"
 
diff --git a/src/gallium/auxiliary/draw/draw_prim_assembler.c b/src/gallium/auxiliary/draw/draw_prim_assembler.c
index 7db6e8557e2..7b4fd1ae8bd 100644
--- a/src/gallium/auxiliary/draw/draw_prim_assembler.c
+++ b/src/gallium/auxiliary/draw/draw_prim_assembler.c
@@ -247,7 +247,7 @@ draw_prim_assembler_prepare_outputs(struct draw_assembler *ia)
 #include "draw_prim_assembler_tmp.h"
 
 #define FUNC assembler_run_elts
-#define LOCAL_VARS   const ushort *elts = input_prims->elts;
+#define LOCAL_VARS   const uint16_t *elts = input_prims->elts;
 #define GET_ELT(idx) (elts[start + (idx)])
 #include "draw_prim_assembler_tmp.h"
 
diff --git a/src/gallium/auxiliary/draw/draw_pt_so_emit.c b/src/gallium/auxiliary/draw/draw_pt_so_emit.c
index b907af14c9e..6353d78195e 100644
--- a/src/gallium/auxiliary/draw/draw_pt_so_emit.c
+++ b/src/gallium/auxiliary/draw/draw_pt_so_emit.c
@@ -268,7 +268,7 @@ so_tri(struct pt_so_emit *so, int i0, int i1, int i2)
 
 
 #define FUNC         so_run_elts
-#define LOCAL_VARS   const ushort *elts = input_prims->elts;
+#define LOCAL_VARS   const uint16_t *elts = input_prims->elts;
 #define GET_ELT(idx) (elts[start + (idx)])
 #include "draw_so_emit_tmp.h"