diff --git a/libcxx/.clang-format b/libcxx/.clang-format
--- a/libcxx/.clang-format
+++ b/libcxx/.clang-format
@@ -68,7 +68,9 @@
 NamespaceIndentation: Inner
 PackConstructorInitializers: NextLine
 
-PenaltyIndentedWhitespace: 61
+PenaltyIndentedWhitespace: 1
+PenaltyBreakOpenParenthesis: 60
+PenaltyReturnTypeOnItsOwnLine: 10
 
 Language: Cpp
 Standard: c++20
diff --git a/libcxx/include/string b/libcxx/include/string
--- a/libcxx/include/string
+++ b/libcxx/include/string
@@ -539,10 +539,12 @@
 #include <__utility/swap.h>
 #include <__utility/unreachable.h>
 #include <climits>
+#include <compare>
 #include <cstdint>
 #include <cstdio>  // EOF
 #include <cstdlib>
 #include <cstring>
+#include <initializer_list>
 #include <iosfwd>
 #include <limits>
 #include <memory>
@@ -555,19 +557,6 @@
 #  include <cwchar>
 #endif
 
-// standard-mandated includes
-
-// [iterator.range]
-#include <__iterator/access.h>
-#include <__iterator/data.h>
-#include <__iterator/empty.h>
-#include <__iterator/reverse_access.h>
-#include <__iterator/size.h>
-
-// [string.syn]
-#include <compare>
-#include <initializer_list>
-
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif