diff --git a/src/amd/common/ac_surface_meta_address_test.c b/src/amd/common/ac_surface_meta_address_test.c
index 2f44a5b6d3b..11e20b0af86 100644
--- a/src/amd/common/ac_surface_meta_address_test.c
+++ b/src/amd/common/ac_surface_meta_address_test.c
@@ -21,7 +21,7 @@
 #include "util/u_atomic.h"
 #include "util/u_math.h"
 #include "util/u_vector.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "addrlib/inc/addrinterface.h"
 
 #include "ac_surface_test.h"
diff --git a/src/amd/common/ac_surface_modifier_test.c b/src/amd/common/ac_surface_modifier_test.c
index d1ad9445f04..6cac2068480 100644
--- a/src/amd/common/ac_surface_modifier_test.c
+++ b/src/amd/common/ac_surface_modifier_test.c
@@ -13,7 +13,7 @@
 #include "util/macros.h"
 #include "util/u_math.h"
 #include "util/u_vector.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "addrlib/inc/addrinterface.h"
 
 #include "ac_surface_test.h"
diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/radv_debug.c
index 55e29a07d95..b26b9e8834b 100644
--- a/src/amd/vulkan/radv_debug.c
+++ b/src/amd/vulkan/radv_debug.c
@@ -16,7 +16,7 @@
 #include <sys/stat.h>
 
 #include "spirv/nir_spirv.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/os_time.h"
 #include "ac_debug.h"
 #include "ac_descriptors.h"
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 7ad5e0a140e..b7ad68c8e55 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -54,7 +54,7 @@ typedef void *drmDevicePtr;
 #endif
 #include "util/build_id.h"
 #include "util/driconf.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/os_time.h"
 #include "util/timespec.h"
 #include "util/u_atomic.h"
diff --git a/src/amd/vulkan/radv_pipeline.h b/src/amd/vulkan/radv_pipeline.h
index 11d813cd2e7..84b85ea063d 100644
--- a/src/amd/vulkan/radv_pipeline.h
+++ b/src/amd/vulkan/radv_pipeline.h
@@ -11,7 +11,7 @@
 #ifndef RADV_PIPELINE_H
 #define RADV_PIPELINE_H
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 #include "vk_pipeline.h"
 #include "vk_pipeline_cache.h"
diff --git a/src/amd/vulkan/radv_pipeline_binary.c b/src/amd/vulkan/radv_pipeline_binary.c
index 63383b59bc7..40ad9e9bbb0 100644
--- a/src/amd/vulkan/radv_pipeline_binary.c
+++ b/src/amd/vulkan/radv_pipeline_binary.c
@@ -9,7 +9,7 @@
 #include "util/disk_cache.h"
 #include "util/macros.h"
 #include "util/mesa-blake3.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/u_atomic.h"
 #include "util/u_debug.h"
 #include "radv_debug.h"
diff --git a/src/amd/vulkan/radv_pipeline_binary.h b/src/amd/vulkan/radv_pipeline_binary.h
index cf52d3e8552..12fd24a0cb1 100644
--- a/src/amd/vulkan/radv_pipeline_binary.h
+++ b/src/amd/vulkan/radv_pipeline_binary.h
@@ -10,7 +10,7 @@
 #include "vk_object.h"
 
 #include "util/mesa-blake3.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 struct radv_device;
 struct radv_ray_tracing_stage_info;
diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c
index 442aaa6decf..e64dacd8cd6 100644
--- a/src/amd/vulkan/radv_pipeline_cache.c
+++ b/src/amd/vulkan/radv_pipeline_cache.c
@@ -8,7 +8,7 @@
 #include "util/disk_cache.h"
 #include "util/macros.h"
 #include "util/mesa-blake3.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/u_atomic.h"
 #include "util/u_debug.h"
 #include "nir.h"
diff --git a/src/amd/vulkan/radv_pipeline_compute.c b/src/amd/vulkan/radv_pipeline_compute.c
index 019e7c937c6..64e6d7e28db 100644
--- a/src/amd/vulkan/radv_pipeline_compute.c
+++ b/src/amd/vulkan/radv_pipeline_compute.c
@@ -15,7 +15,7 @@
 #include "nir/radv_nir.h"
 #include "spirv/nir_spirv.h"
 #include "util/disk_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/os_time.h"
 #include "util/u_atomic.h"
 #include "radv_cs.h"
diff --git a/src/amd/vulkan/radv_pipeline_graphics.c b/src/amd/vulkan/radv_pipeline_graphics.c
index df0add4b492..799d1110056 100644
--- a/src/amd/vulkan/radv_pipeline_graphics.c
+++ b/src/amd/vulkan/radv_pipeline_graphics.c
@@ -16,7 +16,7 @@
 #include "nir/radv_nir.h"
 #include "spirv/nir_spirv.h"
 #include "util/disk_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/os_time.h"
 #include "util/u_atomic.h"
 #include "radv_cs.h"
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index a520598f8fe..cf8c226c21f 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -17,7 +17,7 @@
 #include "nir/radv_nir.h"
 #include "spirv/nir_spirv.h"
 #include "util/memstream.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/streaming-load-memcpy.h"
 #include "util/u_atomic.h"
 #include "ac_shader_util.h"
