diff --git a/src/gallium/auxiliary/driver_ddebug/dd_pipe.h b/src/gallium/auxiliary/driver_ddebug/dd_pipe.h
index b880a804536..d1234c144bd 100644
--- a/src/gallium/auxiliary/driver_ddebug/dd_pipe.h
+++ b/src/gallium/auxiliary/driver_ddebug/dd_pipe.h
@@ -32,7 +32,7 @@
 #include "pipe/p_state.h"
 #include "pipe/p_screen.h"
 #include "dd_util.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/list.h"
 #include "util/u_log.h"
 #include "util/u_queue.h"
diff --git a/src/gallium/auxiliary/driver_trace/tr_dump.c b/src/gallium/auxiliary/driver_trace/tr_dump.c
index 7ef9af34cb5..829f9037c76 100644
--- a/src/gallium/auxiliary/driver_trace/tr_dump.c
+++ b/src/gallium/auxiliary/driver_trace/tr_dump.c
@@ -49,7 +49,7 @@
 #endif
 
 #include "pipe/p_compiler.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/os_time.h"
 #include "util/simple_mtx.h"
 #include "util/u_debug.h"
diff --git a/src/gallium/auxiliary/driver_trace/tr_screen.h b/src/gallium/auxiliary/driver_trace/tr_screen.h
index 76b04e9d98d..f373053e659 100644
--- a/src/gallium/auxiliary/driver_trace/tr_screen.h
+++ b/src/gallium/auxiliary/driver_trace/tr_screen.h
@@ -30,7 +30,7 @@
 
 
 #include "pipe/p_screen.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_threaded_context.h"
 
 #ifdef __cplusplus
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index 2279e5acb28..bdf666560bd 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -86,7 +86,7 @@
 #endif
 
 #include "c11/threads.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "pipe/p_config.h"
 #include "util/u_debug.h"
 #include "util/u_cpu_detect.h"
diff --git a/src/gallium/auxiliary/hud/hud_cpu.c b/src/gallium/auxiliary/hud/hud_cpu.c
index 820e7d71007..51e408aab7a 100644
--- a/src/gallium/auxiliary/hud/hud_cpu.c
+++ b/src/gallium/auxiliary/hud/hud_cpu.c
@@ -30,7 +30,7 @@
 
 #include "hud/hud_private.h"
 #include "util/os_time.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_memory.h"
 #include "util/u_queue.h"
 #include <stdio.h>
diff --git a/src/gallium/auxiliary/hud/hud_cpufreq.c b/src/gallium/auxiliary/hud/hud_cpufreq.c
index 9c7b90f7351..bf1be1e9b40 100644
--- a/src/gallium/auxiliary/hud/hud_cpufreq.c
+++ b/src/gallium/auxiliary/hud/hud_cpufreq.c
@@ -36,7 +36,7 @@
 #include "hud/hud_private.h"
 #include "util/list.h"
 #include "util/os_time.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_memory.h"
 #include <stdio.h>
 #include <unistd.h>
diff --git a/src/gallium/auxiliary/hud/hud_diskstat.c b/src/gallium/auxiliary/hud/hud_diskstat.c
index b5d9710ef11..55bb9023a1f 100644
--- a/src/gallium/auxiliary/hud/hud_diskstat.c
+++ b/src/gallium/auxiliary/hud/hud_diskstat.c
@@ -35,7 +35,7 @@
 #include "hud/hud_private.h"
 #include "util/list.h"
 #include "util/os_time.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_memory.h"
 #include "util/u_string.h"
 #include <stdio.h>
diff --git a/src/gallium/auxiliary/hud/hud_nic.c b/src/gallium/auxiliary/hud/hud_nic.c
index b10247e4475..b54af2add2b 100644
--- a/src/gallium/auxiliary/hud/hud_nic.c
+++ b/src/gallium/auxiliary/hud/hud_nic.c
@@ -35,7 +35,7 @@
 #include "hud/hud_private.h"
 #include "util/list.h"
 #include "util/os_time.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_memory.h"
 #include "util/u_string.h"
 #include <stdio.h>
diff --git a/src/gallium/auxiliary/hud/hud_sensors_temp.c b/src/gallium/auxiliary/hud/hud_sensors_temp.c
index f99752f38df..96876d3a796 100644
--- a/src/gallium/auxiliary/hud/hud_sensors_temp.c
+++ b/src/gallium/auxiliary/hud/hud_sensors_temp.c
@@ -32,7 +32,7 @@
 #include "hud/hud_private.h"
 #include "util/list.h"
 #include "util/os_time.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_memory.h"
 #include "util/u_string.h"
 #include <stdio.h>
diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index 74b44e007b4..eecd326530a 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -115,7 +115,6 @@ files_libgallium = files(
   'os/os_mman.h',
   'os/os_process.c',
   'os/os_process.h',
-  'os/os_thread.h',
   'pipebuffer/pb_buffer_fenced.c',
   'pipebuffer/pb_buffer_fenced.h',
   'pipebuffer/pb_buffer.h',
diff --git a/src/gallium/auxiliary/os/os_thread.h b/src/gallium/auxiliary/os/os_thread.h
deleted file mode 100644
index 404f716db47..00000000000
--- a/src/gallium/auxiliary/os/os_thread.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/**************************************************************************
- * 
- * Copyright 1999-2006 Brian Paul
- * Copyright 2008 VMware, Inc.
- * All Rights Reserved.
- * 
- * 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 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.
- *
- **************************************************************************/
-
-
-/**
- * @file
- * 
- * Thread, mutex, condition variable, barrier, semaphore and
- * thread-specific data functions.
- */
-
-
-#ifndef OS_THREAD_H_
-#define OS_THREAD_H_
-
-#include "util/u_thread.h"
-
-#endif /* OS_THREAD_H_ */
diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
index 41e5c838617..05e03a830c1 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
@@ -45,7 +45,7 @@
 #include "pipe/p_compiler.h"
 #include "pipe/p_defines.h"
 #include "util/u_debug.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_memory.h"
 #include "util/list.h"
 
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c
index 60aaa2dd300..2b8f4b23629 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c
@@ -36,7 +36,7 @@
 
 #include "pipe/p_compiler.h"
 #include "util/u_debug.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_memory.h"
 #include "util/list.h"
 
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c
index 9a10def98ba..ba10ddd908b 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c
@@ -35,7 +35,7 @@
 
 #include "pipe/p_compiler.h"
 #include "util/u_debug.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 #include "util/list.h"
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
index 5cc63b93df2..397e42eed3e 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
@@ -35,7 +35,7 @@
 
 #include "pipe/p_defines.h"
 #include "util/u_debug.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_memory.h"
 #include "util/list.h"
 #include "util/u_mm.h"
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
index d1928dcaffb..f078ff0b10b 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
@@ -38,7 +38,7 @@
 
 #include "pipe/p_compiler.h"
 #include "util/u_debug.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "pipe/p_defines.h"
 #include "util/u_memory.h"
 #include "util/list.h"
diff --git a/src/gallium/auxiliary/pipebuffer/pb_cache.h b/src/gallium/auxiliary/pipebuffer/pb_cache.h
index cda0f99844e..c5d62c7f9fc 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_cache.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_cache.h
@@ -32,7 +32,7 @@
 #include "pb_buffer.h"
 #include "util/simple_mtx.h"
 #include "util/list.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 /**
  * Statically inserted into the driver-specific buffer structure.
diff --git a/src/gallium/auxiliary/pipebuffer/pb_slab.h b/src/gallium/auxiliary/pipebuffer/pb_slab.h
index e8e8f7687de..4fa5fd8d7d9 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_slab.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_slab.h
@@ -47,7 +47,7 @@
 #include "pb_buffer.h"
 #include "util/simple_mtx.h"
 #include "util/list.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 struct pb_slab;
 struct pb_slabs;
diff --git a/src/gallium/auxiliary/rtasm/rtasm_execmem.c b/src/gallium/auxiliary/rtasm/rtasm_execmem.c
index 7fd834eb708..8cfc614e02c 100644
--- a/src/gallium/auxiliary/rtasm/rtasm_execmem.c
+++ b/src/gallium/auxiliary/rtasm/rtasm_execmem.c
@@ -33,7 +33,7 @@
 
 #include "pipe/p_compiler.h"
 #include "util/u_debug.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_memory.h"
 
 #include "rtasm_execmem.h"
diff --git a/src/gallium/auxiliary/util/u_debug_flush.c b/src/gallium/auxiliary/util/u_debug_flush.c
index 55e6d7aa9b8..3474913cd54 100644
--- a/src/gallium/auxiliary/util/u_debug_flush.c
+++ b/src/gallium/auxiliary/util/u_debug_flush.c
@@ -48,7 +48,7 @@
 #include "util/list.h"
 #include "util/u_inlines.h"
 #include "util/u_string.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include <stdio.h>
 
 /* Future improvement: Use realloc instead? */
diff --git a/src/gallium/auxiliary/util/u_range.h b/src/gallium/auxiliary/util/u_range.h
index 90dc80bbc69..1ade98381ed 100644
--- a/src/gallium/auxiliary/util/u_range.h
+++ b/src/gallium/auxiliary/util/u_range.h
@@ -34,7 +34,7 @@
 #ifndef U_RANGE_H
 #define U_RANGE_H
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "pipe/p_state.h"
 #include "pipe/p_screen.h"
 #include "util/u_atomic.h"
diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.h b/src/gallium/drivers/etnaviv/etnaviv_screen.h
index 02e5b314f47..c9f7af50f60 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.h
@@ -31,7 +31,7 @@
 #include "etnaviv_internal.h"
 #include "etnaviv_perfmon.h"
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "pipe/p_screen.h"
 #include "renderonly/renderonly.h"
 #include "util/set.h"
diff --git a/src/gallium/drivers/lima/lima_screen.h b/src/gallium/drivers/lima/lima_screen.h
index fe2edf08d74..c6d98041ae8 100644
--- a/src/gallium/drivers/lima/lima_screen.h
+++ b/src/gallium/drivers/lima/lima_screen.h
@@ -30,7 +30,7 @@
 #include "util/slab.h"
 #include "util/list.h"
 #include "util/disk_cache.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 #include "pipe/p_screen.h"
 
diff --git a/src/gallium/drivers/llvmpipe/lp_fence.h b/src/gallium/drivers/llvmpipe/lp_fence.h
index 5ba746d22d1..606f031fba7 100644
--- a/src/gallium/drivers/llvmpipe/lp_fence.h
+++ b/src/gallium/drivers/llvmpipe/lp_fence.h
@@ -30,7 +30,7 @@
 #define LP_FENCE_H
 
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"
 
diff --git a/src/gallium/drivers/llvmpipe/lp_query.h b/src/gallium/drivers/llvmpipe/lp_query.h
index d73640dd29c..f0c08145eb2 100644
--- a/src/gallium/drivers/llvmpipe/lp_query.h
+++ b/src/gallium/drivers/llvmpipe/lp_query.h
@@ -34,7 +34,7 @@
 #define LP_QUERY_H
 
 #include <limits.h>
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "lp_limits.h"
 
 
diff --git a/src/gallium/drivers/llvmpipe/lp_scene.h b/src/gallium/drivers/llvmpipe/lp_scene.h
index 4017bea5c4a..ac817e763c2 100644
--- a/src/gallium/drivers/llvmpipe/lp_scene.h
+++ b/src/gallium/drivers/llvmpipe/lp_scene.h
@@ -35,7 +35,7 @@
 #ifndef LP_SCENE_H
 #define LP_SCENE_H
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "lp_rast.h"
 #include "lp_debug.h"
 
diff --git a/src/gallium/drivers/llvmpipe/lp_scene_queue.c b/src/gallium/drivers/llvmpipe/lp_scene_queue.c
index 4a6271fee2b..d02a256972f 100644
--- a/src/gallium/drivers/llvmpipe/lp_scene_queue.c
+++ b/src/gallium/drivers/llvmpipe/lp_scene_queue.c
@@ -32,7 +32,7 @@
  * which are produced by the "rast" code when it finishes rendering a scene.
  */
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_memory.h"
 #include "lp_scene_queue.h"
 #include "util/u_math.h"
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.h b/src/gallium/drivers/llvmpipe/lp_screen.h
index a9de1252f09..70dc4e8531d 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.h
+++ b/src/gallium/drivers/llvmpipe/lp_screen.h
@@ -36,7 +36,7 @@
 
 #include "pipe/p_screen.h"
 #include "pipe/p_defines.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/list.h"
 #include "gallivm/lp_bld.h"
 #include "gallivm/lp_bld_misc.h"
diff --git a/src/gallium/drivers/llvmpipe/lp_state_cs.h b/src/gallium/drivers/llvmpipe/lp_state_cs.h
index 6a4b8027035..0a19d745c44 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_cs.h
+++ b/src/gallium/drivers/llvmpipe/lp_state_cs.h
@@ -26,7 +26,6 @@
 #ifndef LP_STATE_CS_H
 #define LP_STATE_CS_H
 
-#include "os/os_thread.h"
 #include "util/u_thread.h"
 #include "pipe/p_state.h"
 
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_surface.c b/src/gallium/drivers/nouveau/nv50/nv50_surface.c
index 983a67200ff..44f195a597f 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_surface.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_surface.c
@@ -32,7 +32,7 @@
 
 #include "tgsi/tgsi_ureg.h"
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 #include "nv50/nv50_context.h"
 #include "nv50/nv50_resource.h"
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c
index 2e7de275252..cc694ef2cd1 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c
@@ -31,7 +31,7 @@
 
 #include "tgsi/tgsi_ureg.h"
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 #include "nvc0/nvc0_context.h"
 #include "nvc0/nvc0_resource.h"
diff --git a/src/gallium/drivers/r300/r300_screen.h b/src/gallium/drivers/r300/r300_screen.h
index fe987fd3c37..bcaea3cfb6e 100644
--- a/src/gallium/drivers/r300/r300_screen.h
+++ b/src/gallium/drivers/r300/r300_screen.h
@@ -29,7 +29,7 @@
 #include "pipe/p_screen.h"
 #include "util/disk_cache.h"
 #include "util/slab.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include <stdio.h>
 
 struct r300_screen {
diff --git a/src/gallium/drivers/svga/svga_resource_buffer.c b/src/gallium/drivers/svga/svga_resource_buffer.c
index 6fa3af52607..2cf854d003b 100644
--- a/src/gallium/drivers/svga/svga_resource_buffer.c
+++ b/src/gallium/drivers/svga/svga_resource_buffer.c
@@ -28,7 +28,7 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
 #include "util/u_inlines.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 #include "util/u_resource.h"
diff --git a/src/gallium/drivers/svga/svga_resource_buffer_upload.c b/src/gallium/drivers/svga/svga_resource_buffer_upload.c
index 597dcd14f67..3945934a5ea 100644
--- a/src/gallium/drivers/svga/svga_resource_buffer_upload.c
+++ b/src/gallium/drivers/svga/svga_resource_buffer_upload.c
@@ -24,7 +24,7 @@
  **********************************************************/
 
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
 #include "util/u_inlines.h"
diff --git a/src/gallium/drivers/svga/svga_resource_texture.c b/src/gallium/drivers/svga/svga_resource_texture.c
index f2ab20edba7..b12435b2333 100644
--- a/src/gallium/drivers/svga/svga_resource_texture.c
+++ b/src/gallium/drivers/svga/svga_resource_texture.c
@@ -28,7 +28,7 @@
 
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/format/u_format.h"
 #include "util/u_inlines.h"
 #include "util/u_math.h"
diff --git a/src/gallium/drivers/svga/svga_sampler_view.c b/src/gallium/drivers/svga/svga_sampler_view.c
index 7adbee06de9..fecfbbdcbda 100644
--- a/src/gallium/drivers/svga/svga_sampler_view.c
+++ b/src/gallium/drivers/svga/svga_sampler_view.c
@@ -28,7 +28,7 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
 #include "util/u_inlines.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/format/u_format.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
diff --git a/src/gallium/drivers/svga/svga_screen.h b/src/gallium/drivers/svga/svga_screen.h
index b5344b55b22..34830af60a4 100644
--- a/src/gallium/drivers/svga/svga_screen.h
+++ b/src/gallium/drivers/svga/svga_screen.h
@@ -28,7 +28,7 @@
 
 
 #include "pipe/p_screen.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 #include "svga_screen_cache.h"
 
diff --git a/src/gallium/drivers/svga/svga_screen_cache.h b/src/gallium/drivers/svga/svga_screen_cache.h
index 5793869f3a0..3ce6d4c6dc7 100644
--- a/src/gallium/drivers/svga/svga_screen_cache.h
+++ b/src/gallium/drivers/svga/svga_screen_cache.h
@@ -32,7 +32,7 @@
 #include "svga_reg.h"
 #include "svga3d_reg.h"
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 #include "util/list.h"
 
diff --git a/src/gallium/drivers/svga/svga_surface.c b/src/gallium/drivers/svga/svga_surface.c
index c80f0a4f9b2..065476f8959 100644
--- a/src/gallium/drivers/svga/svga_surface.c
+++ b/src/gallium/drivers/svga/svga_surface.c
@@ -28,7 +28,7 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
 #include "util/u_inlines.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_bitmask.h"
 #include "util/format/u_format.h"
 #include "util/u_math.h"
diff --git a/src/gallium/drivers/v3d/v3d_screen.h b/src/gallium/drivers/v3d/v3d_screen.h
index de2ce2c1601..1da9b83c965 100644
--- a/src/gallium/drivers/v3d/v3d_screen.h
+++ b/src/gallium/drivers/v3d/v3d_screen.h
@@ -26,7 +26,7 @@
 
 #include "pipe/p_screen.h"
 #include "renderonly/renderonly.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "frontend/drm_driver.h"
 #include "util/disk_cache.h"
 #include "util/list.h"
diff --git a/src/gallium/drivers/vc4/vc4_screen.h b/src/gallium/drivers/vc4/vc4_screen.h
index 52e19a32b57..99b611a637b 100644
--- a/src/gallium/drivers/vc4/vc4_screen.h
+++ b/src/gallium/drivers/vc4/vc4_screen.h
@@ -26,7 +26,7 @@
 
 #include "pipe/p_screen.h"
 #include "renderonly/renderonly.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "frontend/drm_driver.h"
 #include "util/list.h"
 #include "util/slab.h"
diff --git a/src/gallium/frontends/dri/dri_screen.h b/src/gallium/frontends/dri/dri_screen.h
index 0e3bb59796b..6d86340ed43 100644
--- a/src/gallium/frontends/dri/dri_screen.h
+++ b/src/gallium/frontends/dri/dri_screen.h
@@ -39,7 +39,7 @@
 #include "pipe/p_state.h"
 #include "frontend/api.h"
 #include "frontend/opencl_interop.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "postprocess/filters.h"
 #include "kopper_interface.h"
 
diff --git a/src/gallium/frontends/glx/xlib/xm_api.h b/src/gallium/frontends/glx/xlib/xm_api.h
index cad048b2dc4..ef73781cbce 100644
--- a/src/gallium/frontends/glx/xlib/xm_api.h
+++ b/src/gallium/frontends/glx/xlib/xm_api.h
@@ -60,7 +60,7 @@ and create a window, you must do the following to use the X/Mesa interface:
 #include <stdbool.h>
 #include "main/glconfig.h" /* for gl_config */
 #include "frontend/api.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 #include "frontend/xlibsw_api.h"
 
diff --git a/src/gallium/frontends/hgl/hgl_context.h b/src/gallium/frontends/hgl/hgl_context.h
index aa1a1dc1ad7..f952e410814 100644
--- a/src/gallium/frontends/hgl/hgl_context.h
+++ b/src/gallium/frontends/hgl/hgl_context.h
@@ -8,7 +8,7 @@
 #ifndef HGL_CONTEXT_H
 #define HGL_CONTEXT_H
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "pipe/p_format.h"
 #include "pipe/p_compiler.h"
 #include "pipe/p_screen.h"
diff --git a/src/gallium/frontends/nine/nine_lock.c b/src/gallium/frontends/nine/nine_lock.c
index 4d24a572ffb..86879791261 100644
--- a/src/gallium/frontends/nine/nine_lock.c
+++ b/src/gallium/frontends/nine/nine_lock.c
@@ -45,7 +45,7 @@
 #include "d3d9.h"
 #include "nine_lock.h"
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 /* Global mutex as described by MSDN */
 static mtx_t d3dlock_global = _MTX_INITIALIZER_NP;
diff --git a/src/gallium/frontends/nine/nine_queue.c b/src/gallium/frontends/nine/nine_queue.c
index c09810b1a8a..464b9c433f3 100644
--- a/src/gallium/frontends/nine/nine_queue.c
+++ b/src/gallium/frontends/nine/nine_queue.c
@@ -21,7 +21,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
 #include "nine_queue.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/macros.h"
 #include "nine_helpers.h"
 
diff --git a/src/gallium/frontends/nine/nine_state.c b/src/gallium/frontends/nine/nine_state.c
index 3725ebf6259..cd627c83d1e 100644
--- a/src/gallium/frontends/nine/nine_state.c
+++ b/src/gallium/frontends/nine/nine_state.c
@@ -49,7 +49,7 @@
 /* CSMT headers */
 #include "nine_queue.h"
 #include "nine_csmt_helper.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 #define DBG_CHANNEL DBG_DEVICE
 
diff --git a/src/gallium/frontends/nine/threadpool.c b/src/gallium/frontends/nine/threadpool.c
index eb852b65dc6..e6aa3316c49 100644
--- a/src/gallium/frontends/nine/threadpool.c
+++ b/src/gallium/frontends/nine/threadpool.c
@@ -34,7 +34,7 @@
 #include "hud/hud_context.h"
 #include "frontend/drm_driver.h"
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "threadpool.h"
 
 /* POSIX thread function */
diff --git a/src/gallium/frontends/omx/bellagio/vid_dec.h b/src/gallium/frontends/omx/bellagio/vid_dec.h
index 753a8ee18ff..dc8db3deaa4 100644
--- a/src/gallium/frontends/omx/bellagio/vid_dec.h
+++ b/src/gallium/frontends/omx/bellagio/vid_dec.h
@@ -39,7 +39,7 @@
 #include <OMX_Types.h>
 #include <OMX_Component.h>
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 #include "vid_dec_common.h"
 
diff --git a/src/gallium/frontends/omx/bellagio/vid_dec_av1.h b/src/gallium/frontends/omx/bellagio/vid_dec_av1.h
index 647d319abfe..817d2db1948 100644
--- a/src/gallium/frontends/omx/bellagio/vid_dec_av1.h
+++ b/src/gallium/frontends/omx/bellagio/vid_dec_av1.h
@@ -28,7 +28,7 @@
 #ifndef VID_DEC_AV1_H
 #define VID_DEC_AV1_H
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 enum av1_obu_type {
    AV1_OBU_SEQUENCE_HEADER = 1,
diff --git a/src/gallium/frontends/omx/vid_omx_common.c b/src/gallium/frontends/omx/vid_omx_common.c
index 63afa898ba1..b94c5fee41a 100644
--- a/src/gallium/frontends/omx/vid_omx_common.c
+++ b/src/gallium/frontends/omx/vid_omx_common.c
@@ -37,7 +37,7 @@
 #define Display void
 #endif
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_memory.h"
 #include "loader/loader.h"
 
diff --git a/src/gallium/frontends/va/va_private.h b/src/gallium/frontends/va/va_private.h
index 58089b10821..7c329b14310 100644
--- a/src/gallium/frontends/va/va_private.h
+++ b/src/gallium/frontends/va/va_private.h
@@ -44,7 +44,7 @@
 #include "vl/vl_csc.h"
 
 #include "util/u_dynarray.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 #ifndef VA_RT_FORMAT_YUV420_10
 #define VA_RT_FORMAT_YUV420_10  VA_RT_FORMAT_YUV420_10BPP
diff --git a/src/gallium/frontends/vdpau/htab.c b/src/gallium/frontends/vdpau/htab.c
index f596b2d571f..f9577da621b 100644
--- a/src/gallium/frontends/vdpau/htab.c
+++ b/src/gallium/frontends/vdpau/htab.c
@@ -26,7 +26,7 @@
  **************************************************************************/
 
 #include "util/u_handle_table.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "vdpau_private.h"
 
 static struct handle_table *htab = NULL;
diff --git a/src/gallium/frontends/vdpau/vdpau_private.h b/src/gallium/frontends/vdpau/vdpau_private.h
index 339896caab9..1f68e5d5af1 100644
--- a/src/gallium/frontends/vdpau/vdpau_private.h
+++ b/src/gallium/frontends/vdpau/vdpau_private.h
@@ -42,7 +42,7 @@
 
 #include "util/u_debug.h"
 #include "util/u_rect.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 #include "vl/vl_video_buffer.h"
 #include "vl/vl_bicubic_filter.h"
diff --git a/src/gallium/winsys/freedreno/drm/freedreno_drm_winsys.c b/src/gallium/winsys/freedreno/drm/freedreno_drm_winsys.c
index 3e4109e3e9a..3b01bd73a3f 100644
--- a/src/gallium/winsys/freedreno/drm/freedreno_drm_winsys.c
+++ b/src/gallium/winsys/freedreno/drm/freedreno_drm_winsys.c
@@ -33,7 +33,7 @@
 #include "util/u_inlines.h"
 #include "util/u_hash_table.h"
 #include "util/u_pointer.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 #include "freedreno_drm_public.h"
 
diff --git a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
index 3c8345b249f..e717fc1fe8f 100644
--- a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
+++ b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
@@ -9,7 +9,7 @@
 #include "util/u_inlines.h"
 #include "util/u_hash_table.h"
 #include "util/u_pointer.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 #include "nouveau_drm_public.h"
 
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index 9a67434398e..48af758cc02 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -28,7 +28,7 @@
 
 #include "util/u_hash_table.h"
 #include "util/u_memory.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "os/os_mman.h"
 #include "util/os_time.h"
 
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.h b/src/gallium/winsys/radeon/drm/radeon_drm_bo.h
index 84052f43b69..b74d2519461 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.h
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.h
@@ -29,7 +29,7 @@
 #define RADEON_DRM_BO_H
 
 #include "radeon_drm_winsys.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "pipebuffer/pb_slab.h"
 
 struct radeon_bo {
diff --git a/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c b/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c
index f0179f96d1d..e4f798c7f61 100644
--- a/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c
+++ b/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c
@@ -45,7 +45,7 @@
 #include "pipe/p_compiler.h"
 #include "pipe/p_defines.h"
 #include "util/u_debug.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/u_memory.h"
 #include "util/list.h"
 
diff --git a/src/gallium/winsys/svga/drm/vmw_fence.c b/src/gallium/winsys/svga/drm/vmw_fence.c
index a31c3df0b70..0981e741803 100644
--- a/src/gallium/winsys/svga/drm/vmw_fence.c
+++ b/src/gallium/winsys/svga/drm/vmw_fence.c
@@ -27,7 +27,7 @@
 #include "util/u_memory.h"
 #include "util/u_atomic.h"
 #include "util/list.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 #include "pipebuffer/pb_buffer_fenced.h"
 
diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h
index 127ef16d6e3..75439c58a34 100644
--- a/src/gallium/winsys/svga/drm/vmw_screen.h
+++ b/src/gallium/winsys/svga/drm/vmw_screen.h
@@ -40,7 +40,7 @@
 
 #include "svga_winsys.h"
 #include "pipebuffer/pb_buffer_fenced.h"
-#include <os/os_thread.h>
+#include "util/u_thread.h"
 #include <sys/types.h>
 
 #define VMW_GMR_POOL_SIZE (16*1024*1024)
diff --git a/src/gallium/winsys/svga/drm/vmw_surface.h b/src/gallium/winsys/svga/drm/vmw_surface.h
index b6cf63bb476..bfa1bd8fb00 100644
--- a/src/gallium/winsys/svga/drm/vmw_surface.h
+++ b/src/gallium/winsys/svga/drm/vmw_surface.h
@@ -38,7 +38,7 @@
 #include "pipe/p_compiler.h"
 #include "util/u_atomic.h"
 #include "util/u_inlines.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "pipebuffer/pb_buffer.h"
 
 #define VMW_MAX_PRESENTS 3
diff --git a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.h b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.h
index 5c6c4f9ef1a..f17d89c098b 100644
--- a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.h
+++ b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.h
@@ -24,7 +24,7 @@
 #define VIRGL_DRM_WINSYS_H
 
 #include <stdint.h>
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "pipe/p_state.h"
 #include "util/list.h"
 
diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
index 4254a551f01..29cfb3a9ca6 100644
--- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
+++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
@@ -28,7 +28,7 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
 #include "util/list.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 #include "virgl/virgl_winsys.h"
 #include "vtest/vtest_protocol.h"
diff --git a/src/util/u_debug_memory.c b/src/util/u_debug_memory.c
index 213312e5669..9fe9f089e8f 100644
--- a/src/util/u_debug_memory.c
+++ b/src/util/u_debug_memory.c
@@ -36,7 +36,7 @@
 
 #define DEBUG_MEMORY_IMPLEMENTATION
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 #include "util/simple_mtx.h"
 #include "util/u_debug.h"
diff --git a/src/util/u_debug_stack.c b/src/util/u_debug_stack.c
index f213bfbf3e7..8cf1afb77c0 100644
--- a/src/util/u_debug_stack.c
+++ b/src/util/u_debug_stack.c
@@ -45,7 +45,7 @@
 #endif
 #include <dlfcn.h>
 
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/hash_table.h"
 
 static struct hash_table* symbols_hash;
diff --git a/src/util/u_debug_stack_android.cpp b/src/util/u_debug_stack_android.cpp
index be3a88985de..2c7b2d53676 100644
--- a/src/util/u_debug_stack_android.cpp
+++ b/src/util/u_debug_stack_android.cpp
@@ -27,7 +27,7 @@
 #include "util/u_debug.h"
 #include "u_debug_stack.h"
 #include "util/hash_table.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 
 static hash_table *symbol_table;
 static simple_mtx_t table_mutex = SIMPLE_MTX_INITIALIZER;
diff --git a/src/util/u_debug_symbol.c b/src/util/u_debug_symbol.c
index 21b738d44a0..c326a2eeea7 100644
--- a/src/util/u_debug_symbol.c
+++ b/src/util/u_debug_symbol.c
@@ -33,7 +33,7 @@
  */
 
 #include "pipe/p_compiler.h"
-#include "os/os_thread.h"
+#include "util/u_thread.h"
 #include "util/simple_mtx.h"
 #include "util/u_string.h"