From 6b913d7c527b6ced23a26f3a0b633cee2fe4aa1a Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow.lists@gmail.com>
Date: Fri, 9 Jan 2015 20:25:52 +0000
Subject: [PATCH] Walter Brown sent a list of tests which needed 'additional
 includes' to match what was in the standard. Added these includes to the
 tests. No changes to the library or test results.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@225541 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/std/containers/sequences/array/array.tuple/get_rv.pass.cpp | 1 +
 .../sequences/vector/vector.modifiers/erase_iter.pass.cpp       | 1 +
 .../sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp  | 1 +
 .../containers/sequences/vector/vector.special/swap.pass.cpp    | 1 +
 test/std/depr/depr.c.headers/stdint_h.pass.cpp                  | 1 +
 test/std/language.support/cstdint/cstdint.syn/cstdint.pass.cpp  | 2 ++
 .../string.modifiers/string_assign/rv_string.pass.cpp           | 1 +
 .../string.nonmembers/string_op+/char_string.pass.cpp           | 1 +
 .../string.nonmembers/string_op+/pointer_string.pass.cpp        | 1 +
 .../string.nonmembers/string_op+/string_char.pass.cpp           | 1 +
 .../string.nonmembers/string_op+/string_pointer.pass.cpp        | 1 +
 .../string.nonmembers/string_op+/string_string.pass.cpp         | 1 +
 test/std/thread/futures/test_allocator.h                        | 1 +
 .../allocator.adaptor.types/allocator_pointers.pass.cpp         | 1 +
 test/std/utilities/memory/unique.ptr/deleter.h                  | 1 +
 .../memory/unique.ptr/unique.ptr.runtime/move01.fail.cpp        | 1 +
 .../memory/unique.ptr/unique.ptr.runtime/move01.pass.cpp        | 1 +
 .../memory/unique.ptr/unique.ptr.runtime/move02.fail.cpp        | 1 +
 .../memory/unique.ptr/unique.ptr.runtime/move03.fail.cpp        | 1 +
 .../memory/unique.ptr/unique.ptr.runtime/move04.fail.cpp        | 1 +
 .../unique.ptr/unique.ptr.runtime/move_convert01.fail.cpp       | 1 +
 .../unique.ptr/unique.ptr.runtime/move_convert02.fail.cpp       | 1 +
 .../unique.ptr/unique.ptr.runtime/move_convert03.fail.cpp       | 1 +
 .../unique.ptr/unique.ptr.runtime/move_convert04.fail.cpp       | 1 +
 .../unique.ptr/unique.ptr.runtime/move_convert05.fail.cpp       | 1 +
 .../unique.ptr/unique.ptr.runtime/move_convert06.fail.cpp       | 1 +
 .../unique.ptr/unique.ptr.runtime/move_convert07.fail.cpp       | 1 +
 .../unique.ptr/unique.ptr.runtime/move_convert08.fail.cpp       | 1 +
 .../unique.ptr/unique.ptr.runtime/move_convert09.fail.cpp       | 1 +
 .../unique.ptr.runtime/unique.ptr.runtime.ctor/move01.pass.cpp  | 1 +
 .../unique.ptr.single/unique.ptr.single.asgn/move01.pass.cpp    | 1 +
 .../unique.ptr.single.asgn/move_convert01.fail.cpp              | 1 +
 .../unique.ptr.single.asgn/move_convert01.pass.cpp              | 1 +
 .../unique.ptr.single.asgn/move_convert02.fail.cpp              | 1 +
 .../unique.ptr.single.asgn/move_convert02.pass.cpp              | 1 +
 .../unique.ptr.single.asgn/move_convert03.fail.cpp              | 1 +
 .../unique.ptr.single.asgn/move_convert03.pass.cpp              | 1 +
 .../unique.ptr.single.asgn/move_convert04.fail.cpp              | 1 +
 .../unique.ptr.single.asgn/move_convert05.fail.cpp              | 1 +
 .../unique.ptr.single.asgn/move_convert06.fail.cpp              | 1 +
 .../unique.ptr.single.asgn/move_convert13.fail.cpp              | 1 +
 .../unique.ptr.single.ctor/auto_pointer.pass.cpp                | 1 +
 .../unique.ptr.single/unique.ptr.single.ctor/move01.pass.cpp    | 1 +
 .../unique.ptr.single.ctor/move_convert01.fail.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert01.pass.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert02.fail.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert02.pass.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert03.fail.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert03.pass.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert04.fail.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert04.pass.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert05.fail.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert05.pass.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert06.fail.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert06.pass.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert07.fail.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert07.pass.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert08.fail.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert09.fail.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert10.fail.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert11.fail.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert12.fail.cpp              | 1 +
 .../unique.ptr.single.ctor/move_convert13.fail.cpp              | 1 +
 .../tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp        | 1 +
 test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp | 1 +
 .../tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp         | 1 +
 test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp  | 1 +
 .../tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp  | 1 +
 test/std/utilities/tuple/tuple.tuple/tuple.elem/get_rv.pass.cpp | 1 +
 69 files changed, 70 insertions(+)

