diff --git a/CMakeLists.txt b/CMakeLists.txt
index 922aeabb84..fadc7712c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -658,6 +658,14 @@ add_library(Common STATIC
 	${CommonLOONGARCH64}
 	${CommonD3D}
 	${CommonVR}
+	ext/lzma-sdk/7zArcIn.c  # TODO: Move.
+	ext/lzma-sdk/7zBuf.c
+	ext/lzma-sdk/7zCrc.c
+	ext/lzma-sdk/7zDec.c
+	ext/lzma-sdk/7zFile.c
+	ext/lzma-sdk/7zStream.c
+	ext/lzma-sdk/Bcj2.c
+	ext/lzma-sdk/Lzma2Dec.c
 	Common/Serialize/Serializer.cpp
 	Common/Serialize/Serializer.h
 	Common/Serialize/SerializeDeque.h
@@ -726,14 +734,6 @@ add_library(Common STATIC
 	Common/File/VFS/SevenZipFileReader.h
 	Common/File/VFS/DirectoryReader.cpp
 	Common/File/VFS/DirectoryReader.h
-	ext/lzma-sdk/7zArcIn.c
-	ext/lzma-sdk/7zBuf.c
-	ext/lzma-sdk/7zCrc.c
-	ext/lzma-sdk/7zDec.c
-	ext/lzma-sdk/7zFile.c
-	ext/lzma-sdk/7zStream.c
-	ext/lzma-sdk/Bcj2.c
-	ext/lzma-sdk/Lzma2Dec.c
 	Common/File/AndroidStorage.h
 	Common/File/AndroidStorage.cpp
 	Common/File/AndroidContentURI.h
@@ -977,6 +977,7 @@ endif()
 if(ARM64)
 	if(ANDROID)
 		target_link_libraries(Common adrenotools)
+		target_compile_definitions(Common PRIVATE Z7_CRC_NUM_TABLES=1)
 	endif()
 endif()
 
diff --git a/UI/AdhocServerScreen.cpp b/UI/AdhocServerScreen.cpp
index 493d1cf747..fa82bc1675 100644
--- a/UI/AdhocServerScreen.cpp
+++ b/UI/AdhocServerScreen.cpp
@@ -22,7 +22,7 @@ public:
 		parent->Add(new CheckBox(&hasRelay_, ni->T("Relay server mode")));
 	}
 
-	virtual void OnCompleted(DialogResult result) {
+	virtual void OnCompleted(DialogResult result) override {
 		if (result == DialogResult::DR_OK) {
 			std::vector<AdhocServerListEntry> servers = AdhocGetServerList(AdhocLoadListMode::CacheOnlySync);
 			bool preset = false;
diff --git a/UI/InstallZipScreen.cpp b/UI/InstallZipScreen.cpp
index 1befd99d91..36e23d1328 100644
--- a/UI/InstallZipScreen.cpp
+++ b/UI/InstallZipScreen.cpp
@@ -45,8 +45,10 @@ InstallZipScreen::InstallZipScreen(const Path &zipPath) : UITwoPaneBaseDialogScr
 
 	if (zipPath.GetFileExtension() == ".7z") {
 		SevenZipFileReader *sevenZipFile = SevenZipFileReader::Create(zipPath, "");
-		DetectArchiveContents(sevenZipFile, &zipFileInfo_);  // Even if this fails, it sets zipInfo->contents.
-		delete sevenZipFile;
+		if (sevenZipFile) {
+			DetectArchiveContents(sevenZipFile, &zipFileInfo_);  // Even if this fails, it sets zipInfo->contents.
+			delete sevenZipFile;
+		}
 	} else {
 		ZipContainer zipFile = ZipOpenPath(zipPath_);
 		if (zipFile) {
diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj
index f5fb3a0b53..57286cf5e5 100644
--- a/UWP/CommonUWP/CommonUWP.vcxproj
+++ b/UWP/CommonUWP/CommonUWP.vcxproj
@@ -95,6 +95,7 @@
     <ClInclude Include="..\..\Common\Data\Format\DDSLoad.h" />
     <ClInclude Include="..\..\Common\File\AndroidContentURI.h" />
     <ClInclude Include="..\..\Common\File\AndroidStorage.h" />
+    <ClInclude Include="..\..\Common\File\VFS\SevenZipFileReader.h" />
     <ClInclude Include="..\..\Common\GPU\GPUBackendCommon.h" />
     <ClInclude Include="..\..\Common\GPU\Vulkan\VulkanLoader.h" />
     <ClInclude Include="..\..\Common\Math\CrossSIMD.h" />
@@ -275,6 +276,21 @@
     <ClInclude Include="..\..\ext\libpng17\pnglibconf.h" />
     <ClInclude Include="..\..\ext\libpng17\pngpriv.h" />
     <ClInclude Include="..\..\ext\libpng17\pngstruct.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\7z.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\7zBuf.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\7zCrc.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\7zFile.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\7zTypes.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\7zWindows.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\Bcj2.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\Bra.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\Compiler.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\CpuArch.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\Delta.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\Lzma2Dec.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\LzmaDec.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\Precomp.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\RotateDefs.h" />
     <ClInclude Include="..\..\ext\minimp3\minimp3.h" />
     <ClInclude Include="..\..\ext\minimp3\minimp3_ex.h" />
     <ClInclude Include="..\..\ext\naett\naett.h" />
@@ -289,6 +305,7 @@
     <ClCompile Include="..\..\Common\Data\Format\DDSLoad.cpp" />
     <ClCompile Include="..\..\Common\File\AndroidContentURI.cpp" />
     <ClCompile Include="..\..\Common\File\AndroidStorage.cpp" />
+    <ClCompile Include="..\..\Common\File\VFS\SevenZipFileReader.cpp" />
     <ClCompile Include="..\..\Common\GPU\GPUBackendCommon.cpp" />
     <ClCompile Include="..\..\Common\GPU\Vulkan\VulkanLoader.cpp" />
     <ClCompile Include="..\..\Common\Math\Statistics.cpp" />
@@ -443,6 +460,18 @@
     <ClCompile Include="..\..\ext\libpng17\pngwrite.c" />
     <ClCompile Include="..\..\ext\libpng17\pngwtran.c" />
     <ClCompile Include="..\..\ext\libpng17\pngwutil.c" />
+    <ClCompile Include="..\..\ext\lzma-sdk\7zArcIn.c" />
+    <ClCompile Include="..\..\ext\lzma-sdk\7zBuf.c" />
+    <ClCompile Include="..\..\ext\lzma-sdk\7zCrc.c" />
+    <ClCompile Include="..\..\ext\lzma-sdk\7zCrcOpt.c" />
+    <ClCompile Include="..\..\ext\lzma-sdk\7zDec.c" />
+    <ClCompile Include="..\..\ext\lzma-sdk\7zFile.c" />
+    <ClCompile Include="..\..\ext\lzma-sdk\7zStream.c" />
+    <ClCompile Include="..\..\ext\lzma-sdk\Bcj2.c" />
+    <ClCompile Include="..\..\ext\lzma-sdk\CpuArch.c" />
+    <ClCompile Include="..\..\ext\lzma-sdk\Delta.c" />
+    <ClCompile Include="..\..\ext\lzma-sdk\Lzma2Dec.c" />
+    <ClCompile Include="..\..\ext\lzma-sdk\LzmaDec.c" />
     <ClCompile Include="..\..\ext\minimp3\minimp3.cpp" />
     <ClCompile Include="..\..\ext\naett\naett.c" />
   </ItemGroup>
diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters
index 4997be9222..04bb3c2cc5 100644
--- a/UWP/CommonUWP/CommonUWP.vcxproj.filters
+++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters
@@ -109,6 +109,9 @@
     <Filter Include="ext\aemu_postoffice">
       <UniqueIdentifier>{e3871672-2a90-49d9-abb1-43fe75d73f8b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ext\lzma-sdk">
+      <UniqueIdentifier>{32412196-7280-4118-ad20-4ee3f6ad18ef}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Common\ABI.cpp" />
@@ -543,6 +546,45 @@
       <Filter>UI</Filter>
     </ClCompile>
     <ClCompile Include="..\..\ext\aemu_postoffice\client\postoffice_mem_stdc.c" />
+    <ClCompile Include="..\..\ext\lzma-sdk\7zArcIn.c">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\lzma-sdk\7zBuf.c">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\lzma-sdk\7zCrc.c">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\lzma-sdk\7zCrcOpt.c">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\lzma-sdk\7zDec.c">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\lzma-sdk\7zFile.c">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\lzma-sdk\7zStream.c">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\lzma-sdk\Bcj2.c">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\lzma-sdk\CpuArch.c">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\lzma-sdk\Delta.c">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\lzma-sdk\Lzma2Dec.c">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\lzma-sdk\LzmaDec.c">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\File\VFS\SevenZipFileReader.cpp">
+      <Filter>File\VFS</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="targetver.h" />
@@ -1043,6 +1085,54 @@
       <Filter>UI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Common\Math\fast\fast_matrix.h" />
+    <ClInclude Include="..\..\ext\lzma-sdk\7z.h">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\lzma-sdk\7zBuf.h">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\lzma-sdk\7zCrc.h">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\lzma-sdk\7zFile.h">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\lzma-sdk\7zTypes.h">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\lzma-sdk\7zWindows.h">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\lzma-sdk\Bcj2.h">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\lzma-sdk\Bra.h">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\lzma-sdk\Compiler.h">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\lzma-sdk\CpuArch.h">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\lzma-sdk\Delta.h">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\lzma-sdk\Lzma2Dec.h">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\lzma-sdk\LzmaDec.h">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\lzma-sdk\Precomp.h">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\lzma-sdk\RotateDefs.h">
+      <Filter>ext\lzma-sdk</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\File\VFS\SevenZipFileReader.h">
+      <Filter>File\VFS</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\ext\libpng17\CMakeLists.txt" />
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 4384151c07..2d088890e3 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -267,7 +267,15 @@ EXT_FILES := \
   $(SRC)/ext/cpu_features/src/impl_x86_macos.c \
   $(SRC)/ext/cpu_features/src/impl_x86_windows.c \
   $(SRC)/ext/cpu_features/src/stack_line_reader.c \
-  $(SRC)/ext/cpu_features/src/string_view.c
+  $(SRC)/ext/cpu_features/src/string_view.c \
+  $(SRC)/ext/lzma-sdk/7zArcIn.c \
+  $(SRC)/ext/lzma-sdk/7zBuf.c \
+  $(SRC)/ext/lzma-sdk/7zCrc.c \
+  $(SRC)/ext/lzma-sdk/7zDec.c \
+  $(SRC)/ext/lzma-sdk/7zFile.c \
+  $(SRC)/ext/lzma-sdk/7zStream.c \
+  $(SRC)/ext/lzma-sdk/Bcj2.c \
+  $(SRC)/ext/lzma-sdk/Lzma2Dec.c
 
 EXEC_AND_LIB_FILES := \
   $(ARCH_FILES) \