diff --git a/buildfiles/msvc/rpcs3_debug.props b/buildfiles/msvc/rpcs3_debug.props
index b843fdf82b..877dcc77f8 100644
--- a/buildfiles/msvc/rpcs3_debug.props
+++ b/buildfiles/msvc/rpcs3_debug.props
@@ -15,105 +15,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Debug'">%(AdditionalLibraryDirectories);$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\$(Configuration)\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);
-        LLVMAggressiveInstCombine.lib;
-        LLVMAnalysis.lib;
-        LLVMAsmParser.lib;
-        LLVMAsmPrinter.lib;
-        LLVMBinaryFormat.lib;
-        LLVMBitReader.lib;
-        LLVMBitstreamReader.lib;
-        LLVMBitWriter.lib;
-        LLVMCFGuard.lib;
-        LLVMCodeGen.lib;
-        LLVMCodeGenData.lib;
-        LLVMCodeGenTypes.lib;
-        LLVMCore.lib;
-        LLVMCoroutines.lib;
-        LLVMCoverage.lib;
-        LLVMDebugInfoBTF.lib;
-        LLVMDebugInfoCodeView.lib;
-        LLVMDebuginfod.lib;
-        LLVMDebugInfoDWARF.lib;
-        LLVMDebugInfoGSYM.lib;
-        LLVMDebugInfoLogicalView.lib;
-        LLVMDebugInfoMSF.lib;
-        LLVMDebugInfoPDB.lib;
-        LLVMDemangle.lib;
-        LLVMDlltoolDriver.lib;
-        LLVMDWARFLinker.lib;
-        LLVMDWARFLinkerClassic.lib;
-        LLVMDWARFLinkerParallel.lib;
-        LLVMDWP.lib;
-        LLVMExecutionEngine.lib;
-        LLVMExtensions.lib;
-        LLVMFileCheck.lib;
-        LLVMFrontendDriver.lib;
-        LLVMFrontendHLSL.lib;
-        LLVMFrontendOffloading.lib;
-        LLVMFrontendOpenACC.lib;
-        LLVMFrontendOpenMP.lib;
-        LLVMFuzzerCLI.lib;
-        LLVMFuzzMutate.lib;
-        LLVMGlobalISel.lib;
-        LLVMHipStdPar.lib;
-        LLVMInstCombine.lib;
-        LLVMInstrumentation.lib;
-        LLVMIntelJITEvents.lib;
-        LLVMIntelJITProfiling.lib;
-        LLVMInterfaceStub.lib;
-        LLVMInterpreter.lib;
-        LLVMipo.lib;
-        LLVMIRPrinter.lib;
-        LLVMIRReader.lib;
-        LLVMJITLink.lib;
-        LLVMLibDriver.lib;
-        LLVMLineEditor.lib;
-        LLVMLinker.lib;
-        LLVMLTO.lib;
-        LLVMMC.lib;
-        LLVMMCA.lib;
-        LLVMMCDisassembler.lib;
-        LLVMMCJIT.lib;
-        LLVMMCParser.lib;
-        LLVMMIRParser.lib;
-        LLVMObjCARCOpts.lib;
-        LLVMObjCopy.lib;
-        LLVMObject.lib;
-        LLVMObjectYAML.lib;
-        LLVMOption.lib;
-        LLVMOrcDebugging.lib;
-        LLVMOrcJIT.lib;
-        LLVMOrcShared.lib;
-        LLVMOrcTargetProcess.lib;
-        LLVMPasses.lib;
-        LLVMProfileData.lib;
-        LLVMRemarks.lib;
-        LLVMRuntimeDyld.lib;
-        LLVMSandboxIR.lib;
-        LLVMScalarOpts.lib;
-        LLVMSelectionDAG.lib;
-        LLVMSupport.lib;
-        LLVMSymbolize.lib;
-        LLVMTableGen.lib;
-        LLVMTableGenBasic.lib;
-        LLVMTableGenCommon.lib;
-        LLVMTarget.lib;
-        LLVMTargetParser.lib;
-        LLVMTextAPI.lib;
-        LLVMTextAPIBinaryReader.lib;
-        LLVMTransformUtils.lib;
-        LLVMVectorize.lib;
-        LLVMWindowsDriver.lib;
-        LLVMWindowsManifest.lib;
-        LLVMX86AsmParser.lib;
-        LLVMX86CodeGen.lib;
-        LLVMX86Desc.lib;
-        LLVMX86Disassembler.lib;
-        LLVMX86Info.lib;
-        LLVMX86TargetMCA.lib;
-        LLVMXRay.lib;
-      </AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
diff --git a/buildfiles/msvc/rpcs3_default.props b/buildfiles/msvc/rpcs3_default.props
index 4f5862ca84..ad2ac1ee2f 100644
--- a/buildfiles/msvc/rpcs3_default.props
+++ b/buildfiles/msvc/rpcs3_default.props
@@ -23,7 +23,113 @@
       <AdditionalOptions>/utf-8 /Zc:throwingNew- /constexpr:steps16777216 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;Iphlpapi.lib;Bcrypt.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib</AdditionalDependencies>
