1 files changed, 70 insertions, 19 deletions

diff --git a/test/libcxx/double_include.sh.cpp b/test/libcxx/double_include.sh.cpp
index 99767cf1bbc8d..46dfc999be8b4 100644
--- a/test/libcxx/double_include.sh.cpp
+++ b/test/libcxx/double_include.sh.cpp
@@ -15,14 +15,18 @@
 // RUN: %cxx -o %t.exe %t.first.o %t.second.o %flags %link_flags
 // RUN: %run
 
-
 // Prevent <ext/hash_map> from generating deprecated warnings for this test.
 #if defined(__DEPRECATED)
 #undef __DEPRECATED
 #endif
 
+// Top level headers
 #include <algorithm>
+#include <any>
 #include <array>
+#ifndef _LIBCPP_HAS_NO_THREADS
+#include <atomic>
+#endif
 #include <bitset>
 #include <cassert>
 #include <ccomplex>
@@ -51,25 +55,21 @@
 #include <cstring>
 #include <ctgmath>
 #include <ctime>
+#include <ctype.h>
 #include <cwchar>
 #include <cwctype>
 #include <deque>
+#include <errno.h>
 #include <exception>
-#include <experimental/algorithm>
-#include <experimental/any>
-#include <experimental/chrono>
-#include <experimental/dynarray>
-#include <experimental/optional>
-#include <experimental/string_view>
-#include <experimental/system_error>
-#include <experimental/type_traits>
-#include <experimental/utility>
-#include <ext/hash_map>
-#include <ext/hash_set>
+#include <float.h>
 #include <forward_list>
 #include <fstream>
 #include <functional>
+#ifndef _LIBCPP_HAS_NO_THREADS
+#include <future>
+#endif
 #include <initializer_list>
+#include <inttypes.h>
 #include <iomanip>
 #include <ios>
 #include <iosfwd>
@@ -77,12 +77,19 @@
 #include <istream>
 #include <iterator>
 #include <limits>
+#include <limits.h>
 #include <list>
 #include <locale>
+#include <locale.h>
 #include <map>
+#include <math.h>
 #include <memory>
+#ifndef _LIBCPP_HAS_NO_THREADS
+#include <mutex>
+#endif
 #include <new>
 #include <numeric>
+#include <optional>
 #include <ostream>
 #include <queue>
 #include <random>
@@ -90,14 +97,28 @@
 #include <regex>
 #include <scoped_allocator>
 #include <set>
+#include <setjmp.h>
+#ifndef _LIBCPP_HAS_NO_THREADS
+#include <shared_mutex>
+#endif
 #include <sstream>
 #include <stack>
+#include <stdbool.h>
+#include <stddef.h>
 #include <stdexcept>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <streambuf>
 #include <string>
+#include <string.h>
+#include <string_view>
 #include <strstream>
 #include <system_error>
 #include <tgmath.h>
+#ifndef _LIBCPP_HAS_NO_THREADS
+#include <thread>
+#endif
 #include <tuple>
 #include <typeindex>
 #include <typeinfo>
@@ -106,15 +127,45 @@
 #include <unordered_set>
 #include <utility>
 #include <valarray>
+#include <variant>
 #include <vector>
+#include <wchar.h>
+#include <wctype.h>
 
-#ifndef _LIBCPP_HAS_NO_THREADS
-#include <atomic>
-#include <future>
-#include <mutex>
-#include <shared_mutex>
-#include <thread>
-#endif
+// experimental headers
+#if __cplusplus >= 201103L
+#include <experimental/algorithm>
+#include <experimental/any>
+#include <experimental/chrono>
+#include <experimental/deque>
+#include <experimental/dynarray>
+#include <experimental/filesystem>
+#include <experimental/forward_list>
+#include <experimental/functional>
+#include <experimental/iterator>
+#include <experimental/list>
+#include <experimental/map>
+#include <experimental/memory_resource>
+#include <experimental/numeric>
+#include <experimental/optional>
+#include <experimental/propagate_const>
+#include <experimental/ratio>
+#include <experimental/regex>
+#include <experimental/set>
+#include <experimental/string>
+#include <experimental/string_view>
+#include <experimental/system_error>
+#include <experimental/tuple>
+#include <experimental/type_traits>
+#include <experimental/unordered_map>
+#include <experimental/unordered_set>
+#include <experimental/utility>
+#include <experimental/vector>
+#endif // __cplusplus >= 201103L
+
+// extended headers
+#include <ext/hash_map>
+#include <ext/hash_set>
 
 #if defined(WITH_MAIN)
 int main() {}