diff --git a/3rdparty/wolfssl/wolfssl.vcxproj b/3rdparty/wolfssl/wolfssl.vcxproj
index e3da6588f8..90da8b7f38 100644
--- a/3rdparty/wolfssl/wolfssl.vcxproj
+++ b/3rdparty/wolfssl/wolfssl.vcxproj
@@ -139,6 +139,94 @@
   <ItemGroup>
     <ClInclude Include="extra\win32\user_settings.h" />
     <ClInclude Include="wolfssl\resource.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\aes.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\arc4.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\asn.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\asn_public.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\blake2-impl.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\blake2-int.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\blake2.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\camellia.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\chacha.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\chacha20_poly1305.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\cmac.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\coding.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\compress.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\cpuid.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\cryptocb.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\curve25519.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\curve448.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\des3.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\dh.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\dilithium.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\dsa.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ecc.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\eccsi.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ed25519.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ed448.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\error-crypt.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ext_kyber.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ext_lms.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ext_xmss.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\falcon.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\fe_448.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\fe_operations.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\fips_test.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ge_448.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ge_operations.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\hash.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\hmac.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\hpke.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\integer.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\kdf.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\kyber.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\lms.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\logging.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\md2.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\md4.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\md5.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\memory.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\mem_track.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\misc.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\mpi_class.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\mpi_superclass.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\pkcs11.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\pkcs12.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\pkcs7.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\poly1305.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\pwdbased.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\random.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\rc2.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ripemd.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\rsa.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sakke.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\selftest.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\settings.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sha.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sha256.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sha3.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sha512.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\signature.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\siphash.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sm2.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sm3.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sm4.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sp.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sphincs.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sp_int.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\srp.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\tfm.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\types.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\visibility.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_encrypt.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_kyber.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_lms.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_pkcs11.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_port.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_xmss.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wolfevent.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wolfmath.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\xmss.h" />
     <CustomBuild Include="wolfssl\wolfcrypt\src\aes_asm.asm">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">false</ExcludedFromBuild>
@@ -160,6 +248,9 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="wolfssl\wolfssl\wolfcrypt\include.am" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 3da2dc1872..0c54d02978 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -40,10 +40,10 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\3rdparty\miniupnp\miniupnp\miniupnpc\include;..\3rdparty\wolfssl\wolfssl;..\3rdparty\flatbuffers\include;..\3rdparty\libusb\libusb\libusb;..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\SoundTouch\soundtouch\include;..\3rdparty\rtmidi\rtmidi;..\3rdparty\zlib\zlib;$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\include;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\include;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm\include;$(VULKAN_SDK)\Include;..\3rdparty\zstd\zstd\lib;$(SolutionDir)3rdparty\fusion\fusion\Fusion</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\3rdparty\miniupnp\miniupnp\miniupnpc\include;..\3rdparty\wolfssl\wolfssl;..\3rdparty\flatbuffers\include;..\3rdparty\libusb\libusb\libusb;..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\SoundTouch\soundtouch\include;..\3rdparty\rtmidi\rtmidi;..\3rdparty\zlib\zlib;$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\include;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\include;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm\include;$(VULKAN_SDK)\Include;..\3rdparty\zstd\zstd\lib;$(SolutionDir)3rdparty\fusion\fusion\Fusion;$(SolutionDir)3rdparty\wolfssl\extra\win32</AdditionalIncludeDirectories>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AL_LIBTYPE_STATIC;MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL2;ZLIB_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AL_LIBTYPE_STATIC;MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL2;ZLIB_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AL_LIBTYPE_STATIC;MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL2;ZLIB_CONST;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AL_LIBTYPE_STATIC;MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL2;ZLIB_CONST;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalModuleDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalModuleDependencies)</AdditionalModuleDependencies>
       <AdditionalModuleDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalModuleDependencies)</AdditionalModuleDependencies>
     </ClCompile>
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index 755370a4c7..adb7e376be 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -71,7 +71,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\opencv\opencv\opencv410\build\include;$(SolutionDir)3rdparty\SoundTouch\soundtouch\include;$(SolutionDir)3rdparty\cubeb\extra;$(SolutionDir)3rdparty\cubeb\cubeb\include\;$(SolutionDir)3rdparty\flatbuffers\include;$(SolutionDir)3rdparty\wolfssl\wolfssl;$(SolutionDir)3rdparty\curl\curl\include;$(SolutionDir)3rdparty\rtmidi\rtmidi;$(SolutionDir)3rdparty\libusb\libusb\libusb;$(VULKAN_SDK)\Include;$(SolutionDir)3rdparty\libsdl-org\SDL\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtConcurrent;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtSvgWidgets;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtMultimedia;$(QTDIR)\mkspecs\win32-msvc;.\release;.\QTGeneratedFiles\$(ConfigurationName);.\QTGeneratedFiles;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\opencv\opencv\opencv410\build\include;$(SolutionDir)3rdparty\SoundTouch\soundtouch\include;$(SolutionDir)3rdparty\cubeb\extra;$(SolutionDir)3rdparty\cubeb\cubeb\include\;$(SolutionDir)3rdparty\flatbuffers\include;$(SolutionDir)3rdparty\wolfssl\wolfssl;$(SolutionDir)3rdparty\wolfssl\extra\win32;$(SolutionDir)3rdparty\curl\curl\include;$(SolutionDir)3rdparty\rtmidi\rtmidi;$(SolutionDir)3rdparty\libusb\libusb\libusb;$(VULKAN_SDK)\Include;$(SolutionDir)3rdparty\libsdl-org\SDL\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtConcurrent;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtSvgWidgets;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtMultimedia;$(QTDIR)\mkspecs\win32-msvc;.\release;.\QTGeneratedFiles\$(ConfigurationName);.\QTGeneratedFiles;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/Zc:__cplusplus -Zc:strictStrings -Zc:throwingNew- -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)</AdditionalOptions>
       <AssemblerListingLocation>release\</AssemblerListingLocation>
       <BrowseInformation>false</BrowseInformation>
