diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
index cc54dcc12616e54e0ca1a5462333ea03c5f85f38..7915135153af0244fe3e9647afebfea12e403a75 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../test_allocator.h"
+#include "../../../test_allocator.h"
 
 template <class T>
 struct test
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
index b575ca0f9f6eca34efee0eeeb51a6b29287a7da0..3175df186685d070da1c9dc3b0133f8491aed049 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../test_allocator.h"
+#include "../../../test_allocator.h"
 
 template <class T>
 struct test
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
index f345af632d80cad0071c80714372bb2805fd3080..c7afc3fc0328fc2c9dcc0fe2c2e02acc9f3a1097 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../test_allocator.h"
+#include "../../../test_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
index a518ffc98348925e0371a00290d35c1739befc6b..db3924194396ecc8c120479d2272828c85070f05 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../test_allocator.h"
+#include "../../../test_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
index 5b917a3262adce86d84d46d279ad345aafa04af1..36ce800913c5d2e0c395a1711065a612ec55ef23 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
@@ -25,7 +25,7 @@ make(int n)
     return c;
 }
 
-#include "../../../../test_allocator.h"
+#include "../../../test_allocator.h"
 
 template <class T>
 struct test
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
index 901a18a68c46fcfdef02e6183095b726ae78c973..f6367e581fa1918f466c7e1f3f1dbed58bac6bd7 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../MoveOnly.h"
+#include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
@@ -29,7 +29,7 @@ make(int n)
     return c;
 }
 
-#include "../../../../test_allocator.h"
+#include "../../../test_allocator.h"
 
 template <class T>
 struct test
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp
index d34c8fa629a975c0995cf077b73508ec4b58f2c6..575ab354556f0bbafc8b68b90510e1dbb76ed6a7 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp
@@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../MoveOnly.h"
+#include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp.pass.cpp
index fb00c08f5d3854e2f4c58194040e07554ea54315..7be1f6357941f4293dc280bab130d71aaedc0789 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp.pass.cpp
@@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../stack_allocator.h"
+#include "../../../stack_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp
index a734f7229bf259c825986205cf2495d35efb0e3f..43d39adb953196feea7abbfe4e50e78e7c693bcd 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp
@@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../MoveOnly.h"
+#include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_default.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_default.pass.cpp
index ba4630605a01f929d79f185a26b2f9a42c2aa995..05585aa869e5ff00baa71dcddaa95a6ddd7f2ae9 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_default.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_default.pass.cpp
@@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../stack_allocator.h"
+#include "../../../stack_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp
index ac72cc38f46429648472051da91fe6ddd661736e..82c72e6f7752de5b3a64882bab10bfd9407fd33d 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp
@@ -16,7 +16,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../MoveOnly.h"
+#include "../../../MoveOnly.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp
index 2f30b36c423f28d607f9a017d9b493e9804af3b9..344219746e26efac3ac4c7b6c39e30d3796f473a 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp
@@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../MoveOnly.h"
+#include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/emplace.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/emplace.pass.cpp
index 34bbd27e8851893a8530faf073eceaab2b3df536..fbf0436042f8b49f57f32f84d9ed44033f8f0440 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/emplace.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/emplace.pass.cpp
@@ -16,7 +16,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../Emplaceable.h"
+#include "../../../Emplaceable.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp
index 93674b0c1a9edb8ea487d5ce062ef1c9f468dd57..7b49a53a6c3c185fc4443c62b4783cdae944ce41 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp
@@ -16,7 +16,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../MoveOnly.h"
+#include "../../../MoveOnly.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
index 4e231b50e49ebe77021253051ad6aa0b72f05032..afb6a8748954ab1e8f779fafd9a0d2ecb9501f69 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../test_allocator.h"
+#include "../../../test_allocator.h"
 
 struct test
     : private std::queue<int, std::deque<int, test_allocator<int> > >
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
index cdb4fcfc7d82976f3b1205672f35a9032784fb22..763c40ea8380378a259e0c0972457770426e8bba 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../test_allocator.h"
+#include "../../../test_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
index d8316243a5cebbedce86e4b0d32a5b9c82721dca..444dcb4d52c1fde1fdc49332f4ec4d23f94856cb 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../test_allocator.h"
+#include "../../../test_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
index 951160dd8a1ad795560f7e0f9fadca1a7d7c8782..2383efc5e905e2528a1586fe5d20ba77842ed982 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
@@ -15,8 +15,8 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../test_allocator.h"
-#include "../../../../MoveOnly.h"
+#include "../../../test_allocator.h"
+#include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
index c080f5f880399b81d90ae0f527e12791523bc0c5..50ce454e17408c01e3c9e079d9c70bff872bdebd 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
@@ -15,8 +15,8 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../test_allocator.h"
-#include "../../../../MoveOnly.h"
+#include "../../../test_allocator.h"
+#include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_default.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_default.pass.cpp
index 6c90cc24b4f6934326819983c8d3b58d7d2223c7..9c1167c9a428c3e5ea806ccfa8133aa4a71ce304 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_default.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_default.pass.cpp
@@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../stack_allocator.h"
+#include "../../../stack_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp
index c7e4b86b823ba1224889b1561d72787bfa0f2f03..01df3134b4d7ccf094c3653b9c5fa7507acb93f7 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp
@@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../MoveOnly.h"
+#include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp
index 16a2faadc65860be62a1b3ec285cc23e440b257e..fd96c0b9b124f3b55d057fbe6141f8787d302c9f 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp
@@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../MoveOnly.h"
+#include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp
index e655c3216ef11b31cadb490155b93b496d87b612..547a24ba757930da9713216643e39b6def71d164 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp
@@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../MoveOnly.h"
+#include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.defn/emplace.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.defn/emplace.pass.cpp
index eda8b937cf3ba2a6c0ad6143c1ea60c9f542b4e0..eb4101552f56522b081a10f3b549420651861248 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.defn/emplace.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.defn/emplace.pass.cpp
@@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../Emplaceable.h"
+#include "../../../Emplaceable.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp
index 88cf26455fc1644f1261befb4f868424491180e3..13397e20d123fa773cc1b0a90fee265a642cf27b 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp
@@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../../MoveOnly.h"
+#include "../../../MoveOnly.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
index 2ae47cddf22a4a200a473a043c6782153fb882d7..8f0d7ea814bce5c798c62bc044ec8cfe15fa71f1 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <stack>
 #include <cassert>
 
