Revert "[libc++] Remove unused headers from <filesystem>"

This reverts commit 352945dd36.

libcxx/include/filesystem

@@ -254,9 +254,32 @@ inline constexpr bool std::ranges::enable_view<std::filesystem::recursive_direct
 #include<__filesystem/recursive_directory_iterator.h>
 #include<__filesystem/space_info.h>
 #include<__filesystem/u8path.h>
+
+#include <__availability>
+#include <__config>
+#include <__debug>
+#include <__ranges/enable_borrowed_range.h>
+#include <__ranges/enable_view.h>
+#include <__utility/forward.h>
+#include <chrono>
 #include <compare>
+#include <cstddef>
+#include <cstdlib>
+#include <iosfwd>
+#include <iterator>
+#include <memory>
+#include <stack>
+#include <string>
+#include <string_view>
+#include <system_error>
+#include <utility>
 #include <version>
 
+#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+# include <locale>
+# include <iomanip> // for quoted
+#endif
+
 #if defined(_LIBCPP_HAS_NO_FILESYSTEM_LIBRARY)
 # error "The Filesystem library is not supported since libc++ has been configured with LIBCXX_ENABLE_FILESYSTEM disabled"
 #endif

libcxx/src/filesystem/directory_iterator.cpp

@@ -6,9 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "__config"
 #include "filesystem"
-#include "stack"
+#include "__config"
 #if defined(_LIBCPP_WIN32API)
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX

libcxx/src/filesystem/filesystem_common.h

@@ -17,7 +17,6 @@
 #include "cstdlib"
 #include "ctime"
 #include "filesystem"
-#include "system_error"
 
 #if !defined(_LIBCPP_WIN32API)
 # include <unistd.h>

libcxx/test/libcxx/input.output/filesystems/convert_file_time.pass.cpp

@@ -14,13 +14,12 @@
 
 // ADDITIONAL_COMPILE_FLAGS: -I %S/../../../../src/filesystem
 
-#include <cassert>
-#include <chrono>
-#include <cstddef>
 #include <filesystem>
-#include <limits>
-#include <string>
+#include <chrono>
 #include <type_traits>
+#include <limits>
+#include <cstddef>
+#include <cassert>
 
 #include "filesystem_common.h"
 

libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/comparisons.pass.cpp

@@ -19,10 +19,10 @@
 // bool operator> (directory_entry const&) const noexcept;
 // bool operator>=(directory_entry const&) const noexcept;
 
+
 #include "filesystem_include.h"
-#include <cassert>
 #include <type_traits>
-#include <utility>
+#include <cassert>
 
 #include "test_macros.h"
 

libcxx/test/std/input.output/filesystems/class.directory_iterator/types.pass.cpp

@@ -19,9 +19,8 @@
 // typedef ... iterator_category
 
 #include "filesystem_include.h"
-#include <cassert>
-#include <iterator>
 #include <type_traits>
+#include <cassert>
 
 #include "test_macros.h"
 

libcxx/test/std/input.output/filesystems/class.filesystem_error/filesystem_error.members.pass.cpp

@@ -21,10 +21,8 @@
 // const path& path2() const noexcept;
 
 #include "filesystem_include.h"
-#include <cassert>
-#include <string>
-#include <system_error>
 #include <type_traits>
+#include <cassert>
 
 #include "test_macros.h"
 

libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/copy.pass.cpp

@@ -15,9 +15,8 @@
 // path& operator=(path const&);
 
 #include "filesystem_include.h"
-#include <cassert>
-#include <string>
 #include <type_traits>
+#include <cassert>
 
 #include "test_macros.h"
 

libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/move.pass.cpp

@@ -17,9 +17,8 @@
 // path& operator=(path&&) noexcept
 
 #include "filesystem_include.h"
-#include <cassert>
-#include <string>
 #include <type_traits>
+#include <cassert>
 
 #include "test_macros.h"
 #include "count_new.h"

libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/copy.pass.cpp

@@ -15,9 +15,8 @@
 // path(path const&)
 
 #include "filesystem_include.h"
-#include <cassert>
-#include <string>
 #include <type_traits>
+#include <cassert>
 
 #include "test_macros.h"
 

libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/move.pass.cpp

@@ -16,9 +16,8 @@
 // path(path&&) noexcept
 
 #include "filesystem_include.h"
-#include <cassert>
-#include <string>
 #include <type_traits>
+#include <cassert>
 
 #include "test_macros.h"
 #include "count_new.h"

libcxx/test/std/input.output/filesystems/class.path/synop.pass.cpp

@@ -17,9 +17,8 @@
 // static constexpr value_type preferred_separator = ...;
 
 #include "filesystem_include.h"
-#include <cassert>
-#include <string>
 #include <type_traits>
+#include <cassert>
 
 #include "test_macros.h"
 

libcxx/test/support/filesystem_test_helper.h

@@ -14,10 +14,9 @@
 #endif
 
 #include <cassert>
-#include <chrono>
 #include <cstdio> // for printf
 #include <string>
-#include <system_error>
+#include <chrono>
 #include <vector>
 
 #include "make_string.h"