There were two identical files named 'min_allocator.h'. Move one of them to /support and delete the other. Then adjust all the tests that used them to include the moved one. No functionality change.

llvm-svn: 195785

143 files changed, 143 insertions, 143 deletions

diff --git a/libcxx/test/containers/associative/map/map.access/at.pass.cpp b/libcxx/test/containers/associative/map/map.access/at.pass.cpp
index 6c001a34428..86b1e3d2dfa 100644
--- a/libcxx/test/containers/associative/map/map.access/at.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.access/at.pass.cpp
@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.access/empty.pass.cpp b/libcxx/test/containers/associative/map/map.access/empty.pass.cpp
index 2e542ac8c32..b11e94c8042 100644
--- a/libcxx/test/containers/associative/map/map.access/empty.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.access/empty.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.access/index_key.pass.cpp b/libcxx/test/containers/associative/map/map.access/index_key.pass.cpp
index 5dfdf400e5e..ab1144c60af 100644
--- a/libcxx/test/containers/associative/map/map.access/index_key.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.access/index_key.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/map/map.access/index_rv_key.pass.cpp b/libcxx/test/containers/associative/map/map.access/index_rv_key.pass.cpp
index 4c15f088fae..a58d50d8499 100644
--- a/libcxx/test/containers/associative/map/map.access/index_rv_key.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.access/index_rv_key.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.access/iterator.pass.cpp b/libcxx/test/containers/associative/map/map.access/iterator.pass.cpp
index 64a6284eabe..7aa713cc5c1 100644
--- a/libcxx/test/containers/associative/map/map.access/iterator.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.access/iterator.pass.cpp
@@ -29,7 +29,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.access/max_size.pass.cpp b/libcxx/test/containers/associative/map/map.access/max_size.pass.cpp
index 6f86d0e9de8..551120d331e 100644
--- a/libcxx/test/containers/associative/map/map.access/max_size.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.access/max_size.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.access/size.pass.cpp b/libcxx/test/containers/associative/map/map.access/size.pass.cpp
index ab4b05baa5a..07c12322a46 100644
--- a/libcxx/test/containers/associative/map/map.access/size.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.access/size.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp
index 95d71da664a..92146734d21 100644
--- a/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
index a583f0d597f..482d1acff84 100644
--- a/libcxx/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/compare.pass.cpp b/libcxx/test/containers/associative/map/map.cons/compare.pass.cpp
index 2c4bb1a8cbc..5a213c8e8b8 100644
--- a/libcxx/test/containers/associative/map/map.cons/compare.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/compare.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/compare_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
index 670acffc458..dcb0856a744 100644
--- a/libcxx/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp b/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp
index ce20d69d7c9..15d1a4eb507 100644
--- a/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/copy_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
index 849240408ab..1512e2dfdfb 100644
--- a/libcxx/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp b/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp
index fefb35ce712..8bd45a3646d 100644
--- a/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/default.pass.cpp b/libcxx/test/containers/associative/map/map.cons/default.pass.cpp
index 49fc223ffad..2c6908e7b38 100644
--- a/libcxx/test/containers/associative/map/map.cons/default.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/default.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/initializer_list.pass.cpp b/libcxx/test/containers/associative/map/map.cons/initializer_list.pass.cpp
index 63820beea13..196943653a1 100644
--- a/libcxx/test/containers/associative/map/map.cons/initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/initializer_list.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp b/libcxx/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
index 0c3bd23a635..08f8a529f03 100644
--- a/libcxx/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 #include "../../../test_compare.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
index d844624560e..93930fc9e85 100644
--- a/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/iter_iter.pass.cpp b/libcxx/test/containers/associative/map/map.cons/iter_iter.pass.cpp
index d981ccff889..c1029af6889 100644
--- a/libcxx/test/containers/associative/map/map.cons/iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/iter_iter.pass.cpp
@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/iter_iter_comp.pass.cpp b/libcxx/test/containers/associative/map/map.cons/iter_iter_comp.pass.cpp
index 0481de24ccd..837fa8c6cde 100644
--- a/libcxx/test/containers/associative/map/map.cons/iter_iter_comp.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/iter_iter_comp.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
index 2c767123af1..81fa3c8225e 100644
--- a/libcxx/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
@@ -20,7 +20,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/move.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move.pass.cpp
index 323a26548e9..0a0ca445585 100644
--- a/libcxx/test/containers/associative/map/map.cons/move.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/move.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp
index 2bb2c061258..d377ad87d85 100644
--- a/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp
@@ -19,7 +19,7 @@
 #include "../../../MoveOnly.h"
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp
index 2e6ede7bec7..8b0eca74256 100644
--- a/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp
@@ -19,7 +19,7 @@
 #include "../../../MoveOnly.h"
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.modifiers/clear.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/clear.pass.cpp
index 77f50badfef..c37499df307 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/clear.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/clear.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp
index 9a87becf684..5ac44286376 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp
@@ -20,7 +20,7 @@
 
 #include "../../../Emplaceable.h"
 #include "../../../DefaultOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
