Index: test/std/containers/associative/map/map.modifiers/merge.pass.cpp
===================================================================
--- test/std/containers/associative/map/map.modifiers/merge.pass.cpp
+++ test/std/containers/associative/map/map.modifiers/merge.pass.cpp
@@ -23,6 +23,7 @@
 //   void merge(multimap<key_type, value_type, C2, allocator_type>&& source);
 
 #include <map>
+#include <cassert>
 #include "test_macros.h"
 #include "Counter.h"
 
Index: test/std/containers/associative/multimap/multimap.modifiers/merge.pass.cpp
===================================================================
--- test/std/containers/associative/multimap/multimap.modifiers/merge.pass.cpp
+++ test/std/containers/associative/multimap/multimap.modifiers/merge.pass.cpp
@@ -23,6 +23,7 @@
 //   void merge(multimap<key_type, value_type, C2, allocator_type>&& source);
 
 #include <map>
+#include <cassert>
 #include "test_macros.h"
 #include "Counter.h"
 
Index: test/std/containers/associative/multiset/merge.pass.cpp
===================================================================
--- test/std/containers/associative/multiset/merge.pass.cpp
+++ test/std/containers/associative/multiset/merge.pass.cpp
@@ -23,6 +23,7 @@
 //   void merge(multiset<Key, C2, Allocator>&& source);
 
 #include <set>
+#include <cassert>
 #include "test_macros.h"
 #include "Counter.h"
 
Index: test/std/containers/associative/set/merge.pass.cpp
===================================================================
--- test/std/containers/associative/set/merge.pass.cpp
+++ test/std/containers/associative/set/merge.pass.cpp
@@ -23,6 +23,7 @@
 //   void merge(multiset<key_type, C2, allocator_type>&& source);
 
 #include <set>
+#include <cassert>
 #include "test_macros.h"
 #include "Counter.h"
 
Index: test/std/containers/sequences/vector.bool/move.pass.cpp
===================================================================
--- test/std/containers/sequences/vector.bool/move.pass.cpp
+++ test/std/containers/sequences/vector.bool/move.pass.cpp
@@ -26,8 +26,8 @@
         std::vector<bool, test_allocator<bool> > lo(test_allocator<bool>(5));
         for (int i = 1; i <= 3; ++i)
         {
-            l.push_back(i);
-            lo.push_back(i);
+            l.push_back(true);
+            lo.push_back(true);
         }
         std::vector<bool, test_allocator<bool> > l2 = std::move(l);
         assert(l2 == lo);
@@ -39,8 +39,8 @@
         std::vector<bool, other_allocator<bool> > lo(other_allocator<bool>(5));
         for (int i = 1; i <= 3; ++i)
         {
-            l.push_back(i);
-            lo.push_back(i);
+            l.push_back(true);
+            lo.push_back(true);
         }
         std::vector<bool, other_allocator<bool> > l2 = std::move(l);
         assert(l2 == lo);
@@ -52,8 +52,8 @@
         std::vector<bool, min_allocator<bool> > lo(min_allocator<bool>{});
         for (int i = 1; i <= 3; ++i)
         {
-            l.push_back(i);
-            lo.push_back(i);
+            l.push_back(true);
+            lo.push_back(true);
         }
         std::vector<bool, min_allocator<bool> > l2 = std::move(l);
         assert(l2 == lo);
Index: test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp
===================================================================
--- test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp
+++ test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp
@@ -23,6 +23,7 @@
 //   void merge(unordered_multimap<key_type, value_type, H2, P2, allocator_type>&& source);
 
 #include <unordered_map>
+#include <cassert>
 #include "test_macros.h"
 #include "Counter.h"
 
@@ -40,9 +41,6 @@
 
     throw_hasher(bool& should_throw) : should_throw_(should_throw) {}
 
-    typedef size_t result_type;
-    typedef T argument_type;
-
     size_t operator()(const T& p) const
     {
         if (should_throw_)
@@ -98,8 +96,6 @@
     struct hasher
     {
         hasher() = default;
-        typedef Counter<int> argument_type;
-        typedef size_t result_type;
         size_t operator()(const Counter<int>& p) const
         {
             return std::hash<Counter<int>>()(p);
Index: test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp
===================================================================
--- test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp
+++ test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp
@@ -23,6 +23,7 @@
 //   void merge(unordered_multimap<key_type, value_type, H2, P2, allocator_type>&& source);
 
 #include <unordered_map>
+#include <cassert>
 #include "test_macros.h"
 #include "Counter.h"
 
@@ -40,9 +41,6 @@
 
     throw_hasher(bool& should_throw) : should_throw_(should_throw) {}
 
-    typedef size_t result_type;
-    typedef T argument_type;
-
     size_t operator()(const T& p) const
     {
         if (should_throw_)
@@ -98,8 +96,6 @@
     struct hasher
     {
         hasher() = default;
-        typedef Counter<int> argument_type;
-        typedef size_t result_type;
         size_t operator()(const Counter<int>& p) const
         {
             return std::hash<Counter<int>>()(p);
Index: test/std/containers/unord/unord.multiset/merge.pass.cpp
===================================================================
--- test/std/containers/unord/unord.multiset/merge.pass.cpp
+++ test/std/containers/unord/unord.multiset/merge.pass.cpp
@@ -23,6 +23,7 @@
 //   void merge(unordered_multiset<key_type, H2, P2, allocator_type>&& source);
 
 #include <unordered_set>
+#include <cassert>
 #include "test_macros.h"
 #include "Counter.h"
 
@@ -40,9 +41,6 @@
 
     throw_hasher(bool& should_throw) : should_throw_(should_throw) {}
 
-    typedef size_t result_type;
-    typedef T argument_type;
-
     size_t operator()(const T& p) const
     {
         if (should_throw_)
@@ -98,8 +96,6 @@
     struct hasher
     {
         hasher() = default;
-        typedef Counter<int> argument_type;
-        typedef size_t result_type;
         size_t operator()(const Counter<int>& p) const { return std::hash<Counter<int>>()(p); }
     };
     {
Index: test/std/containers/unord/unord.set/merge.pass.cpp
===================================================================
--- test/std/containers/unord/unord.set/merge.pass.cpp
+++ test/std/containers/unord/unord.set/merge.pass.cpp
@@ -23,6 +23,7 @@
 //   void merge(unordered_multiset<key_type, H2, P2, allocator_type>&& source);
 
 #include <unordered_set>
+#include <cassert>
 #include "test_macros.h"
 #include "Counter.h"
 
@@ -40,9 +41,6 @@
 
     throw_hasher(bool& should_throw) : should_throw_(should_throw) {}
 
-    typedef size_t result_type;
-    typedef T argument_type;
-
     size_t operator()(const T& p) const
     {
         if (should_throw_)
@@ -98,8 +96,6 @@
     struct hasher
     {
         hasher() = default;
-        typedef Counter<int> argument_type;
-        typedef size_t result_type;
         size_t operator()(const Counter<int>& p) const { return std::hash<Counter<int>>()(p); }
     };
     {