diff --git a/containers b/containers
index 1633c5d..f9f971d 160000
--- a/containers
+++ b/containers
@@ -1 +1 @@
-Subproject commit 1633c5de6c6fa7ba325c5a13927bb288ef244cbc
+Subproject commit f9f971dac9125cf52d2489dd296c8ef159d2a173
diff --git a/dsymbol b/dsymbol
index 40fe6a3..6ebfb4e 160000
--- a/dsymbol
+++ b/dsymbol
@@ -1 +1 @@
-Subproject commit 40fe6a3c87ef8f4cdda25d1420f2325cd4c82471
+Subproject commit 6ebfb4e1fd45588a46f50ac49eac9acfd177d09e
diff --git a/libdparse b/libdparse
index dbe351d..7ba0b01 160000
--- a/libdparse
+++ b/libdparse
@@ -1 +1 @@
-Subproject commit dbe351d00648cabc1c53fbc31358796102ca4d35
+Subproject commit 7ba0b01fe1f2808db1a6fe67af4f31bdb3ab3980
diff --git a/makefile b/makefile
index 67f229f..042e2fd 100644
--- a/makefile
+++ b/makefile
@@ -63,8 +63,12 @@ SERVER_SRC := \
 	libdparse/src/std/d/lexer.d\
 	libdparse/src/std/d/parser.d\
 	libdparse/src/std/lexer.d\
-	libdparse/src/std/allocator.d\
 	libdparse/src/std/d/formatter.d\
+	containers/src/std/experimental/allocator/mallocator.d\
+	containers/src/std/experimental/allocator/package.d\
+	containers/src/std/experimental/allocator/common.d\
+	containers/src/std/experimental/allocator/gc_allocator.d\
+	containers/src/std/experimental/allocator/typed.d\
 	containers/src/memory/allocators.d\
 	containers/src/memory/appender.d\
 	containers/src/containers/dynamicarray.d\
@@ -96,7 +100,8 @@ DEBUG_SERVER_FLAGS := -Icontainers/src\
 	-wi\
 	-g\
 	-ofbin/dcd-server\
-	-J.
+	-J.\
+	-debug
 
 GDC_SERVER_FLAGS := -Icontainers/src\
 	-Imsgpack-d/src\
@@ -116,27 +121,27 @@ LDC_SERVER_FLAGS := -Icontainers/src\
 
 dmdclient: githash
 	mkdir -p bin
-	rm -f containers/src/std/allocator.d
+	rm -f libdparse/src/std/allocator.d
 	${DMD} ${CLIENT_SRC} ${DMD_CLIENT_FLAGS}
 
 dmdserver: githash
 	mkdir -p bin
-	rm -f containers/src/std/allocator.d
+	rm -f libdparse/src/std/allocator.d
 	${DMD} ${SERVER_SRC} ${DMD_SERVER_FLAGS}
 
 debugserver: githash
 	mkdir -p bin
-	rm -f containers/src/std/allocator.d
+	rm -f libdparse/src/std/allocator.d
 	${DMD} ${SERVER_SRC} ${DEBUG_SERVER_FLAGS}
 
 gdcclient: githash
 	mkdir -p bin
-	rm -f containers/src/std/allocator.d
+	rm -f libdparse/src/std/allocator.d
 	${GDC} ${CLIENT_SRC} ${GDC_CLIENT_FLAGS}
 
 gdcserver: githash
 	mkdir -p bin
-	rm -f containers/src/std/allocator.d
+	rm -f libdparse/src/std/allocator.d
 	${GDC} ${SERVER_SRC} ${GDC_SERVER_FLAGS}
 
 ldcclient: githash
diff --git a/src/server/autocomplete.d b/src/server/autocomplete.d
index e1c60af..bc92387 100644
--- a/src/server/autocomplete.d
+++ b/src/server/autocomplete.d
@@ -19,7 +19,7 @@
 module server.autocomplete;
 
 import std.algorithm;
-import std.allocator;
+import std.experimental.allocator;
 import std.array;
 import std.conv;
 import std.experimental.logger;
@@ -329,7 +329,7 @@ auto getTokensBeforeCursor(const(ubyte[]) sourceCode, size_t cursorPosition,
  *     the request's source code, cursor position, and completion type.
  */
 DSymbol*[] getSymbolsForCompletion(const AutocompleteRequest request,
-	const CompletionType type, CAllocator allocator, StringCache* cache)
+	const CompletionType type, IAllocator allocator, StringCache* cache)
 {
 	const(Token)[] tokenArray;
 	auto beforeTokens = getTokensBeforeCursor(request.sourceCode,
diff --git a/src/server/server.d b/src/server/server.d
index e290abb..76f0fe8 100644
--- a/src/server/server.d
+++ b/src/server/server.d
@@ -28,7 +28,7 @@ import std.array;
 import std.process;
 import std.datetime;
 import std.conv;
-import std.allocator;
+import std.experimental.allocator;
 import std.exception : enforce;
 import std.experimental.logger;