diff --git a/Core/Debugger/SymbolMap.cpp b/Core/Debugger/SymbolMap.cpp
index 97bb798e26..bb4a29c34f 100644
--- a/Core/Debugger/SymbolMap.cpp
+++ b/Core/Debugger/SymbolMap.cpp
@@ -37,6 +37,8 @@
 #include "Core/MemMap.h"
 #include "Core/Debugger/SymbolMap.h"
 
+#include "ext/armips/Core/Assembler.h"
+
 SymbolMap *g_symbolMap;
 
 void SymbolMap::SortSymbols() {
diff --git a/Core/Debugger/SymbolMap.h b/Core/Debugger/SymbolMap.h
index 94641ee477..f40e38e7b2 100644
--- a/Core/Debugger/SymbolMap.h
+++ b/Core/Debugger/SymbolMap.h
@@ -26,8 +26,6 @@
 
 #include "Common/CommonTypes.h"
 
-#include "ext/armips/Core/Assembler.h"
-
 enum SymbolType {
 	ST_NONE     = 0,
 	ST_FUNCTION = 1,
@@ -59,6 +57,8 @@ enum DataType {
 	DATATYPE_NONE, DATATYPE_BYTE, DATATYPE_HALFWORD, DATATYPE_WORD, DATATYPE_ASCII
 };
 
+struct LabelDefinition;
+
 #ifdef _WIN32
 struct HWND__;
 typedef struct HWND__ *HWND;
diff --git a/Core/MIPS/MIPSAsm.cpp b/Core/MIPS/MIPSAsm.cpp
index cb0e52f3ea..ae7982ef8a 100644
--- a/Core/MIPS/MIPSAsm.cpp
+++ b/Core/MIPS/MIPSAsm.cpp
@@ -1,18 +1,23 @@
 #ifdef _WIN32
 #include "stdafx.h"
 #endif
-#include "MIPSAsm.h"
 #include <cstdarg>
 #include <cstring>
-#include "util/text/utf8.h"
-#include "Core/MemMapHelpers.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
-#include "Core/Debugger/SymbolMap.h"
+#include <vector>
+
+#include "Common/CommonTypes.h"
 
 #if defined(_WIN32) || defined(ANDROID)
+// This has to be before basictypes to avoid a define conflict.
 #include "ext/armips/Core/Assembler.h"
 #endif
 
+#include "util/text/utf8.h"
+#include "Core/Debugger/SymbolMap.h"
+#include "Core/MemMapHelpers.h"
+#include "Core/MIPS/JitCommon/NativeJit.h"
+#include "Core/MIPS/MIPSAsm.h"
+
 namespace MIPSAsm
 {	
 	static std::wstring errorText;
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 1dab6bfbed..a4cdbbaa34 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -401,22 +401,19 @@ ifeq ($(UNITTEST),1)
   LIBARMIPS_FILES := \
 	$(SRC)/ext/armips/Archs/ARM/Arm.cpp \
 	$(SRC)/ext/armips/Archs/ARM/ArmOpcodes.cpp \
+	$(SRC)/ext/armips/Archs/ARM/ArmParser.cpp \
 	$(SRC)/ext/armips/Archs/ARM/ArmRelocator.cpp \
 	$(SRC)/ext/armips/Archs/ARM/CArmInstruction.cpp \
 	$(SRC)/ext/armips/Archs/ARM/CThumbInstruction.cpp \
 	$(SRC)/ext/armips/Archs/ARM/Pool.cpp \
 	$(SRC)/ext/armips/Archs/ARM/ThumbOpcodes.cpp \
 	$(SRC)/ext/armips/Archs/MIPS/CMipsInstruction.cpp \
-	$(SRC)/ext/armips/Archs/MIPS/CMipsMacro.cpp \
 	$(SRC)/ext/armips/Archs/MIPS/Mips.cpp \
 	$(SRC)/ext/armips/Archs/MIPS/MipsElfFile.cpp \
 	$(SRC)/ext/armips/Archs/MIPS/MipsMacros.cpp \
 	$(SRC)/ext/armips/Archs/MIPS/MipsOpcodes.cpp \
-	$(SRC)/ext/armips/Archs/MIPS/MipsPSP.cpp \
+	$(SRC)/ext/armips/Archs/MIPS/MipsParser.cpp \
 	$(SRC)/ext/armips/Archs/MIPS/PsxRelocator.cpp \
-	$(SRC)/ext/armips/Archs/Z80/CZ80Instruction.cpp \
-	$(SRC)/ext/armips/Archs/Z80/z80.cpp \
-	$(SRC)/ext/armips/Archs/Z80/z80Opcodes.cpp \
 	$(SRC)/ext/armips/Archs/Architecture.cpp \
 	$(SRC)/ext/armips/Commands/CAssemblerCommand.cpp \
 	$(SRC)/ext/armips/Commands/CAssemblerLabel.cpp \
@@ -424,31 +421,41 @@ ifeq ($(UNITTEST),1)
 	$(SRC)/ext/armips/Commands/CDirectiveConditional.cpp \
 	$(SRC)/ext/armips/Commands/CDirectiveData.cpp \
 	$(SRC)/ext/armips/Commands/CDirectiveFile.cpp \
-	$(SRC)/ext/armips/Commands/CDirectiveFill.cpp \
 	$(SRC)/ext/armips/Commands/CDirectiveMessage.cpp \
+	$(SRC)/ext/armips/Commands/CommandSequence.cpp \
 	$(SRC)/ext/armips/Core/ELF/ElfFile.cpp \
 	$(SRC)/ext/armips/Core/ELF/ElfRelocator.cpp \
 	$(SRC)/ext/armips/Core/Assembler.cpp \
-	$(SRC)/ext/armips/Core/CMacro.cpp \
 	$(SRC)/ext/armips/Core/Common.cpp \
-	$(SRC)/ext/armips/Core/Directives.cpp \
+	$(SRC)/ext/armips/Core/Expression.cpp \
 	$(SRC)/ext/armips/Core/FileManager.cpp \
-	$(SRC)/ext/armips/Core/MathParser.cpp \
 	$(SRC)/ext/armips/Core/Misc.cpp \
 	$(SRC)/ext/armips/Core/SymbolData.cpp \
 	$(SRC)/ext/armips/Core/SymbolTable.cpp \
+	$(SRC)/ext/armips/Parser/DirectivesParser.cpp \
+	$(SRC)/ext/armips/Parser/ExpressionParser.cpp \
+	$(SRC)/ext/armips/Parser/Parser.cpp \
+	$(SRC)/ext/armips/Parser/Tokenizer.cpp \
 	$(SRC)/ext/armips/Util/ByteArray.cpp \
-	$(SRC)/ext/armips/Util/CommonClasses.cpp \
 	$(SRC)/ext/armips/Util/CRC.cpp \
 	$(SRC)/ext/armips/Util/EncodingTable.cpp \
 	$(SRC)/ext/armips/Util/FileClasses.cpp \
-	$(SRC)/ext/armips/Util/StringFormat.cpp \
 	$(SRC)/ext/armips/Util/Util.cpp
 
   ifeq ($(findstring arm64-v8a,$(TARGET_ARCH_ABI)),arm64-v8a)
     TESTARMEMITTER_FILE = $(SRC)/unittest/TestArm64Emitter.cpp
-  else
+  else ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
     TESTARMEMITTER_FILE = $(SRC)/unittest/TestArmEmitter.cpp
+  else
+    TESTARMEMITTER_FILE = \
+      $(SRC)/Common/ArmEmitter.cpp \
+      $(SRC)/Common/Arm64Emitter.cpp \
+      $(SRC)/Core/MIPS/ARM/ArmRegCacheFPU.cpp \
+      $(SRC)/Core/Util/DisArm64.cpp \
+      $(SRC)/ext/disarm.cpp \
+      $(SRC)/unittest/TestArmEmitter.cpp \
+      $(SRC)/unittest/TestArm64Emitter.cpp \
+      $(SRC)/unittest/TestX64Emitter.cpp
   endif
 
   LOCAL_MODULE := ppsspp_unittest
diff --git a/ext/armips b/ext/armips
index a0b878fced..a192a20ac8 160000
--- a/ext/armips
+++ b/ext/armips
@@ -1 +1 @@
-Subproject commit a0b878fced466b71b9b78b6187038c826dec0684
+Subproject commit a192a20ac87111f8de62d6c0e678b0e052e5ed63
diff --git a/ext/libarmips.vcxproj b/ext/libarmips.vcxproj
index 4be715a234..7d7c37703a 100644
--- a/ext/libarmips.vcxproj
+++ b/ext/libarmips.vcxproj
@@ -229,41 +229,40 @@
     <ClCompile Include="armips\Archs\Architecture.cpp" />
     <ClCompile Include="armips\Archs\ARM\Arm.cpp" />
     <ClCompile Include="armips\Archs\ARM\ArmOpcodes.cpp" />
+    <ClCompile Include="armips\Archs\ARM\ArmParser.cpp" />
     <ClCompile Include="armips\Archs\ARM\ArmRelocator.cpp" />
     <ClCompile Include="armips\Archs\ARM\CArmInstruction.cpp" />
     <ClCompile Include="armips\Archs\ARM\CThumbInstruction.cpp" />
     <ClCompile Include="armips\Archs\ARM\Pool.cpp" />
     <ClCompile Include="armips\Archs\ARM\ThumbOpcodes.cpp" />
     <ClCompile Include="armips\Archs\MIPS\CMipsInstruction.cpp" />
-    <ClCompile Include="armips\Archs\MIPS\CMipsMacro.cpp" />
     <ClCompile Include="armips\Archs\MIPS\Mips.cpp" />
     <ClCompile Include="armips\Archs\MIPS\MipsElfFile.cpp" />
     <ClCompile Include="armips\Archs\MIPS\MipsMacros.cpp" />
     <ClCompile Include="armips\Archs\MIPS\MipsOpcodes.cpp" />
-    <ClCompile Include="armips\Archs\MIPS\MipsPSP.cpp" />
+    <ClCompile Include="armips\Archs\MIPS\MipsParser.cpp" />
     <ClCompile Include="armips\Archs\MIPS\PsxRelocator.cpp" />
-    <ClCompile Include="armips\Archs\Z80\CZ80Instruction.cpp" />
-    <ClCompile Include="armips\Archs\Z80\z80.cpp" />
-    <ClCompile Include="armips\Archs\Z80\z80Opcodes.cpp" />
     <ClCompile Include="armips\Commands\CAssemblerCommand.cpp" />
     <ClCompile Include="armips\Commands\CAssemblerLabel.cpp" />
     <ClCompile Include="armips\Commands\CDirectiveArea.cpp" />
     <ClCompile Include="armips\Commands\CDirectiveConditional.cpp" />
     <ClCompile Include="armips\Commands\CDirectiveData.cpp" />
     <ClCompile Include="armips\Commands\CDirectiveFile.cpp" />
-    <ClCompile Include="armips\Commands\CDirectiveFill.cpp" />
     <ClCompile Include="armips\Commands\CDirectiveMessage.cpp" />
+    <ClCompile Include="armips\Commands\CommandSequence.cpp" />
     <ClCompile Include="armips\Core\Assembler.cpp" />
-    <ClCompile Include="armips\Core\CMacro.cpp" />
     <ClCompile Include="armips\Core\Common.cpp" />
-    <ClCompile Include="armips\Core\Directives.cpp" />
     <ClCompile Include="armips\Core\ELF\ElfFile.cpp" />
     <ClCompile Include="armips\Core\ELF\ElfRelocator.cpp" />
+    <ClCompile Include="armips\Core\Expression.cpp" />
     <ClCompile Include="armips\Core\FileManager.cpp" />
-    <ClCompile Include="armips\Core\MathParser.cpp" />
     <ClCompile Include="armips\Core\Misc.cpp" />
     <ClCompile Include="armips\Core\SymbolData.cpp" />
     <ClCompile Include="armips\Core\SymbolTable.cpp" />
+    <ClCompile Include="armips\Parser\DirectivesParser.cpp" />
+    <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>
@@ -273,60 +272,56 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="armips\Util\ByteArray.cpp" />
-    <ClCompile Include="armips\Util\CommonClasses.cpp" />
     <ClCompile Include="armips\Util\CRC.cpp" />
     <ClCompile Include="armips\Util\EncodingTable.cpp" />
     <ClCompile Include="armips\Util\FileClasses.cpp" />
-    <ClCompile Include="armips\Util\StringFormat.cpp" />
     <ClCompile Include="armips\Util\Util.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="armips\Archs\Architecture.h" />
     <ClInclude Include="armips\Archs\ARM\Arm.h" />
     <ClInclude Include="armips\Archs\ARM\ArmOpcodes.h" />
+    <ClInclude Include="armips\Archs\ARM\ArmParser.h" />
     <ClInclude Include="armips\Archs\ARM\ArmRelocator.h" />
     <ClInclude Include="armips\Archs\ARM\CArmInstruction.h" />
     <ClInclude Include="armips\Archs\ARM\CThumbInstruction.h" />
     <ClInclude Include="armips\Archs\ARM\Pool.h" />
     <ClInclude Include="armips\Archs\ARM\ThumbOpcodes.h" />
     <ClInclude Include="armips\Archs\MIPS\CMipsInstruction.h" />
-    <ClInclude Include="armips\Archs\MIPS\CMipsMacro.h" />
     <ClInclude Include="armips\Archs\MIPS\Mips.h" />
     <ClInclude Include="armips\Archs\MIPS\MipsElfFile.h" />
     <ClInclude Include="armips\Archs\MIPS\MipsMacros.h" />
     <ClInclude Include="armips\Archs\MIPS\MipsOpcodes.h" />
-    <ClInclude Include="armips\Archs\MIPS\MipsPSP.h" />
+    <ClInclude Include="armips\Archs\MIPS\MipsParser.h" />
     <ClInclude Include="armips\Archs\MIPS\PsxRelocator.h" />
-    <ClInclude Include="armips\Archs\Z80\CZ80Instruction.h" />
-    <ClInclude Include="armips\Archs\Z80\z80.h" />
-    <ClInclude Include="armips\Archs\Z80\z80Opcodes.h" />
     <ClInclude Include="armips\Commands\CAssemblerCommand.h" />
     <ClInclude Include="armips\Commands\CAssemblerLabel.h" />
     <ClInclude Include="armips\Commands\CDirectiveArea.h" />
     <ClInclude Include="armips\Commands\CDirectiveConditional.h" />
     <ClInclude Include="armips\Commands\CDirectiveData.h" />
     <ClInclude Include="armips\Commands\CDirectiveFile.h" />
-    <ClInclude Include="armips\Commands\CDirectiveFill.h" />
     <ClInclude Include="armips\Commands\CDirectiveMessage.h" />
+    <ClInclude Include="armips\Commands\CommandSequence.h" />
     <ClInclude Include="armips\Core\Assembler.h" />
-    <ClInclude Include="armips\Core\CMacro.h" />
     <ClInclude Include="armips\Core\Common.h" />
-    <ClInclude Include="armips\Core\Directives.h" />
     <ClInclude Include="armips\Core\ELF\ElfFile.h" />
     <ClInclude Include="armips\Core\ELF\ElfRelocator.h" />
     <ClInclude Include="armips\Core\ELF\ElfTypes.h" />
+    <ClInclude Include="armips\Core\Expression.h" />
     <ClInclude Include="armips\Core\FileManager.h" />
-    <ClInclude Include="armips\Core\MathParser.h" />
     <ClInclude Include="armips\Core\Misc.h" />
     <ClInclude Include="armips\Core\SymbolData.h" />
     <ClInclude Include="armips\Core\SymbolTable.h" />
+    <ClInclude Include="armips\ext\tinyformat\tinyformat.h" />
+    <ClInclude Include="armips\Parser\DirectivesParser.h" />
+    <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\CommonClasses.h" />
     <ClInclude Include="armips\Util\CRC.h" />
     <ClInclude Include="armips\Util\EncodingTable.h" />
     <ClInclude Include="armips\Util\FileClasses.h" />
-    <ClInclude Include="armips\Util\StringFormat.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 bd55d60b96..decde16f2e 100644
--- a/ext/libarmips.vcxproj.filters
+++ b/ext/libarmips.vcxproj.filters
@@ -10,9 +10,6 @@
     <Filter Include="Archs\MIPS">
       <UniqueIdentifier>{b14a90ab-ec40-4a91-b169-81f6e36916a8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Archs\Z80">
-      <UniqueIdentifier>{8749652c-eae9-42f5-ad72-86197d31657e}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Commands">
       <UniqueIdentifier>{876c84a8-beac-42b9-8372-a1c7bdca6e50}</UniqueIdentifier>
     </Filter>
@@ -25,6 +22,15 @@
     <Filter Include="Util">
       <UniqueIdentifier>{b5ae6780-190b-480d-a356-20b3c69e6a7d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ext">
+      <UniqueIdentifier>{f5bcf5e1-9ad8-4f34-ab14-6c04ef80f1c1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ext\tinyformat">
+      <UniqueIdentifier>{cca034bb-30ca-48d3-9283-e9def7f9b1bb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Parser">
+      <UniqueIdentifier>{d1037c70-bb54-46fc-8b0c-a47c4ea4a252}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="armips\Archs\Architecture.cpp">
@@ -54,9 +60,6 @@
     <ClCompile Include="armips\Archs\MIPS\CMipsInstruction.cpp">
       <Filter>Archs\MIPS</Filter>
     </ClCompile>
-    <ClCompile Include="armips\Archs\MIPS\CMipsMacro.cpp">
-      <Filter>Archs\MIPS</Filter>
-    </ClCompile>
     <ClCompile Include="armips\Archs\MIPS\Mips.cpp">
       <Filter>Archs\MIPS</Filter>
     </ClCompile>
@@ -69,21 +72,9 @@
     <ClCompile Include="armips\Archs\MIPS\MipsOpcodes.cpp">
       <Filter>Archs\MIPS</Filter>
     </ClCompile>
-    <ClCompile Include="armips\Archs\MIPS\MipsPSP.cpp">
-      <Filter>Archs\MIPS</Filter>
-    </ClCompile>
     <ClCompile Include="armips\Archs\MIPS\PsxRelocator.cpp">
       <Filter>Archs\MIPS</Filter>
     </ClCompile>
-    <ClCompile Include="armips\Archs\Z80\CZ80Instruction.cpp">
-      <Filter>Archs\Z80</Filter>
-    </ClCompile>
-    <ClCompile Include="armips\Archs\Z80\z80.cpp">
-      <Filter>Archs\Z80</Filter>
-    </ClCompile>
-    <ClCompile Include="armips\Archs\Z80\z80Opcodes.cpp">
-      <Filter>Archs\Z80</Filter>
-    </ClCompile>
     <ClCompile Include="armips\Commands\CAssemblerCommand.cpp">
       <Filter>Commands</Filter>
     </ClCompile>
@@ -102,9 +93,6 @@
     <ClCompile Include="armips\Commands\CDirectiveFile.cpp">
       <Filter>Commands</Filter>
     </ClCompile>
-    <ClCompile Include="armips\Commands\CDirectiveFill.cpp">
-      <Filter>Commands</Filter>
-    </ClCompile>
     <ClCompile Include="armips\Commands\CDirectiveMessage.cpp">
       <Filter>Commands</Filter>
     </ClCompile>
@@ -123,18 +111,9 @@
     <ClCompile Include="armips\Core\Assembler.cpp">
       <Filter>Core</Filter>
     </ClCompile>
-    <ClCompile Include="armips\Core\CMacro.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
     <ClCompile Include="armips\Core\Common.cpp">
       <Filter>Core</Filter>
     </ClCompile>
-    <ClCompile Include="armips\Core\Directives.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="armips\Core\MathParser.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
     <ClCompile Include="armips\Core\ELF\ElfFile.cpp">
       <Filter>Core\ELF</Filter>
     </ClCompile>
@@ -144,9 +123,6 @@
     <ClCompile Include="armips\Util\ByteArray.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="armips\Util\CommonClasses.cpp">
-      <Filter>Util</Filter>
-    </ClCompile>
     <ClCompile Include="armips\Util\CRC.cpp">
       <Filter>Util</Filter>
     </ClCompile>
@@ -156,13 +132,34 @@
     <ClCompile Include="armips\Util\FileClasses.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="armips\Util\StringFormat.cpp">
-      <Filter>Util</Filter>
-    </ClCompile>
     <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>
+    <ClCompile Include="armips\Commands\CommandSequence.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="armips\Parser\Tokenizer.cpp">
+      <Filter>Parser</Filter>
+    </ClCompile>
+    <ClCompile Include="armips\Parser\ExpressionParser.cpp">
+      <Filter>Parser</Filter>
+    </ClCompile>
+    <ClCompile Include="armips\Parser\DirectivesParser.cpp">
+      <Filter>Parser</Filter>
+    </ClCompile>
+    <ClCompile Include="armips\Parser\Parser.cpp">
+      <Filter>Parser</Filter>
+    </ClCompile>
+    <ClCompile Include="armips\Archs\ARM\ArmParser.cpp">
+      <Filter>Archs\ARM</Filter>
+    </ClCompile>
+    <ClCompile Include="armips\Archs\MIPS\MipsParser.cpp">
+      <Filter>Archs\MIPS</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="armips\Archs\Architecture.h">
@@ -192,9 +189,6 @@
     <ClInclude Include="armips\Archs\MIPS\CMipsInstruction.h">
       <Filter>Archs\MIPS</Filter>
     </ClInclude>
-    <ClInclude Include="armips\Archs\MIPS\CMipsMacro.h">
-      <Filter>Archs\MIPS</Filter>
-    </ClInclude>
     <ClInclude Include="armips\Archs\MIPS\Mips.h">
       <Filter>Archs\MIPS</Filter>
     </ClInclude>
@@ -207,21 +201,9 @@
     <ClInclude Include="armips\Archs\MIPS\MipsOpcodes.h">
       <Filter>Archs\MIPS</Filter>
     </ClInclude>
-    <ClInclude Include="armips\Archs\MIPS\MipsPSP.h">
-      <Filter>Archs\MIPS</Filter>
-    </ClInclude>
     <ClInclude Include="armips\Archs\MIPS\PsxRelocator.h">
       <Filter>Archs\MIPS</Filter>
     </ClInclude>
-    <ClInclude Include="armips\Archs\Z80\CZ80Instruction.h">
-      <Filter>Archs\Z80</Filter>
-    </ClInclude>
-    <ClInclude Include="armips\Archs\Z80\z80.h">
-      <Filter>Archs\Z80</Filter>
-    </ClInclude>
-    <ClInclude Include="armips\Archs\Z80\z80Opcodes.h">
-      <Filter>Archs\Z80</Filter>
-    </ClInclude>
     <ClInclude Include="armips\Commands\CAssemblerCommand.h">
       <Filter>Commands</Filter>
     </ClInclude>
@@ -240,30 +222,18 @@
     <ClInclude Include="armips\Commands\CDirectiveFile.h">
       <Filter>Commands</Filter>
     </ClInclude>
-    <ClInclude Include="armips\Commands\CDirectiveFill.h">
-      <Filter>Commands</Filter>
-    </ClInclude>
     <ClInclude Include="armips\Commands\CDirectiveMessage.h">
       <Filter>Commands</Filter>
     </ClInclude>
     <ClInclude Include="armips\Core\Assembler.h">
       <Filter>Core</Filter>
     </ClInclude>
-    <ClInclude Include="armips\Core\CMacro.h">
-      <Filter>Core</Filter>
-    </ClInclude>
     <ClInclude Include="armips\Core\Common.h">
       <Filter>Core</Filter>
     </ClInclude>
-    <ClInclude Include="armips\Core\Directives.h">
-      <Filter>Core</Filter>
-    </ClInclude>
     <ClInclude Include="armips\Core\FileManager.h">
       <Filter>Core</Filter>
     </ClInclude>
-    <ClInclude Include="armips\Core\MathParser.h">
-      <Filter>Core</Filter>
-    </ClInclude>
     <ClInclude Include="armips\Core\Misc.h">
       <Filter>Core</Filter>
     </ClInclude>
@@ -285,9 +255,6 @@
     <ClInclude Include="armips\Util\ByteArray.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="armips\Util\CommonClasses.h">
-      <Filter>Util</Filter>
-    </ClInclude>
     <ClInclude Include="armips\Util\CRC.h">
       <Filter>Util</Filter>
     </ClInclude>
@@ -297,12 +264,36 @@
     <ClInclude Include="armips\Util\FileClasses.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="armips\Util\StringFormat.h">
-      <Filter>Util</Filter>
-    </ClInclude>
     <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>
+    <ClInclude Include="armips\ext\tinyformat\tinyformat.h">
+      <Filter>ext\tinyformat</Filter>
+    </ClInclude>
+    <ClInclude Include="armips\Commands\CommandSequence.h">
+      <Filter>Commands</Filter>
+    </ClInclude>
+    <ClInclude Include="armips\Parser\Tokenizer.h">
+      <Filter>Parser</Filter>
+    </ClInclude>
+    <ClInclude Include="armips\Parser\ExpressionParser.h">
+      <Filter>Parser</Filter>
+    </ClInclude>
+    <ClInclude Include="armips\Parser\DirectivesParser.h">
+      <Filter>Parser</Filter>
+    </ClInclude>
+    <ClInclude Include="armips\Parser\Parser.h">
+      <Filter>Parser</Filter>
+    </ClInclude>
+    <ClInclude Include="armips\Archs\ARM\ArmParser.h">
+      <Filter>Archs\ARM</Filter>
+    </ClInclude>
+    <ClInclude Include="armips\Archs\MIPS\MipsParser.h">
+      <Filter>Archs\MIPS</Filter>
+    </ClInclude>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/headless/Compare.cpp b/headless/Compare.cpp
index 446546df81..ad9e32231d 100644
--- a/headless/Compare.cpp
+++ b/headless/Compare.cpp
@@ -30,6 +30,7 @@
 #include <cstdarg>
 #include <iostream>
 #include <fstream>
+#include <vector>
 
 bool teamCityMode = false;
 std::string teamCityName = "";