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

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@171594 91177308-0d34-0410-b5e6-96231b3b80d8

test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp

@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InIter, class OutIter>
 void

test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InIter, class OutIter>
 void

test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp

@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct Pred
 {

test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp

@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InIter, class OutIter>
 void

test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void

test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void

test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp

@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct gen_test
 {

test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp

@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct gen_test
 {

test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp

@@ -20,7 +20,7 @@
 #include <memory>
 #endif
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InIter, class OutIter>
 void

test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp

@@ -20,7 +20,7 @@
 #include <memory>
 #endif
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InIter, class OutIter>
 void

test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp

@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct is_odd
 {

test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp

@@ -21,7 +21,7 @@
 #include <memory>
 #endif
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct is_odd
 {

test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp

@@ -19,7 +19,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct is_odd
 {

test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp

@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct is_odd
 {

test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp

@@ -21,7 +21,7 @@
 #include <memory>
 #endif
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct is_odd
 {

test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp

@@ -21,7 +21,7 @@
 #include <memory>
 #endif
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void

test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InIter, class OutIter>
 void

test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp

@@ -19,7 +19,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InIter, class OutIter>
 void

test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp

@@ -22,7 +22,7 @@
 #include <memory>
 #endif
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void

test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp

@@ -19,7 +19,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void

test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp

@@ -20,7 +20,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InIter, class OutIter>
 void

test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp

@@ -21,7 +21,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InIter, class OutIter>
 void

test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp

@@ -20,7 +20,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void

test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void

test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp

@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InIter, class OutIter>
 void

test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp

@@ -19,7 +19,7 @@
 #include <memory>
 #endif
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void

test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp

@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InIter, class OutIter>
 void

test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp

@@ -20,7 +20,7 @@
 #include <memory>
 #endif
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template<class Iter1, class Iter2>
 void

test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp

@@ -19,7 +19,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template<class InIter1, class InIter2, class OutIter>
 void

test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp

@@ -19,7 +19,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InIter, class OutIter>
 void

test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp

@@ -21,7 +21,7 @@
 #include <memory>
 #endif
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter>
 void

test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp

@@ -20,7 +20,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InIter, class OutIter>
 void

test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp

@@ -21,7 +21,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct count_equal
 {

test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp

@@ -21,7 +21,7 @@
 #include <memory>
 #endif
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct count_equal
 {

test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp

@@ -18,7 +18,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp

@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct test1
 {

test/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp

@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct test1
 {

test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp

@@ -18,7 +18,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp

@@ -19,7 +19,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter1, class Iter2>
 void

test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp

@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct count_equal
 {

test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp

@@ -19,7 +19,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp

@@ -18,7 +18,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp

@@ -18,7 +18,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct for_each_test
 {

test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp

@@ -18,7 +18,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp

@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct test1
 {

test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class Iter1, class Iter2>
 void

test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 struct count_equal
 {

test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp

@@ -19,7 +19,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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>
 

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>
 

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>
 

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>
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp

@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp

@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {

test/containers/associative/multiset/insert_iter_iter.pass.cpp

@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {