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

258 files changed, 258 insertions, 258 deletions

diff --git a/libcxx/test/containers/sequences/deque/deque.capacity/access.pass.cpp b/libcxx/test/containers/sequences/deque/deque.capacity/access.pass.cpp
index 1215f9582b0..77aaf3c131e 100644
--- a/libcxx/test/containers/sequences/deque/deque.capacity/access.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.capacity/access.pass.cpp
@@ -24,7 +24,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.capacity/resize_size.pass.cpp b/libcxx/test/containers/sequences/deque/deque.capacity/resize_size.pass.cpp
index fee4a8955c6..15f49df395e 100644
--- a/libcxx/test/containers/sequences/deque/deque.capacity/resize_size.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.capacity/resize_size.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp b/libcxx/test/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp
index b05bffae93e..727b5d5d864 100644
--- a/libcxx/test/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp b/libcxx/test/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp
index b823ace58be..0ac1d5a680c 100644
--- a/libcxx/test/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
index e23e50003aa..1bb672cb1c2 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
@@ -16,7 +16,7 @@
 
 #include "../../../test_allocator.h"
 #include "../../../NotConstructible.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class T, class Allocator>
 void
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp
index 27b8bbbed5f..c760b437244 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
index 0c60d75a8e8..6594984fc0d 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp
index 7401f042efb..fd6dd6e4ab6 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp
index 4029bcc724b..8f79e122609 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
index 156e011343c..9cf660cfb8c 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/default.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/default.pass.cpp
index 910421c6fc3..f8754f1df15 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/default.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/default.pass.cpp
@@ -16,7 +16,7 @@
 
 #include "../../../stack_allocator.h"
 #include "../../../NotConstructible.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class T, class Allocator>
 void
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp
index 537ded5e034..a9e0218e2e0 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
index 66ee3abdaeb..a2529b416a2 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
index 1a85871f9d5..faadf2b1a1d 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
@@ -16,7 +16,7 @@
 
 #include "../../../stack_allocator.h"
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class InputIterator>
 void
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
index 2070f4a957a..89d9b34e5e9 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
@@ -17,7 +17,7 @@
 
 #include "test_iterators.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class InputIterator, class Allocator>
 void
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp
index 5764c61d54e..e2fb7e61f15 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp
@@ -16,7 +16,7 @@
 
 #include "../../../MoveOnly.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
index def1fc396f7..f801ceb60e7 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
@@ -16,7 +16,7 @@
 
 #include "../../../MoveOnly.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
index a9e760f2fbd..eaab0f7cc85 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
@@ -16,7 +16,7 @@
 
 #include "../../../MoveOnly.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
index bb169c1f836..4cbb0fb0249 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp
index 577b51cf05f..6468e4329bd 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/size.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/size.pass.cpp
index 1f07caf4860..8ce1ab2fd9f 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/size.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/size.pass.cpp
@@ -16,7 +16,7 @@
 
 #include "../../../stack_allocator.h"
 #include "../../../DefaultOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class T, class Allocator>
 void
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/size_value.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/size_value.pass.cpp
index 782c0ed5d0d..859deba1e1a 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/size_value.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class T, class Allocator>
 void
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp
index c61ce155e6d..5693be702de 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class T, class Allocator>
 void
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp
index d332bb45d72..806f7280332 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../Emplaceable.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
index 892418e935f..aa977eb84bf 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../Emplaceable.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
index 6eebfa8e1a1..cf09d6e19b6 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../Emplaceable.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp
index 1b4da3faa9d..bfab2a3a4fc 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp
index 37b6c1c157c..b7fa4f6c5a5 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp
index 487db6bd564..5f7804023c7 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
index 1cf507c5d74..6ab948e7c3d 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
@@ -18,7 +18,7 @@
 #include "test_iterators.h"
 #include "../../../MoveOnly.h"
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp
index e1cac32357e..0bde7d9b7e3 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp
index 71129bf98e3..7b7786161db 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp
index 87be595b67b..97827c1183a 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp
index 51812cf268f..e642f7132f5 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp
index 17597abc7f5..e27edf51f79 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/push_back.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/push_back.pass.cpp
index cb7155a59f4..444ab9ba955 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/push_back.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/push_back.pass.cpp
@@ -16,7 +16,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
index c60fdfc55d1..d6c44391477 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/push_front.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/push_front.pass.cpp
index e3b2d98f7a5..700edd3abdb 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/push_front.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/push_front.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
index 650a9b8a050..1670a44aa07 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp
index e8bf4daf0b7..7dfb4bc5c2d 100644
--- a/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp
index 61681265908..b484a865c57 100644
--- a/libcxx/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp
index 2da742f6d76..b100ba487ea 100644
--- a/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.special/move_backward.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/move_backward.pass.cpp
index 6fe094f7b48..072d7a78a30 100644
--- a/libcxx/test/containers/sequences/deque/deque.special/move_backward.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.special/move_backward.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp
index d4da735a408..035bcea37c3 100644
--- a/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp
@@ -15,7 +15,7 @@
 #include <deque>
 #include <cassert>
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/sequences/deque/iterators.pass.cpp b/libcxx/test/containers/sequences/deque/iterators.pass.cpp
index a83a16b3a2f..9140e02ba2b 100644
--- a/libcxx/test/containers/sequences/deque/iterators.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/iterators.pass.cpp
@@ -20,7 +20,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/deque/types.pass.cpp b/libcxx/test/containers/sequences/deque/types.pass.cpp
index 9e70299787f..71cb54032f1 100644
--- a/libcxx/test/containers/sequences/deque/types.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/types.pass.cpp
@@ -35,7 +35,7 @@
 
 #include "../../test_allocator.h"
 #include "../../Copyable.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class T, class Allocator>
 void
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp
index 9a201aafd0c..2ec9b871332 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
index 318328753f8..07a8e22e016 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
@@ -16,7 +16,7 @@
 
 #include "../../../test_allocator.h"
 #include "../../../NotConstructible.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