-#include "../../../../test_allocator.h"
+#include "../../../test_allocator.h"
 
 struct test
     : private std::stack<int, std::deque<int, test_allocator<int> > >
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
index 1c777d16d28c79bbbbd39f77a11b8af0644f4711..4ecbd54ee4514e524bcd73d27946a74370bdbfd3 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <stack>
 #include <cassert>
 
-#include "../../../../test_allocator.h"
+#include "../../../test_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
index ccbdfc5d4f57e795922d1785834cfffb59895fba..6748a46c8344cd0fe66c365505541c5599dff5fb 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <stack>
 #include <cassert>
 
-#include "../../../../test_allocator.h"
+#include "../../../test_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
index e1c69824b58153a118f2c3a5837567c5563ed687..d36ca2bd82eb948a03feb6c650eb2325f4db496f 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
@@ -15,8 +15,8 @@
 #include <stack>
 #include <cassert>
 
-#include "../../../../test_allocator.h"
-#include "../../../../MoveOnly.h"
+#include "../../../test_allocator.h"
+#include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
index fa315cb7464ea38d1ff56840fda7d862908d48a2..7b21dee6b3afcbf2fb12bb90a8aecca14e22da89 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
@@ -15,8 +15,8 @@
 #include <stack>
 #include <cassert>
 
-#include "../../../../test_allocator.h"
-#include "../../../../MoveOnly.h"
+#include "../../../test_allocator.h"
+#include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_default.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_default.pass.cpp
index 143c4ef8ab42d613d35ec5bde37c4ba9d61775ab..5d4351136551e7326e421f7eded9f51b3e1f5581 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_default.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_default.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../../stack_allocator.h"
+#include "../../../stack_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp
index 96baadce06592e57eef2a59d058472adcb666a45..6606ac0ce5247c7313455a8f0a84d2bfa9ec2065 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp
@@ -14,7 +14,7 @@
 #include <stack>
 #include <cassert>
 
-#include "../../../../MoveOnly.h"
+#include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp
index 53dd98e8a9721bfb97a332d4cec42e8b0eb1a682..468dfbcf596a47688577e035c9eee8ab75e47032 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp
@@ -14,7 +14,7 @@
 #include <stack>
 #include <cassert>
 
-#include "../../../../MoveOnly.h"
+#include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp
index c2df371648581477fe20c0898061b50891062e57..bb83797cb74ad9bb17c43ed8ca29ce91e2a1245d 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp
@@ -14,7 +14,7 @@
 #include <stack>
 #include <cassert>
 
-#include "../../../../MoveOnly.h"
+#include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.defn/emplace.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.defn/emplace.pass.cpp
index ba0fe08f108ab09969c89ea0a79bad1f234d2a26..9a35ac48da545b034e6b68d9cb645731eaddbd69 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.defn/emplace.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.defn/emplace.pass.cpp
@@ -14,7 +14,7 @@
 #include <stack>
 #include <cassert>
 
-#include "../../../../Emplaceable.h"
+#include "../../../Emplaceable.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp
index 1d280de26bce9b1d146a23c75ec5cd210df702b8..f4ddb7ce3d36d2ac3ed936c67289bdb4d8ebd9f5 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp
@@ -14,7 +14,7 @@
 #include <stack>
 #include <cassert>
 
-#include "../../../../MoveOnly.h"
+#include "../../../MoveOnly.h"
 
 int main()
 {
diff --git a/libcxx/www/libcxx_by_chapter.pdf b/libcxx/www/libcxx_by_chapter.pdf
index 2b9096d32a4a176d8c051e3b688b566b6ecef922..c3c57f23d282e92fe2e74146deea0472d7983e0a 100644
Binary files a/libcxx/www/libcxx_by_chapter.pdf and b/libcxx/www/libcxx_by_chapter.pdf differ