diff --git a/clang-tools-extra/clangd/index/CanonicalIncludes.cpp b/clang-tools-extra/clangd/index/CanonicalIncludes.cpp
--- a/clang-tools-extra/clangd/index/CanonicalIncludes.cpp
+++ b/clang-tools-extra/clangd/index/CanonicalIncludes.cpp
@@ -181,19 +181,26 @@
       {"backward/auto_ptr.h", "<memory>"},
       {"backward/binders.h", "<string>"},
       {"bits/algorithmfwd.h", "<algorithm>"},
+      {"bits/align.h", "<memory>"},
       {"bits/alloc_traits.h", "<memory>"},
       {"bits/allocated_ptr.h", "<memory>"},
       {"bits/allocator.h", "<allocator>"},
       {"bits/atomic_base.h", "<atomic>"},
       {"bits/atomic_lockfree_defines.h", "<exception>"},
       {"bits/atomic_futex.h", "<atomic>"},
+      {"bits/atomic_timed_wait.h", "<semaphore>"},
+      {"bits/atomic_wait.h", "<atomic>"},
       {"bits/basic_ios.h", "<ios>"},
       {"bits/basic_ios.tcc", "<ios>"},
       {"bits/basic_string.h", "<string>"},
       {"bits/basic_string.tcc", "<string>"},
+      {"bits/boost_concept_check.h", "<numeric>"},
       {"bits/char_traits.h", "<string>"},
+      {"bits/charconv.h", "<charconv>"},
+      {"bits/chrono.h", "<chrono>"},
       {"bits/codecvt.h", "<locale>"},
       {"bits/concept_check.h", "<numeric>"},
+      {"bits/cow_string.h", "<string>"},
       {"bits/cpp_type_traits.h", "<cmath>"},
       {"bits/cxxabi_forced.h", "<cxxabi.h>"},
       {"bits/deque.tcc", "<deque>"},
@@ -202,6 +209,10 @@
       {"bits/exception_ptr.h", "<exception>"},
       {"bits/forward_list.h", "<forward_list>"},
       {"bits/forward_list.tcc", "<forward_list>"},
+      {"bits/fs_dir.h", "<filesystem>"},
+      {"bits/fs_fwd.h", "<filesystem>"},
+      {"bits/fs_ops.h", "<filesystem>"},
+      {"bits/fs_path.h", "<filesystem>"},
       {"bits/fstream.tcc", "<fstream>"},
       {"bits/functexcept.h", "<list>"},
       {"bits/functional_hash.h", "<functional>"},
@@ -214,6 +225,7 @@
       {"bits/invoke.h", "<functional>"},
       {"bits/ios_base.h", "<ios>"},
       {"bits/istream.tcc", "<istream>"},
+      {"bits/iterator_concepts.h", "<iterator>"},
       {"bits/list.tcc", "<list>"},
       {"bits/locale_classes.h", "<locale>"},
       {"bits/locale_classes.tcc", "<locale>"},
@@ -224,8 +236,11 @@
       {"bits/locale_facets_nonio.tcc", "<locale>"},
       {"bits/localefwd.h", "<locale>"},
       {"bits/mask_array.h", "<valarray>"},
+      {"bits/max_size_type.h", "<iterator>"},
+      {"bits/memory_resource.h", "<memory_resource>"},
       {"bits/memoryfwd.h", "<memory>"},
       {"bits/move.h", "<utility>"},
+      {"bits/move_only_function.h", "<functional>"},
       {"bits/nested_exception.h", "<exception>"},
       {"bits/ostream.tcc", "<ostream>"},
       {"bits/ostream_insert.h", "<ostream>"},
@@ -237,6 +252,12 @@
       {"bits/random.h", "<random>"},
       {"bits/random.tcc", "<random>"},
       {"bits/range_access.h", "<iterator>"},
+      {"bits/ranges_algo.h", "<algorithm>"},
+      {"bits/ranges_algobase.h", "<algorithm>"},
+      {"bits/ranges_base.h", "<ranges>"},
+      {"bits/ranges_cmp.h", "<functional>"},
+      {"bits/ranges_uninitialized.h", "<memory>"},
+      {"bits/ranges_util.h", "<ranges>"},
       {"bits/refwrap.h", "<functional>"},
       {"bits/regex.h", "<regex>"},
       {"bits/regex_automaton.h", "<regex>"},
@@ -249,6 +270,7 @@
       {"bits/regex_grep_matcher.tcc", "<regex>"},
       {"bits/regex_nfa.h", "<regex>"},
       {"bits/regex_scanner.h", "<regex>"},
+      {"bits/semaphore_base.h", "<semaphore>"},
       {"bits/shared_ptr.h", "<memory>"},
       {"bits/shared_ptr_base.h", "<memory>"},
       {"bits/shared_ptr_atomic.h", "<atomic>"},
@@ -257,6 +279,7 @@
       {"bits/std_abs.h", "<cmath>"},
       {"bits/std_function.h", "<functional>"},
       {"bits/std_mutex.h", "<mutex>"},
+      {"bits/std_thread.h", "<thread>"},
       {"bits/stl_algo.h", "<algorithm>"},
       {"bits/stl_algobase.h", "<algorithm>"},
       {"bits/stl_bvector.h", "<vector>"},
@@ -286,11 +309,15 @@
       {"bits/streambuf.tcc", "<streambuf>"},
       {"bits/streambuf_iterator.h", "<iterator>"},
       {"bits/stringfwd.h", "<string>"},
+      {"bits/this_thread_sleep.h", "<thread>"},
       {"bits/uniform_int_dist.h", "<random>"},
+      {"bits/unique_lock.h", "<mutex>"},
       {"bits/unique_ptr.h", "<memory>"},
       {"bits/unordered_map.h", "<unordered_map>"},
       {"bits/unordered_set.h", "<unordered_set>"},
       {"bits/uses_allocator.h", "<memory>"},
+      {"bits/uses_allocator_args.h", "<memory>"},
+      {"bits/utility.h", "<utility>"},
       {"bits/valarray_after.h", "<valarray>"},
       {"bits/valarray_array.h", "<valarray>"},
       {"bits/valarray_array.tcc", "<valarray>"},