diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj
index 1978f3bcac..cb005628be 100644
--- a/Core/Core.vcxproj
+++ b/Core/Core.vcxproj
@@ -1406,13 +1406,11 @@
     <ClInclude Include="WebServer.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\android\jni\Android.mk" />
     <None Include="..\ext\cityhash\COPYING" />
     <None Include="..\ext\cityhash\README" />
     <None Include="..\ext\gason\LICENSE" />
     <None Include="..\ext\libzip\Android.mk" />
     <None Include="..\LICENSE.TXT" />
-    <None Include="CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.vcxproj">
@@ -1432,6 +1430,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Text Include="..\ext\CMakeLists.txt" />
     <Text Include="..\ext\libzip\CMakeLists.txt" />
     <Text Include="..\ext\sha1\CMakeLists.txt" />
   </ItemGroup>
diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters
index 3a24903dbc..b6dbc27862 100644
--- a/Core/Core.vcxproj.filters
+++ b/Core/Core.vcxproj.filters
@@ -694,7 +694,6 @@
     <ClCompile Include="AVIDump.cpp">
       <Filter>Core</Filter>
     </ClCompile>
-    <ClCompile Include="WaveFile.cpp" />
     <ClCompile Include="HLE\KUBridge.cpp">
       <Filter>HLE\Libraries</Filter>
     </ClCompile>
@@ -1190,6 +1189,9 @@
     <ClCompile Include="HLE\sceNp2.cpp">
       <Filter>HLE\Libraries</Filter>
     </ClCompile>
+    <ClCompile Include="WaveFile.cpp">
+      <Filter>Core</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ELF\ElfReader.h">
@@ -1753,7 +1755,6 @@
     <ClInclude Include="AVIDump.h">
       <Filter>Core</Filter>
     </ClInclude>
-    <ClInclude Include="WaveFile.h" />
     <ClInclude Include="HLE\KUBridge.h">
       <Filter>HLE\Libraries</Filter>
     </ClInclude>
@@ -1922,11 +1923,12 @@
     <ClInclude Include="HLE\sceNp2.h">
       <Filter>HLE\Libraries</Filter>
     </ClInclude>
+    <ClInclude Include="WaveFile.h">
+      <Filter>Core</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="CMakeLists.txt" />
     <None Include="..\LICENSE.TXT" />
-    <None Include="..\android\jni\Android.mk" />
     <None Include="..\ext\gason\LICENSE">
       <Filter>Ext\gason</Filter>
     </None>
@@ -1947,5 +1949,8 @@
     <Text Include="..\ext\libzip\CMakeLists.txt">
       <Filter>Ext\libzip</Filter>
     </Text>
+    <Text Include="..\ext\CMakeLists.txt">
+      <Filter>Ext</Filter>
+    </Text>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/UI/ReadMe.txt b/UI/ReadMe.txt
deleted file mode 100644
index 9f9060e341..0000000000
--- a/UI/ReadMe.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-========================================================================
-    STATIC LIBRARY : UI Project Overview
-========================================================================
-
-AppWizard has created this UI library project for you.
-
-No source files were created as part of your project.
-
-
-UI.vcxproj
-    This is the main project file for VC++ projects generated using an Application Wizard.
-    It contains information about the version of Visual C++ that generated the file, and
-    information about the platforms, configurations, and project features selected with the
-    Application Wizard.
-
-UI.vcxproj.filters
-    This is the filters file for VC++ projects generated using an Application Wizard. 
-    It contains information about the association between the files in your project 
-    and the filters. This association is used in the IDE to show grouping of files with
-    similar extensions under a specific node (for e.g. ".cpp" files are associated with the
-    "Source Files" filter).
-
-/////////////////////////////////////////////////////////////////////////////
-Other notes:
-
-AppWizard uses "TODO:" comments to indicate parts of the source code you
-should add to or customize.
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj
index 67d3f25f66..9c637788ae 100644
--- a/Windows/PPSSPP.vcxproj
+++ b/Windows/PPSSPP.vcxproj
@@ -691,6 +691,16 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\libretro\LibretroGLCoreContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\libretro\LibretroGraphicsContext.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -831,26 +841,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\UWP\StorageFileLoader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\UWP\StorageFolderBrowser.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\UWP\UWPHost.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1090,6 +1080,26 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="..\ios\iCade\iCadeReaderView.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\ios\iCade\iCadeState.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="..\ios\iOSCoreAudio.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1180,6 +1190,16 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="..\libretro\LibretroGLCoreContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="..\libretro\LibretroGraphicsContext.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1200,6 +1220,26 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="..\libretro\libretro_core_options.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\libretro\libretro_core_options_intl.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="..\libretro\libretro_d3d.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1220,6 +1260,16 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="..\libretro\retro_inline.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="..\ppsspp_config.h" />
     <ClInclude Include="..\Qt\mainwindow.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -1361,26 +1411,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\UWP\StorageFileLoader.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="..\UWP\StorageFolderBrowser.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClInclude>
     <ClInclude Include="..\UWP\UWPHost.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1469,6 +1499,7 @@
     <ClInclude Include="GPU\WindowsGraphicsContext.h" />
     <ClInclude Include="InputDevice.h" />
     <ClInclude Include="MainWindowMenu.h" />