index 0379e47f4d1..0de0d99fd52 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
@@ -16,7 +16,7 @@
 #include <iterator>
 
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp
index 088ed6d961b..e0382a10db4 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
index 480350becc2..ee4130127ee 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
@@ -17,7 +17,7 @@
 
 #include "../../../test_allocator.h"
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp
index 5efe79ff3ba..551908fea16 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
index ccbd7ce5b42..fb3765d2030 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
@@ -17,7 +17,7 @@
 #include <iterator>
 
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp
index 7e7dbb63aa7..ea53e1c3732 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
index 0c3f1623768..0759418a4b3 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
@@ -16,7 +16,7 @@
 #include <iterator>
 
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
index 764967931d1..9ff8215ff8e 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <iterator>
 
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp
index aa002360619..dcc438c3ed2 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp
index 987185dca05..5b31c4dad0a 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
index 4b62a42e697..e6e2f124980 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
index 01b12597c41..41de1eb0559 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
@@ -17,7 +17,7 @@
 
 #include "../../../test_allocator.h"
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
index b659e88ed90..c43b3c19079 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
@@ -17,7 +17,7 @@
 
 #include "../../../test_allocator.h"
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
index 57d345060af..763952439f0 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
@@ -17,7 +17,7 @@
 #include <iterator>
 
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
index 8f3b39a64cf..d0810f9df2f 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
@@ -19,7 +19,7 @@
 
 #include "../../../test_allocator.h"
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
index fb71b318581..1bebcd4dec0 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 
 #include "../../../DefaultOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class T, class Allocator>
 void check_allocator(unsigned n, Allocator const &alloc = Allocator())
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp
index 4981d7e4214..05ab98bb205 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
index da4e80dad92..6d92c68165c 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp
index 1b89177220e..083cec2886d 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp
index 2e9951456b9..02e17d72e5f 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp
index 33db9e9e5ce..2739b49d8eb 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../NotConstructible.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp
index 680b5b848f2..e305c5b6ab5 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 
 #include "../../../Emplaceable.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp
