diff --git a/libcxx/docs/ReleaseNotes.rst b/libcxx/docs/ReleaseNotes.rst
--- a/libcxx/docs/ReleaseNotes.rst
+++ b/libcxx/docs/ReleaseNotes.rst
@@ -67,10 +67,15 @@
   ``<filesystem>`` header. The associated macro
   ``_LIBCPP_DEPRECATED_EXPERIMENTAL_FILESYSTEM`` has also been removed.
 
-- Some libc++ headers no longer transitively include all of ``<algorithm>``, ``<chrono>`` and ``<utility>``.
-  If, after updating libc++, you see compiler errors related to missing declarations in
-  namespace ``std``, it might be because one of your source files now needs to
-  ``#include <algorithm>``, ``#include <chrono>`` and/or ``#include <utility>``.
+- Some libc++ headers no longer transitively include all of:
+    - ``<algorithm>``
+    - ``<chrono>``
+    - ``<functional>``
+    - ``<utility>``
+
+  If, after updating libc++, you see compiler errors related to missing declarations
+  in namespace ``std``, it might be because one of your source files now needs to
+  include one or more of the headers listed above.
 
 - The integer distributions ``binomial_distribution``, ``discrete_distribution``,
   ``geometric_distribution``, ``negative_binomial_distribution``, ``poisson_distribution``,
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm
--- a/libcxx/include/algorithm
+++ b/libcxx/include/algorithm
@@ -881,7 +881,6 @@
 #include <__debug>
 #include <cstddef>
 #include <cstring>
-#include <functional> // TODO: Remove this include
 #include <initializer_list>
 #include <iterator>
 #include <memory>
diff --git a/libcxx/include/experimental/coroutine b/libcxx/include/experimental/coroutine
--- a/libcxx/include/experimental/coroutine
+++ b/libcxx/include/experimental/coroutine
@@ -49,7 +49,6 @@
 #include <__functional/hash.h>
 #include <cstddef>
 #include <experimental/__config>
-#include <functional> // TODO: Remove this include
 #include <memory> // for hash<T*>
 #include <new>
 #include <type_traits>
diff --git a/libcxx/include/experimental/propagate_const b/libcxx/include/experimental/propagate_const
--- a/libcxx/include/experimental/propagate_const
+++ b/libcxx/include/experimental/propagate_const
@@ -113,7 +113,6 @@
 #include <__utility/move.h>
 #include <__utility/swap.h>
 #include <experimental/__config>
-#include <functional> // TODO: Remove this include
 #include <type_traits>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/experimental/simd b/libcxx/include/experimental/simd
--- a/libcxx/include/experimental/simd
+++ b/libcxx/include/experimental/simd
@@ -654,7 +654,6 @@
 #include <array>
 #include <cstddef>
 #include <experimental/__config>
-#include <functional> // TODO: Remove this include
 #include <tuple>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/ext/hash_map b/libcxx/include/ext/hash_map
--- a/libcxx/include/ext/hash_map
+++ b/libcxx/include/ext/hash_map
@@ -206,7 +206,6 @@
 #include <__hash_table>
 #include <algorithm>
 #include <ext/__hash>
-#include <functional> // TODO: Remove this include
 #include <stdexcept>
 #include <type_traits>
 
diff --git a/libcxx/include/ext/hash_set b/libcxx/include/ext/hash_set
--- a/libcxx/include/ext/hash_set
+++ b/libcxx/include/ext/hash_set
@@ -197,7 +197,6 @@
 #include <__hash_table>
 #include <algorithm>
 #include <ext/__hash>
-#include <functional> // TODO: Remove this include
 
 #if defined(__DEPRECATED) && __DEPRECATED
 #if defined(_LIBCPP_WARNING)
diff --git a/libcxx/include/map b/libcxx/include/map
--- a/libcxx/include/map
+++ b/libcxx/include/map
@@ -539,7 +539,6 @@
 #include <__utility/forward.h>
 #include <__utility/swap.h>
 #include <compare>
-#include <functional> // TODO: Remove this include
 #include <initializer_list>
 #include <iterator> // __libcpp_erase_if_container
 #include <memory>
diff --git a/libcxx/include/mutex b/libcxx/include/mutex
--- a/libcxx/include/mutex
+++ b/libcxx/include/mutex
@@ -192,7 +192,6 @@
 #include <__threading_support>
 #include <__utility/forward.h>
 #include <cstdint>
-#include <functional> // TODO: Remove this include
 #include <memory>
 #ifndef _LIBCPP_CXX03_LANG
 # include <tuple>
diff --git a/libcxx/include/numeric b/libcxx/include/numeric
--- a/libcxx/include/numeric
+++ b/libcxx/include/numeric
@@ -147,7 +147,6 @@
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__config>
 #include <cmath> // for isnormal
-#include <functional> // TODO: Remove this include
 #include <iterator>
 #include <version>
 
diff --git a/libcxx/include/optional b/libcxx/include/optional
--- a/libcxx/include/optional
+++ b/libcxx/include/optional
@@ -172,7 +172,6 @@
 #include <__utility/move.h>
 #include <__utility/swap.h>
 #include <compare>
-#include <functional> // TODO: Remove this include
 #include <initializer_list>
 #include <new>
 #include <stdexcept>
diff --git a/libcxx/include/queue b/libcxx/include/queue
--- a/libcxx/include/queue
+++ b/libcxx/include/queue
@@ -227,7 +227,6 @@
 #include <__utility/forward.h>
 #include <compare>
 #include <deque>
-#include <functional> // TODO: Remove this include
 #include <type_traits>
 #include <vector>
 #include <version>
diff --git a/libcxx/include/set b/libcxx/include/set
--- a/libcxx/include/set
+++ b/libcxx/include/set
@@ -481,7 +481,6 @@
 #include <__tree>
 #include <__utility/forward.h>
 #include <compare>
-#include <functional> // TODO: Remove this include
 #include <initializer_list>
 #include <iterator> // __libcpp_erase_if_container
 #include <version>
diff --git a/libcxx/include/thread b/libcxx/include/thread
--- a/libcxx/include/thread
+++ b/libcxx/include/thread
@@ -90,7 +90,6 @@
 #include <__threading_support>
 #include <__utility/forward.h>
 #include <cstddef>
-#include <functional> // TODO: Remove this include
 #include <iosfwd>
 #include <memory>
 #include <system_error>
diff --git a/libcxx/include/unordered_map b/libcxx/include/unordered_map
--- a/libcxx/include/unordered_map
+++ b/libcxx/include/unordered_map
@@ -525,7 +525,6 @@
 #include <__node_handle>
 #include <__utility/forward.h>
 #include <compare>
-#include <functional> // TODO: Remove this include
 #include <iterator> // __libcpp_erase_if_container
 #include <stdexcept>
 #include <tuple>
diff --git a/libcxx/include/unordered_set b/libcxx/include/unordered_set
--- a/libcxx/include/unordered_set
+++ b/libcxx/include/unordered_set
@@ -469,7 +469,6 @@
 #include <__node_handle>
 #include <__utility/forward.h>
 #include <compare>
-#include <functional> // TODO: Remove this include
 #include <iterator> // __libcpp_erase_if_container
 #include <version>
 
diff --git a/libcxx/include/valarray b/libcxx/include/valarray
--- a/libcxx/include/valarray
+++ b/libcxx/include/valarray
@@ -357,7 +357,6 @@
 #include <__utility/swap.h>
 #include <cmath>
 #include <cstddef>
-#include <functional> // TODO: Remove this include
 #include <initializer_list>
 #include <new>
 #include <version>