index bf8173f770d..7ce8c19805f 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
@@ -19,7 +19,7 @@
 
 #include "../../../Emplaceable.h"
 #include "../../../DefaultOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.modifiers/erase_iter.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/erase_iter.pass.cpp
index 086096b7c8b..05fb988e991 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/erase_iter.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/erase_iter.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp
index 6589ace8ff1..1b49956d8a5 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.modifiers/erase_key.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/erase_key.pass.cpp
index 4a93173a704..e41f5129140 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/erase_key.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/erase_key.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_cv.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_cv.pass.cpp
index 24d3f84ea30..3d28242fd32 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/insert_cv.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/insert_cv.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
index bc7e760fad0..ab325ed45bf 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp
index 43ca35a099f..278db4631a8 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
index d1acdf2b826..964738b4a68 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
index e84a82b609a..22164202932 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp
index c5724c42980..fea88957a70 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.ops/count.pass.cpp b/libcxx/test/containers/associative/map/map.ops/count.pass.cpp
index 70eadac3f8f..6628e3d8973 100644
--- a/libcxx/test/containers/associative/map/map.ops/count.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.ops/count.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.ops/equal_range.pass.cpp b/libcxx/test/containers/associative/map/map.ops/equal_range.pass.cpp
index b08acb08693..dff751c3724 100644
--- a/libcxx/test/containers/associative/map/map.ops/equal_range.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.ops/equal_range.pass.cpp
@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/map/map.ops/find.pass.cpp b/libcxx/test/containers/associative/map/map.ops/find.pass.cpp
index 4d1beabc815..a7578449f5b 100644
--- a/libcxx/test/containers/associative/map/map.ops/find.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.ops/find.pass.cpp
@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/map/map.ops/lower_bound.pass.cpp b/libcxx/test/containers/associative/map/map.ops/lower_bound.pass.cpp
index 1ac175327c8..87b84eef070 100644
--- a/libcxx/test/containers/associative/map/map.ops/lower_bound.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.ops/lower_bound.pass.cpp
@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/map/map.ops/upper_bound.pass.cpp b/libcxx/test/containers/associative/map/map.ops/upper_bound.pass.cpp
index 20973e3e163..037ceb962cd 100644
--- a/libcxx/test/containers/associative/map/map.ops/upper_bound.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.ops/upper_bound.pass.cpp
@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/map/map.special/member_swap.pass.cpp b/libcxx/test/containers/associative/map/map.special/member_swap.pass.cpp
index af5922526a0..4f7bd5154ed 100644
--- a/libcxx/test/containers/associative/map/map.special/member_swap.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.special/member_swap.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/map.special/non_member_swap.pass.cpp b/libcxx/test/containers/associative/map/map.special/non_member_swap.pass.cpp
index e474a4661bb..dc925fda87d 100644
--- a/libcxx/test/containers/associative/map/map.special/non_member_swap.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.special/non_member_swap.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 #include "../../../test_allocator.h"
 #include "../../../test_compare.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/map/types.pass.cpp b/libcxx/test/containers/associative/map/types.pass.cpp
