diff --git a/build.bat b/build.bat
index 97474531..0a565a35 100644
--- a/build.bat
+++ b/build.bat
@@ -58,6 +58,8 @@ set DMD_FRONTEND_DENYLIST=^
 set DMD_FRONTEND_SRC=
 for %%x in (dmd\compiler\src\dmd\common\*.d) do set DMD_FRONTEND_SRC=!DMD_FRONTEND_SRC! %%x
 for %%x in (dmd\compiler\src\dmd\root\*.d) do set DMD_FRONTEND_SRC=!DMD_FRONTEND_SRC! %%x
+for %%x in (dmd\compiler\src\dmd\visitor\*.d) do set DMD_FRONTEND_SRC=!DMD_FRONTEND_SRC! %%x
+for %%x in (dmd\compiler\src\dmd\mangle\*.d) do set DMD_FRONTEND_SRC=!DMD_FRONTEND_SRC! %%x
 for %%x in (dmd\compiler\src\dmd\*.d) do (
     echo "%DMD_FRONTEND_DENYLIST%" | findstr /i /c:"%%x" >nul
     if errorlevel 1 (
@@ -65,31 +67,6 @@ for %%x in (dmd\compiler\src\dmd\*.d) do (
     )
 )
 
-set DMD_ROOT_SRC=
-for %%x in (dmd\compiler\src\dmd\common\*.d) do set DMD_ROOT_SRC=!DMD_ROOT_SRC! %%x
-for %%x in (dmd\compiler\src\dmd\root\*.d) do set DMD_ROOT_SRC=!DMD_ROOT_SRC! %%x
-
-set DMD_LEXER_SRC=^
-	dmd\compiler\src\dmd\console.d ^
-	dmd\compiler\src\dmd\entity.d ^
-	dmd\compiler\src\dmd\errors.d ^
-	dmd\compiler\src\dmd\file_manager.d ^
-	dmd\compiler\src\dmd\globals.d ^
-	dmd\compiler\src\dmd\id.d ^
-	dmd\compiler\src\dmd\identifier.d ^
-	dmd\compiler\src\dmd\lexer.d ^
-	dmd\compiler\src\dmd\tokens.d ^
-	dmd\compiler\src\dmd\utils.d
-
-set DMD_PARSER_SRC=^
-	dmd\compiler\src\dmd\astbase.d ^
-	dmd\compiler\src\dmd\parse.d ^
-	dmd\compiler\src\dmd\parsetimevisitor.d ^
-	dmd\compiler\src\dmd\transitivevisitor.d ^
-	dmd\compiler\src\dmd\permissivevisitor.d ^
-	dmd\compiler\src\dmd\strictvisitor.d ^
-	dmd\compiler\src\dmd\astenums.d
-
 for %%x in (src\dscanner\*.d) do set CORE=!CORE! %%x
 for %%x in (src\dscanner\analysis\*.d) do set ANALYSIS=!ANALYSIS! %%x
 for %%x in (libdparse\src\dparse\*.d) do set LIBDPARSE=!LIBDPARSE! %%x
diff --git a/dmd b/dmd
index 6f1b331a..ef02f084 160000
--- a/dmd
+++ b/dmd
@@ -1 +1 @@
-Subproject commit 6f1b331a6a29e3dddc647ec04dfc9cd85064f3e9
+Subproject commit ef02f08456762548555b1476a6e32c6e6af6320c
diff --git a/dub.json b/dub.json
index 8dba641c..c46401c7 100644
--- a/dub.json
+++ b/dub.json
@@ -18,7 +18,7 @@
     "libddoc": "~>0.8.0",
     "dmd": {
       "repository": "git+https://github.com/dlang/dmd.git",
-      "version": "6f1b331a6a29e3dddc647ec04dfc9cd85064f3e9"
+      "version": "ef02f08456762548555b1476a6e32c6e6af6320c"
     }
   },
   "targetPath" : "bin",
