diff --git a/platform/windows/SCsub b/platform/windows/SCsub
index f8ed8b73f58..d6bbebf0d16 100644
--- a/platform/windows/SCsub
+++ b/platform/windows/SCsub
@@ -58,6 +58,10 @@ sources += res_obj
 prog = env.add_program("#bin/godot", sources, PROGSUFFIX=env["PROGSUFFIX"])
 arrange_program_clean(prog)
 
+env.Depends(prog, "godot.manifest")
+if env.msvc:
+    env.Depends(prog, "godot.natvis")
+
 # Build console wrapper app.
 if env["windows_subsystem"] == "gui":
     env_wrap = env.Clone()
diff --git a/godot.manifest b/platform/windows/godot.manifest
similarity index 100%
rename from godot.manifest
rename to platform/windows/godot.manifest
diff --git a/platform/windows/godot_res.rc b/platform/windows/godot_res.rc
index 86191ad9d98..6cd1bb82e17 100644
--- a/platform/windows/godot_res.rc
+++ b/platform/windows/godot_res.rc
@@ -5,7 +5,7 @@
 #endif
 
 GODOT_ICON ICON platform/windows/godot.ico
-1 RT_MANIFEST "godot.manifest"
+1 RT_MANIFEST "platform/windows/godot.manifest"
 
 1 VERSIONINFO
 FILEVERSION     VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0
diff --git a/platform/windows/godot_res_wrap.rc b/platform/windows/godot_res_wrap.rc
index 27ad26cbc54..ed4acfdad87 100644
--- a/platform/windows/godot_res_wrap.rc
+++ b/platform/windows/godot_res_wrap.rc
@@ -1,6 +1,11 @@
 #include "core/version.h"
 
+#ifndef RT_MANIFEST
+#define RT_MANIFEST 24
+#endif
+
 GODOT_ICON ICON platform/windows/godot_console.ico
+1 RT_MANIFEST "platform/windows/godot.manifest"
 
 1 VERSIONINFO
 FILEVERSION     VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0