index aca81dfb964..487b69f8c37 100644
--- a/libcxx/test/containers/associative/map/types.pass.cpp
+++ b/libcxx/test/containers/associative/map/types.pass.cpp
@@ -32,7 +32,7 @@
 #include <map>
 #include <type_traits>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/empty.pass.cpp b/libcxx/test/containers/associative/multimap/empty.pass.cpp
index cafdb7344c8..2384960d10d 100644
--- a/libcxx/test/containers/associative/multimap/empty.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/empty.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/iterator.pass.cpp b/libcxx/test/containers/associative/multimap/iterator.pass.cpp
index a58b5830837..1fdbfa1aa3a 100644
--- a/libcxx/test/containers/associative/multimap/iterator.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/iterator.pass.cpp
@@ -29,7 +29,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/max_size.pass.cpp b/libcxx/test/containers/associative/multimap/max_size.pass.cpp
index 7bcb12a2e80..ccd8b10638c 100644
--- a/libcxx/test/containers/associative/multimap/max_size.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/max_size.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
index aa3b6e2e6d2..5b494c92303 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
index 8c658d4f61a..0c899183252 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/compare.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/compare.pass.cpp
index 99265ef72f8..9a4e0f987fd 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/compare.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/compare.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
index 864a5429974..c578b20723a 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
index 65a1e921a47..7edcc5121bf 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
index a9cba17de93..c5b87aaa0d9 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
index 533338c9683..c7a0e49588f 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/default.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/default.pass.cpp
index ca8225f3738..2651d90a6fd 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/default.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/default.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
index 139052c5730..937a202a55e 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
index f2545c0cbc1..e6677039c90 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 #include "../../../test_compare.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
index a2c0cdb858d..c65c36b4aaa 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp
index 78fdbdb2022..fa062e2be0b 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp
@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp
index 267edc21061..d6de59428dd 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
index 883f64c8e93..dfd946e3be5 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
@@ -20,7 +20,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp
index d6e835ca477..06bab095f03 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
index c807b4ff558..7f5f0f7f2b0 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
@@ -19,7 +19,7 @@
 #include "../../../MoveOnly.h"
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
index 0aa7c185784..e02a9888bb4 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
@@ -19,7 +19,7 @@
 #include "../../../MoveOnly.h"
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/clear.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/clear.pass.cpp
index 4864ec1141b..fe9b8c8ba12 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/clear.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/clear.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
index 7af44261b43..6fbcda922df 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
@@ -19,7 +19,7 @@
 
 #include "../../../Emplaceable.h"
 #include "../../../DefaultOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
index 3f94c03a3e5..7d5e5e89d15 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
@@ -19,7 +19,7 @@
 
 #include "../../../Emplaceable.h"
 #include "../../../DefaultOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp
index d2979b1eecc..d91295b48c6 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp
index be1ab6f8d23..4d378949311 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp
index c5dd6fbdcc7..ebae10e6ebc 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp
index c23d821e0bb..d9afc9d0fdf 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
index 8fc080d013f..5e1a1d4125e 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp
index 0c8e9168731..b83c802c04c 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
index 6e3d2f26bc3..70ff7ef6d6b 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
index efc99e1e762..60ca7d4a5b4 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
index 1678c9de89e..2f198f8f7c2 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.ops/count.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.ops/count.pass.cpp
index b0e4c58873c..34c0413284a 100644
--- a/libcxx/test/containers/associative/multimap/multimap.ops/count.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.ops/count.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.ops/equal_range.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.ops/equal_range.pass.cpp
index 4632eb1c472..a408796d1fb 100644
--- a/libcxx/test/containers/associative/multimap/multimap.ops/equal_range.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.ops/equal_range.pass.cpp
@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/multimap/multimap.ops/find.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.ops/find.pass.cpp
index e4dba289d09..fb5afa241ca 100644
--- a/libcxx/test/containers/associative/multimap/multimap.ops/find.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.ops/find.pass.cpp
@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp
index 5ec1210e842..49cf6de853c 100644
--- a/libcxx/test/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp
@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp
index aa5a525ae54..1920647705f 100644
--- a/libcxx/test/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp
@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/multimap/multimap.special/member_swap.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.special/member_swap.pass.cpp
index 1e1ab2335ab..c8f30aa7c71 100644
--- a/libcxx/test/containers/associative/multimap/multimap.special/member_swap.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.special/member_swap.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
index 6f5b92fe1fe..d403774b6e5 100644
--- a/libcxx/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 #include "../../../test_allocator.h"
 #include "../../../test_compare.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/size.pass.cpp b/libcxx/test/containers/associative/multimap/size.pass.cpp
