diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj
index bdfaea4361..4697e33a40 100644
--- a/Core/Core.vcxproj
+++ b/Core/Core.vcxproj
@@ -568,7 +568,12 @@
     <ClCompile Include="Cwcheat.cpp" />
     <ClCompile Include="Debugger\Breakpoints.cpp" />
     <ClCompile Include="Debugger\DisassemblyManager.cpp" />
-    <ClCompile Include="Debugger\SymbolMap.cpp" />
+    <ClCompile Include="Debugger\SymbolMap.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext;../ext/armips/;../ext/armips/ext/filesystem/include/;../ext/armips/ext/tinyformat/</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext;../ext/armips/;../ext/armips/ext/filesystem/include/;../ext/armips/ext/tinyformat/</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext;../ext/armips/;../ext/armips/ext/filesystem/include/;../ext/armips/ext/tinyformat/</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext;../ext/armips/;../ext/armips/ext/filesystem/include/;../ext/armips/ext/tinyformat/</AdditionalIncludeDirectories>
+    </ClCompile>
     <ClCompile Include="Dialog\PSPGamedataInstallDialog.cpp" />
     <ClCompile Include="Dialog\PSPDialog.cpp" />
     <ClCompile Include="Dialog\PSPMsgDialog.cpp" />
@@ -900,7 +905,12 @@
     <ClCompile Include="MIPS\JitCommon\JitState.cpp" />
     <ClCompile Include="MIPS\MIPS.cpp" />
     <ClCompile Include="MIPS\MIPSAnalyst.cpp" />
-    <ClCompile Include="MIPS\MIPSAsm.cpp" />
+    <ClCompile Include="MIPS\MIPSAsm.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext;../ext/armips/;../ext/armips/ext/filesystem/include/;../ext/armips/ext/tinyformat/</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext;../ext/armips/;../ext/armips/ext/filesystem/include/;../ext/armips/ext/tinyformat/</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext;../ext/armips/;../ext/armips/ext/filesystem/include/;../ext/armips/ext/tinyformat/</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext;../ext/armips/;../ext/armips/ext/filesystem/include/;../ext/armips/ext/tinyformat/</AdditionalIncludeDirectories>
+    </ClCompile>
     <ClCompile Include="MIPS\MIPSCodeUtils.cpp" />
     <ClCompile Include="MIPS\MIPSDebugInterface.cpp" />
     <ClCompile Include="MIPS\MIPSDis.cpp" />
diff --git a/Core/MIPS/MIPSAsm.cpp b/Core/MIPS/MIPSAsm.cpp
index 97d34a4f18..837e857b68 100644
--- a/Core/MIPS/MIPSAsm.cpp
+++ b/Core/MIPS/MIPSAsm.cpp
@@ -5,6 +5,7 @@
 
 #include "Common/CommonTypes.h"
 #include "ext/armips/Core/Assembler.h"
+#include "ext/armips/Core/FileManager.h"
 
 #include "Common/Data/Encoding/Utf8.h"
 #include "Core/Debugger/SymbolMap.h"
@@ -55,15 +56,15 @@ public:
 		return true;
 	}
 	bool seekPhysical(int64_t physicalAddress) override { return seekVirtual(physicalAddress); }
-	const std::wstring &getFileName() override { return dummyWFilename_; }
+	const fs::path &getFileName() override { return dummyFilename_; }
 private:
 	u64 address;
-	std::wstring dummyWFilename_;
+	fs::path dummyFilename_;
 };
 
 bool MipsAssembleOpcode(const char* line, DebugInterface* cpu, u32 address)
 {
-	StringList errors;
+	std::vector<std::wstring> errors;
 
 	wchar_t str[64];
 	swprintf(str,64,L".psp\n.org 0x%08X\n",address);
diff --git a/ext/armips b/ext/armips
index 7885552b20..0b13ef32c5 160000
--- a/ext/armips
+++ b/ext/armips
@@ -1 +1 @@
-Subproject commit 7885552b208493a6a0f21663770c446c3ba65576
+Subproject commit 0b13ef32c566781f0566b027ad5681d9320bddf7
diff --git a/ext/libarmips.vcxproj b/ext/libarmips.vcxproj
index b3d288f799..de44145f1a 100644
--- a/ext/libarmips.vcxproj
+++ b/ext/libarmips.vcxproj
@@ -187,14 +187,14 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>.;$(IncludePath)</IncludePath>
+    <IncludePath>.;.\armips\ext\filesystem\include;.\armips\ext\tinyformat;$(IncludePath)</IncludePath>
     <OutDir>_Output\</OutDir>
     <IntDir>_Output\$(ProjectName)\$(Configuration)\</IntDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetName>$(ProjectName)d64</TargetName>
-    <IncludePath>.;$(IncludePath)</IncludePath>
+    <IncludePath>.;.\armips\ext\filesystem\include;.\armips\ext\tinyformat;$(IncludePath)</IncludePath>
     <OutDir>_Output\</OutDir>
     <IntDir>_Output\$(ProjectName)\$(Configuration)64\</IntDir>
   </PropertyGroup>
@@ -211,13 +211,13 @@
     <IntDir>_Output\$(ProjectName)\$(Configuration)ARM\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Tests|Win32'">
-    <IncludePath>.;$(IncludePath)</IncludePath>
+    <IncludePath>.;.\armips\ext\filesystem\include;.\armips\ext\tinyformat;$(IncludePath)</IncludePath>
     <OutDir>_Output\</OutDir>
     <IntDir>_Output\$(ProjectName)\$(Configuration)\</IntDir>
     <TargetName>$(ProjectName)tests</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Tests|x64'">
-    <IncludePath>.;$(IncludePath)</IncludePath>
+    <IncludePath>.;.\armips\ext\filesystem\include;.\armips\ext\tinyformat;$(IncludePath)</IncludePath>
     <TargetName>$(ProjectName)tests64</TargetName>
     <OutDir>_Output\</OutDir>
     <IntDir>_Output\$(ProjectName)\$(Configuration)64\</IntDir>
@@ -235,14 +235,14 @@
     <IntDir>_Output\$(ProjectName)\$(Configuration)ARM\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>.;$(IncludePath)</IncludePath>
+    <IncludePath>.;.\armips\ext\filesystem\include;.\armips\ext\tinyformat;$(IncludePath)</IncludePath>
     <OutDir>_Output\</OutDir>
     <IntDir>_Output\$(ProjectName)\$(Configuration)\</IntDir>
     <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>$(ProjectName)64</TargetName>
-    <IncludePath>.;$(IncludePath)</IncludePath>
+    <IncludePath>.;.\armips\ext\filesystem\include;.\armips\ext\tinyformat;$(IncludePath)</IncludePath>
     <OutDir>_Output\</OutDir>
     <IntDir>_Output\$(ProjectName)\$(Configuration)64\</IntDir>
   </PropertyGroup>
@@ -260,7 +260,6 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -269,6 +268,7 @@
       </ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -280,7 +280,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -290,6 +289,7 @@
       </ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -341,11 +341,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Tests|Win32'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>armips</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -354,11 +354,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Tests|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>armips</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -395,7 +395,6 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -405,6 +404,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -416,7 +416,6 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -428,6 +427,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <OmitFramePointers>false</OmitFramePointers>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -510,6 +510,7 @@
     <ClCompile Include="armips\Commands\CDirectiveFile.cpp" />
     <ClCompile Include="armips\Commands\CDirectiveMessage.cpp" />
     <ClCompile Include="armips\Commands\CommandSequence.cpp" />
+    <ClCompile Include="armips\Core\Allocations.cpp" />
     <ClCompile Include="armips\Core\Assembler.cpp" />
     <ClCompile Include="armips\Core\Common.cpp" />
     <ClCompile Include="armips\Core\ELF\ElfFile.cpp" />
@@ -524,24 +525,11 @@
     <ClCompile Include="armips\Parser\ExpressionParser.cpp" />
     <ClCompile Include="armips\Parser\Parser.cpp" />
     <ClCompile Include="armips\Parser\Tokenizer.cpp" />
-    <ClCompile Include="armips\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Tests|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Tests|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Tests|ARM64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Tests|ARM'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="armips\Util\ByteArray.cpp" />
     <ClCompile Include="armips\Util\CRC.cpp" />
     <ClCompile Include="armips\Util\EncodingTable.cpp" />
     <ClCompile Include="armips\Util\FileClasses.cpp" />
+    <ClCompile Include="armips\Util\FileSystem.cpp" />
     <ClCompile Include="armips\Util\Util.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -572,6 +560,7 @@
     <ClInclude Include="armips\Commands\CDirectiveFile.h" />
     <ClInclude Include="armips\Commands\CDirectiveMessage.h" />
     <ClInclude Include="armips\Commands\CommandSequence.h" />
+    <ClInclude Include="armips\Core\Allocations.h" />
     <ClInclude Include="armips\Core\Assembler.h" />
     <ClInclude Include="armips\Core\Common.h" />
     <ClInclude Include="armips\Core\ELF\ElfFile.h" />
@@ -588,11 +577,11 @@
     <ClInclude Include="armips\Parser\ExpressionParser.h" />
     <ClInclude Include="armips\Parser\Parser.h" />
     <ClInclude Include="armips\Parser\Tokenizer.h" />
-    <ClInclude Include="armips\stdafx.h" />
     <ClInclude Include="armips\Util\ByteArray.h" />
     <ClInclude Include="armips\Util\CRC.h" />
     <ClInclude Include="armips\Util\EncodingTable.h" />
     <ClInclude Include="armips\Util\FileClasses.h" />
+    <ClInclude Include="armips\Util\FileSystem.h" />
     <ClInclude Include="armips\Util\Util.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/ext/libarmips.vcxproj.filters b/ext/libarmips.vcxproj.filters
index e1c8ef9a3a..d374c5f4b8 100644
--- a/ext/libarmips.vcxproj.filters
+++ b/ext/libarmips.vcxproj.filters
@@ -132,7 +132,6 @@
     <ClCompile Include="armips\Util\Util.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="armips\stdafx.cpp" />
     <ClCompile Include="armips\Core\Expression.cpp">
       <Filter>Core</Filter>
     </ClCompile>
@@ -172,6 +171,12 @@
     <ClCompile Include="armips\Archs\MIPS\MipsExpressionFunctions.cpp">
       <Filter>Archs\MIPS</Filter>
     </ClCompile>
+    <ClCompile Include="armips\Core\Allocations.cpp">
+      <Filter>Core</Filter>
+    </ClCompile>
+    <ClCompile Include="armips\Util\FileSystem.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="armips\Archs\Architecture.h">
@@ -276,7 +281,6 @@
     <ClInclude Include="armips\Util\Util.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="armips\stdafx.h" />
     <ClInclude Include="armips\Core\Expression.h">
       <Filter>Core</Filter>
     </ClInclude>
@@ -319,5 +323,11 @@
     <ClInclude Include="armips\Archs\MIPS\MipsExpressionFunctions.h">
       <Filter>Archs\MIPS</Filter>
     </ClInclude>
+    <ClInclude Include="armips\Core\Allocations.h">
+      <Filter>Core</Filter>
+    </ClInclude>
+    <ClInclude Include="armips\Util\FileSystem.h">
+      <Filter>Util</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file