diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 38f669c7d22..40771ad9bbd 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -298,8 +298,8 @@ radv_emit_clear_data(struct radv_cmd_buffer *cmd_buffer, unsigned engine_sel, ui
 static void
 radv_cmd_buffer_finish_shader_part_cache(struct radv_cmd_buffer *cmd_buffer)
 {
-   ralloc_free(cmd_buffer->vs_prologs.table);
-   ralloc_free(cmd_buffer->ps_epilogs.table);
+   _mesa_set_fini(&cmd_buffer->vs_prologs, NULL);
+   _mesa_set_fini(&cmd_buffer->ps_epilogs, NULL);
 }
 
 static bool
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index 2b1e5f79d84..e29804846a9 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -2886,7 +2886,7 @@ radv_shader_part_cache_finish(struct radv_device *device, struct radv_shader_par
    set_foreach (&cache->entries, entry)
       radv_shader_part_unref(device, radv_shader_part_from_cache_entry(entry->key));
    simple_mtx_destroy(&cache->lock);
-   ralloc_free(cache->entries.table);
+   _mesa_set_fini(&cache->entries, NULL);
 }
 
 /*
diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c
index 4adb78cce07..04f8758757f 100644
--- a/src/gallium/drivers/zink/zink_compiler.c
+++ b/src/gallium/drivers/zink/zink_compiler.c
@@ -6029,7 +6029,7 @@ trivial_revectorize(nir_shader *nir)
       nir_instr *instr = (void*)entry->key;
       nir_instr_remove(instr);
    }
-   ralloc_free(deletions.table);
+   _mesa_set_fini(&deletions, NULL);
    return progress;
 }
 
diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c
index 6cbbd7e5203..650057cc8e8 100644
--- a/src/gallium/drivers/zink/zink_program.c
+++ b/src/gallium/drivers/zink/zink_program.c
@@ -1035,7 +1035,7 @@ zink_gfx_lib_cache_unref(struct zink_screen *screen, struct zink_gfx_lib_cache *
       VKSCR(DestroyPipeline)(screen->dev, gkey->pipeline, NULL);
       FREE(gkey);
    }
-   ralloc_free(libs->libs.table);
+   _mesa_set_fini(&libs->libs, NULL);
    FREE(libs);
 }
 
diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index 605dd72235e..03125d90b5e 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -207,14 +207,14 @@ zink_destroy_resource_surface_cache(struct zink_screen *screen, struct set *ht,
          VKSCR(DestroyBufferView)(screen->dev, bv->buffer_view, NULL);
          FREE(bv);
       }
-      ralloc_free(ht->table);
+      _mesa_set_fini(ht, NULL);
    } else {
       set_foreach_remove(ht, he) {
          struct zink_surface *surf = (void*)he->key;
          VKSCR(DestroyImageView)(screen->dev, surf->image_view, NULL);
          FREE(surf);
       }
-      ralloc_free(ht->table);
+      _mesa_set_fini(ht, NULL);
    }
 }
 
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index b289ad2aafe..ad059abff15 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1539,8 +1539,7 @@ zink_destroy_screen(struct pipe_screen *pscreen)
          }
       }
       if (!device_table.entries) {
-         ralloc_free(device_table.table);
-         device_table.table = NULL;
+         _mesa_set_fini(&device_table, NULL);
       }
       simple_mtx_unlock(&device_lock);
    }
diff --git a/src/mesa/state_tracker/st_pbo_compute.c b/src/mesa/state_tracker/st_pbo_compute.c
index 7ec6bd0d72c..4e9e6faa582 100644
--- a/src/mesa/state_tracker/st_pbo_compute.c
+++ b/src/mesa/state_tracker/st_pbo_compute.c
@@ -1360,7 +1360,7 @@ st_pbo_compute_deinit(struct st_context *st)
             }
             free(spec);
          }
-         ralloc_free(async->specialized.table);
+         _mesa_set_fini(&async->specialized, NULL);
          free(async);
       } else {
          st->pipe->delete_compute_state(st->pipe, entry->data);