diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.h b/src/gallium/auxiliary/tgsi/tgsi_scan.h
index cf0d43c2efa..1afae19e64d 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.h
@@ -57,7 +57,7 @@ struct tgsi_shader_info
    uint8_t num_system_values;
    uint8_t system_value_semantic_name[PIPE_MAX_SHADER_INPUTS];
 
-   uint8_t processor;
+   mesa_shader_stage processor;
 
    uint32_t file_mask[TGSI_FILE_COUNT];  /**< bitmask of declared registers */
    unsigned file_count[TGSI_FILE_COUNT];  /**< number of declared registers */
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 0ce1ee49436..def60a85997 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -111,7 +111,7 @@ void st_init_limits(struct pipe_screen *screen,
                     struct gl_constants *c, struct gl_extensions *extensions,
                     gl_api api)
 {
-   unsigned sh;
+   mesa_shader_stage sh;
    bool can_ubo = true;
    int temp;