@@ -79,7 +79,7 @@
       <DisableSpecificWarnings>4577;4467;4281;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>_WINDOWS;UNICODE;WIN32;WIN64;WIN32_LEAN_AND_MEAN;HAVE_VULKAN;HAVE_OPENCV;CV_IGNORE_DEBUG_BUILD_GUARD;MINIUPNP_STATICLIB;ZLIB_CONST;AL_LIBTYPE_STATIC;HAVE_SDL2;WITH_DISCORD_RPC;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;NDEBUG;QT_WINEXTRAS_LIB;QT_CONCURRENT_LIB;QT_MULTIMEDIA_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_SVG_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;UNICODE;WIN32;WIN64;WIN32_LEAN_AND_MEAN;HAVE_VULKAN;HAVE_OPENCV;CV_IGNORE_DEBUG_BUILD_GUARD;MINIUPNP_STATICLIB;ZLIB_CONST;AL_LIBTYPE_STATIC;WOLFSSL_USER_SETTINGS;HAVE_SDL2;WITH_DISCORD_RPC;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;NDEBUG;QT_WINEXTRAS_LIB;QT_CONCURRENT_LIB;QT_MULTIMEDIA_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_SVG_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
       <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -124,7 +124,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\opencv\opencv\opencv410\build\include;$(SolutionDir)3rdparty\SoundTouch\soundtouch\include;$(SolutionDir)3rdparty\cubeb\extra;$(SolutionDir)3rdparty\cubeb\cubeb\include\;$(SolutionDir)3rdparty\flatbuffers\include;$(SolutionDir)3rdparty\wolfssl\wolfssl;$(SolutionDir)3rdparty\curl\curl\include;$(SolutionDir)3rdparty\rtmidi\rtmidi;$(SolutionDir)3rdparty\libusb\libusb\libusb;$(VULKAN_SDK)\Include;$(SolutionDir)3rdparty\libsdl-org\SDL\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtConcurrent;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtSvgWidgets;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtMultimedia;$(QTDIR)\mkspecs\win32-msvc;.\debug;.\QTGeneratedFiles\$(ConfigurationName);.\QTGeneratedFiles;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\opencv\opencv\opencv410\build\include;$(SolutionDir)3rdparty\SoundTouch\soundtouch\include;$(SolutionDir)3rdparty\cubeb\extra;$(SolutionDir)3rdparty\cubeb\cubeb\include\;$(SolutionDir)3rdparty\flatbuffers\include;$(SolutionDir)3rdparty\wolfssl\wolfssl;$(SolutionDir)3rdparty\wolfssl\extra\win32;$(SolutionDir)3rdparty\curl\curl\include;$(SolutionDir)3rdparty\rtmidi\rtmidi;$(SolutionDir)3rdparty\libusb\libusb\libusb;$(VULKAN_SDK)\Include;$(SolutionDir)3rdparty\libsdl-org\SDL\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtConcurrent;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtSvgWidgets;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtMultimedia;$(QTDIR)\mkspecs\win32-msvc;.\debug;.\QTGeneratedFiles\$(ConfigurationName);.\QTGeneratedFiles;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/Zc:__cplusplus -Zc:strictStrings -Zc:throwingNew- -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)</AdditionalOptions>
       <AssemblerListingLocation>debug\</AssemblerListingLocation>
       <BrowseInformation>false</BrowseInformation>
@@ -132,7 +132,7 @@
       <DisableSpecificWarnings>4577;4467;4281;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_WINDOWS;UNICODE;WIN32;WIN64;WIN32_LEAN_AND_MEAN;HAVE_VULKAN;HAVE_OPENCV;CV_IGNORE_DEBUG_BUILD_GUARD;MINIUPNP_STATICLIB;ZLIB_CONST;AL_LIBTYPE_STATIC;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_WINEXTRAS_LIB;QT_CONCURRENT_LIB;QT_MULTIMEDIA_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_SVG_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;UNICODE;WIN32;WIN64;WIN32_LEAN_AND_MEAN;HAVE_VULKAN;HAVE_OPENCV;CV_IGNORE_DEBUG_BUILD_GUARD;MINIUPNP_STATICLIB;ZLIB_CONST;AL_LIBTYPE_STATIC;WOLFSSL_USER_SETTINGS;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_WINEXTRAS_LIB;QT_CONCURRENT_LIB;QT_MULTIMEDIA_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_SVG_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <SuppressStartupBanner>true</SuppressStartupBanner>