4 files changed, 10 insertions, 6 deletions
diff --git a/libcxx/include/__thread/support.h b/libcxx/include/__thread/support.h
index 33f343a..92f1c44 100644
--- a/libcxx/include/__thread/support.h
+++ b/libcxx/include/__thread/support.h
@@ -23,6 +23,8 @@
 // The following functionality must be provided by any implementation:
 //
 
+_LIBCPP_BEGIN_NAMESPACE_STD
+
 using __libcpp_timespec_t = ...;
 
 //
@@ -98,6 +100,8 @@ int __libcpp_tls_create(__libcpp_tls_key*, void (*__at_exit)(void*));
 void* __libcpp_tls_get(__libcpp_tls_key);
 int __libcpp_tls_set(__libcpp_tls_key, void*);
 
+_LIBCPP_END_NAMESPACE_STD
+
 */
 
 #if !defined(_LIBCPP_HAS_NO_THREADS)
diff --git a/libcxx/include/__thread/support/c11.h b/libcxx/include/__thread/support/c11.h
index 4451545..8962648 100644
--- a/libcxx/include/__thread/support/c11.h
+++ b/libcxx/include/__thread/support/c11.h
@@ -20,10 +20,10 @@
 #  pragma GCC system_header
 #endif
 
-typedef ::timespec __libcpp_timespec_t;
-
 _LIBCPP_BEGIN_NAMESPACE_STD
 
+using __libcpp_timespec_t = ::timespec;
+
 //
 // Mutex
 //
diff --git a/libcxx/include/__thread/support/pthread.h b/libcxx/include/__thread/support/pthread.h
index 6ea2a38..d0b8367 100644
--- a/libcxx/include/__thread/support/pthread.h
+++ b/libcxx/include/__thread/support/pthread.h
@@ -36,10 +36,10 @@
 #  pragma GCC system_header
 #endif
 
-typedef ::timespec __libcpp_timespec_t;
-
 _LIBCPP_BEGIN_NAMESPACE_STD
 
+using __libcpp_timespec_t = ::timespec;
+
 //
 // Mutex
 //
diff --git a/libcxx/include/__thread/support/windows.h b/libcxx/include/__thread/support/windows.h
index 16d1f3b..5dc4fa1 100644
--- a/libcxx/include/__thread/support/windows.h
+++ b/libcxx/include/__thread/support/windows.h
@@ -18,10 +18,10 @@
 #  pragma GCC system_header
 #endif
 
-typedef ::timespec __libcpp_timespec_t;
-
 _LIBCPP_BEGIN_NAMESPACE_STD
 
+using __libcpp_timespec_t = ::timespec;
+
 //
 // Mutex
 //