diff --git a/test/std/containers/sequences/array/array.tuple/get_rv.pass.cpp b/test/std/containers/sequences/array/array.tuple/get_rv.pass.cpp
index 869c1ec9..8eec3cef 100644
--- a/test/std/containers/sequences/array/array.tuple/get_rv.pass.cpp
+++ b/test/std/containers/sequences/array/array.tuple/get_rv.pass.cpp
@@ -13,6 +13,7 @@
 
 #include <array>
 #include <memory>
+#include <utility>
 #include <cassert>
 
 int main()
diff --git a/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp b/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp
index 7a850edd..4fa07b72 100644
--- a/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp
+++ b/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp
@@ -12,6 +12,7 @@
 // iterator erase(const_iterator position);
 
 #include <vector>
+#include <iterator>
 #include <cassert>
 
 #include "min_allocator.h"
diff --git a/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp b/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
index bfc18bc4..2e81d133 100644
--- a/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
+++ b/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
@@ -12,6 +12,7 @@
 // iterator erase(const_iterator first, const_iterator last);
 
 #include <vector>
+#include <iterator>
 #include <cassert>
 
 #include "min_allocator.h"
diff --git a/test/std/containers/sequences/vector/vector.special/swap.pass.cpp b/test/std/containers/sequences/vector/vector.special/swap.pass.cpp
index 27001aef..96aaf713 100644
--- a/test/std/containers/sequences/vector/vector.special/swap.pass.cpp
+++ b/test/std/containers/sequences/vector/vector.special/swap.pass.cpp
@@ -13,6 +13,7 @@
 //   void swap(vector<T,Alloc>& x, vector<T,Alloc>& y);
 
 #include <vector>
+#include <iterator>
 #include <cassert>
 #include "test_allocator.h"
 #include "min_allocator.h"
diff --git a/test/std/depr/depr.c.headers/stdint_h.pass.cpp b/test/std/depr/depr.c.headers/stdint_h.pass.cpp
index 9e3c329b..3861ee50 100644
--- a/test/std/depr/depr.c.headers/stdint_h.pass.cpp
+++ b/test/std/depr/depr.c.headers/stdint_h.pass.cpp
@@ -10,6 +10,7 @@
 // test <stdint.h>
 
 #include <stdint.h>
+#include <cstddef>
 #include <csignal>
 #include <cwctype>
 #include <climits>
diff --git a/test/std/language.support/cstdint/cstdint.syn/cstdint.pass.cpp b/test/std/language.support/cstdint/cstdint.syn/cstdint.pass.cpp
index 9c3354d7..23cf8b66 100644
--- a/test/std/language.support/cstdint/cstdint.syn/cstdint.pass.cpp
+++ b/test/std/language.support/cstdint/cstdint.syn/cstdint.pass.cpp
@@ -10,6 +10,8 @@
 // test <cstdint>
 
 #include <cstdint>
+#include <cstddef>
+#include <cwchar>
 #include <csignal>
 #include <cwctype>
 #include <climits>
diff --git a/test/std/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp b/test/std/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
index ac0e535e..4273860f 100644
--- a/test/std/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
+++ b/test/std/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
@@ -13,6 +13,7 @@
 //   assign(basic_string<charT,traits>&& str);
 
 #include <string>
+#include <utility>
 #include <cassert>
 
 #include "min_allocator.h"