+    <ClInclude Include="mingw_defines.h" />
     <ClInclude Include="RawInput.h" />
     <ClInclude Include="TouchInputHandler.h" />
     <ClInclude Include="GPU\WindowsVulkanContext.h" />
@@ -1490,8 +1521,11 @@
     <ClInclude Include="XinputDevice.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\.travis.sh" />
-    <None Include="..\.travis.yml" />
+    <None Include="..\.github\workflows\build.yml" />
+    <None Include="..\.github\workflows\generateDockerLayer.yml" />
+    <None Include="..\.github\workflows\manual_generate_apk.yml" />
+    <None Include="..\.github\workflows\tarball.yml" />
+    <None Include="..\android\buildassets.sh" />
     <None Include="..\android\git-version-gen.sh" />
     <None Include="..\android\jni\Android.mk" />
     <None Include="..\android\jni\Application.mk" />
@@ -1507,8 +1541,26 @@
     <None Include="..\buildatlas.sh" />
     <None Include="..\build_ppgeatlas.sh" />
     <None Include="..\CMakeLists.txt" />
+    <None Include="..\cmake\Modules\ccache.cmake" />
+    <None Include="..\cmake\Modules\FindFFmpeg.cmake" />
+    <None Include="..\cmake\Modules\FindLIBZIP.cmake" />
+    <None Include="..\cmake\Modules\FindMINIUPNPC.cmake" />
+    <None Include="..\cmake\Modules\FindSnappy.cmake" />
+    <None Include="..\cmake\Modules\FindWayland.cmake" />
+    <None Include="..\cmake\Modules\FindZSTD.cmake" />
+    <None Include="..\cmake\sdl\FindSDL2.cmake" />
+    <None Include="..\cmake\Toolchains\beagleboard.cmake" />
+    <None Include="..\cmake\Toolchains\generic.armv7.cmake" />
+    <None Include="..\cmake\Toolchains\ios.cmake" />
+    <None Include="..\cmake\Toolchains\nvidiajetsonsdl.armv8.cmake" />
+    <None Include="..\cmake\Toolchains\raspberry.armv6.cmake" />
+    <None Include="..\cmake\Toolchains\raspberry.armv7.cmake" />
+    <None Include="..\cmake\Toolchains\raspberry.armv8.cmake" />
+    <None Include="..\cmake\Toolchains\vero4k.armv8.cmake" />
     <None Include="..\copyrelease.sh" />
+    <None Include="..\Dockerfile" />
     <None Include="..\git-version.cmake" />
+    <None Include="..\gradle.properties" />
     <None Include="..\history.md" />
     <None Include="..\ios\AppDelegate.mm">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -1550,6 +1602,16 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </None>
+    <None Include="..\ios\iCade\iCadeReaderView.m">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
     <None Include="..\ios\iOSCoreAudio.mm">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1560,6 +1622,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </None>
+    <None Include="..\ios\Launch Screen.storyboard" />
     <None Include="..\ios\LocationHelper.mm">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1601,6 +1664,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </None>
+    <None Include="..\ios\README.md" />
     <None Include="..\ios\SubtleVolume.mm">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1626,17 +1690,8 @@
     <None Include="..\libretro\Makefile" />
     <None Include="..\libretro\Makefile.common" />
     <None Include="..\ppsspp.iss" />
-    <None Include="..\Qt\assets.qrc" />
-    <None Include="..\Qt\Common.pro" />
-    <None Include="..\Qt\Core.pro" />
-    <None Include="..\Qt\GPU.pro" />
     <None Include="..\Qt\macbundle.sh" />
-    <None Include="..\Qt\Native.pro" />
-    <None Include="..\Qt\PPSSPP.pro" />
-    <None Include="..\Qt\PPSSPPQt.pro" />
-    <None Include="..\Qt\Settings.pri" />
     <None Include="..\README.md" />
-    <None Include="..\SDL\buildassets.sh" />
     <None Include="..\SDL\macbundle.sh" />
     <None Include="..\SDL\SDLCocoaMetalLayer.mm">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -1659,10 +1714,13 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </None>
     <None Include="..\settings.gradle" />
+    <None Include="build-x64.cmd" />
+    <None Include="build-x86.cmd" />
     <None Include="git-version-gen.cmd" />
     <None Include="ppsspp.ico" />
     <None Include="icon1.ico" />
     <None Include="stop1.ico" />
+    <None Include="zipup.cmd" />
   </ItemGroup>
   <ItemGroup>
     <None Include="aboutbox.rc" />
@@ -1708,9 +1766,14 @@
     <Image Include="ppsspp_gold.ico" />
   </ItemGroup>
   <ItemGroup>
+    <Text Include="..\asciifont_atlasscript.txt" />
+    <Text Include="..\font_atlasscript.txt" />
     <Text Include="..\libretro\CMakeLists.txt" />
     <Text Include="..\libretro\README_WINDOWS.txt" />
     <Text Include="..\ppge_atlasscript.txt" />
+    <Text Include="..\SDL\README.TXT" />
+    <Text Include="..\ui_atlasscript.txt" />
+    <Text Include="debugger.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Windows/PPSSPP.vcxproj.filters b/Windows/PPSSPP.vcxproj.filters
index 9575308dd8..6649ca6aa4 100644
--- a/Windows/PPSSPP.vcxproj.filters
+++ b/Windows/PPSSPP.vcxproj.filters
@@ -32,9 +32,6 @@
     <Filter Include="Other Platforms\Qt">
       <UniqueIdentifier>{45191b1f-33c8-405c-a410-35fe2344d1d1}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Other Platforms\Qt\Debugger">
-      <UniqueIdentifier>{1d0cc0ee-fdbd-419e-b322-b35075d9d9db}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Other Platforms\SDL">
       <UniqueIdentifier>{5bfed059-8636-4b1e-a3cf-f948d645babb}</UniqueIdentifier>
     </Filter>
@@ -53,6 +50,15 @@
     <Filter Include="Other Platforms\UWP">
       <UniqueIdentifier>{21c262bc-bc21-49d7-a332-2e2614e89217}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Build\Actions">
