Index: containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp
===================================================================
--- containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp	(revision 191954)
+++ containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp	(working copy)
@@ -21,8 +21,6 @@
 // ~dynarray();
 
   
-#include <__config>
-
 #if _LIBCPP_STD_VER > 11
 
 #include <dynarray>
Index: containers/sequences/dynarray/dynarray.cons/default.pass.cpp
===================================================================
--- containers/sequences/dynarray/dynarray.cons/default.pass.cpp	(revision 191954)
+++ containers/sequences/dynarray/dynarray.cons/default.pass.cpp	(working copy)
@@ -17,8 +17,6 @@
 // ~dynarray();
 
   
-#include <__config>
-
 #if _LIBCPP_STD_VER > 11
 
 #include <dynarray>
Index: containers/sequences/dynarray/dynarray.data/default.pass.cpp
===================================================================
--- containers/sequences/dynarray/dynarray.data/default.pass.cpp	(revision 191954)
+++ containers/sequences/dynarray/dynarray.data/default.pass.cpp	(working copy)
@@ -13,8 +13,6 @@
 // const T* data() const noexcept;
 
   
-#include <__config>
-
 #if _LIBCPP_STD_VER > 11
 
 #include <dynarray>
Index: containers/sequences/dynarray/dynarray.mutate/default.pass.cpp
===================================================================
--- containers/sequences/dynarray/dynarray.mutate/default.pass.cpp	(revision 191954)
+++ containers/sequences/dynarray/dynarray.mutate/default.pass.cpp	(working copy)
@@ -13,8 +13,6 @@
 // const T* data() const noexcept;
 
   
-#include <__config>
-
 #if _LIBCPP_STD_VER > 11
 
 #include <dynarray>
Index: containers/sequences/dynarray/dynarray.overview/at.pass.cpp
===================================================================
--- containers/sequences/dynarray/dynarray.overview/at.pass.cpp	(revision 191954)
+++ containers/sequences/dynarray/dynarray.overview/at.pass.cpp	(working copy)
@@ -12,8 +12,6 @@
 // const_reference at(size_type n) const;
 //       reference at(size_type n);
   
-#include <__config>
-
 #if _LIBCPP_STD_VER > 11
 
 #include <dynarray>
Index: containers/sequences/dynarray/dynarray.overview/begin_end.pass.cpp
===================================================================
--- containers/sequences/dynarray/dynarray.overview/begin_end.pass.cpp	(revision 191954)
+++ containers/sequences/dynarray/dynarray.overview/begin_end.pass.cpp	(working copy)
@@ -25,8 +25,6 @@
 // const_reverse_iterator crend()   const noexcept;
 
   
-#include <__config>
-
 #if _LIBCPP_STD_VER > 11
 
 #include <dynarray>
Index: containers/sequences/dynarray/dynarray.overview/capacity.pass.cpp
===================================================================
--- containers/sequences/dynarray/dynarray.overview/capacity.pass.cpp	(revision 191954)
+++ containers/sequences/dynarray/dynarray.overview/capacity.pass.cpp	(working copy)
@@ -13,8 +13,6 @@
 // size_type max_size() const noexcept;
 // bool      empty()    const noexcept;  
 
-#include <__config>
-
 #if _LIBCPP_STD_VER > 11
 
 #include <dynarray>
Index: containers/sequences/dynarray/dynarray.overview/front_back.pass.cpp
===================================================================
--- containers/sequences/dynarray/dynarray.overview/front_back.pass.cpp	(revision 191954)
+++ containers/sequences/dynarray/dynarray.overview/front_back.pass.cpp	(working copy)
@@ -15,8 +15,6 @@
 // const_reference back()  const;
 
   
-#include <__config>
-
 #if _LIBCPP_STD_VER > 11
 
 #include <dynarray>
Index: containers/sequences/dynarray/dynarray.overview/indexing.pass.cpp
===================================================================
--- containers/sequences/dynarray/dynarray.overview/indexing.pass.cpp	(revision 191954)
+++ containers/sequences/dynarray/dynarray.overview/indexing.pass.cpp	(working copy)
@@ -12,8 +12,6 @@
 // const_reference at(size_type n) const;
 //       reference at(size_type n);
   
-#include <__config>
-
 #if _LIBCPP_STD_VER > 11
 
 #include <dynarray>
Index: containers/sequences/dynarray/dynarray.traits/default.pass.cpp
===================================================================
--- containers/sequences/dynarray/dynarray.traits/default.pass.cpp	(revision 191954)
+++ containers/sequences/dynarray/dynarray.traits/default.pass.cpp	(working copy)
@@ -13,8 +13,6 @@
 //   struct uses_allocator<dynarray<Type>, Alloc> : true_type { };
 
   
-#include <__config>
-
 #if _LIBCPP_STD_VER > 11
 
 #include <dynarray>
Index: containers/sequences/dynarray/dynarray.zero/default.pass.cpp
===================================================================
--- containers/sequences/dynarray/dynarray.zero/default.pass.cpp	(revision 191954)
+++ containers/sequences/dynarray/dynarray.zero/default.pass.cpp	(working copy)
@@ -16,8 +16,6 @@
 
 
   
-#include <__config>
-
 #if _LIBCPP_STD_VER > 11
 
 #include <dynarray>
Index: iterators/iterator.range/begin-end.pass.cpp
===================================================================
--- iterators/iterator.range/begin-end.pass.cpp	(revision 191954)
+++ iterators/iterator.range/begin-end.pass.cpp	(working copy)
@@ -15,8 +15,6 @@
 // template <class E> reverse_iterator<const E*> rbegin(initializer_list<E> il);
 // template <class E> reverse_iterator<const E*> rend(initializer_list<E> il);
 
-#include <__config>
-
 #if __cplusplus >= 201103L
 #include <iterator>
 #include <cassert>
Index: support/platform_support.h
===================================================================
--- support/platform_support.h	(revision 191954)
+++ support/platform_support.h	(working copy)
@@ -42,19 +42,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
+#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
+#include <io.h> // _mktemp
+#endif
 
 inline
 std::string
 get_temp_file_name()
 {
-#ifdef _LIBCPP_MSVCRT
-   char* p = _tempnam( NULL, NULL );
-   if (p == nullptr)
-       abort();
-    std::string s(p);
-    free( p );
+   std::string s("temp.XXXXXX");
+#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
+   _mktemp(&s[0]);
 #else
-   std::string s("temp.XXXXXX");
    mktemp(&s[0]);
 #endif
    return s;
Index: utilities/function.objects/unord.hash/enum.pass.cpp
===================================================================
--- utilities/function.objects/unord.hash/enum.pass.cpp	(revision 191954)
+++ utilities/function.objects/unord.hash/enum.pass.cpp	(working copy)
@@ -12,8 +12,6 @@
 // make sure that we can hash enumeration values
 // Not very portable
 
-#include <__config>
-
 #if _LIBCPP_STD_VER > 11
 
 #include <functional>