diff --git a/test/std/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp b/test/std/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
index 4e09bf24..23a89c6f 100644
--- a/test/std/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
+++ b/test/std/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
@@ -18,6 +18,7 @@
 //   operator+(charT lhs, basic_string<charT,traits,Allocator>&& rhs);
 
 #include <string>
+#include <utility>
 #include <cassert>
 
 #include "min_allocator.h"
diff --git a/test/std/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp b/test/std/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
index 9dc8a510..665e86f2 100644
--- a/test/std/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
+++ b/test/std/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
@@ -18,6 +18,7 @@
 //   operator+(const charT* lhs, basic_string<charT,traits,Allocator>&& rhs);
 
 #include <string>
+#include <utility>
 #include <cassert>
 
 #include "min_allocator.h"
diff --git a/test/std/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp b/test/std/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
index 4d72db59..12903fe8 100644
--- a/test/std/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
+++ b/test/std/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
@@ -18,6 +18,7 @@
 //   operator+(basic_string<charT,traits,Allocator>&& lhs, charT rhs);
 
 #include <string>
+#include <utility>
 #include <cassert>
 
 #include "min_allocator.h"
diff --git a/test/std/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp b/test/std/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
index 47fc1ca5..63a7b769 100644
--- a/test/std/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
+++ b/test/std/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
@@ -18,6 +18,7 @@
 //   operator+(basic_string<charT,traits,Allocator>&& lhs, const charT* rhs);
 
 #include <string>
+#include <utility>
 #include <cassert>
 
 #include "min_allocator.h"
diff --git a/test/std/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp b/test/std/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
index bf2ddd51..318b648d 100644
--- a/test/std/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
+++ b/test/std/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
@@ -30,6 +30,7 @@
 //             const basic_string<charT,traits,Allocator>&& rhs);
 
 #include <string>
+#include <utility>
 #include <cassert>
 
 #include "min_allocator.h"
diff --git a/test/std/thread/futures/test_allocator.h b/test/std/thread/futures/test_allocator.h
index ea70ada6..50072909 100644
--- a/test/std/thread/futures/test_allocator.h
+++ b/test/std/thread/futures/test_allocator.h
@@ -12,6 +12,7 @@
 
 #include <cstddef>
 #include <type_traits>
+#include <utility>
 #include <cstdlib>
 #include <new>
 #include <climits>
diff --git a/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp b/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
index dbfaa978..e165d983 100644
--- a/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
+++ b/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <scoped_allocator>
+#include <memory>
 #include <cassert>
 
 #if __cplusplus >= 201103L
diff --git a/test/std/utilities/memory/unique.ptr/deleter.h b/test/std/utilities/memory/unique.ptr/deleter.h
index 04b6de7c..fb26044d 100644
--- a/test/std/utilities/memory/unique.ptr/deleter.h
+++ b/test/std/utilities/memory/unique.ptr/deleter.h
@@ -17,6 +17,7 @@
 #define DELETER_H
 
 #include <type_traits>