+      <AdditionalDependencies>
+        ws2_32.lib;
+        Iphlpapi.lib;
+        Bcrypt.lib;
+        avcodec.lib;
+        avformat.lib;
+        avutil.lib;
+        swresample.lib;
+        swscale.lib;
+        LLVMAggressiveInstCombine.lib;
+        LLVMAnalysis.lib;
+        LLVMAsmParser.lib;
+        LLVMAsmPrinter.lib;
+        LLVMBinaryFormat.lib;
+        LLVMBitReader.lib;
+        LLVMBitstreamReader.lib;
+        LLVMBitWriter.lib;
+        LLVMCFGuard.lib;
+        LLVMCodeGen.lib;
+        LLVMCodeGenData.lib;
+        LLVMCodeGenTypes.lib;
+        LLVMCore.lib;
+        LLVMCoroutines.lib;
+        LLVMCoverage.lib;
+        LLVMDebugInfoBTF.lib;
+        LLVMDebugInfoCodeView.lib;
+        LLVMDebuginfod.lib;
+        LLVMDebugInfoDWARF.lib;
+        LLVMDebugInfoGSYM.lib;
+        LLVMDebugInfoLogicalView.lib;
+        LLVMDebugInfoMSF.lib;
+        LLVMDebugInfoPDB.lib;
+        LLVMDemangle.lib;
+        LLVMDlltoolDriver.lib;
+        LLVMDWARFLinker.lib;
+        LLVMDWARFLinkerClassic.lib;
+        LLVMDWARFLinkerParallel.lib;
+        LLVMDWP.lib;
+        LLVMExecutionEngine.lib;
+        LLVMExtensions.lib;
+        LLVMFileCheck.lib;
+        LLVMFrontendDriver.lib;
+        LLVMFrontendHLSL.lib;
+        LLVMFrontendOffloading.lib;
+        LLVMFrontendOpenACC.lib;
+        LLVMFrontendOpenMP.lib;
+        LLVMFuzzerCLI.lib;
+        LLVMFuzzMutate.lib;
+        LLVMGlobalISel.lib;
+        LLVMHipStdPar.lib;
+        LLVMInstCombine.lib;
+        LLVMInstrumentation.lib;
+        LLVMIntelJITEvents.lib;
+        LLVMIntelJITProfiling.lib;
+        LLVMInterfaceStub.lib;
+        LLVMInterpreter.lib;
+        LLVMipo.lib;
+        LLVMIRPrinter.lib;
+        LLVMIRReader.lib;
+        LLVMJITLink.lib;
+        LLVMLibDriver.lib;
+        LLVMLineEditor.lib;
+        LLVMLinker.lib;
+        LLVMLTO.lib;
+        LLVMMC.lib;
+        LLVMMCA.lib;
+        LLVMMCDisassembler.lib;
+        LLVMMCJIT.lib;
+        LLVMMCParser.lib;
+        LLVMMIRParser.lib;
+        LLVMObjCARCOpts.lib;
+        LLVMObjCopy.lib;
+        LLVMObject.lib;
+        LLVMObjectYAML.lib;
+        LLVMOption.lib;
+        LLVMOrcDebugging.lib;
+        LLVMOrcJIT.lib;
+        LLVMOrcShared.lib;
+        LLVMOrcTargetProcess.lib;
+        LLVMPasses.lib;
+        LLVMProfileData.lib;
+        LLVMRemarks.lib;
+        LLVMRuntimeDyld.lib;
+        LLVMSandboxIR.lib;
+        LLVMScalarOpts.lib;
+        LLVMSelectionDAG.lib;
+        LLVMSupport.lib;
+        LLVMSymbolize.lib;
+        LLVMTableGen.lib;
+        LLVMTableGenBasic.lib;
+        LLVMTableGenCommon.lib;
+        LLVMTarget.lib;
+        LLVMTargetParser.lib;
+        LLVMTextAPI.lib;
+        LLVMTextAPIBinaryReader.lib;
+        LLVMTransformUtils.lib;
+        LLVMVectorize.lib;
+        LLVMWindowsDriver.lib;
+        LLVMWindowsManifest.lib;
+        LLVMX86AsmParser.lib;
+        LLVMX86CodeGen.lib;
+        LLVMX86Desc.lib;
+        LLVMX86Disassembler.lib;
+        LLVMX86Info.lib;
+        LLVMX86TargetMCA.lib;
+        LLVMXRay.lib;
+      </AdditionalDependencies>
       <AdditionalLibraryDirectories>..\3rdparty\ffmpeg\lib\windows\x86_64</AdditionalLibraryDirectories>
       <StackReserveSize>8388608</StackReserveSize>
       <StackCommitSize>1048576</StackCommitSize>