index f3c7f4aac84..c02337e0562 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../Emplaceable.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp
index f3265930538..bd9b15300ef 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp
index e36089e3b61..4f51498bc65 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp
index b6785e72f2f..ec650b69572 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp
index 7afaacdb3f6..4d301819980 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
index dde6a13dcf5..103475f1eda 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp
index 59f67701921..4f0be520c30 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp
index 42977535231..b2da2ecd3bb 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp
index 0b73c7a09b0..276f2c9f8ed 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp
index bcf2865f89c..85958afc1ce 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp
index f2e99e1e363..53181ec881e 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
index e9372808489..20861368b43 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../DefaultOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp
index 89775d15a57..d722b925e19 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../DefaultOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp
index 280d92ca5e8..3b6f853c84c 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp
@@ -15,7 +15,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp
index 6d6c40ef374..7e873bdddd0 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp
@@ -16,7 +16,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp
index 98748033f9a..a15e786cd28 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp
@@ -15,7 +15,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp
index 93b8ad8090e..4c4e80c3df2 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp
@@ -15,7 +15,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 bool g(int i)
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp
index b707c191d97..9bf0d03a885 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp
@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void test(int N)
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp
index 9a8bd17d3e2..06e40c595ec 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp
@@ -17,7 +17,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void test(int N)
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp
index 8524439d208..8b6ca39b2aa 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp
@@ -18,7 +18,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void test(int N)
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp
index 0fee4a49217..51da651970c 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 typedef int T;
 const T t1[] = {0, 1, 2, 3, 4, 5, 6, 7};
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp
index 6e75d49fdfe..296ffcd6955 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 typedef int T;
 const T t1[] = {0, 1, 2, 3, 4, 5, 6, 7};
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp
index 0c6128055f4..90a15995963 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 typedef int T;
 const T t1[] = {0, 1, 2, 3, 4, 5, 6, 7};
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp
index 9c95dc9369f..25db6e64b8a 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp
@@ -15,7 +15,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp
index f956f270aa8..b7dce20b709 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp
@@ -15,7 +15,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 bool g(int x, int y)
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp
index 485d89ef057..ca673b58368 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp
@@ -22,7 +22,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void test(int N, int M)
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
index da27cc9d994..9c3a5466d9f 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
index 115a369e53c..aa34ce95098 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp
index 7823693d0ed..42e245d007b 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp
@@ -30,7 +30,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void test(int N, int M)
diff --git a/libcxx/test/containers/sequences/forwardlist/max_size.pass.cpp b/libcxx/test/containers/sequences/forwardlist/max_size.pass.cpp
index 96883b51517..be7ebaf44b0 100644
--- a/libcxx/test/containers/sequences/forwardlist/max_size.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/max_size.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/types.pass.cpp b/libcxx/test/containers/sequences/forwardlist/types.pass.cpp
index d812f8a9e4a..68cebf978cb 100644
--- a/libcxx/test/containers/sequences/forwardlist/types.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/types.pass.cpp
@@ -28,7 +28,7 @@
 #include <forward_list>
 #include <type_traits>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/db_back.pass.cpp b/libcxx/test/containers/sequences/list/db_back.pass.cpp