+#include <utility>
 #include <cassert>
 
 template <class T>
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move01.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move01.fail.cpp
index 57724ae1..17375ede 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move01.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move01.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr move assignment
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // Can't copy from lvalue
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move01.pass.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move01.pass.cpp
index 2426dd30..286e6bc9 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move01.pass.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move01.pass.cpp
@@ -17,6 +17,7 @@
 //    deleter is a reference, not even that.
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move02.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move02.fail.cpp
index bfaac880..6e13873c 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move02.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move02.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr move assignment
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // Can't copy from const lvalue
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move03.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move03.fail.cpp
index aa4fdb8a..3712a279 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move03.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move03.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr move assignment
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // Can't copy from lvalue
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move04.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move04.fail.cpp
index e0d7c891..4e85e5b0 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move04.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move04.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // test move ctor.  Can't copy from const lvalue
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert01.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert01.fail.cpp
index a0ea40bc..9461958a 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert01.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert01.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move assignment
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // Can't assign from lvalue
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert02.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert02.fail.cpp
index b4609235..1737136f 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert02.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert02.fail.cpp
@@ -16,6 +16,7 @@
 // Can't assign from lvalue
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert03.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert03.fail.cpp
index e18be7b0..3c89bb12 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert03.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert03.fail.cpp
@@ -16,6 +16,7 @@
 // Can't assign from lvalue
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert04.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert04.fail.cpp
index 8d2e0746..970beb5a 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert04.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert04.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move assignment
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // Can't assign from const lvalue
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert05.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert05.fail.cpp
index 3ba514c9..786858dd 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert05.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert05.fail.cpp
@@ -16,6 +16,7 @@
 // Can't assign from const lvalue
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert06.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert06.fail.cpp
index f4c45bc5..46d4c098 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert06.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert06.fail.cpp
@@ -16,6 +16,7 @@
 // Can't assign from const lvalue
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert07.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert07.fail.cpp
index 5e238bd2..65ee2694 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert07.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert07.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move assignment
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 struct A
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert08.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert08.fail.cpp
index d084d382..da08195f 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert08.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert08.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move assignment
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert09.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert09.fail.cpp
index 972c5593..aeec076c 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert09.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert09.fail.cpp
@@ -16,6 +16,7 @@
 // test converting move assignment with reference deleters
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move01.pass.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move01.pass.cpp
index fc00c7da..03747b4f 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move01.pass.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move01.pass.cpp
@@ -17,6 +17,7 @@
 //    deleter is a reference, not even that.
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move01.pass.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move01.pass.cpp
index 6641a588..9535ed02 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move01.pass.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move01.pass.cpp
@@ -17,6 +17,7 @@
 //    deleter is a reference, not even that.
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.fail.cpp
index 8940dbe9..3fd2cbc4 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move assignment
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // Can't assign from lvalue
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.pass.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.pass.cpp
index 64d7b6b9..989f594e 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.pass.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.pass.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move assignment
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 struct A
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.fail.cpp
index 1ab0779b..0f900603 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move assignment
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.pass.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.pass.cpp
index ff59ad46..a448c77a 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.pass.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.pass.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move assignment
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.fail.cpp
index e06b9d0a..f35af9f4 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.fail.cpp
@@ -16,6 +16,7 @@
 // Can't assign from lvalue
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.pass.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.pass.cpp
index d726a830..9aea81a8 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.pass.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.pass.cpp
@@ -16,6 +16,7 @@
 // test converting move assignment with reference deleters
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert04.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert04.fail.cpp
index ab33785b..dba901b2 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert04.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert04.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move assignment
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // Can't assign from const lvalue
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert05.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert05.fail.cpp
index 50c553e5..4694986c 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert05.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert05.fail.cpp
@@ -16,6 +16,7 @@
 // Can't assign from const lvalue
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert06.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert06.fail.cpp
index 541e10b8..220677cd 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert06.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert06.fail.cpp
@@ -16,6 +16,7 @@
 // Can't assign from const lvalue
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert13.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert13.fail.cpp
index f7e128be..56ab43c7 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert13.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert13.fail.cpp
@@ -16,6 +16,7 @@
 // Do not convert from an array unique_ptr
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 struct A
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer.pass.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer.pass.cpp
index a23f029c..1ce1838a 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer.pass.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer.pass.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr(pointer) ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // template <class U> explicit unique_ptr(auto_ptr<U>&);
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move01.pass.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move01.pass.cpp
index 65b1694b..dc16c311 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move01.pass.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move01.pass.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // test move ctor.  Should only require a MoveConstructible deleter, or if
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.fail.cpp
index 5cd1b180..ed1fe8c2 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // Can't construct from lvalue
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.pass.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.pass.cpp
index 42917b1d..b65cf564 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.pass.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.pass.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // test converting move ctor.  Should only require a MoveConstructible deleter, or if
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.fail.cpp
index 8f125922..a1bf634b 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.fail.cpp
@@ -18,6 +18,7 @@
 // Explicit version
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.pass.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.pass.cpp
index f72efb98..829e7553 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.pass.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.pass.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.fail.cpp
index c9076af4..74091997 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // test converting move ctor.  Should only require a MoveConstructible deleter, or if
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.pass.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.pass.cpp
index 7463c38e..792076a9 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.pass.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.pass.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // test converting move ctor.  Should only require a MoveConstructible deleter, or if
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.fail.cpp
index 7487e2db..981ea706 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // test converting move ctor.  Should only require a MoveConstructible deleter, or if
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.pass.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.pass.cpp
index 18443a46..12ab17fa 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.pass.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.pass.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // test converting move ctor.  Should only require a MoveConstructible deleter, or if
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.fail.cpp
index 630fcb77..d055b806 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.pass.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.pass.cpp
index a8a9c760..8077b0da 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.pass.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.pass.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.fail.cpp
index 04bf0f92..5b9b12e0 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // test converting move ctor.  Should only require a MoveConstructible deleter, or if
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.pass.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.pass.cpp
index 84cef783..4115107b 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.pass.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.pass.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // test converting move ctor.  Should only require a MoveConstructible deleter, or if
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.fail.cpp
index da15c5c2..bef022cf 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // test converting move ctor.  Should only require a MoveConstructible deleter, or if
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.pass.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.pass.cpp
index f8093102..978cb0e9 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.pass.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.pass.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 #include "../../deleter.h"
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert08.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert08.fail.cpp
index 4d47bfd7..e14bba07 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert08.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert08.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // test converting move ctor.  Should only require a MoveConstructible deleter, or if
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert09.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert09.fail.cpp
index d5687985..a475c175 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert09.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert09.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // test converting move ctor.  Should only require a MoveConstructible deleter, or if
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert10.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert10.fail.cpp
index 50647b93..f0da5efb 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert10.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert10.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // test converting move ctor.  Should only require a MoveConstructible deleter, or if
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert11.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert11.fail.cpp
index 0ca3d8c7..bcf94a97 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert11.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert11.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // test converting move ctor.  Should only require a MoveConstructible deleter, or if
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert12.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert12.fail.cpp
index e1eff8dd..095bec65 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert12.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert12.fail.cpp
@@ -14,6 +14,7 @@
 // Test unique_ptr converting move ctor
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 // test converting move ctor.  Should only require a MoveConstructible deleter, or if
diff --git a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert13.fail.cpp b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert13.fail.cpp
index cf03a2bb..a4bd2cba 100644
--- a/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert13.fail.cpp
+++ b/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert13.fail.cpp
@@ -16,6 +16,7 @@
 // Do not convert from an array unique_ptr
 
 #include <memory>
+#include <utility>
 #include <cassert>
 
 struct A
diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp
index 670ca04a..2c09690f 100644
--- a/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp
+++ b/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp
@@ -17,6 +17,7 @@
 #include <tuple>
 #include <string>
 #include <memory>
+#include <utility>
 #include <cassert>
 
 struct B
diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp
index 302c1f92..59464fcc 100644
--- a/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp
+++ b/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp
@@ -14,6 +14,7 @@
 // tuple& operator=(tuple&& u);
 
 #include <tuple>
+#include <utility>
 #include <cassert>
 
 #include "../MoveOnly.h"
diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp
index bcdb9d99..00bb1e85 100644
--- a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp
+++ b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp
@@ -14,6 +14,7 @@
 // template <class... UTypes> tuple(const tuple<UTypes...>& u);
 
 #include <tuple>
+#include <utility>
 #include <string>
 #include <cassert>
 
diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
index 8dc7d21e..92bff97d 100644
--- a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
+++ b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
@@ -14,6 +14,7 @@
 // tuple(tuple&& u);
 
 #include <tuple>
+#include <utility>
 #include <cassert>
 
 #include "../MoveOnly.h"
diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp
index 5e84ff8e..751c1a50 100644
--- a/test/std/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp
+++ b/test/std/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp
@@ -13,6 +13,7 @@
 //     tuple<Types&&...> forward_as_tuple(Types&&... t);
 
 #include <tuple>
+#include <type_traits>
 #include <cassert>
 
 template <class Tuple>
diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_rv.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_rv.pass.cpp
index 5a97710c..414d8a1c 100644
--- a/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_rv.pass.cpp
+++ b/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_rv.pass.cpp
@@ -16,6 +16,7 @@
 //   get(tuple<Types...>&& t);
 
 #include <tuple>
+#include <utility>
 #include <memory>
 #include <cassert>