diff --git a/third_party/tbb/address_waiter.cc b/third_party/tbb/address_waiter.cc
index 0508f06f7..52c1bc7e2 100644
--- a/third_party/tbb/address_waiter.cc
+++ b/third_party/tbb/address_waiter.cc
@@ -15,10 +15,10 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/governor.h"
-#include "third_party/tbb/concurrent_monitor.h"
-#include "third_party/tbb/detail/_waitable_atomic.h"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/governor.hh"
+#include "third_party/tbb/concurrent_monitor.hh"
+#include "third_party/tbb/detail/_waitable_atomic.hh"
 
 #include "third_party/libcxx/type_traits"
 
diff --git a/third_party/tbb/allocator.cc b/third_party/tbb/allocator.cc
index aec21f80e..95daa5386 100644
--- a/third_party/tbb/allocator.cc
+++ b/third_party/tbb/allocator.cc
@@ -15,16 +15,16 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/version.h"
+#include "third_party/tbb/version.hh"
 
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/tbb_allocator.h" // Is this OK?
-#include "third_party/tbb/cache_aligned_allocator.h"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/tbb_allocator.hh" // Is this OK?
+#include "third_party/tbb/cache_aligned_allocator.hh"
 
-#include "third_party/tbb/dynamic_link.h"
-#include "third_party/tbb/misc.h"
+#include "third_party/tbb/dynamic_link.hh"
+#include "third_party/tbb/misc.hh"
 
 #include "third_party/libcxx/cstdlib"
 
diff --git a/third_party/tbb/arena.cc b/third_party/tbb/arena.cc
index 6c290b898..f603d56f3 100644
--- a/third_party/tbb/arena.cc
+++ b/third_party/tbb/arena.cc
@@ -15,16 +15,16 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/task_dispatcher.h"
-#include "third_party/tbb/governor.h"
-#include "third_party/tbb/threading_control.h"
-#include "third_party/tbb/arena.h"
-#include "third_party/tbb/itt_notify.h"
-#include "third_party/tbb/semaphore.h"
-#include "third_party/tbb/waiters.h"
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/info.h"
-#include "third_party/tbb/tbb_allocator.h"
+#include "third_party/tbb/task_dispatcher.hh"
+#include "third_party/tbb/governor.hh"
+#include "third_party/tbb/threading_control.hh"
+#include "third_party/tbb/arena.hh"
+#include "third_party/tbb/itt_notify.hh"
+#include "third_party/tbb/semaphore.hh"
+#include "third_party/tbb/waiters.hh"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/info.hh"
+#include "third_party/tbb/tbb_allocator.hh"
 
 #include "third_party/libcxx/atomic"
 #include "third_party/libcxx/cstring"
@@ -454,7 +454,7 @@ arena& arena::create(threading_control* control, unsigned num_slots, unsigned nu
 } // namespace tbb
 
 // Enable task_arena.h
-#include "third_party/tbb/task_arena.h" // task_arena_base
+#include "third_party/tbb/task_arena.hh" // task_arena_base
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/arena.h b/third_party/tbb/arena.hh
similarity index 96%
rename from third_party/tbb/arena.h
rename to third_party/tbb/arena.hh
index 18c02828e..3b45342c1 100644
--- a/third_party/tbb/arena.h
+++ b/third_party/tbb/arena.hh
@@ -21,21 +21,21 @@
 #include "third_party/libcxx/atomic"
 #include "third_party/libcxx/cstring"
 
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/spin_mutex.h"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/spin_mutex.hh"
 
-#include "third_party/tbb/scheduler_common.h"
-#include "third_party/tbb/intrusive_list.h"
-#include "third_party/tbb/task_stream.h"
-#include "third_party/tbb/arena_slot.h"
-#include "third_party/tbb/rml_tbb.h"
-#include "third_party/tbb/mailbox.h"
-#include "third_party/tbb/governor.h"
-#include "third_party/tbb/concurrent_monitor.h"
-#include "third_party/tbb/observer_proxy.h"
-#include "third_party/tbb/thread_control_monitor.h"
-#include "third_party/tbb/threading_control_client.h"
+#include "third_party/tbb/scheduler_common.hh"
+#include "third_party/tbb/intrusive_list.hh"
+#include "third_party/tbb/task_stream.hh"
+#include "third_party/tbb/arena_slot.hh"
+#include "third_party/tbb/rml_tbb.hh"
+#include "third_party/tbb/mailbox.hh"
+#include "third_party/tbb/governor.hh"
+#include "third_party/tbb/concurrent_monitor.hh"
+#include "third_party/tbb/observer_proxy.hh"
+#include "third_party/tbb/thread_control_monitor.hh"
+#include "third_party/tbb/threading_control_client.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/arena_slot.cc b/third_party/tbb/arena_slot.cc
index 8c10cf071..ab91b2681 100644
--- a/third_party/tbb/arena_slot.cc
+++ b/third_party/tbb/arena_slot.cc
@@ -15,9 +15,9 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/arena_slot.h"
-#include "third_party/tbb/arena.h"
-#include "third_party/tbb/thread_data.h"
+#include "third_party/tbb/arena_slot.hh"
+#include "third_party/tbb/arena.hh"
+#include "third_party/tbb/thread_data.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/arena_slot.h b/third_party/tbb/arena_slot.hh
similarity index 98%
rename from third_party/tbb/arena_slot.h
rename to third_party/tbb/arena_slot.hh
index 3f18342c5..7a45b9100 100644
--- a/third_party/tbb/arena_slot.h
+++ b/third_party/tbb/arena_slot.hh
@@ -18,16 +18,16 @@
 #ifndef _TBB_arena_slot_H
 #define _TBB_arena_slot_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_template_helpers.h"
-#include "third_party/tbb/detail/_task.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
+#include "third_party/tbb/detail/_task.hh"
 
-#include "third_party/tbb/cache_aligned_allocator.h"
+#include "third_party/tbb/cache_aligned_allocator.hh"
 
-#include "third_party/tbb/misc.h"
-#include "third_party/tbb/mailbox.h"
-#include "third_party/tbb/scheduler_common.h"
+#include "third_party/tbb/misc.hh"
+#include "third_party/tbb/mailbox.hh"
+#include "third_party/tbb/scheduler_common.hh"
 
 #include "third_party/libcxx/atomic"
 
diff --git a/third_party/tbb/assert_impl.h b/third_party/tbb/assert_impl.hh
similarity index 97%
rename from third_party/tbb/assert_impl.h
rename to third_party/tbb/assert_impl.hh
index c958d3a40..9c0409fe3 100644
--- a/third_party/tbb/assert_impl.h
+++ b/third_party/tbb/assert_impl.hh
@@ -18,8 +18,8 @@
 #ifndef __TBB_assert_impl_H
 #define __TBB_assert_impl_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_utils.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_utils.hh"
 
 #include "third_party/libcxx/cstdio"
 #include "third_party/libcxx/cstdlib"
diff --git a/third_party/tbb/blocked_range.h b/third_party/tbb/blocked_range.hh
similarity index 97%
rename from third_party/tbb/blocked_range.h
rename to third_party/tbb/blocked_range.hh
index 4f3041ab2..d9486d56e 100644
--- a/third_party/tbb/blocked_range.h
+++ b/third_party/tbb/blocked_range.hh
@@ -20,10 +20,10 @@
 
 #include "third_party/libcxx/cstddef"
 
-#include "third_party/tbb/detail/_range_common.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
+#include "third_party/tbb/detail/_range_common.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
 
-#include "third_party/tbb/version.h"
+#include "third_party/tbb/version.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/blocked_range2d.h b/third_party/tbb/blocked_range2d.hh
similarity index 94%
rename from third_party/tbb/blocked_range2d.h
rename to third_party/tbb/blocked_range2d.hh
index e8f3df03e..36f17695e 100644
--- a/third_party/tbb/blocked_range2d.h
+++ b/third_party/tbb/blocked_range2d.hh
@@ -20,11 +20,11 @@
 
 #include "third_party/libcxx/cstddef"
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_range_common.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_range_common.hh"
 
-#include "third_party/tbb/blocked_range.h"
+#include "third_party/tbb/blocked_range.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/blocked_range3d.h b/third_party/tbb/blocked_range3d.hh
similarity index 96%
rename from third_party/tbb/blocked_range3d.h
rename to third_party/tbb/blocked_range3d.hh
index dd5e2312f..46423dacb 100644
--- a/third_party/tbb/blocked_range3d.h
+++ b/third_party/tbb/blocked_range3d.hh
@@ -20,10 +20,10 @@
 
 #include "third_party/libcxx/cstddef"
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
 
-#include "third_party/tbb/blocked_range.h"
+#include "third_party/tbb/blocked_range.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/blocked_rangeNd.h b/third_party/tbb/blocked_rangeNd.hh
similarity index 95%
rename from third_party/tbb/blocked_rangeNd.h
rename to third_party/tbb/blocked_rangeNd.hh
index 3b48046de..c1336326c 100644
--- a/third_party/tbb/blocked_rangeNd.h
+++ b/third_party/tbb/blocked_rangeNd.hh
@@ -27,11 +27,11 @@
 #include "third_party/libcxx/cstddef"
 #include "third_party/libcxx/type_traits"  // std::is_same, std::enable_if
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_template_helpers.h" // index_sequence, make_index_sequence
-#include "third_party/tbb/detail/_range_common.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_template_helpers.hh" // index_sequence, make_index_sequence
+#include "third_party/tbb/detail/_range_common.hh"
 
-#include "third_party/tbb/blocked_range.h"
+#include "third_party/tbb/blocked_range.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/cache_aligned_allocator.h b/third_party/tbb/cache_aligned_allocator.hh
similarity index 98%
rename from third_party/tbb/cache_aligned_allocator.h
rename to third_party/tbb/cache_aligned_allocator.hh
index 0e79b238b..e8b54a5bd 100644
--- a/third_party/tbb/cache_aligned_allocator.h
+++ b/third_party/tbb/cache_aligned_allocator.hh
@@ -18,8 +18,8 @@
 #ifndef __TBB_cache_aligned_allocator_H
 #define __TBB_cache_aligned_allocator_H
 
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
 #include "third_party/libcxx/cstdlib"
 #include "third_party/libcxx/utility"
 
diff --git a/third_party/tbb/cancellation_disseminator.h b/third_party/tbb/cancellation_disseminator.hh
similarity index 95%
rename from third_party/tbb/cancellation_disseminator.h
rename to third_party/tbb/cancellation_disseminator.hh
index 4ec879718..b5394da93 100644
--- a/third_party/tbb/cancellation_disseminator.h
+++ b/third_party/tbb/cancellation_disseminator.hh
@@ -18,11 +18,11 @@
 #ifndef _TBB_cancellation_disseminator_H
 #define _TBB_cancellation_disseminator_H
 
-#include "third_party/tbb/mutex.h"
-#include "third_party/tbb/task_group.h"
+#include "third_party/tbb/mutex.hh"
+#include "third_party/tbb/task_group.hh"
 
-#include "third_party/tbb/intrusive_list.h"
-#include "third_party/tbb/thread_data.h"
+#include "third_party/tbb/intrusive_list.hh"
+#include "third_party/tbb/thread_data.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/co_context.h b/third_party/tbb/co_context.hh
similarity index 98%
rename from third_party/tbb/co_context.h
rename to third_party/tbb/co_context.hh
index fe1ddaee2..fd0616cff 100644
--- a/third_party/tbb/co_context.h
+++ b/third_party/tbb/co_context.hh
@@ -18,7 +18,7 @@
 #ifndef _TBB_co_context_H
 #define _TBB_co_context_H
 
-#include "third_party/tbb/detail/_config.h"
+#include "third_party/tbb/detail/_config.hh"
 
 #if __TBB_RESUMABLE_TASKS
 
@@ -55,7 +55,7 @@
 #endif
 
 #include "third_party/libcxx/condition_variable"
-#include "third_party/tbb/governor.h"
+#include "third_party/tbb/governor.hh"
 
 #elif _WIN32 || _WIN64
 #include "libc/nt/accounting.h"
@@ -89,7 +89,7 @@
     #endif
 #endif // __APPLE__
 
-// MISSING #include <ucontext.h>
+#include "libc/calls/ucontext.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/weirdtypes.h"
 #include "libc/runtime/runtime.h"
@@ -102,7 +102,7 @@
 #include "libc/sysv/consts/mfd.h"
 #include "libc/sysv/consts/mremap.h" // mprotect
 
-#include "third_party/tbb/governor.h" // default_page_size()
+#include "third_party/tbb/governor.hh" // default_page_size()
 
 #ifndef MAP_STACK
 // macOS* does not define MAP_STACK
diff --git a/third_party/tbb/collaborative_call_once.h b/third_party/tbb/collaborative_call_once.hh
similarity index 99%
rename from third_party/tbb/collaborative_call_once.h
rename to third_party/tbb/collaborative_call_once.hh
index b154b6f7f..56bdf295c 100644
--- a/third_party/tbb/collaborative_call_once.h
+++ b/third_party/tbb/collaborative_call_once.hh
@@ -18,8 +18,8 @@
 #ifndef __TBB_collaborative_call_once_H
 #define __TBB_collaborative_call_once_H
 
-#include "third_party/tbb/task_arena.h"
-#include "third_party/tbb/task_group.h"
+#include "third_party/tbb/task_arena.hh"
+#include "third_party/tbb/task_group.hh"
 
 #include "third_party/libcxx/atomic"
 
diff --git a/third_party/tbb/combinable.h b/third_party/tbb/combinable.hh
similarity index 91%
rename from third_party/tbb/combinable.h
rename to third_party/tbb/combinable.hh
index 63eaf36e7..f9fbc5c88 100644
--- a/third_party/tbb/combinable.h
+++ b/third_party/tbb/combinable.hh
@@ -18,10 +18,10 @@
 #ifndef __TBB_combinable_H
 #define __TBB_combinable_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
 
-#include "third_party/tbb/enumerable_thread_specific.h"
-#include "third_party/tbb/cache_aligned_allocator.h"
+#include "third_party/tbb/enumerable_thread_specific.hh"
+#include "third_party/tbb/cache_aligned_allocator.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/concurrent_bounded_queue.cc b/third_party/tbb/concurrent_bounded_queue.cc
index 6608c59a8..39a48a3c4 100644
--- a/third_party/tbb/concurrent_bounded_queue.cc
+++ b/third_party/tbb/concurrent_bounded_queue.cc
@@ -15,10 +15,10 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/concurrent_queue.h"
-#include "third_party/tbb/cache_aligned_allocator.h"
-#include "third_party/tbb/concurrent_monitor.h"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/concurrent_queue.hh"
+#include "third_party/tbb/cache_aligned_allocator.hh"
+#include "third_party/tbb/concurrent_monitor.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/concurrent_hash_map.h b/third_party/tbb/concurrent_hash_map.hh
similarity index 99%
rename from third_party/tbb/concurrent_hash_map.h
rename to third_party/tbb/concurrent_hash_map.hh
index ae1a0e0a2..6cffed381 100644
--- a/third_party/tbb/concurrent_hash_map.h
+++ b/third_party/tbb/concurrent_hash_map.hh
@@ -18,16 +18,16 @@
 #ifndef __TBB_concurrent_hash_map_H
 #define __TBB_concurrent_hash_map_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_allocator_traits.h"
-#include "third_party/tbb/detail/_containers_helpers.h"
-#include "third_party/tbb/detail/_template_helpers.h"
-#include "third_party/tbb/detail/_hash_compare.h"
-#include "third_party/tbb/detail/_range_common.h"
-#include "third_party/tbb/tbb_allocator.h"
-#include "third_party/tbb/spin_rw_mutex.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_allocator_traits.hh"
+#include "third_party/tbb/detail/_containers_helpers.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
+#include "third_party/tbb/detail/_hash_compare.hh"
+#include "third_party/tbb/detail/_range_common.hh"
+#include "third_party/tbb/tbb_allocator.hh"
+#include "third_party/tbb/spin_rw_mutex.hh"
 
 #include "third_party/libcxx/atomic"
 #include "third_party/libcxx/initializer_list"
diff --git a/third_party/tbb/concurrent_lru_cache.h b/third_party/tbb/concurrent_lru_cache.hh
similarity index 99%
rename from third_party/tbb/concurrent_lru_cache.h
rename to third_party/tbb/concurrent_lru_cache.hh
index d8fe096b4..a89abab33 100644
--- a/third_party/tbb/concurrent_lru_cache.h
+++ b/third_party/tbb/concurrent_lru_cache.hh
@@ -22,8 +22,8 @@
     #error Set TBB_PREVIEW_CONCURRENT_LRU_CACHE to include concurrent_lru_cache.h
 #endif
 
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_aggregator.h"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_aggregator.hh"
 
 #include "third_party/libcxx/map"       // for std::map
 #include "third_party/libcxx/list"      // for std::list