index 794c34a2846..ac71d4c95b6 100644
--- a/libcxx/test/containers/associative/multimap/size.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/size.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/types.pass.cpp b/libcxx/test/containers/associative/multimap/types.pass.cpp
index 2fe8fe0eabf..82132f15d09 100644
--- a/libcxx/test/containers/associative/multimap/types.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/types.pass.cpp
@@ -32,7 +32,7 @@
 #include <map>
 #include <type_traits>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/clear.pass.cpp b/libcxx/test/containers/associative/multiset/clear.pass.cpp
index f325a701abe..3069de5a300 100644
--- a/libcxx/test/containers/associative/multiset/clear.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/clear.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/count.pass.cpp b/libcxx/test/containers/associative/multiset/count.pass.cpp
index cba64301a33..12af167a19d 100644
--- a/libcxx/test/containers/associative/multiset/count.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/count.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/emplace.pass.cpp b/libcxx/test/containers/associative/multiset/emplace.pass.cpp
index 08ac42b1d13..6b76cf05e03 100644
--- a/libcxx/test/containers/associative/multiset/emplace.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/emplace.pass.cpp
@@ -19,7 +19,7 @@
 
 #include "../../Emplaceable.h"
 #include "../../DefaultOnly.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp b/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp
index 1510c010477..1eddd1e920d 100644
--- a/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp
@@ -19,7 +19,7 @@
 
 #include "../../Emplaceable.h"
 #include "../../DefaultOnly.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/empty.pass.cpp b/libcxx/test/containers/associative/multiset/empty.pass.cpp
