diff --git a/src/ExpandVolume/ExpandVolume.vcxproj b/src/ExpandVolume/ExpandVolume.vcxproj
index 8cbb76a0..fa553e62 100644
--- a/src/ExpandVolume/ExpandVolume.vcxproj
+++ b/src/ExpandVolume/ExpandVolume.vcxproj
@@ -432,24 +432,6 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-arm64.exe" >NUL:
       <PreprocessorDefinitions>VC_EFI_CUSTOM_MODE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Common\Lzma_vs2019.vcxproj">
-      <Project>{b896fe1f-6bf3-4f75-9148-f841829073d9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\Crypto\Crypto_vs2019.vcxproj">
-      <Project>{993245cf-6b70-47ee-91bb-39f8fc6dc0e7}</Project>
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\Format\Format_vs2019.vcxproj">
-      <Project>{9dc1abe2-d18b-48fb-81d2-8c50adc57bcf}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\Mount\Mount_vs2019.vcxproj">
-      <Project>{e4c40f94-e7f9-4981-86e4-186b46f993f3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Common\CommandAPDU.cpp" />
     <ClCompile Include="..\Common\EMVCard.cpp" />
@@ -619,6 +601,20 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-arm64.exe" &gt;NUL:
   <ItemGroup>
     <Manifest Include="VeraCryptExpander.manifest" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Lzma.vcxproj">
+      <Project>{b896fe1f-6bf3-4f75-9148-f841829073d9}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\Crypto\Crypto.vcxproj">
+      <Project>{993245cf-6b70-47ee-91bb-39f8fc6dc0e7}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\Format\Format.vcxproj">
+      <Project>{9dc1abe2-d18b-48fb-81d2-8c50adc57bcf}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\Mount\Mount.vcxproj">
+      <Project>{e4c40f94-e7f9-4981-86e4-186b46f993f3}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/Format/Format.vcxproj b/src/Format/Format.vcxproj
index 1477e2d8..1ffac006 100644
--- a/src/Format/Format.vcxproj
+++ b/src/Format/Format.vcxproj
@@ -568,12 +568,14 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-arm64.exe" &gt;NUL:
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Common\Lzma_vs2019.vcxproj">
+    <ProjectReference Include="..\Common\Lzma.vcxproj">
       <Project>{b896fe1f-6bf3-4f75-9148-f841829073d9}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\Crypto\Crypto_vs2019.vcxproj">
+    <ProjectReference Include="..\Common\Zip.vcxproj">
+      <Project>{6316ee71-0210-4ca4-bcc7-cfb7a3c090fc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\Crypto\Crypto.vcxproj">
       <Project>{993245cf-6b70-47ee-91bb-39f8fc6dc0e7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/Mount/Mount.vcxproj b/src/Mount/Mount.vcxproj
index 5beda2d3..38e63cac 100644
--- a/src/Mount/Mount.vcxproj
+++ b/src/Mount/Mount.vcxproj
@@ -596,16 +596,17 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-arm64.exe" &gt;NUL:
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Common\Lzma_vs2019.vcxproj">
+    <ProjectReference Include="..\Common\Lzma.vcxproj">
       <Project>{b896fe1f-6bf3-4f75-9148-f841829073d9}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\Crypto\Crypto_vs2019.vcxproj">
-      <Project>{993245cf-6b70-47ee-91bb-39f8fc6dc0e7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    <ProjectReference Include="..\Common\Zip.vcxproj">
+      <Project>{6316ee71-0210-4ca4-bcc7-cfb7a3c090fc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\Format\Format_vs2019.vcxproj">
+    <ProjectReference Include="..\Crypto\Crypto.vcxproj">
+      <Project>{993245cf-6b70-47ee-91bb-39f8fc6dc0e7}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\Format\Format.vcxproj">
       <Project>{9dc1abe2-d18b-48fb-81d2-8c50adc57bcf}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/Setup/Setup.vcxproj b/src/Setup/Setup.vcxproj
index 47d031be..f76efd6b 100644
--- a/src/Setup/Setup.vcxproj
+++ b/src/Setup/Setup.vcxproj
@@ -325,6 +325,11 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" &gt;NUL
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Lzma.vcxproj">
+      <Project>{b896fe1f-6bf3-4f75-9148-f841829073d9}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>