diff --git a/third_party/tbb/concurrent_map.h b/third_party/tbb/concurrent_map.hh
similarity index 98%
rename from third_party/tbb/concurrent_map.h
rename to third_party/tbb/concurrent_map.hh
index 55e2f3568..960b17687 100644
--- a/third_party/tbb/concurrent_map.h
+++ b/third_party/tbb/concurrent_map.hh
@@ -18,9 +18,9 @@
 #ifndef __TBB_concurrent_map_H
 #define __TBB_concurrent_map_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_concurrent_skip_list.h"
-#include "third_party/tbb/tbb_allocator.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_concurrent_skip_list.hh"
+#include "third_party/tbb/tbb_allocator.hh"
 #include "third_party/libcxx/functional"
 #include "third_party/libcxx/tuple"
 #include "third_party/libcxx/utility"
diff --git a/third_party/tbb/concurrent_monitor.h b/third_party/tbb/concurrent_monitor.hh
similarity index 98%
rename from third_party/tbb/concurrent_monitor.h
rename to third_party/tbb/concurrent_monitor.hh
index 539706ed1..2c4b80716 100644
--- a/third_party/tbb/concurrent_monitor.h
+++ b/third_party/tbb/concurrent_monitor.hh
@@ -18,11 +18,11 @@
 #ifndef __TBB_concurrent_monitor_H
 #define __TBB_concurrent_monitor_H
 
-#include "third_party/tbb/spin_mutex.h"
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_aligned_space.h"
-#include "third_party/tbb/concurrent_monitor_mutex.h"
-#include "third_party/tbb/semaphore.h"
+#include "third_party/tbb/spin_mutex.hh"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_aligned_space.hh"
+#include "third_party/tbb/concurrent_monitor_mutex.hh"
+#include "third_party/tbb/semaphore.hh"
 
 #include "third_party/libcxx/atomic"
 
diff --git a/third_party/tbb/concurrent_monitor_mutex.h b/third_party/tbb/concurrent_monitor_mutex.hh
similarity index 95%
rename from third_party/tbb/concurrent_monitor_mutex.h
rename to third_party/tbb/concurrent_monitor_mutex.hh
index 14d6317e7..47d31a361 100644
--- a/third_party/tbb/concurrent_monitor_mutex.h
+++ b/third_party/tbb/concurrent_monitor_mutex.hh
@@ -18,9 +18,9 @@
 #ifndef __TBB_monitor_mutex_H
 #define __TBB_monitor_mutex_H
 
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_aligned_space.h"
-#include "third_party/tbb/semaphore.h"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_aligned_space.hh"
+#include "third_party/tbb/semaphore.hh"
 
 #include "third_party/libcxx/mutex"
 
diff --git a/third_party/tbb/concurrent_priority_queue.h b/third_party/tbb/concurrent_priority_queue.hh
similarity index 97%
rename from third_party/tbb/concurrent_priority_queue.h
rename to third_party/tbb/concurrent_priority_queue.hh
index 86e915dee..297d3855e 100644
--- a/third_party/tbb/concurrent_priority_queue.h
+++ b/third_party/tbb/concurrent_priority_queue.hh
@@ -18,15 +18,15 @@
 #ifndef __TBB_concurrent_priority_queue_H
 #define __TBB_concurrent_priority_queue_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_aggregator.h"
-#include "third_party/tbb/detail/_template_helpers.h"
-#include "third_party/tbb/detail/_allocator_traits.h"
-#include "third_party/tbb/detail/_range_common.h"
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_containers_helpers.h"
-#include "third_party/tbb/cache_aligned_allocator.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_aggregator.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
+#include "third_party/tbb/detail/_allocator_traits.hh"
+#include "third_party/tbb/detail/_range_common.hh"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_containers_helpers.hh"
+#include "third_party/tbb/cache_aligned_allocator.hh"
 #include "third_party/libcxx/vector"
 #include "third_party/libcxx/iterator"
 #include "third_party/libcxx/functional"
diff --git a/third_party/tbb/concurrent_queue.h b/third_party/tbb/concurrent_queue.hh
similarity index 98%
rename from third_party/tbb/concurrent_queue.h
rename to third_party/tbb/concurrent_queue.hh
index 2cceab80f..037016b93 100644
--- a/third_party/tbb/concurrent_queue.h
+++ b/third_party/tbb/concurrent_queue.hh
@@ -18,12 +18,12 @@
 #ifndef __TBB_concurrent_queue_H
 #define __TBB_concurrent_queue_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_concurrent_queue_base.h"
-#include "third_party/tbb/detail/_allocator_traits.h"
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_containers_helpers.h"
-#include "third_party/tbb/cache_aligned_allocator.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_concurrent_queue_base.hh"
+#include "third_party/tbb/detail/_allocator_traits.hh"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_containers_helpers.hh"
+#include "third_party/tbb/cache_aligned_allocator.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/concurrent_set.h b/third_party/tbb/concurrent_set.hh
similarity index 98%
rename from third_party/tbb/concurrent_set.h
rename to third_party/tbb/concurrent_set.hh
index f1c8babdd..f16e8bb88 100644
--- a/third_party/tbb/concurrent_set.h
+++ b/third_party/tbb/concurrent_set.hh
@@ -18,9 +18,9 @@
 #ifndef __TBB_concurrent_set_H
 #define __TBB_concurrent_set_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_concurrent_skip_list.h"
-#include "third_party/tbb/tbb_allocator.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_concurrent_skip_list.hh"
+#include "third_party/tbb/tbb_allocator.hh"
 #include "third_party/libcxx/functional"
 #include "third_party/libcxx/utility"
 
diff --git a/third_party/tbb/concurrent_unordered_map.h b/third_party/tbb/concurrent_unordered_map.hh
similarity index 99%
rename from third_party/tbb/concurrent_unordered_map.h
rename to third_party/tbb/concurrent_unordered_map.hh
index d9fce65d6..ab0e42fad 100644
--- a/third_party/tbb/concurrent_unordered_map.h
+++ b/third_party/tbb/concurrent_unordered_map.hh
@@ -18,9 +18,9 @@
 #ifndef __TBB_concurrent_unordered_map_H
 #define __TBB_concurrent_unordered_map_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_concurrent_unordered_base.h"