index 154180def46..32aef90d418 100644
--- a/libcxx/test/containers/associative/multiset/empty.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/empty.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/equal_range.pass.cpp b/libcxx/test/containers/associative/multiset/equal_range.pass.cpp
index 6babfa1b9ae..8c69d0c61ec 100644
--- a/libcxx/test/containers/associative/multiset/equal_range.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/equal_range.pass.cpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/multiset/erase_iter.pass.cpp b/libcxx/test/containers/associative/multiset/erase_iter.pass.cpp
index 3657f521cb1..b6656668d40 100644
--- a/libcxx/test/containers/associative/multiset/erase_iter.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/erase_iter.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/erase_iter_iter.pass.cpp b/libcxx/test/containers/associative/multiset/erase_iter_iter.pass.cpp
index de4c8783bf3..e1d7090d816 100644
--- a/libcxx/test/containers/associative/multiset/erase_iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/erase_iter_iter.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/erase_key.pass.cpp b/libcxx/test/containers/associative/multiset/erase_key.pass.cpp
index 170232904c4..e9bce1e1b64 100644
--- a/libcxx/test/containers/associative/multiset/erase_key.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/erase_key.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/find.pass.cpp b/libcxx/test/containers/associative/multiset/find.pass.cpp
index b4963e9dd0f..364460a6ca3 100644
--- a/libcxx/test/containers/associative/multiset/find.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/find.pass.cpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/multiset/insert_cv.pass.cpp b/libcxx/test/containers/associative/multiset/insert_cv.pass.cpp
index 57e1e98f500..179715753ab 100644
--- a/libcxx/test/containers/associative/multiset/insert_cv.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/insert_cv.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp b/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp
index c609d242ae2..7e923f2516d 100644
--- a/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/insert_iter_cv.pass.cpp b/libcxx/test/containers/associative/multiset/insert_iter_cv.pass.cpp
index fccc2b71960..7d204024c21 100644
--- a/libcxx/test/containers/associative/multiset/insert_iter_cv.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/insert_iter_cv.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp b/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp
index 3cfa9dd16c4..189c4549866 100644
--- a/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/insert_iter_rv.pass.cpp b/libcxx/test/containers/associative/multiset/insert_iter_rv.pass.cpp
index f09d97de827..342c6fd53d7 100644
--- a/libcxx/test/containers/associative/multiset/insert_iter_rv.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/insert_iter_rv.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../MoveOnly.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/insert_rv.pass.cpp b/libcxx/test/containers/associative/multiset/insert_rv.pass.cpp
index e9e773ccd73..1030e0886eb 100644
--- a/libcxx/test/containers/associative/multiset/insert_rv.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/insert_rv.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../MoveOnly.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/iterator.pass.cpp b/libcxx/test/containers/associative/multiset/iterator.pass.cpp
index f801de7269e..ccb6c6665ad 100644
--- a/libcxx/test/containers/associative/multiset/iterator.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/iterator.pass.cpp
@@ -29,7 +29,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/lower_bound.pass.cpp b/libcxx/test/containers/associative/multiset/lower_bound.pass.cpp
index 48e297ac608..e466791d935 100644
--- a/libcxx/test/containers/associative/multiset/lower_bound.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/lower_bound.pass.cpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/multiset/max_size.pass.cpp b/libcxx/test/containers/associative/multiset/max_size.pass.cpp
index a209d700ee6..5524f771b34 100644
--- a/libcxx/test/containers/associative/multiset/max_size.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/max_size.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
index 16ba28abfca..7d76581d6d8 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/default.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/default.pass.cpp
index cf24bf771ce..b6176c92d2a 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/default.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/default.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
index 60e6940e723..dadafec7c3b 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
index 3f0053996f3..f6c1fd76de1 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp
index 97f593bb32b..a5195f7eb6f 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
index e02942ffeea..2af24ce9d59 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
@@ -19,7 +19,7 @@
 #include "../../../MoveOnly.h"
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.special/member_swap.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.special/member_swap.pass.cpp
index 8d5b1e822bc..ce906896b9a 100644
--- a/libcxx/test/containers/associative/multiset/multiset.special/member_swap.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.special/member_swap.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/size.pass.cpp b/libcxx/test/containers/associative/multiset/size.pass.cpp
index 8129a9c3675..68099b566df 100644
--- a/libcxx/test/containers/associative/multiset/size.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/size.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/types.pass.cpp b/libcxx/test/containers/associative/multiset/types.pass.cpp
index e3331cddc6d..da9c8d6b5fe 100644
--- a/libcxx/test/containers/associative/multiset/types.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/types.pass.cpp
@@ -32,7 +32,7 @@
 #include <set>
 #include <type_traits>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/upper_bound.pass.cpp b/libcxx/test/containers/associative/multiset/upper_bound.pass.cpp
index 932ab0b1044..7ad3d6ced3d 100644
--- a/libcxx/test/containers/associative/multiset/upper_bound.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/upper_bound.pass.cpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/set/clear.pass.cpp b/libcxx/test/containers/associative/set/clear.pass.cpp
index c6e01023f65..4439ad3b1e4 100644
--- a/libcxx/test/containers/associative/set/clear.pass.cpp
+++ b/libcxx/test/containers/associative/set/clear.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/count.pass.cpp b/libcxx/test/containers/associative/set/count.pass.cpp
index 7d7a31ad0db..a2dc177f2da 100644
--- a/libcxx/test/containers/associative/set/count.pass.cpp
+++ b/libcxx/test/containers/associative/set/count.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/emplace.pass.cpp b/libcxx/test/containers/associative/set/emplace.pass.cpp
index 69fdbeeb6b2..731382f8d2c 100644
--- a/libcxx/test/containers/associative/set/emplace.pass.cpp
+++ b/libcxx/test/containers/associative/set/emplace.pass.cpp
@@ -19,7 +19,7 @@
 
 #include "../../Emplaceable.h"
 #include "../../DefaultOnly.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/emplace_hint.pass.cpp b/libcxx/test/containers/associative/set/emplace_hint.pass.cpp
index 8e7fbbc4033..f06cfeceaf2 100644
--- a/libcxx/test/containers/associative/set/emplace_hint.pass.cpp
+++ b/libcxx/test/containers/associative/set/emplace_hint.pass.cpp
@@ -19,7 +19,7 @@
 
 #include "../../Emplaceable.h"
 #include "../../DefaultOnly.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/empty.pass.cpp b/libcxx/test/containers/associative/set/empty.pass.cpp
index 305ae39ff90..eb1080263f4 100644
--- a/libcxx/test/containers/associative/set/empty.pass.cpp
+++ b/libcxx/test/containers/associative/set/empty.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/equal_range.pass.cpp b/libcxx/test/containers/associative/set/equal_range.pass.cpp
index 5b83887e61f..8a180ef4924 100644
--- a/libcxx/test/containers/associative/set/equal_range.pass.cpp
+++ b/libcxx/test/containers/associative/set/equal_range.pass.cpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/set/erase_iter.pass.cpp b/libcxx/test/containers/associative/set/erase_iter.pass.cpp
index f05d4819e07..21666c36401 100644
--- a/libcxx/test/containers/associative/set/erase_iter.pass.cpp
+++ b/libcxx/test/containers/associative/set/erase_iter.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/erase_iter_iter.pass.cpp b/libcxx/test/containers/associative/set/erase_iter_iter.pass.cpp
index 953d1be8bd4..47995031665 100644
--- a/libcxx/test/containers/associative/set/erase_iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/set/erase_iter_iter.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/erase_key.pass.cpp b/libcxx/test/containers/associative/set/erase_key.pass.cpp
index 12ee0af980e..9d92bd70d70 100644
--- a/libcxx/test/containers/associative/set/erase_key.pass.cpp
+++ b/libcxx/test/containers/associative/set/erase_key.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/find.pass.cpp b/libcxx/test/containers/associative/set/find.pass.cpp
index 6ce47f8dea0..d08d2fb1e24 100644
--- a/libcxx/test/containers/associative/set/find.pass.cpp
+++ b/libcxx/test/containers/associative/set/find.pass.cpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/set/insert_cv.pass.cpp b/libcxx/test/containers/associative/set/insert_cv.pass.cpp
index eabd1a8722a..18d5c2e0339 100644
--- a/libcxx/test/containers/associative/set/insert_cv.pass.cpp
+++ b/libcxx/test/containers/associative/set/insert_cv.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/insert_initializer_list.pass.cpp b/libcxx/test/containers/associative/set/insert_initializer_list.pass.cpp
index d75e8a8bcbd..fc6d612b2eb 100644
--- a/libcxx/test/containers/associative/set/insert_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/set/insert_initializer_list.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/insert_iter_cv.pass.cpp b/libcxx/test/containers/associative/set/insert_iter_cv.pass.cpp
index d86d40e8909..718e720559f 100644
--- a/libcxx/test/containers/associative/set/insert_iter_cv.pass.cpp
+++ b/libcxx/test/containers/associative/set/insert_iter_cv.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp b/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp
index d99dbe365ac..ff729a0e7b9 100644
--- a/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/insert_iter_rv.pass.cpp b/libcxx/test/containers/associative/set/insert_iter_rv.pass.cpp
index cf2dcbf91bb..c149fa3c68e 100644
--- a/libcxx/test/containers/associative/set/insert_iter_rv.pass.cpp
+++ b/libcxx/test/containers/associative/set/insert_iter_rv.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../MoveOnly.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/insert_rv.pass.cpp b/libcxx/test/containers/associative/set/insert_rv.pass.cpp
index 0b58af6cad0..39894514ee9 100644
--- a/libcxx/test/containers/associative/set/insert_rv.pass.cpp
+++ b/libcxx/test/containers/associative/set/insert_rv.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../MoveOnly.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/iterator.pass.cpp b/libcxx/test/containers/associative/set/iterator.pass.cpp
index f52e8451c5f..39c8cc6723e 100644
--- a/libcxx/test/containers/associative/set/iterator.pass.cpp
+++ b/libcxx/test/containers/associative/set/iterator.pass.cpp
@@ -29,7 +29,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/lower_bound.pass.cpp b/libcxx/test/containers/associative/set/lower_bound.pass.cpp
index 1562dfa9041..df202f31a4c 100644
--- a/libcxx/test/containers/associative/set/lower_bound.pass.cpp
+++ b/libcxx/test/containers/associative/set/lower_bound.pass.cpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()
diff --git a/libcxx/test/containers/associative/set/max_size.pass.cpp b/libcxx/test/containers/associative/set/max_size.pass.cpp
index b744b9eb16a..cde4397c717 100644
--- a/libcxx/test/containers/associative/set/max_size.pass.cpp
+++ b/libcxx/test/containers/associative/set/max_size.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
index 26f38e94b19..892ae5a0a79 100644
--- a/libcxx/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/default.pass.cpp b/libcxx/test/containers/associative/set/set.cons/default.pass.cpp
index 300b4fc6873..d047b12a9d1 100644
--- a/libcxx/test/containers/associative/set/set.cons/default.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/default.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/initializer_list.pass.cpp b/libcxx/test/containers/associative/set/set.cons/initializer_list.pass.cpp
index 7d981a11a85..2ad538e143f 100644
--- a/libcxx/test/containers/associative/set/set.cons/initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/initializer_list.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/iter_iter.pass.cpp b/libcxx/test/containers/associative/set/set.cons/iter_iter.pass.cpp
index 3248257fe2a..7ca7fe14d6c 100644
--- a/libcxx/test/containers/associative/set/set.cons/iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/iter_iter.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/move.pass.cpp b/libcxx/test/containers/associative/set/set.cons/move.pass.cpp
index 2d1b37f4e07..53d4bd6dcfd 100644
--- a/libcxx/test/containers/associative/set/set.cons/move.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/move.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp
index 3e82e28d516..48a799e4983 100644
--- a/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp
@@ -19,7 +19,7 @@
 #include "../../../MoveOnly.h"
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.special/member_swap.pass.cpp b/libcxx/test/containers/associative/set/set.special/member_swap.pass.cpp
index aa38fe03577..f72abd7eb4a 100644
--- a/libcxx/test/containers/associative/set/set.special/member_swap.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.special/member_swap.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/size.pass.cpp b/libcxx/test/containers/associative/set/size.pass.cpp
index e1b6b6ce7c8..e7865473550 100644
--- a/libcxx/test/containers/associative/set/size.pass.cpp
+++ b/libcxx/test/containers/associative/set/size.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/types.pass.cpp b/libcxx/test/containers/associative/set/types.pass.cpp
index 04b9ead0381..8d7bb68f078 100644
--- a/libcxx/test/containers/associative/set/types.pass.cpp
+++ b/libcxx/test/containers/associative/set/types.pass.cpp
@@ -32,7 +32,7 @@
 #include <set>
 #include <type_traits>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/upper_bound.pass.cpp b/libcxx/test/containers/associative/set/upper_bound.pass.cpp
index 5e889d280d0..10a28f06469 100644
--- a/libcxx/test/containers/associative/set/upper_bound.pass.cpp
+++ b/libcxx/test/containers/associative/set/upper_bound.pass.cpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 #include "private_constructor.hpp"
 
 int main()