diff --git a/src/asahi/lib/agx_device.c b/src/asahi/lib/agx_device.c
index 8db6e9b594f..3c9ed903943 100644
--- a/src/asahi/lib/agx_device.c
+++ b/src/asahi/lib/agx_device.c
@@ -29,7 +29,7 @@
 #include "drm-uapi/dma-buf.h"
 #include "util/blob.h"
 #include "util/log.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/os_file.h"
 #include "util/os_mman.h"
 #include "util/os_time.h"
diff --git a/src/asahi/vulkan/hk_instance.c b/src/asahi/vulkan/hk_instance.c
index 5339195f029..e0db7a46633 100644
--- a/src/asahi/vulkan/hk_instance.c
+++ b/src/asahi/vulkan/hk_instance.c
@@ -13,7 +13,7 @@
 
 #include "util/build_id.h"
 #include "util/driconf.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 VKAPI_ATTR VkResult VKAPI_CALL
 hk_EnumerateInstanceVersion(uint32_t *pApiVersion)
diff --git a/src/asahi/vulkan/hk_physical_device.c b/src/asahi/vulkan/hk_physical_device.c
index caf92b9fdc6..434364ebdc9 100644
--- a/src/asahi/vulkan/hk_physical_device.c
+++ b/src/asahi/vulkan/hk_physical_device.c
@@ -10,7 +10,7 @@
 #include "asahi/lib/agx_device.h"
 #include "asahi/lib/agx_nir_lower_vbo.h"
 #include "util/disk_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "git_sha1.h"
 #include "hk_buffer.h"
 #include "hk_entrypoints.h"
diff --git a/src/asahi/vulkan/hk_shader.c b/src/asahi/vulkan/hk_shader.c
index ebe84ecadea..b046b22e7eb 100644
--- a/src/asahi/vulkan/hk_shader.c
+++ b/src/asahi/vulkan/hk_shader.c
@@ -54,7 +54,7 @@
 #include "util/blob.h"
 #include "util/hash_table.h"
 #include "util/macros.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/simple_mtx.h"
 #include "util/u_debug.h"
 #include "vulkan/vulkan_core.h"
diff --git a/src/compiler/clc/nir_load_libclc.c b/src/compiler/clc/nir_load_libclc.c
index c31f7a6af23..b139b31a38a 100644
--- a/src/compiler/clc/nir_load_libclc.c
+++ b/src/compiler/clc/nir_load_libclc.c
@@ -26,7 +26,7 @@
 #include "nir_clc_helpers.h"
 #include "nir_serialize.h"
 #include "nir_spirv.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 #ifdef DYNAMIC_LIBCLC_PATH
 #include <fcntl.h>
diff --git a/src/compiler/glsl/shader_cache.cpp b/src/compiler/glsl/shader_cache.cpp
index cf53495fff6..c81b53becbb 100644
--- a/src/compiler/glsl/shader_cache.cpp
+++ b/src/compiler/glsl/shader_cache.cpp
@@ -55,7 +55,7 @@
 #include "nir.h"
 #include "serialize.h"
 #include "shader_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "string_to_uint_map.h"
 #include "main/mtypes.h"
 
diff --git a/src/freedreno/common/freedreno_uuid.c b/src/freedreno/common/freedreno_uuid.c
index 14bdb092518..599612e8197 100644
--- a/src/freedreno/common/freedreno_uuid.c
+++ b/src/freedreno/common/freedreno_uuid.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "git_sha1.h"
 
 /* (Re)define UUID_SIZE to avoid including vulkan.h (or p_defines.h) here. */
diff --git a/src/freedreno/vulkan/tu_descriptor_set.cc b/src/freedreno/vulkan/tu_descriptor_set.cc
index d133f9111bf..2de9664ccf9 100644
--- a/src/freedreno/vulkan/tu_descriptor_set.cc
+++ b/src/freedreno/vulkan/tu_descriptor_set.cc
@@ -21,7 +21,7 @@
 
 #include <fcntl.h>
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "vk_descriptors.h"
 #include "vk_util.h"
 #include "vk_acceleration_structure.h"
diff --git a/src/freedreno/vulkan/tu_pipeline.cc b/src/freedreno/vulkan/tu_pipeline.cc
index d4dd5ec8ee3..e24c48df5a3 100644
--- a/src/freedreno/vulkan/tu_pipeline.cc
+++ b/src/freedreno/vulkan/tu_pipeline.cc
@@ -17,7 +17,7 @@
 #include "nir/nir_serialize.h"
 #include "spirv/nir_spirv.h"
 #include "util/u_debug.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/shader_stats.h"
 #include "vk_nir.h"
 #include "vk_pipeline.h"
diff --git a/src/freedreno/vulkan/tu_shader.cc b/src/freedreno/vulkan/tu_shader.cc
index a86f297c05f..0fffbf8d404 100644
--- a/src/freedreno/vulkan/tu_shader.cc
+++ b/src/freedreno/vulkan/tu_shader.cc
@@ -6,7 +6,7 @@
 #include "tu_shader.h"
 
 #include "spirv/nir_spirv.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "nir/nir_xfb_info.h"
 #include "vk_nir.h"
 #include "vk_nir_convert_ycbcr.h"
diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c
index 9ed5a49ea75..825722b1bde 100644
--- a/src/gallium/auxiliary/draw/draw_llvm.c
+++ b/src/gallium/auxiliary/draw/draw_llvm.c
@@ -60,7 +60,7 @@
 #include "util/u_pointer.h"
 #include "util/u_string.h"
 #include "nir_serialize.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #define DEBUG_STORE 0
 
 
diff --git a/src/gallium/auxiliary/util/u_live_shader_cache.c b/src/gallium/auxiliary/util/u_live_shader_cache.c
index ef1c785dbed..f9e9a8bbb35 100644
--- a/src/gallium/auxiliary/util/u_live_shader_cache.c
+++ b/src/gallium/auxiliary/util/u_live_shader_cache.c
@@ -33,7 +33,7 @@
 
 #include "util/blob.h"
 #include "util/hash_table.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 static uint32_t key_hash(const void *key)
 {
diff --git a/src/gallium/drivers/asahi/agx_disk_cache.c b/src/gallium/drivers/asahi/agx_disk_cache.c
index 72fbeaabeee..f9f189a508b 100644
--- a/src/gallium/drivers/asahi/agx_disk_cache.c
+++ b/src/gallium/drivers/asahi/agx_disk_cache.c
@@ -13,7 +13,7 @@
 #include "util/blob.h"
 #include "util/build_id.h"
 #include "util/disk_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "agx_bo.h"
 #include "agx_device.h"
 #include "agx_disk_cache.h"
diff --git a/src/gallium/drivers/crocus/crocus_disk_cache.c b/src/gallium/drivers/crocus/crocus_disk_cache.c
index 61a063f504b..2796350f1b3 100644
--- a/src/gallium/drivers/crocus/crocus_disk_cache.c
+++ b/src/gallium/drivers/crocus/crocus_disk_cache.c
@@ -35,7 +35,7 @@
 #include "util/blob.h"
 #include "util/build_id.h"
 #include "util/disk_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 #include "crocus_context.h"
 
diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp
index ce96f0fec0b..53e553442cf 100644
--- a/src/gallium/drivers/d3d12/d3d12_screen.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp
@@ -46,7 +46,7 @@
 #include "util/u_memory.h"
 #include "util/u_screen.h"
 #include "util/u_dl.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 #include "frontend/sw_winsys.h"
 
diff --git a/src/gallium/drivers/iris/iris_disk_cache.c b/src/gallium/drivers/iris/iris_disk_cache.c
index e56bb059fe9..a270705b935 100644
--- a/src/gallium/drivers/iris/iris_disk_cache.c
+++ b/src/gallium/drivers/iris/iris_disk_cache.c
@@ -16,7 +16,7 @@
 #include "util/blob.h"
 #include "util/build_id.h"
 #include "util/disk_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "intel/compiler/brw/brw_compiler.h"
 #ifdef INTEL_USE_ELK
 #include "intel/compiler/elk/elk_compiler.h"
diff --git a/src/gallium/drivers/lima/lima_disk_cache.c b/src/gallium/drivers/lima/lima_disk_cache.c
index c5a2b584b75..b9d9855a1f7 100644
--- a/src/gallium/drivers/lima/lima_disk_cache.c
+++ b/src/gallium/drivers/lima/lima_disk_cache.c
@@ -27,7 +27,7 @@
 #include "util/blob.h"
 #include "util/build_id.h"
 #include "util/disk_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 #include "lima_context.h"
 #include "lima_screen.h"
diff --git a/src/gallium/drivers/llvmpipe/lp_state_cs.c b/src/gallium/drivers/llvmpipe/lp_state_cs.c
index 579d97634dd..1a39efe6d9d 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_cs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_cs.c
@@ -49,7 +49,7 @@
 #include "frontend/sw_winsys.h"
 #include "nir/nir_to_tgsi_info.h"
 #include "nir/tgsi_to_nir.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "nir_serialize.h"
 
 #include "draw/draw_context.h"
diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index f4440a821ba..de5b1338d3a 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -107,7 +107,7 @@
 
 #include "lp_screen.h"
 #include "compiler/nir/nir_serialize.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 
 /** Fragment shader number (for debugging) */
diff --git a/src/gallium/drivers/llvmpipe/lp_texture_handle.c b/src/gallium/drivers/llvmpipe/lp_texture_handle.c
index 6875ca4df77..d36d785f4b3 100644
--- a/src/gallium/drivers/llvmpipe/lp_texture_handle.c
+++ b/src/gallium/drivers/llvmpipe/lp_texture_handle.c
@@ -34,7 +34,7 @@
 
 #include "pipe/p_context.h"
 #include "pipe/p_screen.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 static const char *image_function_base_hash = "8ca89d7a4ab5830be6a1ba1140844081235b01164a8fce8316ca6a2f81f1a899";
 static const char *sample_function_base_hash = "0789b032c4a1ddba086e07496fe2a992b1ee08f78c0884a2923564b1ed52b9cc";
diff --git a/src/gallium/drivers/panfrost/pan_disk_cache.c b/src/gallium/drivers/panfrost/pan_disk_cache.c
index 6727b1e5f7a..1315e2b9ab3 100644
--- a/src/gallium/drivers/panfrost/pan_disk_cache.c
+++ b/src/gallium/drivers/panfrost/pan_disk_cache.c
@@ -13,7 +13,7 @@
 #include "util/blob.h"
 #include "util/build_id.h"
 #include "util/disk_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 #include "pan_context.h"
 #include "pan_trace.h"
diff --git a/src/gallium/drivers/radeonsi/si_shader_info.c b/src/gallium/drivers/radeonsi/si_shader_info.c
index 323d446a9bf..a6e85e9234d 100644
--- a/src/gallium/drivers/radeonsi/si_shader_info.c
+++ b/src/gallium/drivers/radeonsi/si_shader_info.c
@@ -6,7 +6,7 @@
 
 #include "si_pipe.h"
 #include "si_shader_internal.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "pipe/p_shader_tokens.h"
 #include "sid.h"
 #include "nir.h"
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.cpp b/src/gallium/drivers/radeonsi/si_state_shaders.cpp
index 63b59adbb77..e6d4ef48197 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.cpp
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.cpp
@@ -15,7 +15,7 @@
 #include "util/crc32.h"
 #include "util/disk_cache.h"
 #include "util/hash_table.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/u_async_debug.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
diff --git a/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c b/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c
index c924092b366..f259b402ad9 100644
--- a/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c
+++ b/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c
@@ -12,7 +12,7 @@
 
 #include "spirv/spirv.h"
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/simple_mtx.h"
 
 static void
diff --git a/src/imagination/vulkan/pvr_device.c b/src/imagination/vulkan/pvr_device.c
index 917325724cf..8a152c0286c 100644
--- a/src/imagination/vulkan/pvr_device.c
+++ b/src/imagination/vulkan/pvr_device.c
@@ -61,7 +61,7 @@
 #include "pvr_wsi.h"
 #include "util/log.h"
 #include "util/macros.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/os_misc.h"
 #include "util/u_math.h"
 #include "vk_device_memory.h"
diff --git a/src/imagination/vulkan/pvr_device.h b/src/imagination/vulkan/pvr_device.h
index e3dfca52813..75177a1e04b 100644
--- a/src/imagination/vulkan/pvr_device.h
+++ b/src/imagination/vulkan/pvr_device.h
@@ -22,7 +22,7 @@
 
 #include "wsi_common.h"
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 #include "pvr_bo.h"
 #include "pvr_common.h"
diff --git a/src/imagination/vulkan/pvr_instance.h b/src/imagination/vulkan/pvr_instance.h
index 77e8573b991..4148ef5f4d9 100644
--- a/src/imagination/vulkan/pvr_instance.h
+++ b/src/imagination/vulkan/pvr_instance.h
@@ -18,7 +18,7 @@
 
 #include <stdint.h>
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 struct pvr_instance {
    struct vk_instance vk;
diff --git a/src/imagination/vulkan/pvr_physical_device.h b/src/imagination/vulkan/pvr_physical_device.h
index 1cb4fe7ac47..c6ce0556463 100644
--- a/src/imagination/vulkan/pvr_physical_device.h
+++ b/src/imagination/vulkan/pvr_physical_device.h
@@ -20,7 +20,7 @@
 #include <sys/types.h>
 #include <xf86drm.h>
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 #include "wsi_common.h"
 
diff --git a/src/intel/common/intel_uuid.c b/src/intel/common/intel_uuid.c
index 451de8a96d8..1549929ccf7 100644
--- a/src/intel/common/intel_uuid.c
+++ b/src/intel/common/intel_uuid.c
@@ -23,7 +23,7 @@
 
 #include "intel_uuid.h"
 #include "git_sha1.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 void
 intel_uuid_compute_device_id(uint8_t *uuid,
diff --git a/src/intel/compiler/brw/brw_compiler.h b/src/intel/compiler/brw/brw_compiler.h
index 707452e9fa1..2fb517d4101 100644
--- a/src/intel/compiler/brw/brw_compiler.h
+++ b/src/intel/compiler/brw/brw_compiler.h
@@ -12,7 +12,7 @@
 #include "isl/isl.h"
 #include "mda/debug_archiver.h"
 #include "util/macros.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/enum_operators.h"
 #include "util/ralloc.h"
 #include "util/shader_stats.h"
diff --git a/src/intel/compiler/brw/brw_generator.cpp b/src/intel/compiler/brw/brw_generator.cpp
index 987797c184f..35b710c770d 100644
--- a/src/intel/compiler/brw/brw_generator.cpp
+++ b/src/intel/compiler/brw/brw_generator.cpp
@@ -18,7 +18,7 @@
 #include "brw_generator.h"
 #include "brw_cfg.h"
 #include "dev/intel_debug.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/half_float.h"
 
 static uint32_t
diff --git a/src/intel/compiler/elk/elk_compiler.h b/src/intel/compiler/elk/elk_compiler.h
index 0bdc0e24617..a8c75a43022 100644
--- a/src/intel/compiler/elk/elk_compiler.h
+++ b/src/intel/compiler/elk/elk_compiler.h
@@ -10,7 +10,7 @@
 #include "dev/intel_device_info.h"
 #include "isl/isl.h"
 #include "util/macros.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/enum_operators.h"
 #include "util/ralloc.h"
 #include "util/u_math.h"
diff --git a/src/intel/compiler/elk/elk_fs_generator.cpp b/src/intel/compiler/elk/elk_fs_generator.cpp
index 391bdd64670..564dc8829df 100644
--- a/src/intel/compiler/elk/elk_fs_generator.cpp
+++ b/src/intel/compiler/elk/elk_fs_generator.cpp
@@ -14,7 +14,7 @@
 #include "elk_fs.h"
 #include "elk_cfg.h"
 #include "dev/intel_debug.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/half_float.h"
 
 static enum elk_reg_file
diff --git a/src/intel/compiler/elk/elk_vec4_generator.cpp b/src/intel/compiler/elk/elk_vec4_generator.cpp
index 57c9cebb409..051ecc52ce1 100644
--- a/src/intel/compiler/elk/elk_vec4_generator.cpp
+++ b/src/intel/compiler/elk/elk_vec4_generator.cpp
@@ -8,7 +8,7 @@
 #include "elk_eu.h"
 #include "elk_disasm_info.h"
 #include "dev/intel_debug.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 using namespace elk;
 
diff --git a/src/intel/perf/intel_perf.c b/src/intel/perf/intel_perf.c
index 8679b413e1f..b2afa7b8d39 100644
--- a/src/intel/perf/intel_perf.c
+++ b/src/intel/perf/intel_perf.c
@@ -61,7 +61,7 @@
 
 #include "util/bitscan.h"
 #include "util/macros.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/u_debug.h"
 #include "util/u_math.h"
 
diff --git a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c
index a3487928559..eb9eab72f8e 100644
--- a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c
+++ b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c
@@ -24,7 +24,7 @@
 #include "anv_nir.h"
 #include "nir/nir_builder.h"
 #include "compiler/brw/brw_nir.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/set.h"
 
 #include "vk_enum_to_str.h"
diff --git a/src/intel/vulkan/anv_nir_compute_push_layout.c b/src/intel/vulkan/anv_nir_compute_push_layout.c
index 0bcd261c40f..3cf96d37416 100644
--- a/src/intel/vulkan/anv_nir_compute_push_layout.c
+++ b/src/intel/vulkan/anv_nir_compute_push_layout.c
@@ -24,7 +24,7 @@
 #include "anv_nir.h"
 #include "nir_builder.h"
 #include "compiler/brw/brw_nir.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/set.h"
 
 #define PUSH_CONSTANTS_DWORDS (sizeof(struct anv_push_constants) / 4)
diff --git a/src/intel/vulkan/anv_perf.c b/src/intel/vulkan/anv_perf.c
index a0fea63b4d2..5a8ac67835e 100644
--- a/src/intel/vulkan/anv_perf.c
+++ b/src/intel/vulkan/anv_perf.c
@@ -31,7 +31,7 @@
 #include "perf/intel_perf.h"
 #include "perf/intel_perf_mdapi.h"
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 void
 anv_physical_device_init_perf(struct anv_physical_device *device, int fd)
diff --git a/src/intel/vulkan/anv_physical_device.c b/src/intel/vulkan/anv_physical_device.c
index bad622bbade..af2d9c35456 100644
--- a/src/intel/vulkan/anv_physical_device.c
+++ b/src/intel/vulkan/anv_physical_device.c
@@ -18,7 +18,7 @@
 
 #include "util/disk_cache.h"
 #include "util/os_misc.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/os_misc.h"
 
 #include <xf86drm.h>
diff --git a/src/intel/vulkan/anv_pipeline_cache.c b/src/intel/vulkan/anv_pipeline_cache.c
index ef7d081d0a1..fca502118d3 100644
--- a/src/intel/vulkan/anv_pipeline_cache.c
+++ b/src/intel/vulkan/anv_pipeline_cache.c
@@ -25,7 +25,7 @@
 #include "util/hash_table.h"
 #include "util/u_debug.h"
 #include "util/disk_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "nir/nir_serialize.h"
 #include "nir/nir.h"
 #include "anv_private.h"
diff --git a/src/intel/vulkan_hasvk/anv_descriptor_set.c b/src/intel/vulkan_hasvk/anv_descriptor_set.c
index 5479d810d63..a646d27ef8b 100644
--- a/src/intel/vulkan_hasvk/anv_descriptor_set.c
+++ b/src/intel/vulkan_hasvk/anv_descriptor_set.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "vk_util.h"
 
 #include "anv_private.h"
diff --git a/src/intel/vulkan_hasvk/anv_device.c b/src/intel/vulkan_hasvk/anv_device.c
index d69b28fc2d5..2f102f1859c 100644
--- a/src/intel/vulkan_hasvk/anv_device.c
+++ b/src/intel/vulkan_hasvk/anv_device.c
@@ -44,7 +44,7 @@
 #include "util/u_debug.h"
 #include "util/build_id.h"
 #include "util/disk_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/os_file.h"
 #include "util/os_misc.h"
 #include "util/u_atomic.h"
diff --git a/src/intel/vulkan_hasvk/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan_hasvk/anv_nir_apply_pipeline_layout.c
index 5cd530b5557..923b255481a 100644
--- a/src/intel/vulkan_hasvk/anv_nir_apply_pipeline_layout.c
+++ b/src/intel/vulkan_hasvk/anv_nir_apply_pipeline_layout.c
@@ -24,7 +24,7 @@
 #include "anv_nir.h"
 #include "nir/nir_builder.h"
 #include "compiler/elk/elk_nir.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/set.h"
 
 /* Sampler tables don't actually have a maximum size but we pick one just so
diff --git a/src/intel/vulkan_hasvk/anv_nir_compute_push_layout.c b/src/intel/vulkan_hasvk/anv_nir_compute_push_layout.c
index 265f18f82d3..a0dcff05ff9 100644
--- a/src/intel/vulkan_hasvk/anv_nir_compute_push_layout.c
+++ b/src/intel/vulkan_hasvk/anv_nir_compute_push_layout.c
@@ -24,7 +24,7 @@
 #include "anv_nir.h"
 #include "nir_builder.h"
 #include "compiler/elk/elk_nir.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 #define sizeof_field(type, field) sizeof(((type *)0)->field)
 
diff --git a/src/intel/vulkan_hasvk/anv_perf.c b/src/intel/vulkan_hasvk/anv_perf.c
index cd4340c780a..65c8576b561 100644
--- a/src/intel/vulkan_hasvk/anv_perf.c
+++ b/src/intel/vulkan_hasvk/anv_perf.c
@@ -31,7 +31,7 @@
 #include "perf/intel_perf.h"
 #include "perf/intel_perf_mdapi.h"
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 void
 anv_physical_device_init_perf(struct anv_physical_device *device, int fd)
diff --git a/src/intel/vulkan_hasvk/anv_pipeline.c b/src/intel/vulkan_hasvk/anv_pipeline.c
index bb282028e0e..537b05527e0 100644
--- a/src/intel/vulkan_hasvk/anv_pipeline.c
+++ b/src/intel/vulkan_hasvk/anv_pipeline.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/os_time.h"
 #include "common/intel_compute_slm.h"
 #include "common/intel_l3_config.h"
diff --git a/src/intel/vulkan_hasvk/anv_pipeline_cache.c b/src/intel/vulkan_hasvk/anv_pipeline_cache.c
index 7fd6b7b56c6..f3cdbad26e8 100644
--- a/src/intel/vulkan_hasvk/anv_pipeline_cache.c
+++ b/src/intel/vulkan_hasvk/anv_pipeline_cache.c
@@ -25,7 +25,7 @@
 #include "util/hash_table.h"
 #include "util/u_debug.h"
 #include "util/disk_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "nir/nir_serialize.h"
 #include "anv_private.h"
 #include "nir/nir_xfb_info.h"
diff --git a/src/kosmickrisp/vulkan/kk_instance.c b/src/kosmickrisp/vulkan/kk_instance.c
index 334ad4043da..90abd528338 100644
--- a/src/kosmickrisp/vulkan/kk_instance.c
+++ b/src/kosmickrisp/vulkan/kk_instance.c
@@ -17,7 +17,7 @@
 
 #include "util/build_id.h"
 #include "util/driconf.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/u_debug.h"
 
 VKAPI_ATTR VkResult VKAPI_CALL
diff --git a/src/kosmickrisp/vulkan/kk_physical_device.c b/src/kosmickrisp/vulkan/kk_physical_device.c
index dde68d7d8c6..2df2334de9d 100644
--- a/src/kosmickrisp/vulkan/kk_physical_device.c
+++ b/src/kosmickrisp/vulkan/kk_physical_device.c
@@ -17,7 +17,7 @@
 #include "kosmickrisp/bridge/mtl_bridge.h"
 
 #include "util/disk_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "git_sha1.h"
 
 #include "vulkan/wsi/wsi_common.h"
diff --git a/src/mesa/main/shader_types.h b/src/mesa/main/shader_types.h
index 5bb48b337d9..0a4e113e5b3 100644
--- a/src/mesa/main/shader_types.h
+++ b/src/mesa/main/shader_types.h
@@ -35,7 +35,7 @@
 #include "util/glheader.h"
 #include "main/menums.h"
 #include "program/prog_parameter.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/mesa-blake3.h"
 #include "compiler/shader_info.h"
 #include "compiler/list.h"
diff --git a/src/mesa/main/tests/disable_windows_include.c b/src/mesa/main/tests/disable_windows_include.c
index ae7bf6ae479..b6fb957a71c 100644
--- a/src/mesa/main/tests/disable_windows_include.c
+++ b/src/mesa/main/tests/disable_windows_include.c
@@ -226,7 +226,7 @@
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/memstream.h>
-#include <util/mesa-sha1.h>
+#include <util/mesa-blake3.h>
 #include <util/mesa_cache_db.h>
 #include <util/os_file.h>
 #include <util/os_memory.h>
diff --git a/src/mesa/state_tracker/st_shader_cache.h b/src/mesa/state_tracker/st_shader_cache.h
index 1d6146eaffa..109feff5a32 100644
--- a/src/mesa/state_tracker/st_shader_cache.h
+++ b/src/mesa/state_tracker/st_shader_cache.h
@@ -28,7 +28,7 @@
 #include "pipe/p_state.h"
 #include "util/blob.h"
 #include "util/disk_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/microsoft/vulkan/dzn_descriptor_set.c b/src/microsoft/vulkan/dzn_descriptor_set.c
index 7e54d6650b6..fe27d615957 100644
--- a/src/microsoft/vulkan/dzn_descriptor_set.c
+++ b/src/microsoft/vulkan/dzn_descriptor_set.c
@@ -29,7 +29,7 @@
 
 #include "dxil_spirv_nir.h"
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 static uint32_t
 translate_desc_stages(VkShaderStageFlags in)
diff --git a/src/microsoft/vulkan/dzn_device.c b/src/microsoft/vulkan/dzn_device.c
index ada728983bb..ed6e27368a9 100644
--- a/src/microsoft/vulkan/dzn_device.c
+++ b/src/microsoft/vulkan/dzn_device.c
@@ -36,7 +36,7 @@
 #include "util/u_debug.h"
 #include "util/disk_cache.h"
 #include "util/macros.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/u_dl.h"
 
 #include "util/driconf.h"
diff --git a/src/nouveau/vulkan/nvk_instance.c b/src/nouveau/vulkan/nvk_instance.c
index e6ab62f06b8..5a8464d0510 100644
--- a/src/nouveau/vulkan/nvk_instance.c
+++ b/src/nouveau/vulkan/nvk_instance.c
@@ -12,7 +12,7 @@
 #include "util/build_id.h"
 #include "util/detect_os.h"
 #include "util/driconf.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/u_debug.h"
 
 VKAPI_ATTR VkResult VKAPI_CALL
diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c
index bf120b9c7a0..496d6774e60 100644
--- a/src/nouveau/vulkan/nvk_physical_device.c
+++ b/src/nouveau/vulkan/nvk_physical_device.c
@@ -20,7 +20,7 @@
 #include "git_sha1.h"
 #include "util/detect_os.h"
 #include "util/disk_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 #include "vk_android.h"
 #include "vk_device.h"
diff --git a/src/nouveau/vulkan/nvk_shader.c b/src/nouveau/vulkan/nvk_shader.c
index 86171e4bb47..31ffded3659 100644
--- a/src/nouveau/vulkan/nvk_shader.c
+++ b/src/nouveau/vulkan/nvk_shader.c
@@ -23,7 +23,7 @@
 #include "nir_builder.h"
 #include "compiler/spirv/nir_spirv.h"
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/u_debug.h"
 
 #include "cla097.h"
diff --git a/src/panfrost/vulkan/panvk_instance.c b/src/panfrost/vulkan/panvk_instance.c
index dd07b35f021..00e6a7d7802 100644
--- a/src/panfrost/vulkan/panvk_instance.c
+++ b/src/panfrost/vulkan/panvk_instance.c
@@ -11,7 +11,7 @@
 
 #include "util/build_id.h"
 #include "util/driconf.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/os_misc.h"
 #include "util/u_call_once.h"
 
diff --git a/src/panfrost/vulkan/panvk_vX_descriptor_set.c b/src/panfrost/vulkan/panvk_vX_descriptor_set.c
index 03b8c4b7c02..7d087307d66 100644
--- a/src/panfrost/vulkan/panvk_vX_descriptor_set.c
+++ b/src/panfrost/vulkan/panvk_vX_descriptor_set.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "vk_alloc.h"
 #include "vk_descriptor_update_template.h"
 #include "vk_descriptors.h"
diff --git a/src/panfrost/vulkan/panvk_vX_shader.c b/src/panfrost/vulkan/panvk_vX_shader.c
index 598dacaaf96..506d1bf3ebd 100644
--- a/src/panfrost/vulkan/panvk_vX_shader.c
+++ b/src/panfrost/vulkan/panvk_vX_shader.c
@@ -24,7 +24,7 @@
 
 #include "spirv/nir_spirv.h"
 #include "util/memstream.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/shader_stats.h"
 #include "util/u_dynarray.h"
 #include "nir_builder.h"
diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index ae54982d41e..1f4338820dd 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -42,7 +42,7 @@
 #include "util/u_debug.h"
 #include "util/rand_xor.h"
 #include "util/u_atomic.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/perf/cpu_trace.h"
 #include "util/ralloc.h"
 #include "util/compiler.h"
diff --git a/src/util/disk_cache.h b/src/util/disk_cache.h
index 6a257d3cc7e..aba50cb5e7a 100644
--- a/src/util/disk_cache.h
+++ b/src/util/disk_cache.h
@@ -33,7 +33,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <sys/stat.h>
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/detect_os.h"
 
 #ifdef __cplusplus
@@ -158,7 +158,7 @@ disk_cache_get_function_identifier(void *ptr, blake3_hasher *ctx)
  * In all cases, the keys are sequences of 20 bytes. It is anticipated
  * that callers will compute appropriate SHA-1 signatures for keys,
  * (though nothing in this implementation directly relies on how the
- * names are computed). See mesa-sha1.h and _mesa_blake3_compute for
+ * names are computed). See mesa-blake3.h and _mesa_blake3_compute for
  * assistance in computing SHA-1 signatures.
  */
 struct disk_cache *
diff --git a/src/util/fossilize_db.c b/src/util/fossilize_db.c
index 9e94e887f0f..00671e23931 100644
--- a/src/util/fossilize_db.c
+++ b/src/util/fossilize_db.c
@@ -49,7 +49,7 @@
 
 #include "crc32.h"
 #include "hash_table.h"
-#include "mesa-sha1.h"
+#include "mesa-blake3.h"
 #include "ralloc.h"
 
 #define FOZ_REF_MAGIC_SIZE 16
diff --git a/src/util/mesa-sha1.h b/src/util/mesa-sha1.h
deleted file mode 100644
index 694e2927750..00000000000
--- a/src/util/mesa-sha1.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright © 2014 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef MESA_SHA1_H
-#define MESA_SHA1_H
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include "mesa-blake3.h"
-
-#endif
diff --git a/src/util/mesa_cache_db.c b/src/util/mesa_cache_db.c
index fd06ccb158a..0daac81de12 100644
--- a/src/util/mesa_cache_db.c
+++ b/src/util/mesa_cache_db.c
@@ -21,7 +21,7 @@
 #include "crc32.h"
 #include "disk_cache.h"
 #include "hash_table.h"
-#include "mesa-sha1.h"
+#include "mesa-blake3.h"
 #include "mesa_cache_db.h"
 #include "os_time.h"
 #include "ralloc.h"
diff --git a/src/util/meson.build b/src/util/meson.build
index 6ef1b1bb414..1e3fe801e12 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -69,7 +69,6 @@ files_mesa_util = files(
   'macros.h',
   'memstream.c',
   'memstream.h',
-  'mesa-sha1.h',
   'mesa-blake3.c',
   'mesa-blake3.h',
   'os_drm.h',
diff --git a/src/util/os_memory_fd.c b/src/util/os_memory_fd.c
index 4b7fc689192..e48fd86cf37 100644
--- a/src/util/os_memory_fd.c
+++ b/src/util/os_memory_fd.c
@@ -42,7 +42,7 @@
 #include <sys/mman.h>
 
 #include "anon_file.h"
-#include "mesa-sha1.h"
+#include "mesa-blake3.h"
 #include "u_math.h"
 #include "u_overflow.h"
 #include "os_memory.h"
diff --git a/src/util/tests/cache_test.cpp b/src/util/tests/cache_test.cpp
index a352115c00f..ec850a52dc8 100644
--- a/src/util/tests/cache_test.cpp
+++ b/src/util/tests/cache_test.cpp
@@ -41,7 +41,7 @@
 #include "util/detect_os.h"
 #include "util/disk_cache_os.h"
 #include "util/disk_cache.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/os_misc.h"
 #include "util/ralloc.h"
 
diff --git a/src/util/tests/mesa-sha1_test.cpp b/src/util/tests/mesa-sha1_test.cpp
index 2a313572986..c341b732b52 100644
--- a/src/util/tests/mesa-sha1_test.cpp
+++ b/src/util/tests/mesa-sha1_test.cpp
@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "mesa-sha1.h"
+#include "mesa-blake3.h"
 
 #include <gtest/gtest.h>
 
diff --git a/src/util/xmlconfig.h b/src/util/xmlconfig.h
index ee80cb90d84..d0d2288887e 100644
--- a/src/util/xmlconfig.h
+++ b/src/util/xmlconfig.h
@@ -30,7 +30,7 @@
 #ifndef __XMLCONFIG_H
 #define __XMLCONFIG_H
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/ralloc.h"
 #include <stdint.h>
 #include <string.h>
diff --git a/src/virtio/vulkan/vn_physical_device.c b/src/virtio/vulkan/vn_physical_device.c
index 6741c3a4bae..c09808800a7 100644
--- a/src/virtio/vulkan/vn_physical_device.c
+++ b/src/virtio/vulkan/vn_physical_device.c
@@ -13,7 +13,7 @@
 #include <stdio.h>
 
 #include "git_sha1.h"
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 #include "util/os_misc.h"
 #include "venus-protocol/vn_protocol_driver_device.h"
 #include "vk_android.h"
diff --git a/src/vulkan/runtime/vk_pipeline.c b/src/vulkan/runtime/vk_pipeline.c
index 341e12e5120..c26c43b9aa2 100644
--- a/src/vulkan/runtime/vk_pipeline.c
+++ b/src/vulkan/runtime/vk_pipeline.c
@@ -43,7 +43,7 @@
 
 #include "shader_enums.h"
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 struct vk_pipeline_binary {
    struct vk_object_base base;
diff --git a/src/vulkan/runtime/vk_pipeline_layout.c b/src/vulkan/runtime/vk_pipeline_layout.c
index 27e960891a4..49d0cc0bca7 100644
--- a/src/vulkan/runtime/vk_pipeline_layout.c
+++ b/src/vulkan/runtime/vk_pipeline_layout.c
@@ -29,7 +29,7 @@
 #include "vk_device.h"
 #include "vk_log.h"
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 static void
 vk_pipeline_layout_init(struct vk_device *device,
diff --git a/src/vulkan/runtime/vk_shader.c b/src/vulkan/runtime/vk_shader.c
index 3ae2eeb9e54..9ad0cc3ad7c 100644
--- a/src/vulkan/runtime/vk_shader.c
+++ b/src/vulkan/runtime/vk_shader.c
@@ -33,7 +33,7 @@
 #include "vk_physical_device_features.h"
 #include "vk_pipeline.h"
 
-#include "util/mesa-sha1.h"
+#include "util/mesa-blake3.h"
 
 #include "nir.h"