Move common header files into a 'support' directory; make 'testit' include -I to that directory; rename 'iterators.h' to 'iterator_test.h'; remove hard-coded paths to include files from more than 350 source files

llvm-svn: 171594

40 files changed, 40 insertions, 40 deletions

diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp
index bf1c5dd3651..253e0e38690 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp
@@ -19,7 +19,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter, class T>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp
index 2860955b82b..1d2840921e8 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp
@@ -20,7 +20,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter, class T>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp
index e15c9c1cf01..ce659c1b50f 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp
@@ -19,7 +19,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter, class T>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp
index cd17c4c1596..2b29e2c8435 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp
@@ -20,7 +20,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter, class T>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp
index 804f65d9222..ce4f7ced5e6 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp
@@ -18,7 +18,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter, class T>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp
index f68c670ed6d..ae65c59e315 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp
@@ -19,7 +19,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter, class T>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp
index 9c4ee64d89c..3659e08fb28 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp
@@ -18,7 +18,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter, class T>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp
index abc7d880a5c..dd5fcfc2852 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp
@@ -19,7 +19,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter, class T>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
index f3b294f22f7..3fa8b2c6e5d 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter1, class Iter2>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
index 1c78a50620c..f5f1c07fa02 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
@@ -20,7 +20,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter1, class Iter2>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
index f4317eb2f71..01db088aa43 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
index 7bc0809f472..8da8dfee719 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
@@ -30,7 +30,7 @@ struct indirect_less
 
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp
index 0536813aabb..be19710bf13 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp
@@ -19,7 +19,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InIter1, class InIter2, class OutIter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
index 77c072727c6..8ef6d542dd3 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
@@ -22,7 +22,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InIter1, class InIter2, class OutIter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
index 4681041a537..2788b193200 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
index d4bde658b54..c99c6936ef5 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
@@ -18,7 +18,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
index cba481368be..fd41f7a9ad7 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
index 698729813ec..55d7215a40e 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
@@ -18,7 +18,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
index daf1990c79e..6cdb87dedb4 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
index 6bd532dbcfe..cc0e66e175c 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
@@ -18,7 +18,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp
index 422f6e7acfb..fb58c718c7e 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 #include <cstdio>
 
diff --git a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp
index caea596cf7c..8e87e9a4351 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp
@@ -19,7 +19,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 #include <cstdio>
 
diff --git a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp
index ddff3ba12fb..d2fa2cb98b0 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 #include <cstdio>
 
diff --git a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp
index 220c8d68e22..51b7aa8c11b 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp
@@ -19,7 +19,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 #include <cstdio>
 
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
index ab9df3e6dec..8db8177fb9c 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter1, class Iter2>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
index cc904f6e30a..7e1aef4749a 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
@@ -19,7 +19,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter1, class Iter2>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
index 1f7001ac07d..c2c20c295ca 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
@@ -21,7 +21,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter1, class Iter2, class OutIter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
index 6217c45ee71..2b5a6a9f56b 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
@@ -23,7 +23,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter1, class Iter2, class OutIter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
index eea9972b465..f371890d8e7 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
@@ -21,7 +21,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter1, class Iter2, class OutIter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
index 7f02ffd56a0..035522b5462 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
@@ -23,7 +23,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter1, class Iter2, class OutIter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
index 46a564873d7..ea3812a7f1c 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
@@ -22,7 +22,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter1, class Iter2, class OutIter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
index ae880e45741..ba1f61a1067 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
@@ -24,7 +24,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter1, class Iter2, class OutIter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
index 8b18c504d46..46578501d77 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
@@ -21,7 +21,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter1, class Iter2, class OutIter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
index 0051e27c300..3d63e3fb9c4 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
@@ -23,7 +23,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter1, class Iter2, class OutIter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
index af75647f867..dd6b5c1766a 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
index cdeb3cd9be2..d5a34e2f2cb 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
@@ -18,7 +18,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
index 8dc1f835667..bef01027472 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
index 2e445cfccce..68ed29c6f4b 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
@@ -18,7 +18,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp
index 577dd9265bd..5f298fde7b3 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp
@@ -20,7 +20,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp
index a075d02aed2..df8fb9eacac 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp
@@ -23,7 +23,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void