diff --git a/libcxx/include/any b/libcxx/include/any
--- a/libcxx/include/any
+++ b/libcxx/include/any
@@ -80,7 +80,7 @@
 
 */
 
-#include <experimental/__config>
+#include <__config>
 #include <__availability>
 #include <memory>
 #include <typeinfo>
diff --git a/libcxx/include/system_error b/libcxx/include/system_error
--- a/libcxx/include/system_error
+++ b/libcxx/include/system_error
@@ -142,11 +142,12 @@
 
 */
 
+#include <__config>
 #include <__errc>
-#include <type_traits>
+#include <__functional_base> // unary_function
 #include <stdexcept>
-#include <__functional_base>
 #include <string>
+#include <type_traits>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header