+      <UniqueIdentifier>{14abd855-ec8b-47a5-8b4c-eadcff122dc8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Other Platforms\iOS\iCade">
+      <UniqueIdentifier>{ce617e38-1bc8-4eab-a3cb-d3d664116c91}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Build\CMake">
+      <UniqueIdentifier>{8f39c005-9738-41c5-a8d8-cfc05bf178e8}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Debugger\CtrlDisAsmView.cpp">
@@ -250,15 +256,9 @@
     <ClCompile Include="..\UWP\App.cpp">
       <Filter>Other Platforms\UWP</Filter>
     </ClCompile>
-    <ClCompile Include="..\UWP\StorageFolderBrowser.cpp">
-      <Filter>Other Platforms\UWP</Filter>
-    </ClCompile>
     <ClCompile Include="..\UWP\XAudioSoundStream.cpp">
       <Filter>Other Platforms\UWP</Filter>
     </ClCompile>
-    <ClCompile Include="..\UWP\StorageFileLoader.cpp">
-      <Filter>Other Platforms\UWP</Filter>
-    </ClCompile>
     <ClCompile Include="..\UWP\pch.cpp">
       <Filter>Other Platforms\UWP</Filter>
     </ClCompile>
@@ -271,6 +271,9 @@
     <ClCompile Include="W32Util\ContextMenu.cpp">
       <Filter>Windows\W32Util</Filter>
     </ClCompile>
+    <ClCompile Include="..\libretro\LibretroGLCoreContext.cpp">
+      <Filter>Other Platforms\libretro</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Debugger\CtrlDisAsmView.h">
@@ -514,18 +517,12 @@
     <ClInclude Include="..\UWP\App.h">
       <Filter>Other Platforms\UWP</Filter>
     </ClInclude>
-    <ClInclude Include="..\UWP\StorageFolderBrowser.h">
-      <Filter>Other Platforms\UWP</Filter>
-    </ClInclude>
     <ClInclude Include="..\UWP\UWPUtil.h">
       <Filter>Other Platforms\UWP</Filter>
     </ClInclude>
     <ClInclude Include="..\UWP\XAudioSoundStream.h">
       <Filter>Other Platforms\UWP</Filter>
     </ClInclude>
-    <ClInclude Include="..\UWP\StorageFileLoader.h">
-      <Filter>Other Platforms\UWP</Filter>
-    </ClInclude>
     <ClInclude Include="..\UWP\pch.h">
       <Filter>Other Platforms\UWP</Filter>
     </ClInclude>
@@ -541,6 +538,27 @@
     <ClInclude Include="W32Util\ContextMenu.h">
       <Filter>Windows\W32Util</Filter>
     </ClInclude>
+    <ClInclude Include="..\libretro\libretro_core_options.h">
+      <Filter>Other Platforms\libretro</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libretro\libretro_core_options_intl.h">
+      <Filter>Other Platforms\libretro</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libretro\LibretroGLCoreContext.h">
+      <Filter>Other Platforms\libretro</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libretro\retro_inline.h">
+      <Filter>Other Platforms\libretro</Filter>
+    </ClInclude>
+    <ClInclude Include="mingw_defines.h">
+      <Filter>Other Platforms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ios\iCade\iCadeState.h">
+      <Filter>Other Platforms\iOS\iCade</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ios\iCade\iCadeReaderView.h">
+      <Filter>Other Platforms\iOS\iCade</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="icon1.ico">
@@ -553,7 +571,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="..\README.md" />
-    <None Include="git-version-gen.cmd" />
     <None Include="aboutbox.rc">
       <Filter>Resource Files</Filter>
     </None>
@@ -566,30 +583,6 @@
     <None Include="PPSSPP.manifest">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\Qt\Native.pro">
-      <Filter>Other Platforms\Qt</Filter>
-    </None>
-    <None Include="..\Qt\PPSSPP.pro">
-      <Filter>Other Platforms\Qt</Filter>
-    </None>
-    <None Include="..\Qt\PPSSPPQt.pro">
-      <Filter>Other Platforms\Qt</Filter>
-    </None>
-    <None Include="..\Qt\Settings.pri">
-      <Filter>Other Platforms\Qt</Filter>
-    </None>
-    <None Include="..\Qt\Common.pro">
-      <Filter>Other Platforms\Qt</Filter>
-    </None>
-    <None Include="..\Qt\Core.pro">
-      <Filter>Other Platforms\Qt</Filter>
-    </None>
-    <None Include="..\Qt\GPU.pro">
-      <Filter>Other Platforms\Qt</Filter>
-    </None>
-    <None Include="..\Qt\assets.qrc">
-      <Filter>Other Platforms\Qt</Filter>
-    </None>
     <None Include="..\assets\langregion.ini">
       <Filter>Resource Files</Filter>
     </None>
@@ -602,12 +595,6 @@
     <None Include="..\CMakeLists.txt">
       <Filter>Build</Filter>
     </None>
-    <None Include="..\.travis.sh">
-      <Filter>Build</Filter>
-    </None>
-    <None Include="..\.travis.yml">
-      <Filter>Build</Filter>
-    </None>
     <None Include="..\appveyor.yml">
       <Filter>Build</Filter>
     </None>
@@ -675,9 +662,6 @@
     <None Include="..\ios\iOSCoreAudio.mm">
       <Filter>Other Platforms\iOS</Filter>
     </None>
-    <None Include="..\ios\macbundle.sh">
-      <Filter>Build</Filter>
-    </None>
     <None Include="..\ios\PPSSPP-Info.plist">
       <Filter>Other Platforms\iOS</Filter>
     </None>
@@ -708,12 +692,102 @@
     <None Include="..\SDL\SDLMain.mm">
       <Filter>Other Platforms\SDL</Filter>
     </None>
-    <None Include="..\SDL\buildassets.sh">
-      <Filter>Other Platforms\SDL</Filter>
-    </None>
     <None Include="..\assets\compatvr.ini">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="git-version-gen.cmd">
+      <Filter>Build</Filter>
+    </None>
+    <None Include="zipup.cmd">
+      <Filter>Build</Filter>
+    </None>
+    <None Include="build-x64.cmd">
+      <Filter>Build</Filter>
+    </None>
+    <None Include="build-x86.cmd">
+      <Filter>Build</Filter>
+    </None>
+    <None Include="..\Dockerfile">
+      <Filter>Build</Filter>
+    </None>
+    <None Include="..\gradle.properties">
+      <Filter>Other Platforms\Android</Filter>
+    </None>
+    <None Include="..\.github\workflows\build.yml">
+      <Filter>Build\Actions</Filter>
+    </None>
+    <None Include="..\.github\workflows\manual_generate_apk.yml">
+      <Filter>Build\Actions</Filter>
+    </None>
+    <None Include="..\.github\workflows\tarball.yml">
+      <Filter>Build\Actions</Filter>
+    </None>
+    <None Include="..\.github\workflows\generateDockerLayer.yml">
+      <Filter>Build\Actions</Filter>
+    </None>
+    <None Include="..\android\buildassets.sh">
+      <Filter>Build</Filter>
+    </None>
+    <None Include="..\ios\Launch Screen.storyboard">
+      <Filter>Other Platforms\iOS</Filter>
+    </None>
+    <None Include="..\ios\macbundle.sh">
+      <Filter>Other Platforms\iOS</Filter>
+    </None>
+    <None Include="..\ios\README.md">
+      <Filter>Other Platforms\iOS</Filter>
+    </None>
+    <None Include="..\ios\iCade\iCadeReaderView.m">
+      <Filter>Other Platforms\iOS\iCade</Filter>
+    </None>
+    <None Include="..\cmake\Modules\FindMINIUPNPC.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
+    <None Include="..\cmake\Modules\FindSnappy.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
+    <None Include="..\cmake\Modules\FindWayland.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
+    <None Include="..\cmake\Modules\FindZSTD.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
+    <None Include="..\cmake\Modules\ccache.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
+    <None Include="..\cmake\Modules\FindFFmpeg.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
+    <None Include="..\cmake\Modules\FindLIBZIP.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
+    <None Include="..\cmake\sdl\FindSDL2.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
+    <None Include="..\cmake\Toolchains\raspberry.armv6.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
+    <None Include="..\cmake\Toolchains\raspberry.armv7.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
+    <None Include="..\cmake\Toolchains\raspberry.armv8.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
+    <None Include="..\cmake\Toolchains\vero4k.armv8.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
+    <None Include="..\cmake\Toolchains\beagleboard.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
+    <None Include="..\cmake\Toolchains\generic.armv7.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
+    <None Include="..\cmake\Toolchains\ios.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
+    <None Include="..\cmake\Toolchains\nvidiajetsonsdl.armv8.cmake">
+      <Filter>Build\CMake</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ppsspp.rc">
@@ -738,5 +812,18 @@
     <Text Include="..\libretro\README_WINDOWS.txt">
       <Filter>Other Platforms\libretro</Filter>
     </Text>
+    <Text Include="debugger.txt" />
+    <Text Include="..\font_atlasscript.txt">
+      <Filter>Build</Filter>
+    </Text>
+    <Text Include="..\asciifont_atlasscript.txt">
+      <Filter>Build</Filter>
+    </Text>
+    <Text Include="..\ui_atlasscript.txt">
+      <Filter>Build</Filter>
+    </Text>
+    <Text Include="..\SDL\README.TXT">
+      <Filter>Other Platforms\SDL</Filter>
+    </Text>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ext/SPIRV-Cross.vcxproj b/ext/SPIRV-Cross.vcxproj
index 964e42ea6e..b6369489d7 100644
--- a/ext/SPIRV-Cross.vcxproj
+++ b/ext/SPIRV-Cross.vcxproj
@@ -336,6 +336,9 @@
     <ClCompile Include="SPIRV-Cross\spirv_msl.cpp" />
     <ClCompile Include="SPIRV-Cross\spirv_parser.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="SPIRV-Cross-build\CMakeLists.txt" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/ext/SPIRV-Cross.vcxproj.filters b/ext/SPIRV-Cross.vcxproj.filters
index de9c67fd82..66e047af50 100644
--- a/ext/SPIRV-Cross.vcxproj.filters
+++ b/ext/SPIRV-Cross.vcxproj.filters
@@ -26,4 +26,7 @@
     <ClCompile Include="SPIRV-Cross\spirv_cross_parsed_ir.cpp" />
     <ClCompile Include="SPIRV-Cross\spirv_parser.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="SPIRV-Cross-build\CMakeLists.txt" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ext/discord-rpc-build/discord-rpc.vcxproj b/ext/discord-rpc-build/discord-rpc.vcxproj
index 3506f7ee6d..5fc9b0f697 100644
--- a/ext/discord-rpc-build/discord-rpc.vcxproj
+++ b/ext/discord-rpc-build/discord-rpc.vcxproj
@@ -45,6 +45,7 @@
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\discord-rpc\src\CMakeLists.txt" />
+    <Text Include="CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\discord-rpc\src\connection_win.cpp" />
diff --git a/ext/discord-rpc-build/discord-rpc.vcxproj.filters b/ext/discord-rpc-build/discord-rpc.vcxproj.filters
index a10d90a63d..d21da7021c 100644
--- a/ext/discord-rpc-build/discord-rpc.vcxproj.filters
+++ b/ext/discord-rpc-build/discord-rpc.vcxproj.filters
@@ -11,6 +11,7 @@
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\discord-rpc\src\CMakeLists.txt" />
+    <Text Include="CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\discord-rpc\src\connection_win.cpp" />
diff --git a/ext/glslang.vcxproj b/ext/glslang.vcxproj
index 5835c251ba..4b9c2bdd5e 100644
--- a/ext/glslang.vcxproj
+++ b/ext/glslang.vcxproj
@@ -411,6 +411,7 @@
     <ClInclude Include="glslang\SPIRV\SPVRemapper.h" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="glslang-build\Android.mk" />
     <None Include="glslang\glslang\MachineIndependent\glslang.y" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/ext/glslang.vcxproj.filters b/ext/glslang.vcxproj.filters
index 479bd35e78..3dc0c42408 100644
--- a/ext/glslang.vcxproj.filters
+++ b/ext/glslang.vcxproj.filters
@@ -334,5 +334,6 @@
     <None Include="glslang\glslang\MachineIndependent\glslang.y">
       <Filter>glslang</Filter>
     </None>
+    <None Include="glslang-build\Android.mk" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ext/libarmips.vcxproj b/ext/libarmips.vcxproj
index bd9f5c9911..fa5fa59c2c 100644
--- a/ext/libarmips.vcxproj
+++ b/ext/libarmips.vcxproj
@@ -600,6 +600,9 @@
     <ClInclude Include="armips\Util\FileSystem.h" />
     <ClInclude Include="armips\Util\Util.h" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="cmake\armips\CMakeLists.txt" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/ext/libarmips.vcxproj.filters b/ext/libarmips.vcxproj.filters
index 4a9b54143c..7bdfaca8c3 100644
--- a/ext/libarmips.vcxproj.filters
+++ b/ext/libarmips.vcxproj.filters
@@ -381,4 +381,7 @@
       <Filter>Archs\SuperH</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="cmake\armips\CMakeLists.txt" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ext/miniupnpc.vcxproj b/ext/miniupnpc.vcxproj
index 4181392fb3..ee83b4495c 100644
--- a/ext/miniupnpc.vcxproj
+++ b/ext/miniupnpc.vcxproj
@@ -68,6 +68,7 @@
     <ClCompile Include="miniupnp\miniupnpc\upnpreplyparse.c" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="miniupnp-build\Android.mk" />
     <None Include="miniupnp\miniupnpc\msvc\genminiupnpcstrings.vbs">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </None>
diff --git a/ext/miniupnpc.vcxproj.filters b/ext/miniupnpc.vcxproj.filters
index 2106988bbf..8ecbe2bfcf 100644
--- a/ext/miniupnpc.vcxproj.filters
+++ b/ext/miniupnpc.vcxproj.filters
@@ -42,5 +42,6 @@
     <None Include="miniupnp\miniupnpc\msvc\genminiupnpcstrings.vbs">
       <Filter>scripts</Filter>
     </None>
+    <None Include="miniupnp-build\Android.mk" />
   </ItemGroup>
 </Project>
\ No newline at end of file