diff --git a/buildfiles/msvc/rpcs3_release.props b/buildfiles/msvc/rpcs3_release.props
index 98066601c4..378ba797d6 100644
--- a/buildfiles/msvc/rpcs3_release.props
+++ b/buildfiles/msvc/rpcs3_release.props
@@ -16,105 +16,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Release'">%(AdditionalLibraryDirectories);$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\$(Configuration)\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);
-        LLVMAggressiveInstCombine.lib;
-        LLVMAnalysis.lib;
-        LLVMAsmParser.lib;
-        LLVMAsmPrinter.lib;
-        LLVMBinaryFormat.lib;
-        LLVMBitReader.lib;
-        LLVMBitstreamReader.lib;
-        LLVMBitWriter.lib;
-        LLVMCFGuard.lib;
-        LLVMCodeGen.lib;
-        LLVMCodeGenData.lib;
-        LLVMCodeGenTypes.lib;
-        LLVMCore.lib;
-        LLVMCoroutines.lib;
-        LLVMCoverage.lib;
-        LLVMDebugInfoBTF.lib;
-        LLVMDebugInfoCodeView.lib;
-        LLVMDebuginfod.lib;
-        LLVMDebugInfoDWARF.lib;
-        LLVMDebugInfoGSYM.lib;
-        LLVMDebugInfoLogicalView.lib;
-        LLVMDebugInfoMSF.lib;
-        LLVMDebugInfoPDB.lib;
-        LLVMDemangle.lib;
-        LLVMDlltoolDriver.lib;
-        LLVMDWARFLinker.lib;
-        LLVMDWARFLinkerClassic.lib;
-        LLVMDWARFLinkerParallel.lib;
-        LLVMDWP.lib;
-        LLVMExecutionEngine.lib;
-        LLVMExtensions.lib;
-        LLVMFileCheck.lib;
-        LLVMFrontendDriver.lib;
-        LLVMFrontendHLSL.lib;
-        LLVMFrontendOffloading.lib;
-        LLVMFrontendOpenACC.lib;
-        LLVMFrontendOpenMP.lib;
-        LLVMFuzzerCLI.lib;
-        LLVMFuzzMutate.lib;
-        LLVMGlobalISel.lib;
-        LLVMHipStdPar.lib;
-        LLVMInstCombine.lib;
-        LLVMInstrumentation.lib;
-        LLVMIntelJITEvents.lib;
-        LLVMIntelJITProfiling.lib;
-        LLVMInterfaceStub.lib;
-        LLVMInterpreter.lib;
-        LLVMipo.lib;
-        LLVMIRPrinter.lib;
-        LLVMIRReader.lib;
-        LLVMJITLink.lib;
-        LLVMLibDriver.lib;
-        LLVMLineEditor.lib;
-        LLVMLinker.lib;
-        LLVMLTO.lib;
-        LLVMMC.lib;
-        LLVMMCA.lib;
-        LLVMMCDisassembler.lib;
-        LLVMMCJIT.lib;
-        LLVMMCParser.lib;
-        LLVMMIRParser.lib;
-        LLVMObjCARCOpts.lib;
-        LLVMObjCopy.lib;
-        LLVMObject.lib;
-        LLVMObjectYAML.lib;
-        LLVMOption.lib;
-        LLVMOrcDebugging.lib;
-        LLVMOrcJIT.lib;
-        LLVMOrcShared.lib;
-        LLVMOrcTargetProcess.lib;
-        LLVMPasses.lib;
-        LLVMProfileData.lib;
-        LLVMRemarks.lib;
-        LLVMRuntimeDyld.lib;
-        LLVMSandboxIR.lib;
-        LLVMScalarOpts.lib;
-        LLVMSelectionDAG.lib;
-        LLVMSupport.lib;
-        LLVMSymbolize.lib;
-        LLVMTableGen.lib;
-        LLVMTableGenBasic.lib;
-        LLVMTableGenCommon.lib;
-        LLVMTarget.lib;
-        LLVMTargetParser.lib;
-        LLVMTextAPI.lib;
-        LLVMTextAPIBinaryReader.lib;
-        LLVMTransformUtils.lib;
-        LLVMVectorize.lib;
-        LLVMWindowsDriver.lib;
-        LLVMWindowsManifest.lib;
-        LLVMX86AsmParser.lib;
-        LLVMX86CodeGen.lib;
-        LLVMX86Desc.lib;
-        LLVMX86Disassembler.lib;
-        LLVMX86Info.lib;
-        LLVMX86TargetMCA.lib;
-        LLVMXRay.lib;
-      </AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />