diff --git a/include/module.modulemap b/include/module.modulemap
index 88e6590e5..af32dfc7b 100644
--- a/include/module.modulemap
+++ b/include/module.modulemap
@@ -393,6 +393,14 @@ module std [system] {
   module string {
     header "string"
     export initializer_list
+    export string_view
+    export __string
+    export *
+  }
+  module string_view {
+    header "string_view"
+    export initializer_list
+    export __string
     export *
   }
   module strstream {
@@ -468,6 +476,7 @@ module std [system] {
   module __split_buffer { header "__split_buffer" export * }
   module __sso_allocator { header "__sso_allocator" export * }
   module __std_stream { header "__std_stream" export * }
+  module __string { header "__string" export * }
   module __tree { header "__tree" export * }
   module __tuple { header "__tuple" export * }
   module __undef_min_max { header "__undef_min_max" export * }
diff --git a/include/string_view b/include/string_view
index 60c0ad00f..e66ac40d3 100644
--- a/include/string_view
+++ b/include/string_view
@@ -164,7 +164,10 @@ namespace std {
 #include <__config>
 
 #include <__string>
+#include <algorithm>
 #include <iterator>
+#include <limits>
+#include <stdexcept>
 #include <__debug>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)