diff --git a/CREDITS.TXT b/CREDITS.TXT
index 408cda317..937412433 100644
--- a/CREDITS.TXT
+++ b/CREDITS.TXT
@@ -47,3 +47,6 @@ D: Linux fixes.
 
 N: Jonathan Sauer
 D: Minor patches, mostly related to constexpr
+
+N: Richard Smith
+D: Minor patches.
diff --git a/test/atomics/atomics.types.generic/address.pass.cpp b/test/atomics/atomics.types.generic/address.pass.cpp
index b43959b4d..1cfdef501 100644
--- a/test/atomics/atomics.types.generic/address.pass.cpp
+++ b/test/atomics/atomics.types.generic/address.pass.cpp
@@ -66,6 +66,7 @@
 // };
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class A, class T>
diff --git a/test/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp b/test/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp
index 0ce127daf..eac51777d 100644
--- a/test/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp
+++ b/test/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp
@@ -36,6 +36,7 @@
 
 #include <atomic>
 #include <type_traits>
+#include <cstdint>
 
 int main()
 {
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
index 2223de155..fd5102bb9 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_compare_exchange_strong(atomic<T>* obj, T* expc, T desr);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
index bc37ac45b..f2610a3ec 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
@@ -21,6 +21,7 @@
 //                                           memory_order s, memory_order f);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
index 56ba572b7..a3f95a487 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_compare_exchange_weak(atomic<T>* obj, T* expc, T desr);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
index b3a804b7d..2f3e99657 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
@@ -21,6 +21,7 @@
 //                                           memory_order s, memory_order f);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp
index 61bf812ba..426494351 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_exchange(atomic<T>* obj, T desr);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp
index 5c2d77fee..0f3add563 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_exchange_explicit(atomic<T>* obj, T desr, memory_order m);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp
index 4b1a491bb..9ce60adb0 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp
@@ -26,6 +26,7 @@
 //     atomic_fetch_add(atomic<T*>* obj, ptrdiff_t op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp
index ce960945c..a2a1a4479 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp
@@ -26,6 +26,7 @@
 //     atomic_fetch_add_explicit(atomic<T*>* obj, ptrdiff_t op, memory_order m);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp
index a62335c89..01d2cc6d3 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_fetch_and(atomic<Integral>* obj, Integral op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp
index 87f091b3d..abfb83db1 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_fetch_and_explicit(atomic<Integral>* obj, Integral op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp
index 8a931e9e1..43b6c4f33 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_fetch_or(atomic<Integral>* obj, Integral op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp
index fbd5700fe..21078bbff 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_fetch_or_explicit(atomic<Integral>* obj, Integral op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp
index 27086a51e..d33b81efe 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp
@@ -26,6 +26,7 @@
 //     atomic_fetch_sub(atomic<T*>* obj, ptrdiff_t op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp
index 62128f32d..886a65f78 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp
@@ -27,6 +27,7 @@
 //     atomic_fetch_sub_explicit(atomic<T*>* obj, ptrdiff_t op, memory_order m);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp
index 118f04820..78120a76c 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_fetch_xor(atomic<Integral>* obj, Integral op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp
index 6e5427718..0a0cd154c 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_fetch_xor_explicit(atomic<Integral>* obj, Integral op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp
index 09adb5449..f0d9a2418 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_init(atomic<T>* obj, T desr);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp
index 1a9c652ca..b23988602 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_load(const atomic<T>* obj);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp
index d3557a4d9..3072dd581 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_load_explicit(const atomic<T>* obj, memory_order m);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp
index 5926ec0f6..f9044bf14 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_store(atomic<T>* obj, T desr);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp
index dfa00cfca..18038ae0c 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_store_explicit(atomic<T>* obj, T desr, memory_order m);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp
index 05b335f71..6758c7bb5 100644
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp
+++ b/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp
@@ -12,6 +12,7 @@
 // #define ATOMIC_VAR_INIT(value)
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 int main()
diff --git a/test/testit b/test/testit
index c7409160f..eea3858a6 100755
--- a/test/testit
+++ b/test/testit
@@ -8,7 +8,7 @@
 # //
 # //===--------------------------------------------------------------------===//
 
-if [ -z $CC ]
+if [ -z "$CC" ]
 then
 	if which xcrun >/dev/null
 	then