diff --git a/makefile b/makefile
index 17a413e0..b7b696b4 100644
--- a/makefile
+++ b/makefile
@@ -7,13 +7,12 @@ GIT ?= git
 DMD := $(DC)
 GDC := gdc
 LDC := ldc2
-DMD_ROOT_SRC := \
-	$(shell find dmd/compiler/src/dmd/common -name "*.d")\
-	$(shell find dmd/compiler/src/dmd/root -name "*.d")\
 
 DMD_FRONTEND_SRC := \
 	$(shell find dmd/compiler/src/dmd/common -name "*.d")\
 	$(shell find dmd/compiler/src/dmd/root -name "*.d")\
+	$(shell find dmd/compiler/src/dmd/visitor -name "*.d")\
+	$(shell find dmd/compiler/src/dmd/mangle -name "*.d")\
 	$(shell find dmd/compiler/src/dmd -maxdepth 1 -name "*.d" \
 		! -name "mars.d" \
 		! -name "dmsc.d" \
@@ -40,33 +39,6 @@ DMD_FRONTEND_SRC := \
 		! -name "todt.d" \
 		! -name "toir.d" \
 	)
-#	$(shell find dmd/compiler/src/dmd/backend -name "*.d") \
-#	$(shell find dmd/compiler/src/dmd -maxdepth 1 -name "*.d" ! -name "mars.d" )
-
-DMD_LEXER_SRC := \
-	dmd/compiler/src/dmd/console.d \
-	dmd/compiler/src/dmd/entity.d \
-	dmd/compiler/src/dmd/errors.d \
-	dmd/compiler/src/dmd/errorsink.d \
-	dmd/compiler/src/dmd/file_manager.d \
-	dmd/compiler/src/dmd/globals.d \
-	dmd/compiler/src/dmd/id.d \
-	dmd/compiler/src/dmd/identifier.d \
-	dmd/compiler/src/dmd/lexer.d \
-	dmd/compiler/src/dmd/tokens.d \
-	dmd/compiler/src/dmd/utils.d \
-	dmd/compiler/src/dmd/location.d \
-	$(DMD_ROOT_SRC)
-
-DMD_PARSER_SRC := \
-	dmd/compiler/src/dmd/astbase.d \
-	dmd/compiler/src/dmd/parse.d \
-	dmd/compiler/src/dmd/parsetimevisitor.d \
-	dmd/compiler/src/dmd/transitivevisitor.d \
-	dmd/compiler/src/dmd/permissivevisitor.d \
-	dmd/compiler/src/dmd/strictvisitor.d \
-	dmd/compiler/src/dmd/astenums.d \
-	$(DMD_LEXER_SRC)
 
 LIB_SRC := \
 	$(shell find containers/src -name "*.d")\
diff --git a/src/dscanner/analysis/base.d b/src/dscanner/analysis/base.d
index 94130247..3a43d646 100644
--- a/src/dscanner/analysis/base.d
+++ b/src/dscanner/analysis/base.d
@@ -9,7 +9,7 @@ import std.container;
 import std.meta : AliasSeq;
 import std.string;
 import std.sumtype;
-import dmd.transitivevisitor;
+import dmd.visitor.transitive;
 import dmd.visitor;
 import dmd.func;
 import core.stdc.string;
diff --git a/src/dscanner/imports.d b/src/dscanner/imports.d
index 072eba85..657db4d8 100644
--- a/src/dscanner/imports.d
+++ b/src/dscanner/imports.d
@@ -9,8 +9,8 @@ import std.stdio;
 import std.container.rbtree;
 import std.functional : toDelegate;
 import dscanner.utils;
-import dmd.permissivevisitor;
-import dmd.transitivevisitor;
+import dmd.visitor.permissive;
+import dmd.visitor.transitive;
 import dmd.tokens;
 import dmd.common.outbuffer;
 import core.stdc.stdio;