diff --git a/libcxx/include/__threading_support b/libcxx/include/__threading_support
--- a/libcxx/include/__threading_support
+++ b/libcxx/include/__threading_support
@@ -16,7 +16,6 @@
 #include <__compare/ordering.h>
 #include <__config>
 #include <__fwd/hash.h>
-#include <__thread/poll_with_backoff.h>
 #include <errno.h>
 #include <iosfwd>
 #include <limits>
diff --git a/libcxx/include/barrier b/libcxx/include/barrier
--- a/libcxx/include/barrier
+++ b/libcxx/include/barrier
@@ -330,6 +330,7 @@
 
 #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
 #  include <concepts>
+#  include <ctime>
 #  include <iterator>
 #  include <memory>
 #  include <stdexcept>
diff --git a/libcxx/include/semaphore b/libcxx/include/semaphore
--- a/libcxx/include/semaphore
+++ b/libcxx/include/semaphore
@@ -188,4 +188,8 @@
 
 _LIBCPP_POP_MACROS
 
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <ctime>
+#endif
+
 #endif //_LIBCPP_SEMAPHORE
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b.csv b/libcxx/test/libcxx/transitive_includes/cxx2b.csv
--- a/libcxx/test/libcxx/transitive_includes/cxx2b.csv
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b.csv
@@ -42,7 +42,6 @@
 barrier cstddef
 barrier cstdint
 barrier cstring
-barrier ctime
 barrier iosfwd
 barrier limits
 barrier new
@@ -554,7 +553,6 @@
 scoped_allocator type_traits
 scoped_allocator version
 semaphore atomic
-semaphore ctime
 semaphore iosfwd
 semaphore limits
 semaphore ratio