diff --git a/libcxx/include/__format/format_context.h b/libcxx/include/__format/format_context.h
--- a/libcxx/include/__format/format_context.h
+++ b/libcxx/include/__format/format_context.h
@@ -14,10 +14,9 @@
 #include <__config>
 #include <__format/format_args.h>
 #include <__format/format_fwd.h>
+#include <__iterator/back_insert_iterator.h>
 #include <__iterator/concepts.h>
 #include <concepts>
-#include <iterator>
-#include <string>
 
 #ifndef _LIBCPP_HAS_NO_LOCALIZATION
 #include <locale>
diff --git a/libcxx/include/__format/formatter_string.h b/libcxx/include/__format/formatter_string.h
--- a/libcxx/include/__format/formatter_string.h
+++ b/libcxx/include/__format/formatter_string.h
@@ -16,7 +16,6 @@
 #include <__format/format_string.h>
 #include <__format/formatter.h>
 #include <__format/parser_std_format_spec.h>
-#include <algorithm>
 #include <string_view>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)