diff --git a/build.bat b/build.bat
index 9c7bab1..7673be8 100644
--- a/build.bat
+++ b/build.bat
@@ -1,3 +1,48 @@
-dmd -wi client.d messages.d stupidlog.d msgpack-d/src/msgpack.d -Imsgpack-d/src -release -inline -O -ofdcd-client
+del /f containers\src\std\allocator.d
+
+dmd^
+ client.d^
+ messages.d^
+ stupidlog.d^
+ msgpack-d/src/msgpack.d^
+ -Imsgpack-d/src^
+ -release -inline -O -wi^
+ -ofdcd-client
+
+dmd^
+ actypes.d^
+ conversion/astconverter.d^
+ conversion/first.d^
+ conversion/second.d^
+ conversion/third.d^
+ autocomplete.d^
+ constants.d^
+ messages.d^
+ modulecache.d^
+ semantic.d^
+ server.d^
+ stupidlog.d^
+ string_interning.d^
+ libdparse/src/std/d/ast.d^
+ libdparse/src/std/d/entities.d^
+ 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/memory/allocators.d^
+ containers/src/memory/appender.d^
+ containers/src/containers/dynamicarray.d^
+ containers/src/containers/ttree.d^
+ containers/src/containers/unrolledlist.d^
+ containers/src/containers/hashset.d^
+ containers/src/containers/internal/hash.d^
+ containers/src/containers/internal/node.d^
+ containers/src/containers/slist.d^
+ msgpack-d/src/msgpack.d^
+ -Icontainers/src^
+ -Imsgpack-d/src^
+ -Ilibdparse/src^
+ -wi -O -release^
+ -ofdcd-server
 
-dmd  actypes.d conversion/astconverter.d conversion/first.d conversion/second.d conversion/third.d autocomplete.d constants.d messages.d modulecache.d semantic.d server.d stupidlog.d string_interning.d dscanner/std/d/ast.d dscanner/std/d/entities.d dscanner/std/d/lexer.d dscanner/std/d/parser.d dscanner/std/lexer.d dscanner/std/allocator.d dscanner/formatter.d containers/src/memory/appender.d containers/src/memory/allocators.d containers/src/containers/dynamicarray.d containers/src/containers/ttree.d containers/src/containers/hashset.d containers/src/containers/unrolledlist.d containers/src/containers/internal/hash.d msgpack-d/src/msgpack.d -Icontainers/src -Imsgpack-d/src -Idscanner -wi -g -O -release -ofdcd-server
diff --git a/build.sh b/build.sh
index 294cdd4..6a2d300 100755
--- a/build.sh
+++ b/build.sh
@@ -42,7 +42,7 @@ dmd\
 	msgpack-d/src/msgpack.d\
 	-Icontainers/src\
 	-Imsgpack-d/src\
-	-Idscanner\
+	-Ilibdparse/src\
 	-wi -O -release -inline\
 	-ofdcd-server
 
@@ -71,7 +71,7 @@ dmd\
 #	dscanner/formatter.d\
 #	msgpack-d/src/msgpack.d\
 #	-Imsgpack-d/src\
-#	-Idscanner\
+#	-Ilibdparse/src\
 #	-O3 -frelease -fno-bounds-check\
 #	-odcd-server