diff --git a/containers b/containers
index 8eade1a..afdc2ec 160000
--- a/containers
+++ b/containers
@@ -1 +1 @@
-Subproject commit 8eade1ac6fe3fb4027deef209273799935e8d18f
+Subproject commit afdc2ec1e378b19ebce542072520d36eaa508ede
diff --git a/libdparse b/libdparse
index f7bbbac..e19c26f 160000
--- a/libdparse
+++ b/libdparse
@@ -1 +1 @@
-Subproject commit f7bbbac645ba6c00aaf6b083084bbe8ab45a8f65
+Subproject commit e19c26fc58839777b236a2faa3c2d2395f73f390
diff --git a/makefile b/makefile
index 8de6c29..3f0d060 100644
--- a/makefile
+++ b/makefile
@@ -33,6 +33,7 @@ CLIENT_SRC := \
 
 DMD_CLIENT_FLAGS := -Imsgpack-d/src\
 	-Imsgpack-d/src\
+	-Icontainers/experimental_allocator/src\
 	-J.\
 	-inline\
 	-O\
@@ -40,6 +41,7 @@ DMD_CLIENT_FLAGS := -Imsgpack-d/src\
 	-ofbin/dcd-client
 
 GDC_CLIENT_FLAGS := -Imsgpack-d/src\
+	-Icontainers/experimental_allocator/src\
 	-J.\
 	-O3\
 	-frelease\
@@ -47,6 +49,7 @@ GDC_CLIENT_FLAGS := -Imsgpack-d/src\
 
 LDC_CLIENT_FLAGS := -Imsgpack-d/src\
 	-Imsgpack-d/src\
+	-Icontainers/experimental_allocator/src\
 	-J=.\
 	-release\
 	-O5\
@@ -63,7 +66,7 @@ SERVER_SRC := \
 	libdparse/src/std/d/parser.d\
 	libdparse/src/std/d/formatter.d\
 	libdparse/src/std/lexer.d\
-	$(shell find containers/src/std/experimental/allocator/ -name "*.d")\
+	$(shell find containers/experimental_allocator/src/std/experimental/allocator/ -name "*.d")\
 	containers/src/memory/allocators.d\
 	containers/src/memory/appender.d\
 	containers/src/containers/dynamicarray.d\
@@ -83,6 +86,7 @@ DMD_SERVER_FLAGS := -Icontainers/src\
 	-Imsgpack-d/src\
 	-Ilibdparse/src\
 	-Idsymbol/src\
+	-Icontainers/experimental_allocator/src\
 	-J.\
 	-wi\
 	-O\
@@ -93,6 +97,7 @@ DMD_SERVER_FLAGS := -Icontainers/src\
 DEBUG_SERVER_FLAGS := -Icontainers/src\
 	-Imsgpack-d/src\
 	-Ilibdparse/src\
+	-Icontainers/experimental_allocator/src\
 	-wi\
 	-g\
 	-ofbin/dcd-server\
@@ -101,6 +106,7 @@ DEBUG_SERVER_FLAGS := -Icontainers/src\
 GDC_SERVER_FLAGS := -Icontainers/src\
 	-Imsgpack-d/src\
 	-Ilibdparse/src\
+	-Icontainers/experimental_allocator/src\
 	-J.\
 	-O3\
 	-frelease\
@@ -109,6 +115,7 @@ GDC_SERVER_FLAGS := -Icontainers/src\
 LDC_SERVER_FLAGS := -Icontainers/src\
 	-Imsgpack-d/src\
 	-Ilibdparse/src\
+	-Icontainers/experimental_allocator/src\
 	-Isrc\
 	-J=.\
 	-O5\