-#include "third_party/tbb/tbb_allocator.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_concurrent_unordered_base.hh"
+#include "third_party/tbb/tbb_allocator.hh"
 #include "third_party/libcxx/functional"
 
 namespace tbb {
diff --git a/third_party/tbb/concurrent_unordered_set.h b/third_party/tbb/concurrent_unordered_set.hh
similarity index 98%
rename from third_party/tbb/concurrent_unordered_set.h
rename to third_party/tbb/concurrent_unordered_set.hh
index ff53ac024..dd7ea2586 100644
--- a/third_party/tbb/concurrent_unordered_set.h
+++ b/third_party/tbb/concurrent_unordered_set.hh
@@ -18,9 +18,9 @@
 #ifndef __TBB_concurrent_unordered_set_H
 #define __TBB_concurrent_unordered_set_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_concurrent_unordered_base.h"
-#include "third_party/tbb/tbb_allocator.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_concurrent_unordered_base.hh"
+#include "third_party/tbb/tbb_allocator.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/concurrent_vector.h b/third_party/tbb/concurrent_vector.hh
similarity index 99%
rename from third_party/tbb/concurrent_vector.h
rename to third_party/tbb/concurrent_vector.hh
index 012dbe931..418b32657 100644
--- a/third_party/tbb/concurrent_vector.h
+++ b/third_party/tbb/concurrent_vector.hh
@@ -18,14 +18,14 @@
 #ifndef __TBB_concurrent_vector_H
 #define __TBB_concurrent_vector_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_allocator_traits.h"
-#include "third_party/tbb/detail/_segment_table.h"
-#include "third_party/tbb/detail/_containers_helpers.h"
-#include "third_party/tbb/blocked_range.h"
-#include "third_party/tbb/cache_aligned_allocator.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_allocator_traits.hh"
+#include "third_party/tbb/detail/_segment_table.hh"
+#include "third_party/tbb/detail/_containers_helpers.hh"
+#include "third_party/tbb/blocked_range.hh"
+#include "third_party/tbb/cache_aligned_allocator.hh"
 
 #include "third_party/libcxx/algorithm"
 #include "third_party/libcxx/utility" // std::move_if_noexcept
diff --git a/third_party/tbb/detail/_aggregator.h b/third_party/tbb/detail/_aggregator.hh
similarity index 98%
rename from third_party/tbb/detail/_aggregator.h
rename to third_party/tbb/detail/_aggregator.hh
index bc263885c..7f4b4a7be 100644
--- a/third_party/tbb/detail/_aggregator.h
+++ b/third_party/tbb/detail/_aggregator.hh
@@ -19,11 +19,11 @@
 #ifndef __TBB_detail__aggregator_H
 #define __TBB_detail__aggregator_H
 
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_utils.h"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_utils.hh"
 #include "third_party/libcxx/atomic"
 #if !__TBBMALLOC_BUILD // TODO: check this macro with TBB Malloc
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/profiling.hh"
 #endif
 
 namespace tbb {
diff --git a/third_party/tbb/detail/_aligned_space.h b/third_party/tbb/detail/_aligned_space.hh
similarity index 96%
rename from third_party/tbb/detail/_aligned_space.h
rename to third_party/tbb/detail/_aligned_space.hh
index 9a5addba4..54c8fa4f1 100644
--- a/third_party/tbb/detail/_aligned_space.h
+++ b/third_party/tbb/detail/_aligned_space.hh
@@ -19,7 +19,7 @@
 
 #include "third_party/libcxx/cstddef"
 
-#include "third_party/tbb/detail/_template_helpers.h"
+#include "third_party/tbb/detail/_template_helpers.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/detail/_allocator_traits.h b/third_party/tbb/detail/_allocator_traits.hh
similarity index 97%
rename from third_party/tbb/detail/_allocator_traits.h
rename to third_party/tbb/detail/_allocator_traits.hh
index 366cc63d1..683d4261f 100644
--- a/third_party/tbb/detail/_allocator_traits.h
+++ b/third_party/tbb/detail/_allocator_traits.hh
@@ -18,8 +18,8 @@
 #ifndef __TBB_detail__allocator_traits_H
 #define __TBB_detail__allocator_traits_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_template_helpers.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
 #include "third_party/libcxx/memory"
 #include "third_party/libcxx/type_traits"
 
diff --git a/third_party/tbb/detail/_assert.h b/third_party/tbb/detail/_assert.hh
similarity index 98%
rename from third_party/tbb/detail/_assert.h
rename to third_party/tbb/detail/_assert.hh
index 0d1210860..ec31f48bc 100644
--- a/third_party/tbb/detail/_assert.h
+++ b/third_party/tbb/detail/_assert.hh
@@ -18,7 +18,7 @@
 #ifndef __TBB_detail__assert_H
 #define __TBB_detail__assert_H
 
-#include "third_party/tbb/detail/_config.h"
+#include "third_party/tbb/detail/_config.hh"
 
 #if __TBBMALLOC_BUILD
 namespace rml { namespace internal {
diff --git a/third_party/tbb/detail/_attach.h b/third_party/tbb/detail/_attach.hh
similarity index 95%
rename from third_party/tbb/detail/_attach.h
rename to third_party/tbb/detail/_attach.hh
index ddf21d590..3e8050013 100644
--- a/third_party/tbb/detail/_attach.h
+++ b/third_party/tbb/detail/_attach.hh
@@ -18,7 +18,7 @@
 #ifndef __TBB_detail__attach_H
 #define __TBB_detail__attach_H
 
-#include "third_party/tbb/detail/_config.h"
+#include "third_party/tbb/detail/_config.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/detail/_concurrent_queue_base.h b/third_party/tbb/detail/_concurrent_queue_base.hh
similarity index 98%
rename from third_party/tbb/detail/_concurrent_queue_base.h
rename to third_party/tbb/detail/_concurrent_queue_base.hh
index 2cec3e168..d2619af0d 100644
--- a/third_party/tbb/detail/_concurrent_queue_base.h
+++ b/third_party/tbb/detail/_concurrent_queue_base.hh
@@ -18,14 +18,14 @@
 #ifndef __TBB_detail__concurrent_queue_base_H
 #define __TBB_detail__concurrent_queue_base_H
 
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_machine.h"
-#include "third_party/tbb/detail/_allocator_traits.h"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_machine.hh"
+#include "third_party/tbb/detail/_allocator_traits.hh"
 
-#include "third_party/tbb/profiling.h"
-#include "third_party/tbb/spin_mutex.h"
-#include "third_party/tbb/cache_aligned_allocator.h"
+#include "third_party/tbb/profiling.hh"
+#include "third_party/tbb/spin_mutex.hh"
+#include "third_party/tbb/cache_aligned_allocator.hh"
 
 #include "third_party/libcxx/atomic"
 
diff --git a/third_party/tbb/detail/_concurrent_skip_list.h b/third_party/tbb/detail/_concurrent_skip_list.hh
similarity index 99%
rename from third_party/tbb/detail/_concurrent_skip_list.h
rename to third_party/tbb/detail/_concurrent_skip_list.hh
index df1f80f07..1a74298dc 100644
--- a/third_party/tbb/detail/_concurrent_skip_list.h
+++ b/third_party/tbb/detail/_concurrent_skip_list.hh
@@ -22,15 +22,15 @@
 #error Do not #include this internal file directly; use public TBB headers instead.
 #endif
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_range_common.h"
-#include "third_party/tbb/detail/_allocator_traits.h"
-#include "third_party/tbb/detail/_template_helpers.h"
-#include "third_party/tbb/detail/_node_handle.h"
-#include "third_party/tbb/detail/_containers_helpers.h"
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/enumerable_thread_specific.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_range_common.hh"
+#include "third_party/tbb/detail/_allocator_traits.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
+#include "third_party/tbb/detail/_node_handle.hh"
+#include "third_party/tbb/detail/_containers_helpers.hh"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/enumerable_thread_specific.hh"
 #include "third_party/libcxx/utility"
 #include "third_party/libcxx/initializer_list"
 #include "third_party/libcxx/atomic"
diff --git a/third_party/tbb/detail/_concurrent_unordered_base.h b/third_party/tbb/detail/_concurrent_unordered_base.hh
similarity index 99%
rename from third_party/tbb/detail/_concurrent_unordered_base.h
rename to third_party/tbb/detail/_concurrent_unordered_base.hh
index 9dd0ad499..01895a5f2 100644
--- a/third_party/tbb/detail/_concurrent_unordered_base.h
+++ b/third_party/tbb/detail/_concurrent_unordered_base.hh
@@ -22,15 +22,15 @@
 #error Do not #include this internal file directly; use public TBB headers instead.
 #endif
 
-#include "third_party/tbb/detail/_range_common.h"
-#include "third_party/tbb/detail/_containers_helpers.h"
-#include "third_party/tbb/detail/_segment_table.h"
-#include "third_party/tbb/detail/_hash_compare.h"
-#include "third_party/tbb/detail/_allocator_traits.h"
-#include "third_party/tbb/detail/_node_handle.h"
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_exception.h"
+#include "third_party/tbb/detail/_range_common.hh"
+#include "third_party/tbb/detail/_containers_helpers.hh"
+#include "third_party/tbb/detail/_segment_table.hh"
+#include "third_party/tbb/detail/_hash_compare.hh"
+#include "third_party/tbb/detail/_allocator_traits.hh"
+#include "third_party/tbb/detail/_node_handle.hh"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_exception.hh"
 #include "third_party/libcxx/iterator"
 #include "third_party/libcxx/utility"
 #include "third_party/libcxx/functional"
diff --git a/third_party/tbb/detail/_config.h b/third_party/tbb/detail/_config.hh
similarity index 99%
rename from third_party/tbb/detail/_config.h
rename to third_party/tbb/detail/_config.hh
index ae3383243..03cff9ba2 100644
--- a/third_party/tbb/detail/_config.h
+++ b/third_party/tbb/detail/_config.hh
@@ -35,7 +35,7 @@
 #endif
 #endif
 
-#include "third_party/tbb/detail/_export.h"
+#include "third_party/tbb/detail/_export.hh"
 
 #if _MSC_VER
     #define __TBB_EXPORTED_FUNC   __cdecl
diff --git a/third_party/tbb/detail/_containers_helpers.h b/third_party/tbb/detail/_containers_helpers.hh
similarity index 96%
rename from third_party/tbb/detail/_containers_helpers.h
rename to third_party/tbb/detail/_containers_helpers.hh
index a583a911c..103b9c8c8 100644
--- a/third_party/tbb/detail/_containers_helpers.h
+++ b/third_party/tbb/detail/_containers_helpers.hh
@@ -18,8 +18,8 @@
 #ifndef __TBB_detail__containers_helpers_H
 #define __TBB_detail__containers_helpers_H
 
-#include "third_party/tbb/detail/_template_helpers.h"
-#include "third_party/tbb/detail/_allocator_traits.h"
+#include "third_party/tbb/detail/_template_helpers.hh"
+#include "third_party/tbb/detail/_allocator_traits.hh"
 #include "third_party/libcxx/type_traits"
 #include "third_party/libcxx/memory"
 #include "third_party/libcxx/functional"
diff --git a/third_party/tbb/detail/_exception.h b/third_party/tbb/detail/_exception.hh
similarity index 98%
rename from third_party/tbb/detail/_exception.h
rename to third_party/tbb/detail/_exception.hh
index e209862f2..249744094 100644
--- a/third_party/tbb/detail/_exception.h
+++ b/third_party/tbb/detail/_exception.hh
@@ -18,7 +18,7 @@
 #ifndef __TBB__exception_H
 #define __TBB__exception_H
 
-#include "third_party/tbb/detail/_config.h"
+#include "third_party/tbb/detail/_config.hh"
 
 #include "third_party/libcxx/new"          // std::bad_alloc
 #include "third_party/libcxx/exception"    // std::exception
diff --git a/third_party/tbb/detail/_export.h b/third_party/tbb/detail/_export.hh
similarity index 100%
rename from third_party/tbb/detail/_export.h
rename to third_party/tbb/detail/_export.hh
diff --git a/third_party/tbb/detail/_flow_graph_body_impl.h b/third_party/tbb/detail/_flow_graph_body_impl.hh
similarity index 100%
rename from third_party/tbb/detail/_flow_graph_body_impl.h
rename to third_party/tbb/detail/_flow_graph_body_impl.hh
diff --git a/third_party/tbb/detail/_flow_graph_cache_impl.h b/third_party/tbb/detail/_flow_graph_cache_impl.hh
similarity index 100%
rename from third_party/tbb/detail/_flow_graph_cache_impl.h
rename to third_party/tbb/detail/_flow_graph_cache_impl.hh
diff --git a/third_party/tbb/detail/_flow_graph_impl.h b/third_party/tbb/detail/_flow_graph_impl.hh
similarity index 98%
rename from third_party/tbb/detail/_flow_graph_impl.h
rename to third_party/tbb/detail/_flow_graph_impl.hh
index 38ee6bf9e..3b1153537 100644
--- a/third_party/tbb/detail/_flow_graph_impl.h
+++ b/third_party/tbb/detail/_flow_graph_impl.hh
@@ -19,12 +19,12 @@
 #define __TBB_flow_graph_impl_H
 
 // // MISSING #include "../config.h"
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/task_group.h"
-#include "third_party/tbb/task_arena.h"
-#include "third_party/tbb/flow_graph_abstractions.h"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/task_group.hh"
+#include "third_party/tbb/task_arena.hh"
+#include "third_party/tbb/flow_graph_abstractions.hh"
 
-#include "third_party/tbb/concurrent_priority_queue.h"
+#include "third_party/tbb/concurrent_priority_queue.hh"
 
 #include "third_party/libcxx/list"
 
diff --git a/third_party/tbb/detail/_flow_graph_indexer_impl.h b/third_party/tbb/detail/_flow_graph_indexer_impl.hh
similarity index 99%
rename from third_party/tbb/detail/_flow_graph_indexer_impl.h
rename to third_party/tbb/detail/_flow_graph_indexer_impl.hh
index fdb4f6ab6..ab69b7b50 100644
--- a/third_party/tbb/detail/_flow_graph_indexer_impl.h
+++ b/third_party/tbb/detail/_flow_graph_indexer_impl.hh
@@ -24,7 +24,7 @@
 
 // included in namespace tbb::detail::d1
 
-#include "third_party/tbb/detail/_flow_graph_types_impl.h"
+#include "third_party/tbb/detail/_flow_graph_types_impl.hh"
 
     // Output of the indexer_node is a tbb::flow::tagged_msg, and will be of
     // the form  tagged_msg<tag, result>
diff --git a/third_party/tbb/detail/_flow_graph_item_buffer_impl.h b/third_party/tbb/detail/_flow_graph_item_buffer_impl.hh
similarity index 99%
rename from third_party/tbb/detail/_flow_graph_item_buffer_impl.h
rename to third_party/tbb/detail/_flow_graph_item_buffer_impl.hh
index 6cce8b62c..c64f71b13 100644
--- a/third_party/tbb/detail/_flow_graph_item_buffer_impl.h
+++ b/third_party/tbb/detail/_flow_graph_item_buffer_impl.hh
@@ -22,7 +22,7 @@
 #error Do not #include this internal file directly; use public TBB headers instead.
 #endif
 
-#include "third_party/tbb/detail/_aligned_space.h"
+#include "third_party/tbb/detail/_aligned_space.hh"
 
 // in namespace tbb::flow::interfaceX (included in _flow_graph_node_impl.h)
 
diff --git a/third_party/tbb/detail/_flow_graph_join_impl.h b/third_party/tbb/detail/_flow_graph_join_impl.hh
similarity index 99%
rename from third_party/tbb/detail/_flow_graph_join_impl.h
rename to third_party/tbb/detail/_flow_graph_join_impl.hh
index 1253a0662..6adc26d5e 100644
--- a/third_party/tbb/detail/_flow_graph_join_impl.h
+++ b/third_party/tbb/detail/_flow_graph_join_impl.hh
@@ -502,7 +502,7 @@
         queueing_forwarding_base *my_join;
     };  // queueing_port
 
-#include "third_party/tbb/detail/_flow_graph_tagged_buffer_impl.h"
+#include "third_party/tbb/detail/_flow_graph_tagged_buffer_impl.hh"
 
     template<typename K>
     struct count_element {
diff --git a/third_party/tbb/detail/_flow_graph_node_impl.h b/third_party/tbb/detail/_flow_graph_node_impl.hh
similarity index 99%
rename from third_party/tbb/detail/_flow_graph_node_impl.h
rename to third_party/tbb/detail/_flow_graph_node_impl.hh
index 20a3741d0..252da656f 100644
--- a/third_party/tbb/detail/_flow_graph_node_impl.h
+++ b/third_party/tbb/detail/_flow_graph_node_impl.hh
@@ -22,7 +22,7 @@
 #error Do not #include this internal file directly; use public TBB headers instead.
 #endif
 
-#include "third_party/tbb/detail/_flow_graph_item_buffer_impl.h"
+#include "third_party/tbb/detail/_flow_graph_item_buffer_impl.hh"
 
 template< typename T, typename A >
 class function_input_queue : public item_buffer<T,A> {
diff --git a/third_party/tbb/detail/_flow_graph_node_set_impl.h b/third_party/tbb/detail/_flow_graph_node_set_impl.hh
similarity index 100%
rename from third_party/tbb/detail/_flow_graph_node_set_impl.h
rename to third_party/tbb/detail/_flow_graph_node_set_impl.hh
diff --git a/third_party/tbb/detail/_flow_graph_nodes_deduction.h b/third_party/tbb/detail/_flow_graph_nodes_deduction.hh
similarity index 100%
rename from third_party/tbb/detail/_flow_graph_nodes_deduction.h
rename to third_party/tbb/detail/_flow_graph_nodes_deduction.hh
diff --git a/third_party/tbb/detail/_flow_graph_tagged_buffer_impl.h b/third_party/tbb/detail/_flow_graph_tagged_buffer_impl.hh
similarity index 100%
rename from third_party/tbb/detail/_flow_graph_tagged_buffer_impl.h
rename to third_party/tbb/detail/_flow_graph_tagged_buffer_impl.hh
diff --git a/third_party/tbb/detail/_flow_graph_trace_impl.h b/third_party/tbb/detail/_flow_graph_trace_impl.hh
similarity index 99%
rename from third_party/tbb/detail/_flow_graph_trace_impl.h
rename to third_party/tbb/detail/_flow_graph_trace_impl.hh
index dc9c857be..6551a0793 100644
--- a/third_party/tbb/detail/_flow_graph_trace_impl.h
+++ b/third_party/tbb/detail/_flow_graph_trace_impl.hh
@@ -18,7 +18,7 @@
 #ifndef _FGT_GRAPH_TRACE_IMPL_H
 #define _FGT_GRAPH_TRACE_IMPL_H
 
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/profiling.hh"
 #if (_MSC_VER >= 1900)
     // MISSING #include <intrin.h>
 #endif
diff --git a/third_party/tbb/detail/_flow_graph_types_impl.h b/third_party/tbb/detail/_flow_graph_types_impl.hh
similarity index 100%
rename from third_party/tbb/detail/_flow_graph_types_impl.h
rename to third_party/tbb/detail/_flow_graph_types_impl.hh
diff --git a/third_party/tbb/detail/_hash_compare.h b/third_party/tbb/detail/_hash_compare.hh
similarity index 98%
rename from third_party/tbb/detail/_hash_compare.h
rename to third_party/tbb/detail/_hash_compare.hh
index 2ad1551d0..64675e86d 100644
--- a/third_party/tbb/detail/_hash_compare.h
+++ b/third_party/tbb/detail/_hash_compare.hh
@@ -20,7 +20,7 @@
 
 #include "third_party/libcxx/functional"
 
-#include "third_party/tbb/detail/_containers_helpers.h"
+#include "third_party/tbb/detail/_containers_helpers.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/detail/_intrusive_list_node.h b/third_party/tbb/detail/_intrusive_list_node.hh
similarity index 100%
rename from third_party/tbb/detail/_intrusive_list_node.h
rename to third_party/tbb/detail/_intrusive_list_node.hh
diff --git a/third_party/tbb/detail/_machine.h b/third_party/tbb/detail/_machine.hh
similarity index 99%
rename from third_party/tbb/detail/_machine.h
rename to third_party/tbb/detail/_machine.hh
index 5e9df02ba..54fc5f117 100644
--- a/third_party/tbb/detail/_machine.h
+++ b/third_party/tbb/detail/_machine.hh
@@ -18,8 +18,8 @@
 #ifndef __TBB_detail__machine_H
 #define __TBB_detail__machine_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_assert.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_assert.hh"
 
 #include "third_party/libcxx/atomic"
 #include "third_party/libcxx/climits"
diff --git a/third_party/tbb/detail/_mutex_common.h b/third_party/tbb/detail/_mutex_common.hh
similarity index 96%
rename from third_party/tbb/detail/_mutex_common.h
rename to third_party/tbb/detail/_mutex_common.hh
index 3392df0f5..47d83e66c 100644
--- a/third_party/tbb/detail/_mutex_common.h
+++ b/third_party/tbb/detail/_mutex_common.hh
@@ -18,8 +18,8 @@
 #ifndef __TBB_detail__mutex_common_H
 #define __TBB_detail__mutex_common_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_utils.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_utils.hh"
 
 #if __TBB_CPP20_CONCEPTS_PRESENT
 // MISSING #include <concepts>
diff --git a/third_party/tbb/detail/_namespace_injection.h b/third_party/tbb/detail/_namespace_injection.hh
similarity index 100%
rename from third_party/tbb/detail/_namespace_injection.h
rename to third_party/tbb/detail/_namespace_injection.hh
diff --git a/third_party/tbb/detail/_node_handle.h b/third_party/tbb/detail/_node_handle.hh
similarity index 98%
rename from third_party/tbb/detail/_node_handle.h
rename to third_party/tbb/detail/_node_handle.hh
index 29bec49af..ddc323460 100644
--- a/third_party/tbb/detail/_node_handle.h
+++ b/third_party/tbb/detail/_node_handle.hh
@@ -18,8 +18,8 @@
 #ifndef __TBB_detail__node_handle_H
 #define __TBB_detail__node_handle_H
 
-#include "third_party/tbb/detail/_allocator_traits.h"
-#include "third_party/tbb/detail/_assert.h"
+#include "third_party/tbb/detail/_allocator_traits.hh"
+#include "third_party/tbb/detail/_assert.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/detail/_pipeline_filters.h b/third_party/tbb/detail/_pipeline_filters.hh
similarity index 98%
rename from third_party/tbb/detail/_pipeline_filters.h
rename to third_party/tbb/detail/_pipeline_filters.hh
index 48f453dbb..b0201f4a3 100644
--- a/third_party/tbb/detail/_pipeline_filters.h
+++ b/third_party/tbb/detail/_pipeline_filters.hh
@@ -18,10 +18,10 @@
 #ifndef __TBB_parallel_filters_H
 #define __TBB_parallel_filters_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/detail/_pipeline_filters_deduction.h"
-#include "third_party/tbb/tbb_allocator.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/detail/_pipeline_filters_deduction.hh"
+#include "third_party/tbb/tbb_allocator.hh"
 
 #include "third_party/libcxx/cstddef"
 #include "third_party/libcxx/cstdint"
diff --git a/third_party/tbb/detail/_pipeline_filters_deduction.h b/third_party/tbb/detail/_pipeline_filters_deduction.hh
similarity index 97%
rename from third_party/tbb/detail/_pipeline_filters_deduction.h
rename to third_party/tbb/detail/_pipeline_filters_deduction.hh
index ad183f4cb..0ab2570bd 100644
--- a/third_party/tbb/detail/_pipeline_filters_deduction.h
+++ b/third_party/tbb/detail/_pipeline_filters_deduction.hh
@@ -18,7 +18,7 @@
 #ifndef __TBB__pipeline_filters_deduction_H
 #define __TBB__pipeline_filters_deduction_H
 
-#include "third_party/tbb/detail/_config.h"
+#include "third_party/tbb/detail/_config.hh"
 #include "third_party/libcxx/utility"
 #include "third_party/libcxx/type_traits"
 
diff --git a/third_party/tbb/detail/_range_common.h b/third_party/tbb/detail/_range_common.hh
similarity index 98%
rename from third_party/tbb/detail/_range_common.h
rename to third_party/tbb/detail/_range_common.hh
index 15f4d2bea..5a2d7234b 100644
--- a/third_party/tbb/detail/_range_common.h
+++ b/third_party/tbb/detail/_range_common.hh
@@ -18,8 +18,8 @@
 #ifndef __TBB_detail__range_common_H
 #define __TBB_detail__range_common_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_utils.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_utils.hh"
 #if __TBB_CPP20_CONCEPTS_PRESENT
 // MISSING #include <concepts>
 #endif
diff --git a/third_party/tbb/detail/_rtm_mutex.h b/third_party/tbb/detail/_rtm_mutex.hh
similarity index 96%
rename from third_party/tbb/detail/_rtm_mutex.h
rename to third_party/tbb/detail/_rtm_mutex.hh
index 0633bb6f6..8b5337b4b 100644
--- a/third_party/tbb/detail/_rtm_mutex.h
+++ b/third_party/tbb/detail/_rtm_mutex.hh
@@ -18,11 +18,11 @@
 #ifndef __TBB__rtm_mutex_impl_H
 #define __TBB__rtm_mutex_impl_H
 
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/spin_mutex.h"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/spin_mutex.hh"
 
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/profiling.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/detail/_rtm_rw_mutex.h b/third_party/tbb/detail/_rtm_rw_mutex.hh
similarity index 98%
rename from third_party/tbb/detail/_rtm_rw_mutex.h
rename to third_party/tbb/detail/_rtm_rw_mutex.hh
index 2f2d53e49..b0698e2ec 100644
--- a/third_party/tbb/detail/_rtm_rw_mutex.h
+++ b/third_party/tbb/detail/_rtm_rw_mutex.hh
@@ -18,9 +18,9 @@
 #ifndef __TBB_detail__rtm_rw_mutex_H
 #define __TBB_detail__rtm_rw_mutex_H
 
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/spin_rw_mutex.h"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/spin_rw_mutex.hh"
 
 #include "third_party/libcxx/atomic"
 
diff --git a/third_party/tbb/detail/_scoped_lock.h b/third_party/tbb/detail/_scoped_lock.hh
similarity index 100%
rename from third_party/tbb/detail/_scoped_lock.h
rename to third_party/tbb/detail/_scoped_lock.hh
diff --git a/third_party/tbb/detail/_segment_table.h b/third_party/tbb/detail/_segment_table.hh
similarity index 98%
rename from third_party/tbb/detail/_segment_table.h
rename to third_party/tbb/detail/_segment_table.hh
index a9f570a72..c6682f8b2 100644
--- a/third_party/tbb/detail/_segment_table.h
+++ b/third_party/tbb/detail/_segment_table.hh
@@ -18,12 +18,12 @@
 #ifndef __TBB_detail__segment_table_H
 #define __TBB_detail__segment_table_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_allocator_traits.h"
-#include "third_party/tbb/detail/_template_helpers.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_exception.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_allocator_traits.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_exception.hh"
 #include "third_party/libcxx/atomic"
 #include "third_party/libcxx/type_traits"
 #include "third_party/libcxx/memory"
diff --git a/third_party/tbb/detail/_small_object_pool.h b/third_party/tbb/detail/_small_object_pool.hh
similarity index 96%
rename from third_party/tbb/detail/_small_object_pool.h
rename to third_party/tbb/detail/_small_object_pool.hh
index 114858597..ba04a7f35 100644
--- a/third_party/tbb/detail/_small_object_pool.h
+++ b/third_party/tbb/detail/_small_object_pool.hh
@@ -18,10 +18,10 @@
 #ifndef __TBB__small_object_pool_H
 #define __TBB__small_object_pool_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_assert.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_assert.hh"
 
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/profiling.hh"
 #include "third_party/libcxx/cstddef"
 #include "third_party/libcxx/cstdint"
 #include "third_party/libcxx/atomic"
diff --git a/third_party/tbb/detail/_string_resource.h b/third_party/tbb/detail/_string_resource.hh
similarity index 100%
rename from third_party/tbb/detail/_string_resource.h
rename to third_party/tbb/detail/_string_resource.hh
diff --git a/third_party/tbb/detail/_task.h b/third_party/tbb/detail/_task.hh
similarity index 96%
rename from third_party/tbb/detail/_task.h
rename to third_party/tbb/detail/_task.hh
index 0413c0bed..6b8c06a55 100644
--- a/third_party/tbb/detail/_task.h
+++ b/third_party/tbb/detail/_task.hh
@@ -18,12 +18,12 @@
 #ifndef __TBB__task_H
 #define __TBB__task_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_template_helpers.h"
-#include "third_party/tbb/detail/_small_object_pool.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
+#include "third_party/tbb/detail/_small_object_pool.hh"
 
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/profiling.hh"
 
 #include "third_party/libcxx/cstddef"
 #include "third_party/libcxx/cstdint"
diff --git a/third_party/tbb/detail/_task_handle.h b/third_party/tbb/detail/_task_handle.hh
similarity index 94%
rename from third_party/tbb/detail/_task_handle.h
rename to third_party/tbb/detail/_task_handle.hh
index c7bf32992..efa7d08e9 100644
--- a/third_party/tbb/detail/_task_handle.h
+++ b/third_party/tbb/detail/_task_handle.hh
@@ -19,10 +19,10 @@
 #ifndef __TBB_task_handle_H
 #define __TBB_task_handle_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/detail/_small_object_pool.h"
-#include "third_party/tbb/detail/_utils.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/detail/_small_object_pool.hh"
+#include "third_party/tbb/detail/_utils.hh"
 #include "third_party/libcxx/memory"
 
 namespace tbb {
diff --git a/third_party/tbb/detail/_template_helpers.h b/third_party/tbb/detail/_template_helpers.hh
similarity index 99%
rename from third_party/tbb/detail/_template_helpers.h
rename to third_party/tbb/detail/_template_helpers.hh
index e27ff363e..dc3e695dc 100644
--- a/third_party/tbb/detail/_template_helpers.h
+++ b/third_party/tbb/detail/_template_helpers.hh
@@ -18,8 +18,8 @@
 #ifndef __TBB_detail__template_helpers_H
 #define __TBB_detail__template_helpers_H
 
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_config.h"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_config.hh"
 
 #include "third_party/libcxx/cstddef"
 #include "third_party/libcxx/cstdint"
diff --git a/third_party/tbb/detail/_utils.h b/third_party/tbb/detail/_utils.hh
similarity index 99%
rename from third_party/tbb/detail/_utils.h
rename to third_party/tbb/detail/_utils.hh
index 09fb02561..c39d09739 100644
--- a/third_party/tbb/detail/_utils.h
+++ b/third_party/tbb/detail/_utils.hh
@@ -23,9 +23,9 @@
 #include "third_party/libcxx/atomic"
 #include "third_party/libcxx/functional"
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_machine.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_machine.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/detail/_waitable_atomic.h b/third_party/tbb/detail/_waitable_atomic.hh
similarity index 98%
rename from third_party/tbb/detail/_waitable_atomic.h
rename to third_party/tbb/detail/_waitable_atomic.hh
index 992f9a112..66f5460ed 100644
--- a/third_party/tbb/detail/_waitable_atomic.h
+++ b/third_party/tbb/detail/_waitable_atomic.hh
@@ -18,7 +18,7 @@
 #ifndef __TBB_detail__address_waiters_H
 #define __TBB_detail__address_waiters_H
 
-#include "third_party/tbb/detail/_utils.h"
+#include "third_party/tbb/detail/_utils.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/dynamic_link.cc b/third_party/tbb/dynamic_link.cc
index c20e88f2c..877f39c67 100644
--- a/third_party/tbb/dynamic_link.cc
+++ b/third_party/tbb/dynamic_link.cc
@@ -15,11 +15,11 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/dynamic_link.h"
-#include "third_party/tbb/environment.h"
+#include "third_party/tbb/dynamic_link.hh"
+#include "third_party/tbb/environment.hh"
 
-#include "third_party/tbb/detail/_template_helpers.h"
-#include "third_party/tbb/detail/_utils.h"
+#include "third_party/tbb/detail/_template_helpers.hh"
+#include "third_party/tbb/detail/_utils.hh"
 
 /*
     This file is used by both TBB and OpenMP RTL. Do not use __TBB_ASSERT() macro
diff --git a/third_party/tbb/dynamic_link.h b/third_party/tbb/dynamic_link.hh
similarity index 99%
rename from third_party/tbb/dynamic_link.h
rename to third_party/tbb/dynamic_link.hh
index a7af0072c..c38f09f3a 100644
--- a/third_party/tbb/dynamic_link.h
+++ b/third_party/tbb/dynamic_link.hh
@@ -20,7 +20,7 @@
 
 // Support for dynamic loading entry points from other shared libraries.
 
-#include "third_party/tbb/detail/_config.h"
+#include "third_party/tbb/detail/_config.hh"
 
 #include "third_party/libcxx/atomic"
 #include "third_party/libcxx/mutex"
diff --git a/third_party/tbb/enumerable_thread_specific.h b/third_party/tbb/enumerable_thread_specific.hh
similarity index 98%
rename from third_party/tbb/enumerable_thread_specific.h
rename to third_party/tbb/enumerable_thread_specific.hh
index 0bef0393d..c46cd7dc8 100644
--- a/third_party/tbb/enumerable_thread_specific.h
+++ b/third_party/tbb/enumerable_thread_specific.hh
@@ -18,23 +18,23 @@
 #ifndef __TBB_enumerable_thread_specific_H
 #define __TBB_enumerable_thread_specific_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_template_helpers.h"
-#include "third_party/tbb/detail/_aligned_space.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
+#include "third_party/tbb/detail/_aligned_space.hh"
 
-#include "third_party/tbb/concurrent_vector.h"
-#include "third_party/tbb/tbb_allocator.h"
-#include "third_party/tbb/cache_aligned_allocator.h"
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/concurrent_vector.hh"
+#include "third_party/tbb/tbb_allocator.hh"
+#include "third_party/tbb/cache_aligned_allocator.hh"
+#include "third_party/tbb/profiling.hh"
 
 #include "third_party/libcxx/atomic"
 #include "third_party/libcxx/thread"
 #include "third_party/libcxx/cstring" // memcpy
 #include "third_party/libcxx/cstddef" // std::ptrdiff_t
 
-#include "third_party/tbb/task.h" // for task::suspend_point
+#include "third_party/tbb/task.hh" // for task::suspend_point
 
 #if _WIN32 || _WIN64
 #include "libc/nt/accounting.h"
diff --git a/third_party/tbb/environment.h b/third_party/tbb/environment.hh
similarity index 100%
rename from third_party/tbb/environment.h
rename to third_party/tbb/environment.hh
diff --git a/third_party/tbb/exception.cc b/third_party/tbb/exception.cc
index 7668598f4..f92eb8e7a 100644
--- a/third_party/tbb/exception.cc
+++ b/third_party/tbb/exception.cc
@@ -15,9 +15,9 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_template_helpers.h"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
 
 #include "third_party/libcxx/cstring"
 #include "third_party/libcxx/cstdio"
diff --git a/third_party/tbb/flow_graph.h b/third_party/tbb/flow_graph.hh
similarity index 98%
rename from third_party/tbb/flow_graph.h
rename to third_party/tbb/flow_graph.hh
index 7b0343ddc..77d234859 100644
--- a/third_party/tbb/flow_graph.h
+++ b/third_party/tbb/flow_graph.hh
@@ -22,23 +22,23 @@
 #include "third_party/libcxx/memory"
 #include "third_party/libcxx/type_traits"
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/spin_mutex.h"
-#include "third_party/tbb/null_mutex.h"
-#include "third_party/tbb/spin_rw_mutex.h"
-#include "third_party/tbb/null_rw_mutex.h"
-#include "third_party/tbb/detail/_pipeline_filters.h"
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/detail/_small_object_pool.h"
-#include "third_party/tbb/cache_aligned_allocator.h"
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_template_helpers.h"
-#include "third_party/tbb/detail/_aggregator.h"
-#include "third_party/tbb/detail/_allocator_traits.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/profiling.h"
-#include "third_party/tbb/task_arena.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/spin_mutex.hh"
+#include "third_party/tbb/null_mutex.hh"
+#include "third_party/tbb/spin_rw_mutex.hh"
+#include "third_party/tbb/null_rw_mutex.hh"
+#include "third_party/tbb/detail/_pipeline_filters.hh"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/detail/_small_object_pool.hh"
+#include "third_party/tbb/cache_aligned_allocator.hh"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
+#include "third_party/tbb/detail/_aggregator.hh"
+#include "third_party/tbb/detail/_allocator_traits.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/profiling.hh"
+#include "third_party/tbb/task_arena.hh"
 
 #if TBB_USE_PROFILING_TOOLS && ( __unix__ || __APPLE__ )
    #if __INTEL_COMPILER
@@ -159,7 +159,7 @@ template<typename Order, typename... Args> struct node_set;
 } // namespace tbb
 
 //! The graph class
-#include "third_party/tbb/detail/_flow_graph_impl.h"
+#include "third_party/tbb/detail/_flow_graph_impl.hh"
 
 namespace tbb {
 namespace detail {
@@ -388,16 +388,16 @@ protected:
 } // detail
 } // tbb
 
-#include "third_party/tbb/detail/_flow_graph_trace_impl.h"
-#include "third_party/tbb/detail/_hash_compare.h"
+#include "third_party/tbb/detail/_flow_graph_trace_impl.hh"
+#include "third_party/tbb/detail/_hash_compare.hh"
 
 namespace tbb {
 namespace detail {
 namespace d1 {
 
-#include "third_party/tbb/detail/_flow_graph_body_impl.h"
-#include "third_party/tbb/detail/_flow_graph_cache_impl.h"
-#include "third_party/tbb/detail/_flow_graph_types_impl.h"
+#include "third_party/tbb/detail/_flow_graph_body_impl.hh"
+#include "third_party/tbb/detail/_flow_graph_cache_impl.hh"
+#include "third_party/tbb/detail/_flow_graph_types_impl.hh"
 
 using namespace graph_policy_namespace;
 
@@ -529,7 +529,7 @@ inline graph_node::~graph_node() {
     my_graph.remove_node(this);
 }
 
-#include "third_party/tbb/detail/_flow_graph_node_impl.h"
+#include "third_party/tbb/detail/_flow_graph_node_impl.hh"
 
 
 //! An executable node that acts as a source, i.e. it has no predecessors
@@ -2134,7 +2134,7 @@ protected:
     }
 };  // limiter_node
 
-#include "third_party/tbb/detail/_flow_graph_join_impl.h"
+#include "third_party/tbb/detail/_flow_graph_join_impl.hh"
 
 template<typename OutputTuple, typename JP=queueing> class join_node;
 
@@ -2323,7 +2323,7 @@ public:
 };
 
 // indexer node
-#include "third_party/tbb/detail/_flow_graph_indexer_impl.h"
+#include "third_party/tbb/detail/_flow_graph_indexer_impl.hh"
 
 // TODO: Implement interface with variadic template or tuple
 template<typename T0, typename T1=null_type, typename T2=null_type, typename T3=null_type,
@@ -3013,7 +3013,7 @@ protected:
     }
 };
 
-#include "third_party/tbb/detail/_flow_graph_node_set_impl.h"
+#include "third_party/tbb/detail/_flow_graph_node_set_impl.hh"
 
 template< typename T >
 class overwrite_node : public graph_node, public receiver<T>, public sender<T> {
@@ -3300,7 +3300,7 @@ inline void set_name(const async_node<Input, Output, Policy>& node, const char *
 
 
 // Include deduction guides for node classes
-#include "third_party/tbb/detail/_flow_graph_nodes_deduction.h"
+#include "third_party/tbb/detail/_flow_graph_nodes_deduction.hh"
 
 namespace tbb {
 namespace flow {
diff --git a/third_party/tbb/flow_graph_abstractions.h b/third_party/tbb/flow_graph_abstractions.hh
similarity index 100%
rename from third_party/tbb/flow_graph_abstractions.h
rename to third_party/tbb/flow_graph_abstractions.hh
diff --git a/third_party/tbb/global_control.cc b/third_party/tbb/global_control.cc
index 8d84e61ca..8b15b9837 100644
--- a/third_party/tbb/global_control.cc
+++ b/third_party/tbb/global_control.cc
@@ -15,17 +15,17 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_template_helpers.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
 
-#include "third_party/tbb/global_control.h"
-#include "third_party/tbb/tbb_allocator.h"
-#include "third_party/tbb/spin_mutex.h"
+#include "third_party/tbb/global_control.hh"
+#include "third_party/tbb/tbb_allocator.hh"
+#include "third_party/tbb/spin_mutex.hh"
 
-#include "third_party/tbb/governor.h"
-#include "third_party/tbb/threading_control.h"
-#include "third_party/tbb/market.h"
-#include "third_party/tbb/misc.h"
+#include "third_party/tbb/governor.hh"
+#include "third_party/tbb/threading_control.hh"
+#include "third_party/tbb/market.hh"
+#include "third_party/tbb/misc.hh"
 
 #include "third_party/libcxx/atomic"
 #include "third_party/libcxx/set"
diff --git a/third_party/tbb/global_control.h b/third_party/tbb/global_control.hh
similarity index 95%
rename from third_party/tbb/global_control.h
rename to third_party/tbb/global_control.hh
index 9740b5700..d471c16d6 100644
--- a/third_party/tbb/global_control.h
+++ b/third_party/tbb/global_control.hh
@@ -18,13 +18,13 @@
 #ifndef __TBB_global_control_H
 #define __TBB_global_control_H
 
-#include "third_party/tbb/detail/_config.h"
+#include "third_party/tbb/detail/_config.hh"
 
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_attach.h"
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_template_helpers.h"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_attach.hh"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
 
 #include "third_party/libcxx/cstddef"
 #include "third_party/libcxx/new" // std::nothrow_t
diff --git a/third_party/tbb/governor.cc b/third_party/tbb/governor.cc
index 91f3db3a1..8e6e4e077 100644
--- a/third_party/tbb/governor.cc
+++ b/third_party/tbb/governor.cc
@@ -15,22 +15,22 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/governor.h"
-#include "third_party/tbb/threading_control.h"
-#include "third_party/tbb/main.h"
-#include "third_party/tbb/thread_data.h"
-#include "third_party/tbb/market.h"
-#include "third_party/tbb/arena.h"
-#include "third_party/tbb/dynamic_link.h"
-#include "third_party/tbb/concurrent_monitor.h"
-#include "third_party/tbb/thread_dispatcher.h"
+#include "third_party/tbb/governor.hh"
+#include "third_party/tbb/threading_control.hh"
+#include "third_party/tbb/main.hh"
+#include "third_party/tbb/thread_data.hh"
+#include "third_party/tbb/market.hh"
+#include "third_party/tbb/arena.hh"
+#include "third_party/tbb/dynamic_link.hh"
+#include "third_party/tbb/concurrent_monitor.hh"
+#include "third_party/tbb/thread_dispatcher.hh"
 
-#include "third_party/tbb/task_group.h"
-#include "third_party/tbb/global_control.h"
-#include "third_party/tbb/tbb_allocator.h"
-#include "third_party/tbb/info.h"
+#include "third_party/tbb/task_group.hh"
+#include "third_party/tbb/global_control.hh"
+#include "third_party/tbb/tbb_allocator.hh"
+#include "third_party/tbb/info.hh"
 
-#include "third_party/tbb/task_dispatcher.h"
+#include "third_party/tbb/task_dispatcher.hh"
 
 #include "third_party/libcxx/cstdio"
 #include "third_party/libcxx/cstdlib"
diff --git a/third_party/tbb/governor.h b/third_party/tbb/governor.hh
similarity index 97%
rename from third_party/tbb/governor.h
rename to third_party/tbb/governor.hh
index b1efe08c8..02e9a1117 100644
--- a/third_party/tbb/governor.h
+++ b/third_party/tbb/governor.hh
@@ -18,10 +18,10 @@
 #ifndef _TBB_governor_H
 #define _TBB_governor_H
 
-#include "third_party/tbb/rml_tbb.h"
+#include "third_party/tbb/rml_tbb.hh"
 
-#include "third_party/tbb/misc.h" // for AvailableHwConcurrency
-#include "third_party/tbb/tls.h"
+#include "third_party/tbb/misc.hh" // for AvailableHwConcurrency
+#include "third_party/tbb/tls.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/info.h b/third_party/tbb/info.hh
similarity index 97%
rename from third_party/tbb/info.h
rename to third_party/tbb/info.hh
index b90d38bb2..87bead85a 100644
--- a/third_party/tbb/info.h
+++ b/third_party/tbb/info.hh
@@ -18,8 +18,8 @@
 #ifndef __TBB_info_H
 #define __TBB_info_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
 
 #if __TBB_ARENA_BINDING
 #include "third_party/libcxx/vector"
diff --git a/third_party/tbb/intrusive_list.h b/third_party/tbb/intrusive_list.hh
similarity index 99%
rename from third_party/tbb/intrusive_list.h
rename to third_party/tbb/intrusive_list.hh
index c0f1b19e2..fafa27765 100644
--- a/third_party/tbb/intrusive_list.h
+++ b/third_party/tbb/intrusive_list.hh
@@ -18,7 +18,7 @@
 #ifndef _TBB_intrusive_list_H
 #define _TBB_intrusive_list_H
 
-#include "third_party/tbb/detail/_intrusive_list_node.h"
+#include "third_party/tbb/detail/_intrusive_list_node.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/itt_notify.h b/third_party/tbb/itt_notify.hh
similarity index 98%
rename from third_party/tbb/itt_notify.h
rename to third_party/tbb/itt_notify.hh
index eba910d27..c756ec25a 100644
--- a/third_party/tbb/itt_notify.h
+++ b/third_party/tbb/itt_notify.hh
@@ -18,7 +18,7 @@
 #ifndef _TBB_ITT_NOTIFY
 #define _TBB_ITT_NOTIFY
 
-#include "third_party/tbb/detail/_config.h"
+#include "third_party/tbb/detail/_config.hh"
 
 #if __TBB_USE_ITT_NOTIFY
 
diff --git a/third_party/tbb/mailbox.h b/third_party/tbb/mailbox.hh
similarity index 98%
rename from third_party/tbb/mailbox.h
rename to third_party/tbb/mailbox.hh
index 3cb2f0646..415cecfef 100644
--- a/third_party/tbb/mailbox.h
+++ b/third_party/tbb/mailbox.hh
@@ -18,10 +18,10 @@
 #ifndef _TBB_mailbox_H
 #define _TBB_mailbox_H
 
-#include "third_party/tbb/cache_aligned_allocator.h"
-#include "third_party/tbb/detail/_small_object_pool.h"
+#include "third_party/tbb/cache_aligned_allocator.hh"
+#include "third_party/tbb/detail/_small_object_pool.hh"
 
-#include "third_party/tbb/scheduler_common.h"
+#include "third_party/tbb/scheduler_common.hh"
 
 #include "third_party/libcxx/atomic"
 
diff --git a/third_party/tbb/main.cc b/third_party/tbb/main.cc
index 734913362..72ce01e67 100644
--- a/third_party/tbb/main.cc
+++ b/third_party/tbb/main.cc
@@ -15,15 +15,15 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/detail/_config.h"
+#include "third_party/tbb/detail/_config.hh"
 
-#include "third_party/tbb/main.h"
-#include "third_party/tbb/governor.h"
-#include "third_party/tbb/threading_control.h"
-#include "third_party/tbb/environment.h"
-#include "third_party/tbb/market.h"
-#include "third_party/tbb/misc.h"
-#include "third_party/tbb/itt_notify.h"
+#include "third_party/tbb/main.hh"
+#include "third_party/tbb/governor.hh"
+#include "third_party/tbb/threading_control.hh"
+#include "third_party/tbb/environment.hh"
+#include "third_party/tbb/market.hh"
+#include "third_party/tbb/misc.hh"
+#include "third_party/tbb/itt_notify.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/main.h b/third_party/tbb/main.hh
similarity index 98%
rename from third_party/tbb/main.h
rename to third_party/tbb/main.hh
index c23f34bc5..a3aecf989 100644
--- a/third_party/tbb/main.h
+++ b/third_party/tbb/main.hh
@@ -18,7 +18,7 @@
 #ifndef _TBB_main_H
 #define _TBB_main_H
 
-#include "third_party/tbb/governor.h"
+#include "third_party/tbb/governor.hh"
 
 #include "third_party/libcxx/atomic"
 
diff --git a/third_party/tbb/market.cc b/third_party/tbb/market.cc
index 80a22b960..5b91ab428 100644
--- a/third_party/tbb/market.cc
+++ b/third_party/tbb/market.cc
@@ -15,8 +15,8 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/arena.h"
-#include "third_party/tbb/market.h"
+#include "third_party/tbb/arena.hh"
+#include "third_party/tbb/market.hh"
 
 #include "third_party/libcxx/algorithm" // std::find
 
diff --git a/third_party/tbb/market.h b/third_party/tbb/market.hh
similarity index 92%
rename from third_party/tbb/market.h
rename to third_party/tbb/market.hh
index 0367a19c4..37d823e37 100644
--- a/third_party/tbb/market.h
+++ b/third_party/tbb/market.hh
@@ -18,12 +18,12 @@
 #ifndef _TBB_market_H
 #define _TBB_market_H
 
-#include "third_party/tbb/rw_mutex.h"
-#include "third_party/tbb/tbb_allocator.h"
-#include "third_party/tbb/task_arena.h"
+#include "third_party/tbb/rw_mutex.hh"
+#include "third_party/tbb/tbb_allocator.hh"
+#include "third_party/tbb/task_arena.hh"
 
-#include "third_party/tbb/permit_manager.h"
-#include "third_party/tbb/pm_client.h"
+#include "third_party/tbb/permit_manager.hh"
+#include "third_party/tbb/pm_client.hh"
 
 #include "third_party/libcxx/atomic"
 #include "third_party/libcxx/vector"
diff --git a/third_party/tbb/memory_pool.h b/third_party/tbb/memory_pool.hh
similarity index 99%
rename from third_party/tbb/memory_pool.h
rename to third_party/tbb/memory_pool.hh
index 14f2393e0..bfe53980c 100644
--- a/third_party/tbb/memory_pool.h
+++ b/third_party/tbb/memory_pool.hh
@@ -23,7 +23,7 @@
 #endif
 /** @file */
 
-#include "third_party/tbb/scalable_allocator.h"
+#include "third_party/tbb/scalable_allocator.hh"
 
 #include "third_party/libcxx/new" // std::bad_alloc
 #include "third_party/libcxx/stdexcept" // std::runtime_error, std::invalid_argument
diff --git a/third_party/tbb/misc.cc b/third_party/tbb/misc.cc
index 5358252b8..36c318b81 100644
--- a/third_party/tbb/misc.cc
+++ b/third_party/tbb/misc.cc
@@ -18,15 +18,15 @@
 // Source file for miscellaneous entities that are infrequently referenced by
 // an executing program.
 
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_machine.h"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_machine.hh"
 
-#include "third_party/tbb/version.h"
+#include "third_party/tbb/version.hh"
 
-#include "third_party/tbb/misc.h"
-#include "third_party/tbb/governor.h"
-#include "third_party/tbb/assert_impl.h" // Out-of-line TBB assertion handling routines are instantiated here.
-#include "third_party/tbb/concurrent_monitor_mutex.h"
+#include "third_party/tbb/misc.hh"
+#include "third_party/tbb/governor.hh"
+#include "third_party/tbb/assert_impl.hh" // Out-of-line TBB assertion handling routines are instantiated here.
+#include "third_party/tbb/concurrent_monitor_mutex.hh"
 
 #include "third_party/libcxx/cstdio"
 #include "third_party/libcxx/cstdlib"
diff --git a/third_party/tbb/misc.h b/third_party/tbb/misc.hh
similarity index 98%
rename from third_party/tbb/misc.h
rename to third_party/tbb/misc.hh
index 7f8ab5038..9eb1760a3 100644
--- a/third_party/tbb/misc.h
+++ b/third_party/tbb/misc.hh
@@ -18,12 +18,12 @@
 #ifndef _TBB_tbb_misc_H
 #define _TBB_tbb_misc_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_utils.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_utils.hh"
 
 #if __TBB_ARENA_BINDING
-#include "third_party/tbb/info.h"
+#include "third_party/tbb/info.hh"
 #endif /*__TBB_ARENA_BINDING*/
 
 #if __unix__
diff --git a/third_party/tbb/misc_ex.cc b/third_party/tbb/misc_ex.cc
index feb0ad05f..d86a94922 100644
--- a/third_party/tbb/misc_ex.cc
+++ b/third_party/tbb/misc_ex.cc
@@ -18,11 +18,11 @@
 // Source file for miscellaneous entities that are infrequently referenced by
 // an executing program, and implementation of which requires dynamic linking.
 
-#include "third_party/tbb/misc.h"
+#include "third_party/tbb/misc.hh"
 
 #if !defined(__TBB_HardwareConcurrency)
 
-#include "third_party/tbb/dynamic_link.h"
+#include "third_party/tbb/dynamic_link.hh"
 #include "libc/calls/calls.h"
 #include "libc/calls/weirdtypes.h"
 #include "libc/fmt/fmt.h"
diff --git a/third_party/tbb/mutex.h b/third_party/tbb/mutex.hh
similarity index 88%
rename from third_party/tbb/mutex.h
rename to third_party/tbb/mutex.hh
index 791ba7798..b1feac17b 100644
--- a/third_party/tbb/mutex.h
+++ b/third_party/tbb/mutex.hh
@@ -18,12 +18,12 @@
 #ifndef __TBB_mutex_H
 #define __TBB_mutex_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_scoped_lock.h"
-#include "third_party/tbb/detail/_waitable_atomic.h"
-#include "third_party/tbb/detail/_mutex_common.h"
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_scoped_lock.hh"
+#include "third_party/tbb/detail/_waitable_atomic.hh"
+#include "third_party/tbb/detail/_mutex_common.hh"
+#include "third_party/tbb/profiling.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/null_mutex.h b/third_party/tbb/null_mutex.hh
similarity index 93%
rename from third_party/tbb/null_mutex.h
rename to third_party/tbb/null_mutex.hh
index d0c3cfb99..3d98a395d 100644
--- a/third_party/tbb/null_mutex.h
+++ b/third_party/tbb/null_mutex.hh
@@ -18,9 +18,9 @@
 #ifndef __TBB_null_mutex_H
 #define __TBB_null_mutex_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_mutex_common.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_mutex_common.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/null_rw_mutex.h b/third_party/tbb/null_rw_mutex.hh
similarity index 94%
rename from third_party/tbb/null_rw_mutex.h
rename to third_party/tbb/null_rw_mutex.hh
index d8dff0488..43d5d0c8e 100644
--- a/third_party/tbb/null_rw_mutex.h
+++ b/third_party/tbb/null_rw_mutex.hh
@@ -18,9 +18,9 @@
 #ifndef __TBB_null_rw_mutex_H
 #define __TBB_null_rw_mutex_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_mutex_common.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_mutex_common.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/observer_proxy.cc b/third_party/tbb/observer_proxy.cc
index 463f57809..bcec7bb14 100644
--- a/third_party/tbb/observer_proxy.cc
+++ b/third_party/tbb/observer_proxy.cc
@@ -15,13 +15,13 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_utils.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_utils.hh"
 
-#include "third_party/tbb/observer_proxy.h"
-#include "third_party/tbb/arena.h"
-#include "third_party/tbb/main.h"
-#include "third_party/tbb/thread_data.h"
+#include "third_party/tbb/observer_proxy.hh"
+#include "third_party/tbb/arena.hh"
+#include "third_party/tbb/main.hh"
+#include "third_party/tbb/thread_data.hh"
 
 #include "third_party/libcxx/atomic"
 
diff --git a/third_party/tbb/observer_proxy.h b/third_party/tbb/observer_proxy.hh
similarity index 96%
rename from third_party/tbb/observer_proxy.h
rename to third_party/tbb/observer_proxy.hh
index 78a692423..f16f9624a 100644
--- a/third_party/tbb/observer_proxy.h
+++ b/third_party/tbb/observer_proxy.hh
@@ -18,11 +18,11 @@
 #ifndef __TBB_observer_proxy_H
 #define __TBB_observer_proxy_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_aligned_space.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_aligned_space.hh"
 
-#include "third_party/tbb/task_scheduler_observer.h"
-#include "third_party/tbb/spin_rw_mutex.h"
+#include "third_party/tbb/task_scheduler_observer.hh"
+#include "third_party/tbb/spin_rw_mutex.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/parallel_for.h b/third_party/tbb/parallel_for.hh
similarity index 98%
rename from third_party/tbb/parallel_for.h
rename to third_party/tbb/parallel_for.hh
index de7c4166c..8382c03fa 100644
--- a/third_party/tbb/parallel_for.h
+++ b/third_party/tbb/parallel_for.hh
@@ -18,16 +18,16 @@
 #ifndef __TBB_parallel_for_H
 #define __TBB_parallel_for_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/detail/_small_object_pool.h"
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/detail/_small_object_pool.hh"
+#include "third_party/tbb/profiling.hh"
 
-#include "third_party/tbb/partitioner.h"
-#include "third_party/tbb/blocked_range.h"
-#include "third_party/tbb/task_group.h"
+#include "third_party/tbb/partitioner.hh"
+#include "third_party/tbb/blocked_range.hh"
+#include "third_party/tbb/task_group.hh"
 
 #include "third_party/libcxx/cstddef"
 #include "third_party/libcxx/new"
diff --git a/third_party/tbb/parallel_for_each.h b/third_party/tbb/parallel_for_each.hh
similarity index 98%
rename from third_party/tbb/parallel_for_each.h
rename to third_party/tbb/parallel_for_each.hh
index a4752c69a..6e4f9d736 100644
--- a/third_party/tbb/parallel_for_each.h
+++ b/third_party/tbb/parallel_for_each.hh
@@ -18,16 +18,16 @@
 #ifndef __TBB_parallel_for_each_H
 #define __TBB_parallel_for_each_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/detail/_aligned_space.h"
-#include "third_party/tbb/detail/_small_object_pool.h"
-#include "third_party/tbb/detail/_utils.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/detail/_aligned_space.hh"
+#include "third_party/tbb/detail/_small_object_pool.hh"
+#include "third_party/tbb/detail/_utils.hh"
 
-#include "third_party/tbb/parallel_for.h"
-#include "third_party/tbb/task_group.h" // task_group_context
+#include "third_party/tbb/parallel_for.hh"
+#include "third_party/tbb/task_group.hh" // task_group_context
 
 #include "third_party/libcxx/iterator"
 #include "third_party/libcxx/type_traits"
diff --git a/third_party/tbb/parallel_invoke.h b/third_party/tbb/parallel_invoke.hh
similarity index 95%
rename from third_party/tbb/parallel_invoke.h
rename to third_party/tbb/parallel_invoke.hh
index 899c57cba..913979045 100644
--- a/third_party/tbb/parallel_invoke.h
+++ b/third_party/tbb/parallel_invoke.hh
@@ -18,14 +18,14 @@
 #ifndef __TBB_parallel_invoke_H
 #define __TBB_parallel_invoke_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/detail/_template_helpers.h"
-#include "third_party/tbb/detail/_small_object_pool.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
+#include "third_party/tbb/detail/_small_object_pool.hh"
 
-#include "third_party/tbb/task_group.h"
+#include "third_party/tbb/task_group.hh"
 
 #include "third_party/libcxx/tuple"
 #include "third_party/libcxx/atomic"
diff --git a/third_party/tbb/parallel_pipeline.cc b/third_party/tbb/parallel_pipeline.cc
index dd0b4b651..450a9ad21 100644
--- a/third_party/tbb/parallel_pipeline.cc
+++ b/third_party/tbb/parallel_pipeline.cc
@@ -15,14 +15,14 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/parallel_pipeline.h"
-#include "third_party/tbb/spin_mutex.h"
-#include "third_party/tbb/tbb_allocator.h"
-#include "third_party/tbb/cache_aligned_allocator.h"
-#include "third_party/tbb/itt_notify.h"
-#include "third_party/tbb/tls.h"
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_small_object_pool.h"
+#include "third_party/tbb/parallel_pipeline.hh"
+#include "third_party/tbb/spin_mutex.hh"
+#include "third_party/tbb/tbb_allocator.hh"
+#include "third_party/tbb/cache_aligned_allocator.hh"
+#include "third_party/tbb/itt_notify.hh"
+#include "third_party/tbb/tls.hh"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_small_object_pool.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/parallel_pipeline.h b/third_party/tbb/parallel_pipeline.hh
similarity index 96%
rename from third_party/tbb/parallel_pipeline.h
rename to third_party/tbb/parallel_pipeline.hh
index 3cc24afe4..58be6b19c 100644
--- a/third_party/tbb/parallel_pipeline.h
+++ b/third_party/tbb/parallel_pipeline.hh
@@ -18,10 +18,10 @@
 #ifndef __TBB_parallel_pipeline_H
 #define __TBB_parallel_pipeline_H
 
-#include "third_party/tbb/detail/_pipeline_filters.h"
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/task_group.h"
+#include "third_party/tbb/detail/_pipeline_filters.hh"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/task_group.hh"
 
 #include "third_party/libcxx/cstddef"
 #include "third_party/libcxx/atomic"
diff --git a/third_party/tbb/parallel_reduce.h b/third_party/tbb/parallel_reduce.hh
similarity index 98%
rename from third_party/tbb/parallel_reduce.h
rename to third_party/tbb/parallel_reduce.hh
index 1fc549ce1..ed384d1c3 100644
--- a/third_party/tbb/parallel_reduce.h
+++ b/third_party/tbb/parallel_reduce.hh
@@ -19,15 +19,15 @@
 #define __TBB_parallel_reduce_H
 
 #include "third_party/libcxx/new"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/detail/_aligned_space.h"
-#include "third_party/tbb/detail/_small_object_pool.h"
-#include "third_party/tbb/detail/_range_common.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/detail/_aligned_space.hh"
+#include "third_party/tbb/detail/_small_object_pool.hh"
+#include "third_party/tbb/detail/_range_common.hh"
 
-#include "third_party/tbb/task_group.h" // task_group_context
-#include "third_party/tbb/partitioner.h"
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/task_group.hh" // task_group_context
+#include "third_party/tbb/partitioner.hh"
+#include "third_party/tbb/profiling.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/parallel_scan.h b/third_party/tbb/parallel_scan.hh
similarity index 98%
rename from third_party/tbb/parallel_scan.h
rename to third_party/tbb/parallel_scan.hh
index dba033af8..02ed40012 100644
--- a/third_party/tbb/parallel_scan.h
+++ b/third_party/tbb/parallel_scan.hh
@@ -20,15 +20,15 @@
 
 #include "third_party/libcxx/functional"
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_task.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_task.hh"
 
-#include "third_party/tbb/profiling.h"
-#include "third_party/tbb/partitioner.h"
-#include "third_party/tbb/blocked_range.h"
-#include "third_party/tbb/task_group.h"
+#include "third_party/tbb/profiling.hh"
+#include "third_party/tbb/partitioner.hh"
+#include "third_party/tbb/blocked_range.hh"
+#include "third_party/tbb/task_group.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/parallel_sort.h b/third_party/tbb/parallel_sort.hh
similarity index 98%
rename from third_party/tbb/parallel_sort.h
rename to third_party/tbb/parallel_sort.hh
index b089b9d99..ed95fa800 100644
--- a/third_party/tbb/parallel_sort.h
+++ b/third_party/tbb/parallel_sort.hh
@@ -18,10 +18,10 @@
 #ifndef __TBB_parallel_sort_H
 #define __TBB_parallel_sort_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/parallel_for.h"
-#include "third_party/tbb/blocked_range.h"
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/parallel_for.hh"
+#include "third_party/tbb/blocked_range.hh"
+#include "third_party/tbb/profiling.hh"
 
 #include "third_party/libcxx/algorithm"
 #include "third_party/libcxx/iterator"
diff --git a/third_party/tbb/partitioner.h b/third_party/tbb/partitioner.hh
similarity index 97%
rename from third_party/tbb/partitioner.h
rename to third_party/tbb/partitioner.hh
index 25a300028..a3b65c3d2 100644
--- a/third_party/tbb/partitioner.h
+++ b/third_party/tbb/partitioner.hh
@@ -35,18 +35,18 @@
 #define __TBB_DEMAND_DEPTH_ADD 1
 #endif
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_aligned_space.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_template_helpers.h"
-#include "third_party/tbb/detail/_range_common.h"
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/detail/_small_object_pool.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_aligned_space.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
+#include "third_party/tbb/detail/_range_common.hh"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/detail/_small_object_pool.hh"
 
-#include "third_party/tbb/cache_aligned_allocator.h"
-#include "third_party/tbb/task_group.h" // task_group_context
-#include "third_party/tbb/task_arena.h"
+#include "third_party/tbb/cache_aligned_allocator.hh"
+#include "third_party/tbb/task_group.hh" // task_group_context
+#include "third_party/tbb/task_arena.hh"
 
 #include "third_party/libcxx/algorithm"
 #include "third_party/libcxx/atomic"
diff --git a/third_party/tbb/permit_manager.h b/third_party/tbb/permit_manager.hh
similarity index 94%
rename from third_party/tbb/permit_manager.h
rename to third_party/tbb/permit_manager.hh
index 80f32daf4..e756d0b0c 100644
--- a/third_party/tbb/permit_manager.h
+++ b/third_party/tbb/permit_manager.hh
@@ -18,8 +18,8 @@
 #ifndef _TBB_permit_manager_H
 #define _TBB_permit_manager_H
 
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/thread_request_serializer.h"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/thread_request_serializer.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/pm_client.h b/third_party/tbb/pm_client.hh
similarity index 98%
rename from third_party/tbb/pm_client.h
rename to third_party/tbb/pm_client.hh
index 877e1d2a9..c7d464c0e 100644
--- a/third_party/tbb/pm_client.h
+++ b/third_party/tbb/pm_client.hh
@@ -18,7 +18,7 @@
 #ifndef _TBB_pm_client_H
 #define _TBB_pm_client_H
 
-#include "third_party/tbb/arena.h"
+#include "third_party/tbb/arena.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/private_server.cc b/third_party/tbb/private_server.cc
index 8b7a758bd..b6c2864b3 100644
--- a/third_party/tbb/private_server.cc
+++ b/third_party/tbb/private_server.cc
@@ -15,15 +15,15 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/cache_aligned_allocator.h"
-#include "third_party/tbb/mutex.h"
+#include "third_party/tbb/cache_aligned_allocator.hh"
+#include "third_party/tbb/mutex.hh"
 
-#include "third_party/tbb/rml_tbb.h"
-#include "third_party/tbb/rml_thread_monitor.h"
+#include "third_party/tbb/rml_tbb.hh"
+#include "third_party/tbb/rml_thread_monitor.hh"
 
-#include "third_party/tbb/scheduler_common.h"
-#include "third_party/tbb/governor.h"
-#include "third_party/tbb/misc.h"
+#include "third_party/tbb/scheduler_common.hh"
+#include "third_party/tbb/governor.hh"
+#include "third_party/tbb/misc.hh"
 
 #include "third_party/libcxx/atomic"
 
diff --git a/third_party/tbb/profiling.cc b/third_party/tbb/profiling.cc
index 21ed67b53..bad561422 100644
--- a/third_party/tbb/profiling.cc
+++ b/third_party/tbb/profiling.cc
@@ -15,13 +15,13 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_template_helpers.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
 
-#include "third_party/tbb/main.h"
-#include "third_party/tbb/itt_notify.h"
+#include "third_party/tbb/main.hh"
+#include "third_party/tbb/itt_notify.hh"
 
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/profiling.hh"
 
 #include "libc/mem/alg.h"
 #include "libc/mem/mem.h"
@@ -47,7 +47,7 @@ struct resource_string {
 //
 #define TBB_STRING_RESOURCE( index_name, str ) { str, nullptr },
 static resource_string strings_for_itt[] = {
-    #include "third_party/tbb/detail/_string_resource.h"
+    #include "third_party/tbb/detail/_string_resource.hh"
     { "num_resource_strings", nullptr }
 };
 #undef TBB_STRING_RESOURCE
diff --git a/third_party/tbb/profiling.h b/third_party/tbb/profiling.hh
similarity index 98%
rename from third_party/tbb/profiling.h
rename to third_party/tbb/profiling.hh
index 707df8ce4..766425282 100644
--- a/third_party/tbb/profiling.h
+++ b/third_party/tbb/profiling.hh
@@ -18,7 +18,7 @@
 #ifndef __TBB_profiling_H
 #define __TBB_profiling_H
 
-#include "third_party/tbb/detail/_config.h"
+#include "third_party/tbb/detail/_config.hh"
 #include "third_party/libcxx/cstdint"
 
 #include "third_party/libcxx/string"
@@ -29,7 +29,7 @@ inline namespace d0 {
     // include list of index names
     #define TBB_STRING_RESOURCE(index_name,str) index_name,
     enum string_resource_index : std::uintptr_t {
-        #include "third_party/tbb/detail/_string_resource.h"
+        #include "third_party/tbb/detail/_string_resource.hh"
         NUM_STRINGS
     };
     #undef TBB_STRING_RESOURCE
diff --git a/third_party/tbb/queuing_mutex.h b/third_party/tbb/queuing_mutex.hh
similarity index 96%
rename from third_party/tbb/queuing_mutex.h
rename to third_party/tbb/queuing_mutex.hh
index 0636b667e..20d448048 100644
--- a/third_party/tbb/queuing_mutex.h
+++ b/third_party/tbb/queuing_mutex.hh
@@ -18,12 +18,12 @@
 #ifndef __TBB_queuing_mutex_H
 #define __TBB_queuing_mutex_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_mutex_common.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_mutex_common.hh"
 
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/profiling.hh"
 
 #include "third_party/libcxx/atomic"
 
diff --git a/third_party/tbb/queuing_rw_mutex.cc b/third_party/tbb/queuing_rw_mutex.cc
index 675484a40..7329e33f0 100644
--- a/third_party/tbb/queuing_rw_mutex.cc
+++ b/third_party/tbb/queuing_rw_mutex.cc
@@ -19,10 +19,10 @@
     with SPIN tool using <TBB directory>/tools/spin_models/ReaderWriterMutex.pml.
     There could be some code looking as "can be restructured" but its structure does matter! */
 
-#include "third_party/tbb/queuing_rw_mutex.h"
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/itt_notify.h"
+#include "third_party/tbb/queuing_rw_mutex.hh"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/itt_notify.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/queuing_rw_mutex.h b/third_party/tbb/queuing_rw_mutex.hh
similarity index 96%
rename from third_party/tbb/queuing_rw_mutex.h
rename to third_party/tbb/queuing_rw_mutex.hh
index 4c9368b1b..1d3e815da 100644
--- a/third_party/tbb/queuing_rw_mutex.h
+++ b/third_party/tbb/queuing_rw_mutex.hh
@@ -18,12 +18,12 @@
 #ifndef __TBB_queuing_rw_mutex_H
 #define __TBB_queuing_rw_mutex_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_mutex_common.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_mutex_common.hh"
 
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/profiling.hh"
 
 #include "third_party/libcxx/cstring"
 #include "third_party/libcxx/atomic"
diff --git a/third_party/tbb/rml_base.h b/third_party/tbb/rml_base.hh
similarity index 100%
rename from third_party/tbb/rml_base.h
rename to third_party/tbb/rml_base.hh
diff --git a/third_party/tbb/rml_tbb.cc b/third_party/tbb/rml_tbb.cc
index a08ad0ecd..7f9ef36c7 100644
--- a/third_party/tbb/rml_tbb.cc
+++ b/third_party/tbb/rml_tbb.cc
@@ -15,10 +15,10 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/detail/_assert.h"
+#include "third_party/tbb/detail/_assert.hh"
 
-#include "third_party/tbb/rml_tbb.h"
-#include "third_party/tbb/dynamic_link.h"
+#include "third_party/tbb/rml_tbb.hh"
+#include "third_party/tbb/dynamic_link.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/rml_tbb.h b/third_party/tbb/rml_tbb.hh
similarity index 97%
rename from third_party/tbb/rml_tbb.h
rename to third_party/tbb/rml_tbb.hh
index dd571af47..611e8876a 100644
--- a/third_party/tbb/rml_tbb.h
+++ b/third_party/tbb/rml_tbb.hh
@@ -20,8 +20,8 @@
 #ifndef __TBB_rml_tbb_H
 #define __TBB_rml_tbb_H
 
-#include "third_party/tbb/version.h"
-#include "third_party/tbb/rml_base.h"
+#include "third_party/tbb/version.hh"
+#include "third_party/tbb/rml_base.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/rml_thread_monitor.h b/third_party/tbb/rml_thread_monitor.hh
similarity index 97%
rename from third_party/tbb/rml_thread_monitor.h
rename to third_party/tbb/rml_thread_monitor.hh
index 5b8a4d4d4..3cfd1b0e7 100644
--- a/third_party/tbb/rml_thread_monitor.h
+++ b/third_party/tbb/rml_thread_monitor.hh
@@ -42,7 +42,7 @@
 #include "libc/nt/winsock.h"
 // MISSING #include <process.h>
 #include "libc/mem/mem.h" //_alloca
-#include "third_party/tbb/misc.h" // support for processor groups
+#include "third_party/tbb/misc.hh" // support for processor groups
 #if __TBB_WIN8UI_SUPPORT && (_WIN32_WINNT < 0x0A00)
 #include "third_party/libcxx/thread"
 #endif
@@ -67,10 +67,10 @@
 #endif
 #include "third_party/libcxx/cstdio"
 
-#include "third_party/tbb/detail/_template_helpers.h"
+#include "third_party/tbb/detail/_template_helpers.hh"
 
-#include "third_party/tbb/itt_notify.h"
-#include "third_party/tbb/semaphore.h"
+#include "third_party/tbb/itt_notify.hh"
+#include "third_party/tbb/semaphore.hh"
 
 // All platform-specific threading support is in this header.
 
diff --git a/third_party/tbb/rtm_mutex.cc b/third_party/tbb/rtm_mutex.cc
index 04328689a..b585b6776 100644
--- a/third_party/tbb/rtm_mutex.cc
+++ b/third_party/tbb/rtm_mutex.cc
@@ -15,11 +15,11 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_rtm_mutex.h"
-#include "third_party/tbb/itt_notify.h"
-#include "third_party/tbb/governor.h"
-#include "third_party/tbb/misc.h"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_rtm_mutex.hh"
+#include "third_party/tbb/itt_notify.hh"
+#include "third_party/tbb/governor.hh"
+#include "third_party/tbb/misc.hh"
 
 #include "third_party/libcxx/atomic"
 
diff --git a/third_party/tbb/rtm_rw_mutex.cc b/third_party/tbb/rtm_rw_mutex.cc
index 9e57652e6..490e32e2a 100644
--- a/third_party/tbb/rtm_rw_mutex.cc
+++ b/third_party/tbb/rtm_rw_mutex.cc
@@ -15,11 +15,11 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_rtm_rw_mutex.h"
-#include "third_party/tbb/itt_notify.h"
-#include "third_party/tbb/governor.h"
-#include "third_party/tbb/misc.h"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_rtm_rw_mutex.hh"
+#include "third_party/tbb/itt_notify.hh"
+#include "third_party/tbb/governor.hh"
+#include "third_party/tbb/misc.hh"
 
 #include "third_party/libcxx/atomic"
 
diff --git a/third_party/tbb/rw_mutex.h b/third_party/tbb/rw_mutex.hh
similarity index 96%
rename from third_party/tbb/rw_mutex.h
rename to third_party/tbb/rw_mutex.hh
index d156a0c60..91d2dac0a 100644
--- a/third_party/tbb/rw_mutex.h
+++ b/third_party/tbb/rw_mutex.hh
@@ -18,12 +18,12 @@
 #ifndef __TBB_rw_mutex_H
 #define __TBB_rw_mutex_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_waitable_atomic.h"
-#include "third_party/tbb/detail/_scoped_lock.h"
-#include "third_party/tbb/detail/_mutex_common.h"
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_waitable_atomic.hh"
+#include "third_party/tbb/detail/_scoped_lock.hh"
+#include "third_party/tbb/detail/_mutex_common.hh"
+#include "third_party/tbb/profiling.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/scalable_allocator.h b/third_party/tbb/scalable_allocator.hh
similarity index 99%
rename from third_party/tbb/scalable_allocator.h
rename to third_party/tbb/scalable_allocator.hh
index d6f6b9c60..1774428d6 100644
--- a/third_party/tbb/scalable_allocator.h
+++ b/third_party/tbb/scalable_allocator.hh
@@ -20,7 +20,7 @@
 
 #ifdef __cplusplus
 // MISSING #include "oneapi/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_utils.h"
+#include "third_party/tbb/detail/_utils.hh"
 // MISSING #include "oneapi/tbb/detail/_namespace_injection.h"
 #include "third_party/libcxx/cstdlib"
 #include "third_party/libcxx/utility"
diff --git a/third_party/tbb/scheduler_common.h b/third_party/tbb/scheduler_common.hh
similarity index 97%
rename from third_party/tbb/scheduler_common.h
rename to third_party/tbb/scheduler_common.hh
index 8a0496bd6..89759dbb2 100644
--- a/third_party/tbb/scheduler_common.h
+++ b/third_party/tbb/scheduler_common.hh
@@ -18,23 +18,23 @@
 #ifndef _TBB_scheduler_common_H
 #define _TBB_scheduler_common_H
 
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_template_helpers.h"
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/detail/_machine.h"
-#include "third_party/tbb/task_group.h"
-#include "third_party/tbb/cache_aligned_allocator.h"
-#include "third_party/tbb/itt_notify.h"
-#include "third_party/tbb/co_context.h"
-#include "third_party/tbb/misc.h"
-#include "third_party/tbb/governor.h"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/detail/_machine.hh"
+#include "third_party/tbb/task_group.hh"
+#include "third_party/tbb/cache_aligned_allocator.hh"
+#include "third_party/tbb/itt_notify.hh"
+#include "third_party/tbb/co_context.hh"
+#include "third_party/tbb/misc.hh"
+#include "third_party/tbb/governor.hh"
 
 #ifndef __TBB_SCHEDULER_MUTEX_TYPE
 #define __TBB_SCHEDULER_MUTEX_TYPE tbb::spin_mutex
 #endif
 // TODO: add conditional inclusion based on specified type
-#include "third_party/tbb/spin_mutex.h"
-#include "third_party/tbb/mutex.h"
+#include "third_party/tbb/spin_mutex.hh"
+#include "third_party/tbb/mutex.hh"
 
 #if TBB_USE_ASSERT
 #include "third_party/libcxx/atomic"
diff --git a/third_party/tbb/semaphore.cc b/third_party/tbb/semaphore.cc
index a1ac96b3d..dcd5ed962 100644
--- a/third_party/tbb/semaphore.cc
+++ b/third_party/tbb/semaphore.cc
@@ -15,9 +15,9 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/semaphore.h"
+#include "third_party/tbb/semaphore.hh"
 #if __TBB_USE_SRWLOCK
-#include "third_party/tbb/dynamic_link.h" // Refers to src/tbb, not include/tbb
+#include "third_party/tbb/dynamic_link.hh" // Refers to src/tbb, not include/tbb
 // MISSING #include "tbb_misc.h"
 #endif
 
diff --git a/third_party/tbb/semaphore.h b/third_party/tbb/semaphore.hh
similarity index 99%
rename from third_party/tbb/semaphore.h
rename to third_party/tbb/semaphore.hh
index 281d18516..5bd743ff6 100644
--- a/third_party/tbb/semaphore.h
+++ b/third_party/tbb/semaphore.hh
@@ -18,7 +18,7 @@
 #ifndef __TBB_semaphore_H
 #define __TBB_semaphore_H
 
-#include "third_party/tbb/detail/_utils.h"
+#include "third_party/tbb/detail/_utils.hh"
 
 #if _WIN32||_WIN64
 #include "libc/nt/accounting.h"
diff --git a/third_party/tbb/small_object_pool.cc b/third_party/tbb/small_object_pool.cc
index 74a970d9d..a4d5f6764 100644
--- a/third_party/tbb/small_object_pool.cc
+++ b/third_party/tbb/small_object_pool.cc
@@ -15,12 +15,12 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/cache_aligned_allocator.h"
-#include "third_party/tbb/detail/_small_object_pool.h"
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/governor.h"
-#include "third_party/tbb/thread_data.h"
-#include "third_party/tbb/task_dispatcher.h"
+#include "third_party/tbb/cache_aligned_allocator.hh"
+#include "third_party/tbb/detail/_small_object_pool.hh"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/governor.hh"
+#include "third_party/tbb/thread_data.hh"
+#include "third_party/tbb/task_dispatcher.hh"
 
 #include "third_party/libcxx/cstddef"
 
diff --git a/third_party/tbb/small_object_pool_impl.h b/third_party/tbb/small_object_pool_impl.hh
similarity index 94%
rename from third_party/tbb/small_object_pool_impl.h
rename to third_party/tbb/small_object_pool_impl.hh
index 7478880a9..dc66adf0e 100644
--- a/third_party/tbb/small_object_pool_impl.h
+++ b/third_party/tbb/small_object_pool_impl.hh
@@ -18,8 +18,8 @@
 #ifndef __TBB_small_object_pool_impl_H
 #define __TBB_small_object_pool_impl_H
 
-#include "third_party/tbb/detail/_small_object_pool.h"
-#include "third_party/tbb/detail/_utils.h"
+#include "third_party/tbb/detail/_small_object_pool.hh"
+#include "third_party/tbb/detail/_utils.hh"
 
 #include "third_party/libcxx/cstddef"
 #include "third_party/libcxx/cstdint"
diff --git a/third_party/tbb/spin_mutex.h b/third_party/tbb/spin_mutex.hh
similarity index 90%
rename from third_party/tbb/spin_mutex.h
rename to third_party/tbb/spin_mutex.hh
index 69d1047bb..406b2f2ac 100644
--- a/third_party/tbb/spin_mutex.h
+++ b/third_party/tbb/spin_mutex.hh
@@ -18,14 +18,14 @@
 #ifndef __TBB_spin_mutex_H
 #define __TBB_spin_mutex_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_mutex_common.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_mutex_common.hh"
 
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/profiling.hh"
 
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_scoped_lock.h"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_scoped_lock.hh"
 
 #include "third_party/libcxx/atomic"
 
@@ -119,7 +119,7 @@ namespace profiling {
 }
 } // namespace tbb
 
-#include "third_party/tbb/detail/_rtm_mutex.h"
+#include "third_party/tbb/detail/_rtm_mutex.hh"
 
 namespace tbb {
 inline namespace v1 {
diff --git a/third_party/tbb/spin_rw_mutex.h b/third_party/tbb/spin_rw_mutex.hh
similarity index 95%
rename from third_party/tbb/spin_rw_mutex.h
rename to third_party/tbb/spin_rw_mutex.hh
index 71cbdf7ec..4401b83ed 100644
--- a/third_party/tbb/spin_rw_mutex.h
+++ b/third_party/tbb/spin_rw_mutex.hh
@@ -18,14 +18,14 @@
 #ifndef __TBB_spin_rw_mutex_H
 #define __TBB_spin_rw_mutex_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_mutex_common.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_mutex_common.hh"
 
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/profiling.hh"
 
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_scoped_lock.h"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_scoped_lock.hh"
 
 #include "third_party/libcxx/atomic"
 
@@ -214,7 +214,7 @@ namespace profiling {
 }
 } // namespace tbb
 
-#include "third_party/tbb/detail/_rtm_rw_mutex.h"
+#include "third_party/tbb/detail/_rtm_rw_mutex.hh"
 
 namespace tbb {
 inline namespace v1 {
diff --git a/third_party/tbb/task.cc b/third_party/tbb/task.cc
index c40017376..80ce63513 100644
--- a/third_party/tbb/task.cc
+++ b/third_party/tbb/task.cc
@@ -16,17 +16,17 @@
 */
 
 // Do not include task.h directly. Use scheduler_common.h instead
-#include "third_party/tbb/scheduler_common.h"
-#include "third_party/tbb/governor.h"
-#include "third_party/tbb/arena.h"
-#include "third_party/tbb/thread_data.h"
-#include "third_party/tbb/task_dispatcher.h"
-#include "third_party/tbb/waiters.h"
-#include "third_party/tbb/itt_notify.h"
+#include "third_party/tbb/scheduler_common.hh"
+#include "third_party/tbb/governor.hh"
+#include "third_party/tbb/arena.hh"
+#include "third_party/tbb/thread_data.hh"
+#include "third_party/tbb/task_dispatcher.hh"
+#include "third_party/tbb/waiters.hh"
+#include "third_party/tbb/itt_notify.hh"
 
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/partitioner.h"
-#include "third_party/tbb/task.h"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/partitioner.hh"
+#include "third_party/tbb/task.hh"
 
 #include "third_party/libcxx/cstring"
 
diff --git a/third_party/tbb/task.h b/third_party/tbb/task.hh
similarity index 87%
rename from third_party/tbb/task.h
rename to third_party/tbb/task.hh
index 691c18341..dbff0db3c 100644
--- a/third_party/tbb/task.h
+++ b/third_party/tbb/task.hh
@@ -18,9 +18,9 @@
 #ifndef __TBB_task_H
 #define __TBB_task_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_task.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_task.hh"
 
 namespace tbb {
 inline namespace v1 {
diff --git a/third_party/tbb/task_arena.h b/third_party/tbb/task_arena.hh
similarity index 97%
rename from third_party/tbb/task_arena.h
rename to third_party/tbb/task_arena.hh
index 2b3fbda53..55147ff89 100644
--- a/third_party/tbb/task_arena.h
+++ b/third_party/tbb/task_arena.hh
@@ -18,19 +18,19 @@
 #ifndef __TBB_task_arena_H
 #define __TBB_task_arena_H
 
-#include "third_party/tbb/detail/_config.h"
+#include "third_party/tbb/detail/_config.hh"
 
-#include "third_party/tbb/detail/_aligned_space.h"
-#include "third_party/tbb/detail/_attach.h"
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_small_object_pool.h"
-#include "third_party/tbb/detail/_task.h"
+#include "third_party/tbb/detail/_aligned_space.hh"
+#include "third_party/tbb/detail/_attach.hh"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_small_object_pool.hh"
+#include "third_party/tbb/detail/_task.hh"
 
-#include "third_party/tbb/detail/_task_handle.h"
+#include "third_party/tbb/detail/_task_handle.hh"
 
 #if __TBB_ARENA_BINDING
-#include "third_party/tbb/info.h"
+#include "third_party/tbb/info.hh"
 #endif /*__TBB_ARENA_BINDING*/
 
 namespace tbb {
diff --git a/third_party/tbb/task_dispatcher.cc b/third_party/tbb/task_dispatcher.cc
index 0ab1cb9ac..39ec2a9c9 100644
--- a/third_party/tbb/task_dispatcher.cc
+++ b/third_party/tbb/task_dispatcher.cc
@@ -15,8 +15,8 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/task_dispatcher.h"
-#include "third_party/tbb/waiters.h"
+#include "third_party/tbb/task_dispatcher.hh"
+#include "third_party/tbb/waiters.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/task_dispatcher.h b/third_party/tbb/task_dispatcher.hh
similarity index 97%
rename from third_party/tbb/task_dispatcher.h
rename to third_party/tbb/task_dispatcher.hh
index 4bcbbf66e..d08b925ad 100644
--- a/third_party/tbb/task_dispatcher.h
+++ b/third_party/tbb/task_dispatcher.hh
@@ -18,19 +18,19 @@
 #ifndef _TBB_task_dispatcher_H
 #define _TBB_task_dispatcher_H
 
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/global_control.h"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/global_control.hh"
 
-#include "third_party/tbb/scheduler_common.h"
-#include "third_party/tbb/waiters.h"
-#include "third_party/tbb/arena_slot.h"
-#include "third_party/tbb/arena.h"
-#include "third_party/tbb/thread_data.h"
-#include "third_party/tbb/mailbox.h"
-#include "third_party/tbb/itt_notify.h"
-#include "third_party/tbb/concurrent_monitor.h"
-#include "third_party/tbb/threading_control.h"
+#include "third_party/tbb/scheduler_common.hh"
+#include "third_party/tbb/waiters.hh"
+#include "third_party/tbb/arena_slot.hh"
+#include "third_party/tbb/arena.hh"
+#include "third_party/tbb/thread_data.hh"
+#include "third_party/tbb/mailbox.hh"
+#include "third_party/tbb/itt_notify.hh"
+#include "third_party/tbb/concurrent_monitor.hh"
+#include "third_party/tbb/threading_control.hh"
 
 #include "third_party/libcxx/atomic"
 
diff --git a/third_party/tbb/task_group.h b/third_party/tbb/task_group.hh
similarity index 97%
rename from third_party/tbb/task_group.h
rename to third_party/tbb/task_group.hh
index 70d0bccd8..7caf05154 100644
--- a/third_party/tbb/task_group.h
+++ b/third_party/tbb/task_group.hh
@@ -18,18 +18,18 @@
 #ifndef __TBB_task_group_H
 #define __TBB_task_group_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/detail/_assert.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_template_helpers.h"
-#include "third_party/tbb/detail/_exception.h"
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/detail/_small_object_pool.h"
-#include "third_party/tbb/detail/_intrusive_list_node.h"
-#include "third_party/tbb/detail/_task_handle.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/detail/_assert.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_template_helpers.hh"
+#include "third_party/tbb/detail/_exception.hh"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/detail/_small_object_pool.hh"
+#include "third_party/tbb/detail/_intrusive_list_node.hh"
+#include "third_party/tbb/detail/_task_handle.hh"
 
-#include "third_party/tbb/profiling.h"
+#include "third_party/tbb/profiling.hh"
 
 #include "third_party/libcxx/type_traits"
 
diff --git a/third_party/tbb/task_group_context.cc b/third_party/tbb/task_group_context.cc
index 4f91c54e0..c91c757a1 100644
--- a/third_party/tbb/task_group_context.cc
+++ b/third_party/tbb/task_group_context.cc
@@ -15,14 +15,14 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/tbb_allocator.h"
-#include "third_party/tbb/task_group.h"
-#include "third_party/tbb/governor.h"
-#include "third_party/tbb/thread_data.h"
-#include "third_party/tbb/scheduler_common.h"
-#include "third_party/tbb/itt_notify.h"
-#include "third_party/tbb/task_dispatcher.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/tbb_allocator.hh"
+#include "third_party/tbb/task_group.hh"
+#include "third_party/tbb/governor.hh"
+#include "third_party/tbb/thread_data.hh"
+#include "third_party/tbb/scheduler_common.hh"
+#include "third_party/tbb/itt_notify.hh"
+#include "third_party/tbb/task_dispatcher.hh"
 
 #include "third_party/libcxx/type_traits"
 
diff --git a/third_party/tbb/task_scheduler_observer.h b/third_party/tbb/task_scheduler_observer.hh
similarity index 97%
rename from third_party/tbb/task_scheduler_observer.h
rename to third_party/tbb/task_scheduler_observer.hh
index 4c3d31e79..7c4ff8ceb 100644
--- a/third_party/tbb/task_scheduler_observer.h
+++ b/third_party/tbb/task_scheduler_observer.hh
@@ -18,8 +18,8 @@
 #ifndef __TBB_task_scheduler_observer_H
 #define __TBB_task_scheduler_observer_H
 
-#include "third_party/tbb/detail/_namespace_injection.h"
-#include "third_party/tbb/task_arena.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
+#include "third_party/tbb/task_arena.hh"
 #include "third_party/libcxx/atomic"
 
 namespace tbb {
diff --git a/third_party/tbb/task_stream.h b/third_party/tbb/task_stream.hh
similarity index 97%
rename from third_party/tbb/task_stream.h
rename to third_party/tbb/task_stream.hh
index 54d84446c..b04c585fb 100644
--- a/third_party/tbb/task_stream.h
+++ b/third_party/tbb/task_stream.hh
@@ -25,12 +25,12 @@
 //! time it was developed. In addition, it is not clearly seen at the moment that this container
 //! would be suitable for critical tasks due to linear time complexity on its operations.
 
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/cache_aligned_allocator.h"
-#include "third_party/tbb/mutex.h"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/cache_aligned_allocator.hh"
+#include "third_party/tbb/mutex.hh"
 
-#include "third_party/tbb/scheduler_common.h"
-#include "third_party/tbb/misc.h" // for FastRandom
+#include "third_party/tbb/scheduler_common.hh"
+#include "third_party/tbb/misc.hh" // for FastRandom
 
 #include "third_party/libcxx/deque"
 #include "third_party/libcxx/climits"
diff --git a/third_party/tbb/tbb.h b/third_party/tbb/tbb.hh
similarity index 100%
rename from third_party/tbb/tbb.h
rename to third_party/tbb/tbb.hh
diff --git a/third_party/tbb/tbb.mk b/third_party/tbb/tbb.mk
index b565bf3d8..ec0ce9f30 100644
--- a/third_party/tbb/tbb.mk
+++ b/third_party/tbb/tbb.mk
@@ -7,8 +7,8 @@ THIRD_PARTY_TBB_ARTIFACTS += THIRD_PARTY_TBB_A
 THIRD_PARTY_TBB = $(THIRD_PARTY_TBB_A_DEPS) $(THIRD_PARTY_TBB_A)
 THIRD_PARTY_TBB_A = o/$(MODE)/third_party/tbb/tbb.a
 THIRD_PARTY_TBB_FILES := $(wildcard third_party/tbb/*) $(wildcard third_party/tbb/detail/*)
-THIRD_PARTY_TBB_HDRS = $(filter %.h,$(THIRD_PARTY_TBB_FILES))
-THIRD_PARTY_TBB_SRCS = $(filter %.cpp,$(THIRD_PARTY_TBB_FILES))
+THIRD_PARTY_TBB_HDRS = $(filter %.hh,$(THIRD_PARTY_TBB_FILES))
+THIRD_PARTY_TBB_SRCS = $(filter %.cc,$(THIRD_PARTY_TBB_FILES))
 THIRD_PARTY_TBB_OBJS = $(THIRD_PARTY_TBB_SRCS:%.cpp=o/$(MODE)/%.o)
 
 # Use this to debug
@@ -19,6 +19,7 @@ THIRD_PARTY_TBB_CHECKS =				\
 	$(THIRD_PARTY_TBB_HDRS:%=o/$(MODE)/%.ok)
 
 THIRD_PARTY_TBB_A_DIRECTDEPS =				\
+	LIBC_CALLS								\
 	THIRD_PARTY_LIBCXX
 
 THIRD_PARTY_TBB_A_DEPS :=				\
diff --git a/third_party/tbb/tbb_allocator.h b/third_party/tbb/tbb_allocator.hh
similarity index 97%
rename from third_party/tbb/tbb_allocator.h
rename to third_party/tbb/tbb_allocator.hh
index 0284dfb89..e00ead69b 100644
--- a/third_party/tbb/tbb_allocator.h
+++ b/third_party/tbb/tbb_allocator.hh
@@ -18,8 +18,8 @@
 #ifndef __TBB_tbb_allocator_H
 #define __TBB_tbb_allocator_H
 
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/detail/_namespace_injection.h"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/detail/_namespace_injection.hh"
 #include "third_party/libcxx/cstdlib"
 #include "third_party/libcxx/utility"
 
diff --git a/third_party/tbb/tbbmalloc_proxy.h b/third_party/tbb/tbbmalloc_proxy.hh
similarity index 100%
rename from third_party/tbb/tbbmalloc_proxy.h
rename to third_party/tbb/tbbmalloc_proxy.hh
diff --git a/third_party/tbb/thread_control_monitor.h b/third_party/tbb/thread_control_monitor.hh
similarity index 97%
rename from third_party/tbb/thread_control_monitor.h
rename to third_party/tbb/thread_control_monitor.hh
index 06e2755af..9a4c55101 100644
--- a/third_party/tbb/thread_control_monitor.h
+++ b/third_party/tbb/thread_control_monitor.hh
@@ -18,8 +18,8 @@
 #ifndef __TBB_thread_control_monitor_H
 #define __TBB_thread_control_monitor_H
 
-#include "third_party/tbb/concurrent_monitor.h"
-#include "third_party/tbb/scheduler_common.h"
+#include "third_party/tbb/concurrent_monitor.hh"
+#include "third_party/tbb/scheduler_common.hh"
 
 #include "third_party/libcxx/atomic"
 
diff --git a/third_party/tbb/thread_data.h b/third_party/tbb/thread_data.hh
similarity index 95%
rename from third_party/tbb/thread_data.h
rename to third_party/tbb/thread_data.hh
index 638e87e2f..1ed2fc557 100644
--- a/third_party/tbb/thread_data.h
+++ b/third_party/tbb/thread_data.hh
@@ -18,18 +18,18 @@
 #ifndef __TBB_thread_data_H
 #define __TBB_thread_data_H
 
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/task.h"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/task.hh"
 
-#include "third_party/tbb/rml_base.h" // rml::job
+#include "third_party/tbb/rml_base.hh" // rml::job
 
-#include "third_party/tbb/scheduler_common.h"
-#include "third_party/tbb/arena.h"
-#include "third_party/tbb/concurrent_monitor.h"
-#include "third_party/tbb/mailbox.h"
-#include "third_party/tbb/misc.h" // FastRandom
-#include "third_party/tbb/small_object_pool_impl.h"
-#include "third_party/tbb/intrusive_list.h"
+#include "third_party/tbb/scheduler_common.hh"
+#include "third_party/tbb/arena.hh"
+#include "third_party/tbb/concurrent_monitor.hh"
+#include "third_party/tbb/mailbox.hh"
+#include "third_party/tbb/misc.hh" // FastRandom
+#include "third_party/tbb/small_object_pool_impl.hh"
+#include "third_party/tbb/intrusive_list.hh"
 
 #include "third_party/libcxx/atomic"
 
diff --git a/third_party/tbb/thread_dispatcher.cc b/third_party/tbb/thread_dispatcher.cc
index 6562d8d10..a4f24734a 100644
--- a/third_party/tbb/thread_dispatcher.cc
+++ b/third_party/tbb/thread_dispatcher.cc
@@ -15,8 +15,8 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/thread_dispatcher.h"
-#include "third_party/tbb/threading_control.h"
+#include "third_party/tbb/thread_dispatcher.hh"
+#include "third_party/tbb/threading_control.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/thread_dispatcher.h b/third_party/tbb/thread_dispatcher.hh
similarity index 90%
rename from third_party/tbb/thread_dispatcher.h
rename to third_party/tbb/thread_dispatcher.hh
index 85f3d4766..fced1d2b9 100644
--- a/third_party/tbb/thread_dispatcher.h
+++ b/third_party/tbb/thread_dispatcher.hh
@@ -18,16 +18,16 @@
 #ifndef _TBB_thread_dispatcher_H
 #define _TBB_thread_dispatcher_H
 
-#include "third_party/tbb/detail/_config.h"
-#include "third_party/tbb/detail/_utils.h"
-#include "third_party/tbb/rw_mutex.h"
-#include "third_party/tbb/task_arena.h"
+#include "third_party/tbb/detail/_config.hh"
+#include "third_party/tbb/detail/_utils.hh"
+#include "third_party/tbb/rw_mutex.hh"
+#include "third_party/tbb/task_arena.hh"
 
-#include "third_party/tbb/arena.h"
-#include "third_party/tbb/governor.h"
-#include "third_party/tbb/thread_data.h"
-#include "third_party/tbb/rml_tbb.h"
-#include "third_party/tbb/thread_dispatcher_client.h"
+#include "third_party/tbb/arena.hh"
+#include "third_party/tbb/governor.hh"
+#include "third_party/tbb/thread_data.hh"
+#include "third_party/tbb/rml_tbb.hh"
+#include "third_party/tbb/thread_dispatcher_client.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/thread_dispatcher_client.h b/third_party/tbb/thread_dispatcher_client.hh
similarity index 94%
rename from third_party/tbb/thread_dispatcher_client.h
rename to third_party/tbb/thread_dispatcher_client.hh
index 7c95b5118..ee1eb5947 100644
--- a/third_party/tbb/thread_dispatcher_client.h
+++ b/third_party/tbb/thread_dispatcher_client.hh
@@ -18,8 +18,8 @@
 #ifndef _TBB_thread_dispatcher_client_H
 #define _TBB_thread_dispatcher_client_H
 
-#include "third_party/tbb/detail/_intrusive_list_node.h"
-#include "third_party/tbb/arena.h"
+#include "third_party/tbb/detail/_intrusive_list_node.hh"
+#include "third_party/tbb/arena.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/thread_request_serializer.cc b/third_party/tbb/thread_request_serializer.cc
index 534f720ce..15e7c56c5 100644
--- a/third_party/tbb/thread_request_serializer.cc
+++ b/third_party/tbb/thread_request_serializer.cc
@@ -15,8 +15,8 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/misc.h"
-#include "third_party/tbb/thread_request_serializer.h"
+#include "third_party/tbb/misc.hh"
+#include "third_party/tbb/thread_request_serializer.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/thread_request_serializer.h b/third_party/tbb/thread_request_serializer.hh
similarity index 95%
rename from third_party/tbb/thread_request_serializer.h
rename to third_party/tbb/thread_request_serializer.hh
index 2c633853a..71d841672 100644
--- a/third_party/tbb/thread_request_serializer.h
+++ b/third_party/tbb/thread_request_serializer.hh
@@ -18,10 +18,10 @@
 #ifndef _TBB_thread_serializer_handlers_H
 #define _TBB_thread_serializer_handlers_H
 
-#include "third_party/tbb/mutex.h"
-#include "third_party/tbb/rw_mutex.h"
+#include "third_party/tbb/mutex.hh"
+#include "third_party/tbb/rw_mutex.hh"
 
-#include "third_party/tbb/thread_dispatcher.h"
+#include "third_party/tbb/thread_dispatcher.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/threading_control.cc b/third_party/tbb/threading_control.cc
index 9f48853ed..70258c4f7 100644
--- a/third_party/tbb/threading_control.cc
+++ b/third_party/tbb/threading_control.cc
@@ -15,12 +15,12 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/threading_control.h"
-#include "third_party/tbb/permit_manager.h"
-#include "third_party/tbb/market.h"
-#include "third_party/tbb/thread_dispatcher.h"
-#include "third_party/tbb/governor.h"
-#include "third_party/tbb/thread_dispatcher_client.h"
+#include "third_party/tbb/threading_control.hh"
+#include "third_party/tbb/permit_manager.hh"
+#include "third_party/tbb/market.hh"
+#include "third_party/tbb/thread_dispatcher.hh"
+#include "third_party/tbb/governor.hh"
+#include "third_party/tbb/thread_dispatcher_client.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/threading_control.h b/third_party/tbb/threading_control.hh
similarity index 91%
rename from third_party/tbb/threading_control.h
rename to third_party/tbb/threading_control.hh
index b42c9dd42..1e9f1a3a8 100644
--- a/third_party/tbb/threading_control.h
+++ b/third_party/tbb/threading_control.hh
@@ -18,18 +18,18 @@
 #ifndef _TBB_threading_control_H
 #define _TBB_threading_control_H
 
-#include "third_party/tbb/mutex.h"
-#include "third_party/tbb/global_control.h"
+#include "third_party/tbb/mutex.hh"
+#include "third_party/tbb/global_control.hh"
 
-#include "third_party/tbb/threading_control_client.h"
-#include "third_party/tbb/intrusive_list.h"
-#include "third_party/tbb/main.h"
-#include "third_party/tbb/permit_manager.h"
-#include "third_party/tbb/pm_client.h"
-#include "third_party/tbb/thread_dispatcher.h"
-#include "third_party/tbb/cancellation_disseminator.h"
-#include "third_party/tbb/thread_request_serializer.h"
-#include "third_party/tbb/scheduler_common.h"
+#include "third_party/tbb/threading_control_client.hh"
+#include "third_party/tbb/intrusive_list.hh"
+#include "third_party/tbb/main.hh"
+#include "third_party/tbb/permit_manager.hh"
+#include "third_party/tbb/pm_client.hh"
+#include "third_party/tbb/thread_dispatcher.hh"
+#include "third_party/tbb/cancellation_disseminator.hh"
+#include "third_party/tbb/thread_request_serializer.hh"
+#include "third_party/tbb/scheduler_common.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/threading_control_client.h b/third_party/tbb/threading_control_client.hh
similarity index 97%
rename from third_party/tbb/threading_control_client.h
rename to third_party/tbb/threading_control_client.hh
index 941a9de3f..82d17c034 100644
--- a/third_party/tbb/threading_control_client.h
+++ b/third_party/tbb/threading_control_client.hh
@@ -18,7 +18,7 @@
 #ifndef _TBB_threading_control_client_H
 #define _TBB_threading_control_client_H
 
-#include "third_party/tbb/detail/_assert.h"
+#include "third_party/tbb/detail/_assert.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/tick_count.h b/third_party/tbb/tick_count.hh
similarity index 98%
rename from third_party/tbb/tick_count.h
rename to third_party/tbb/tick_count.hh
index 37880a9c4..bde83f20f 100644
--- a/third_party/tbb/tick_count.h
+++ b/third_party/tbb/tick_count.hh
@@ -20,7 +20,7 @@
 
 #include "third_party/libcxx/chrono"
 
-#include "third_party/tbb/detail/_namespace_injection.h"
+#include "third_party/tbb/detail/_namespace_injection.hh"
 
 namespace tbb {
 namespace detail {
diff --git a/third_party/tbb/tls.h b/third_party/tbb/tls.hh
similarity index 98%
rename from third_party/tbb/tls.h
rename to third_party/tbb/tls.hh
index 7a143a915..086823f3d 100644
--- a/third_party/tbb/tls.h
+++ b/third_party/tbb/tls.hh
@@ -18,7 +18,7 @@
 #ifndef _TBB_tls_H
 #define _TBB_tls_H
 
-#include "third_party/tbb/detail/_config.h"
+#include "third_party/tbb/detail/_config.hh"
 
 #if __TBB_USE_POSIX
 #include "libc/calls/weirdtypes.h"
diff --git a/third_party/tbb/version.cc b/third_party/tbb/version.cc
index d86164b2b..564fd6d20 100644
--- a/third_party/tbb/version.cc
+++ b/third_party/tbb/version.cc
@@ -15,7 +15,7 @@
     limitations under the License.
 */
 
-#include "third_party/tbb/version.h"
+#include "third_party/tbb/version.hh"
 
 extern "C" int TBB_runtime_interface_version() {
     return TBB_INTERFACE_VERSION;
diff --git a/third_party/tbb/version.h b/third_party/tbb/version.hh
similarity index 97%
rename from third_party/tbb/version.h
rename to third_party/tbb/version.hh
index eae21b2c4..ab65f946b 100644
--- a/third_party/tbb/version.h
+++ b/third_party/tbb/version.hh
@@ -20,8 +20,8 @@
 
 // Exclude all includes during .rc files compilation
 #ifndef RC_INVOKED
-    #include "third_party/tbb/detail/_config.h"
-    #include "third_party/tbb/detail/_namespace_injection.h"
+    #include "third_party/tbb/detail/_config.hh"
+    #include "third_party/tbb/detail/_namespace_injection.hh"
 #else
     #define __TBB_STRING_AUX(x) #x
     #define __TBB_STRING(x) __TBB_STRING_AUX(x)
diff --git a/third_party/tbb/waiters.h b/third_party/tbb/waiters.hh
similarity index 96%
rename from third_party/tbb/waiters.h
rename to third_party/tbb/waiters.hh
index d9ca0467b..87e183a47 100644
--- a/third_party/tbb/waiters.h
+++ b/third_party/tbb/waiters.hh
@@ -18,10 +18,10 @@
 #ifndef _TBB_waiters_H
 #define _TBB_waiters_H
 
-#include "third_party/tbb/detail/_task.h"
-#include "third_party/tbb/scheduler_common.h"
-#include "third_party/tbb/arena.h"
-#include "third_party/tbb/threading_control.h"
+#include "third_party/tbb/detail/_task.hh"
+#include "third_party/tbb/scheduler_common.hh"
+#include "third_party/tbb/arena.hh"
+#include "third_party/tbb/threading_control.hh"
 
 namespace tbb {
 namespace detail {