diff --git a/build.bat b/build.bat
index 53967f7..5c8a899 100644
--- a/build.bat
+++ b/build.bat
@@ -3,17 +3,26 @@ setlocal enabledelayedexpansion
 
 set DFLAGS=-O -release -inline
 set CORE=
+set LIBDPARSE=
 set STD=
-set STDD=
 set ANALYSIS=
 set INIFILED=
+set DSYMBOL=
+set CONTAINERS=
 
 for %%x in (src\*.d) do set CORE=!CORE! %%x
 for %%x in (src\analysis\*.d) do set ANALYSIS=!ANALYSIS! %%x
-for %%x in (libdparse\src\std\*.d) do set STD=!STD! %%x
-for %%x in (libdparse\src\std\d\*.d) do set STDD=!STDD! %%x
+for %%x in (libdparse\experimental_allocator\src\std\experimental\allocator\*.d) do set STD=!STD! %%x
+for %%x in (libdparse\experimental_allocator\src\std\experimental\allocator\building_blocks\*.d) do set STD=!STD! %%x
+for %%x in (libdparse\src\dparse\*.d) do set LIBDPARSE=!LIBDPARSE! %%x
+for %%x in (libdparse\src\std\experimental\*.d) do set LIBDPARSE=!LIBDPARSE! %%x
 for %%x in (inifiled\source\*.d) do set INIFILED=!INIFILED! %%x
+for %%x in (dsymbol\src\dsymbol\*.d) do set DSYMBOL=!DSYMBOL! %%x
+for %%x in (dsymbol\src\dsymbol\builtin\*.d) do set DSYMBOL=!DSYMBOL! %%x
+for %%x in (dsymbol\src\dsymbol\conversion\*.d) do set DSYMBOL=!DSYMBOL! %%x
+for %%x in (containers\src\containers\*.d) do set CONTAINERS=!CONTAINERS! %%x
+for %%x in (containers\src\containers\internal\*.d) do set CONTAINERS=!CONTAINERS! %%x
 
 @echo on
-dmd %CORE% %STD% %STDD% %ANALYSIS% %INIFILED% %DFLAGS% -ofdscanner.exe
+dmd %CORE% %STD% %LIBDPARSE% %ANALYSIS% %INIFILED% %DSYMBOL% %CONTAINERS% %DFLAGS% -I"libdparse\src" -I"dsymbol\src" -I"containers\src" -ofdscanner.exe