index 22a7eac4889..b16c0e90701 100644
--- a/libcxx/test/containers/sequences/list/db_back.pass.cpp
+++ b/libcxx/test/containers/sequences/list/db_back.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/db_cback.pass.cpp b/libcxx/test/containers/sequences/list/db_cback.pass.cpp
index 613b4f1b818..ba3977e16f4 100644
--- a/libcxx/test/containers/sequences/list/db_cback.pass.cpp
+++ b/libcxx/test/containers/sequences/list/db_cback.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/db_cfront.pass.cpp b/libcxx/test/containers/sequences/list/db_cfront.pass.cpp
index 2646fe1d1ee..d42290c43c0 100644
--- a/libcxx/test/containers/sequences/list/db_cfront.pass.cpp
+++ b/libcxx/test/containers/sequences/list/db_cfront.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/db_front.pass.cpp b/libcxx/test/containers/sequences/list/db_front.pass.cpp
index f7c3dfcf34a..037b16035c6 100644
--- a/libcxx/test/containers/sequences/list/db_front.pass.cpp
+++ b/libcxx/test/containers/sequences/list/db_front.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/db_iterators_6.pass.cpp b/libcxx/test/containers/sequences/list/db_iterators_6.pass.cpp
index 9528d75dce1..a5b8020b373 100644
--- a/libcxx/test/containers/sequences/list/db_iterators_6.pass.cpp
+++ b/libcxx/test/containers/sequences/list/db_iterators_6.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/db_iterators_7.pass.cpp b/libcxx/test/containers/sequences/list/db_iterators_7.pass.cpp
index 795ffa7d46c..76a491b1184 100644
--- a/libcxx/test/containers/sequences/list/db_iterators_7.pass.cpp
+++ b/libcxx/test/containers/sequences/list/db_iterators_7.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/db_iterators_8.pass.cpp b/libcxx/test/containers/sequences/list/db_iterators_8.pass.cpp
index 2c347231b86..1d1ee23a393 100644
--- a/libcxx/test/containers/sequences/list/db_iterators_8.pass.cpp
+++ b/libcxx/test/containers/sequences/list/db_iterators_8.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/iterators.pass.cpp b/libcxx/test/containers/sequences/list/iterators.pass.cpp
index 9f6a51b951f..a843334e42c 100644
--- a/libcxx/test/containers/sequences/list/iterators.pass.cpp
+++ b/libcxx/test/containers/sequences/list/iterators.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 struct A
 {
diff --git a/libcxx/test/containers/sequences/list/list.capacity/resize_size.pass.cpp b/libcxx/test/containers/sequences/list/list.capacity/resize_size.pass.cpp
index d5135eef8c7..7f0ebc980b4 100644
--- a/libcxx/test/containers/sequences/list/list.capacity/resize_size.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.capacity/resize_size.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 #include "../../../DefaultOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp b/libcxx/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
index dbe2c3f66e1..ab171d5cc7e 100644
--- a/libcxx/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 #include "../../../DefaultOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.cons/assign_copy.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
index 422436ad05c..6426e01202d 100644
--- a/libcxx/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp
index e438f4062de..24bd140c4e4 100644
--- a/libcxx/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.cons/assign_move.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/assign_move.pass.cpp
index da788dd7ee5..3bcd82414a8 100644
--- a/libcxx/test/containers/sequences/list/list.cons/assign_move.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/assign_move.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include "../../../MoveOnly.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp
index b490ebaf8bf..0d093bd2a55 100644
--- a/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include "../../../DefaultOnly.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
index 30eb9ff38f2..910021c6853 100644
--- a/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include "../../../DefaultOnly.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.cons/default.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/default.pass.cpp
index a6e193c2ea8..e992dca9c7f 100644
--- a/libcxx/test/containers/sequences/list/list.cons/default.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/default.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 #include "../../../DefaultOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp
index ef42e522fb3..9d9946b6896 100644
--- a/libcxx/test/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.cons/initializer_list.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/initializer_list.pass.cpp
index f862eedf392..3307017989e 100644
--- a/libcxx/test/containers/sequences/list/list.cons/initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
index 649610abc0a..9720a3d0d3c 100644
--- a/libcxx/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.cons/input_iterator.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/input_iterator.pass.cpp
index b5d8dcba72a..09eae8ab43c 100644
--- a/libcxx/test/containers/sequences/list/list.cons/input_iterator.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/input_iterator.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 #include "test_iterators.h"
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp
index f1c5a98f1b5..ced38b47361 100644
--- a/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include "../../../MoveOnly.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.cons/move_alloc.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
index 94711d4b1db..78e144559b7 100644
--- a/libcxx/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include "../../../MoveOnly.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp
index f090043844b..7b7b8a327b8 100644
--- a/libcxx/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <list>
 #include <cassert>
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.cons/size_type.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/size_type.pass.cpp
index 864b5adcf8a..b72c9ca70e1 100644
--- a/libcxx/test/containers/sequences/list/list.cons/size_type.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/size_type.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include "../../../DefaultOnly.h"
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class T, class Allocator>
 void
diff --git a/libcxx/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
index 89cdf0e1602..e1d768e4446 100644
--- a/libcxx/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include "../../../DefaultOnly.h"
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/clear.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/clear.pass.cpp
index 5bfab6fe20c..38696b6eb50 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/clear.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/clear.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/emplace.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/emplace.pass.cpp
index 9f5edf5113d..6476d1d6c6a 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/emplace.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/emplace.pass.cpp
@@ -18,7 +18,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 class A
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp
index 71bc671e23e..5983efc59ad 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 class A
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp
index 2eee9da2deb..e2e68e33138 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 class A
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter.pass.cpp
index 0c2e5a1ccee..c1cc9004367 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp
index d5fd0449092..18c15eb02c8 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp
@@ -20,7 +20,7 @@
 #include <cstdlib>
 #include <exception>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp
index df567aa6e52..61ff8409c96 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp
@@ -20,7 +20,7 @@
 #include <cstdlib>
 #include <exception>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp
index e1a6e5aef5d..bd3f66b4116 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp
index 18b825beec4..71ad497e7d9 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp
@@ -20,7 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp
index 84fbf375554..db76b4de486 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp
@@ -20,7 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp
index 4bdee44faf3..25c5c6147a0 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp
@@ -20,7 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp
index 5b1d3e1ac2f..35a4ceb4848 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp
@@ -20,7 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp
index 9afb506fea5..a82a2696e82 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
index 9e23df3aa63..625004b5c7d 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
@@ -20,7 +20,7 @@
 #include <cstdlib>
 #include <cassert>
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int throw_next = 0xFFFF;
 int count = 0;
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
index e575753e7fa..27d0411fb04 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
index 0de5a9f04fb..ce2d386e91f 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
@@ -19,7 +19,7 @@
 #include <cstdlib>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int throw_next = 0xFFFF;
 int count = 0;
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
index bf9ed8b8770..1b097e362e9 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
@@ -19,7 +19,7 @@
 #include <cstdlib>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int throw_next = 0xFFFF;
 int count = 0;
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp
index a687b1b8fbb..3add8518809 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp
@@ -18,7 +18,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/pop_front.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/pop_front.pass.cpp
index cc1462cb422..aec17cc08f4 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/pop_front.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/pop_front.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/push_back.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/push_back.pass.cpp
index 2022bb05a54..2638c541fa1 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/push_back.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/push_back.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp
index 3f0dddd4924..070db9e8d6b 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/push_front.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/push_front.pass.cpp
index 7042829eac6..b7f4febcd38 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/push_front.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/push_front.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp
index e7976fa4cd5..8a3175504eb 100644
--- a/libcxx/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.ops/merge.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/merge.pass.cpp
index 9b8d2ad2389..d226ed5dc64 100644
--- a/libcxx/test/containers/sequences/list/list.ops/merge.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.ops/merge.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.ops/merge_comp.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/merge_comp.pass.cpp
index b09e2dcdbc5..ce861a5dcb8 100644
--- a/libcxx/test/containers/sequences/list/list.ops/merge_comp.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.ops/merge_comp.pass.cpp
@@ -15,7 +15,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.ops/remove.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/remove.pass.cpp
index f17dfc8ded6..76d878d02c3 100644
--- a/libcxx/test/containers/sequences/list/list.ops/remove.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.ops/remove.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.ops/remove_if.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/remove_if.pass.cpp
index e6366072ae6..b45562abdd3 100644
--- a/libcxx/test/containers/sequences/list/list.ops/remove_if.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.ops/remove_if.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <functional>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 bool g(int i)
 {
diff --git a/libcxx/test/containers/sequences/list/list.ops/reverse.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/reverse.pass.cpp
index 3eafeee6e2b..046453ae538 100644
--- a/libcxx/test/containers/sequences/list/list.ops/reverse.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.ops/reverse.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.ops/sort.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/sort.pass.cpp
index a79f0a69ba2..1c11227237a 100644
--- a/libcxx/test/containers/sequences/list/list.ops/sort.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.ops/sort.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.ops/sort_comp.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/sort_comp.pass.cpp
index c107e1fb9b4..28125ab83c0 100644
--- a/libcxx/test/containers/sequences/list/list.ops/sort_comp.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.ops/sort_comp.pass.cpp
@@ -15,7 +15,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp
index 81916e0fced..354871c20af 100644
--- a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp
@@ -18,7 +18,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp
index f4c04896fb0..5082c3f8517 100644
--- a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp
@@ -18,7 +18,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp
index 5745af5181f..fcc4acceec5 100644
--- a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp
@@ -18,7 +18,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.ops/unique.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/unique.pass.cpp
index cfd9d03ab42..48cad1ddd15 100644
--- a/libcxx/test/containers/sequences/list/list.ops/unique.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.ops/unique.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.ops/unique_pred.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/unique_pred.pass.cpp
index a9687a9e5ed..f8935b81f6a 100644
--- a/libcxx/test/containers/sequences/list/list.ops/unique_pred.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.ops/unique_pred.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 bool g(int x, int y)
 {
diff --git a/libcxx/test/containers/sequences/list/list.special/db_swap_1.pass.cpp b/libcxx/test/containers/sequences/list/list.special/db_swap_1.pass.cpp
index e440f695f28..f7171795cd5 100644
--- a/libcxx/test/containers/sequences/list/list.special/db_swap_1.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.special/db_swap_1.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 
 #include <__debug>
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp b/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp
index a8283fdeb59..9f790cd22f6 100644
--- a/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp
@@ -15,7 +15,7 @@
 #include <list>
 #include <cassert>
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/types.pass.cpp b/libcxx/test/containers/sequences/list/types.pass.cpp
index 9fa3a0573ed..95d7f5010f0 100644
--- a/libcxx/test/containers/sequences/list/types.pass.cpp
+++ b/libcxx/test/containers/sequences/list/types.pass.cpp
@@ -25,7 +25,7 @@
 #include <list>
 #include <type_traits>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp b/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp
index 7cf927b7553..e524e1a9761 100644
--- a/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../test_allocator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp
index 2cf92970474..2925fbc6674 100644
--- a/libcxx/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp b/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp
index 5edd3137c5f..b3bb0f157ee 100644
--- a/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../test_allocator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/capacity.pass.cpp b/libcxx/test/containers/sequences/vector.bool/capacity.pass.cpp
index 87c98987dbc..63bff25f9f9 100644
--- a/libcxx/test/containers/sequences/vector.bool/capacity.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/capacity.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp
index fa396abddb7..f7ec5db5e9b 100644
--- a/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 
 #include "../../test_allocator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void
diff --git a/libcxx/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp
index 3225d8732ae..94e6801825d 100644
--- a/libcxx/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C, class Iterator>
 void
diff --git a/libcxx/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp
index 12f1caec4b0..ea9d41d342f 100644
--- a/libcxx/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C, class Iterator>
 void
diff --git a/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp
index aa4ca0e27a4..65f2ed504d2 100644
--- a/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 #include "../../test_allocator.h"
 
 template <class C>
diff --git a/libcxx/test/containers/sequences/vector.bool/construct_size_value.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_size_value.pass.cpp
index dc950a26c26..fc772f10dfc 100644
--- a/libcxx/test/containers/sequences/vector.bool/construct_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/construct_size_value.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void
diff --git a/libcxx/test/containers/sequences/vector.bool/construct_size_value_alloc.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_size_value_alloc.pass.cpp
index 5e0b22af19c..6cca948ed83 100644
--- a/libcxx/test/containers/sequences/vector.bool/construct_size_value_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/construct_size_value_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void
diff --git a/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp b/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp
index f0e2c7980ef..b9ce87c216d 100644
--- a/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 #include "../../test_allocator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void
diff --git a/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
index 58e71ddca02..2b5cae68a8b 100644
--- a/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../test_allocator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void
diff --git a/libcxx/test/containers/sequences/vector.bool/emplace.pass.cpp b/libcxx/test/containers/sequences/vector.bool/emplace.pass.cpp
index c5754408504..f3fd1e9926f 100644
--- a/libcxx/test/containers/sequences/vector.bool/emplace.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/emplace.pass.cpp
@@ -14,7 +14,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/emplace_back.pass.cpp b/libcxx/test/containers/sequences/vector.bool/emplace_back.pass.cpp
index 86e0d7a8d3b..57aa47822f8 100644
--- a/libcxx/test/containers/sequences/vector.bool/emplace_back.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/emplace_back.pass.cpp
@@ -14,7 +14,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 
 int main()
diff --git a/libcxx/test/containers/sequences/vector.bool/erase_iter.pass.cpp b/libcxx/test/containers/sequences/vector.bool/erase_iter.pass.cpp
index 776b43ec4d7..cbf26dd570a 100644
--- a/libcxx/test/containers/sequences/vector.bool/erase_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/erase_iter.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/erase_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector.bool/erase_iter_iter.pass.cpp
index 8778c32d724..2c2c4cc4861 100644
--- a/libcxx/test/containers/sequences/vector.bool/erase_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/erase_iter_iter.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector.bool/initializer_list.pass.cpp
index 7c1a5de61ab..b9b46865449 100644
--- a/libcxx/test/containers/sequences/vector.bool/initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp b/libcxx/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
index 19b5b57fe15..c86b644ab44 100644
--- a/libcxx/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../test_allocator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp
index 4865b289142..c081cc81c59 100644
--- a/libcxx/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
index 5099ebc2e14..c49ef9bface 100644
--- a/libcxx/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
@@ -16,7 +16,7 @@
 #include <vector>
 #include <cassert>
 #include "test_iterators.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp b/libcxx/test/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp
index 9d49816c7d1..f9cb65cb808 100644
--- a/libcxx/test/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/insert_iter_value.pass.cpp b/libcxx/test/containers/sequences/vector.bool/insert_iter_value.pass.cpp
index 37bdebcb14a..1213985f53f 100644
--- a/libcxx/test/containers/sequences/vector.bool/insert_iter_value.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/insert_iter_value.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/iterators.pass.cpp b/libcxx/test/containers/sequences/vector.bool/iterators.pass.cpp
index 98f725e25ce..b63f6a60e98 100644
--- a/libcxx/test/containers/sequences/vector.bool/iterators.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/iterators.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/move.pass.cpp b/libcxx/test/containers/sequences/vector.bool/move.pass.cpp
index 49d8e237883..1b3fe49eea7 100644
--- a/libcxx/test/containers/sequences/vector.bool/move.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/move.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../test_allocator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp b/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp
index 2b890d72ca2..7b157fb580e 100644
--- a/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../test_allocator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp
index 6f201770dbe..ef3dc5d1079 100644
--- a/libcxx/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/push_back.pass.cpp b/libcxx/test/containers/sequences/vector.bool/push_back.pass.cpp
index 21b3907b36a..c6b0fbf4185 100644
--- a/libcxx/test/containers/sequences/vector.bool/push_back.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/push_back.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/reserve.pass.cpp b/libcxx/test/containers/sequences/vector.bool/reserve.pass.cpp
index 4e7fbeffebe..be717a3be8a 100644
--- a/libcxx/test/containers/sequences/vector.bool/reserve.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/reserve.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/resize_size.pass.cpp b/libcxx/test/containers/sequences/vector.bool/resize_size.pass.cpp
index 17032458118..77d54e5efc1 100644
--- a/libcxx/test/containers/sequences/vector.bool/resize_size.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/resize_size.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/resize_size_value.pass.cpp b/libcxx/test/containers/sequences/vector.bool/resize_size_value.pass.cpp
index 1413f5cd022..8cecf44d2fb 100644
--- a/libcxx/test/containers/sequences/vector.bool/resize_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/resize_size_value.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/shrink_to_fit.pass.cpp b/libcxx/test/containers/sequences/vector.bool/shrink_to_fit.pass.cpp
index 0b4cf4937cb..1f9fcac3d9b 100644
--- a/libcxx/test/containers/sequences/vector.bool/shrink_to_fit.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/shrink_to_fit.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp b/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp
index ce5a10e7b68..f30e3473c23 100644
--- a/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 #include "../../test_allocator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector.bool/types.pass.cpp b/libcxx/test/containers/sequences/vector.bool/types.pass.cpp
index ef33d04219c..8cc9cb9990e 100644
--- a/libcxx/test/containers/sequences/vector.bool/types.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/types.pass.cpp
@@ -33,7 +33,7 @@
 
 #include "../../test_allocator.h"
 #include "../../Copyable.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class Allocator>
 void
diff --git a/libcxx/test/containers/sequences/vector.bool/vector_bool.pass.cpp b/libcxx/test/containers/sequences/vector.bool/vector_bool.pass.cpp
index e2bc48a8da8..ea2262cd9c1 100644
--- a/libcxx/test/containers/sequences/vector.bool/vector_bool.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/vector_bool.pass.cpp
@@ -22,7 +22,7 @@
 #include <cassert>
 #include <type_traits>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/db_back.pass.cpp b/libcxx/test/containers/sequences/vector/db_back.pass.cpp
index 05444528182..05f3d07712e 100644
--- a/libcxx/test/containers/sequences/vector/db_back.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/db_back.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/db_cback.pass.cpp b/libcxx/test/containers/sequences/vector/db_cback.pass.cpp
index b8fd0326f20..5eb1a353e8b 100644
--- a/libcxx/test/containers/sequences/vector/db_cback.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/db_cback.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp b/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp
index 36ba0dd4792..5e54da1d444 100644
--- a/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp b/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp
index 18ef2cfa815..133aa565282 100644
--- a/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/db_front.pass.cpp b/libcxx/test/containers/sequences/vector/db_front.pass.cpp
index 97cdb2428de..388058fb315 100644
--- a/libcxx/test/containers/sequences/vector/db_front.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/db_front.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/db_index.pass.cpp b/libcxx/test/containers/sequences/vector/db_index.pass.cpp
index 785263b8ce3..1daf076da67 100644
--- a/libcxx/test/containers/sequences/vector/db_index.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/db_index.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp
index 26700027848..2d43843067b 100644
--- a/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp
index d47e3d456e1..051d66c3339 100644
--- a/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp
index bba222e31f1..4c2aa628de1 100644
--- a/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp
index c5d96c520f2..1b1090499c2 100644
--- a/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp
index d33f29d0024..424bc939b13 100644
--- a/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp
index 25555b491da..72cdb10cbc8 100644
--- a/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp
index d891630a13f..7b898533197 100644
--- a/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp
@@ -21,7 +21,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/iterators.pass.cpp b/libcxx/test/containers/sequences/vector/iterators.pass.cpp
index 4ee16e9fd24..82de6654abc 100644
--- a/libcxx/test/containers/sequences/vector/iterators.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/iterators.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 struct A
 {
diff --git a/libcxx/test/containers/sequences/vector/types.pass.cpp b/libcxx/test/containers/sequences/vector/types.pass.cpp
index 5e1dc9b9ec4..c0645878f45 100644
--- a/libcxx/test/containers/sequences/vector/types.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/types.pass.cpp
@@ -35,7 +35,7 @@
 
 #include "../../test_allocator.h"
 #include "../../Copyable.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class T, class Allocator>
 void
diff --git a/libcxx/test/containers/sequences/vector/vector.capacity/capacity.pass.cpp b/libcxx/test/containers/sequences/vector/vector.capacity/capacity.pass.cpp
index 861ec9ab78d..a22c6dae37c 100644
--- a/libcxx/test/containers/sequences/vector/vector.capacity/capacity.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.capacity/capacity.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.capacity/reserve.pass.cpp b/libcxx/test/containers/sequences/vector/vector.capacity/reserve.pass.cpp
index 4b91711dfc3..2914af91a07 100644
--- a/libcxx/test/containers/sequences/vector/vector.capacity/reserve.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.capacity/reserve.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp b/libcxx/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp
index 7a3389fd0fa..e415cee04da 100644
--- a/libcxx/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include "../../../stack_allocator.h"
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp b/libcxx/test/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp
index fb267617820..49f373a09cb 100644
--- a/libcxx/test/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp b/libcxx/test/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp
index 7a8d0c71a38..6b0cce4eb67 100644
--- a/libcxx/test/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.capacity/swap.pass.cpp b/libcxx/test/containers/sequences/vector/vector.capacity/swap.pass.cpp
index 8152802bfa5..46d84033a9e 100644
--- a/libcxx/test/containers/sequences/vector/vector.capacity/swap.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.capacity/swap.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
index 9623d0f328a..1ad4bfcf8be 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
index 13c3e492013..c0dafce02a1 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
index 1a29db939ee..335525475c7 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include "../../../MoveOnly.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
index ec66c0d8545..7321f939751 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
@@ -17,7 +17,7 @@
 #include "../../../test_allocator.h"
 #include "../../../NotConstructible.h"
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
index 6841319920e..8dde17fb301 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
@@ -16,7 +16,7 @@
 
 #include "test_iterators.h"
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C, class Iterator>
 void
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
index afc8ea5d3d2..9edc10c8047 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
@@ -17,7 +17,7 @@
 
 #include "test_iterators.h"
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C, class Iterator, class A>
 void
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
index 19d2760227b..800c732194b 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../DefaultOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 #include "../../../test_allocator.h"
 
 template <class C>
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value.pass.cpp
index 35adaed2fb1..6a52d52afb5 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value_alloc.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value_alloc.pass.cpp
index 27da426f82c..5653521f261 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value_alloc.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp
index 34008ae3bde..78e7fac79ff 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
index 22fca55f74c..b0e07db29b0 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class C>
 void
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp
index 938c0361157..f231fcf8a2a 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
index 12d27c67454..d449f2a655e 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp
index 0514f31a5a2..6b9be7b3df5 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include "../../../MoveOnly.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
index 2f590dcdf89..2640593ec27 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include "../../../MoveOnly.h"
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp
index 916ddaa9fc8..13ec845eca8 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.data/data.pass.cpp b/libcxx/test/containers/sequences/vector/vector.data/data.pass.cpp
index 9ae324332a6..4bda599a85b 100644
--- a/libcxx/test/containers/sequences/vector/vector.data/data.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.data/data.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.data/data_const.pass.cpp b/libcxx/test/containers/sequences/vector/vector.data/data_const.pass.cpp
index 77e8b83af99..7cb64f85d0d 100644
--- a/libcxx/test/containers/sequences/vector/vector.data/data_const.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.data/data_const.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
index 7cca940859a..37298a53437 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
@@ -18,7 +18,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp
index 1d024d452d6..a399433ce65 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp
index d70320716bb..04ff228313c 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp
index 6fcd189bdac..fb9d8084f2b 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp
index bd20844c02d..0478d24c79f 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp
@@ -20,7 +20,7 @@
 #include <cstdlib>
 #include <exception>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp
index bbad13b05e3..c394f197402 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp
@@ -20,7 +20,7 @@
 #include <cstdlib>
 #include <exception>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
index 8a382edba67..e82d3a0dda6 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp
index 395d97b1ebc..af6d0f75789 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp
@@ -20,7 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp
index 1f87c8000df..eee2c66c5c8 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp
@@ -20,7 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp
index ab9cc370ee5..505067d05a1 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp
@@ -20,7 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp
index 141598ec477..c7e4131cb49 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp
@@ -20,7 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp
index caba7844390..386a4f6b37c 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
index 41566a8d149..97255b0b139 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include "../../../stack_allocator.h"
 #include "test_iterators.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
index 2f4b8e81ea3..7ceb9332be2 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 #include "../../../stack_allocator.h"
 #include "../../../MoveOnly.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp
index e4232ff3746..322c9ff71ae 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp
@@ -18,7 +18,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp
index d24847b588e..28c7718175d 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp
@@ -18,7 +18,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp
index 16891ae0026..62fa60103ba 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp
@@ -18,7 +18,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 #if _LIBCPP_DEBUG >= 1
 #include <cstdlib>
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/push_back.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/push_back.pass.cpp
index 3170fe86363..5446b7409b9 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/push_back.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/push_back.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp
index 0127dbc6590..bb1af29d3ac 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include "../../../MoveOnly.h"
 #include "../../../stack_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp b/libcxx/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp
index 7443fecc4d5..e7f6a0011e1 100644
--- a/libcxx/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp
@@ -19,7 +19,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp b/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp
index 8e2ea372036..9fa1274162a 100644
--- a/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../test_allocator.h"
-#include "../../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {