diff --git a/Utilities/rMsgBox.cpp b/Utilities/rMsgBox.cpp
index 4ce0ac5465..cd3a46be0d 100644
--- a/Utilities/rMsgBox.cpp
+++ b/Utilities/rMsgBox.cpp
@@ -1,5 +1,7 @@
 #include "stdafx.h"
+#include "restore_new.h"
 #include <wx/msgdlg.h>
+#include "define_new_memleakdetect.h"
 #include "rMsgBox.h"
 
 #ifndef QT_UI
diff --git a/Utilities/rPlatform.cpp b/Utilities/rPlatform.cpp
index c246692d60..a947b7a00f 100644
--- a/Utilities/rPlatform.cpp
+++ b/Utilities/rPlatform.cpp
@@ -1,5 +1,7 @@
 #include "stdafx.h"
+#include "restore_new.h"
 #include <wx/image.h>
+#include "define_new_memleakdetect.h"
 
 #ifndef _WIN32
 #include <dirent.h>
diff --git a/rpcs3/Crypto/unpkg.cpp b/rpcs3/Crypto/unpkg.cpp
index e667417359..caae7fb9f7 100644
--- a/rpcs3/Crypto/unpkg.cpp
+++ b/rpcs3/Crypto/unpkg.cpp
@@ -4,7 +4,9 @@
 #include "sha1.h"
 #include "key_vault.h"
 #include "unpkg.h"
+#include "restore_new.h"
 #include <wx/progdlg.h>
+#include "define_new_memleakdetect.h"
 
 #include "Utilities/Log.h"
 #include "Utilities/rFile.h"
diff --git a/rpcs3/define_new_memleakdetect.h b/rpcs3/define_new_memleakdetect.h
new file mode 100644
index 0000000000..d331ab3a24
--- /dev/null
+++ b/rpcs3/define_new_memleakdetect.h
@@ -0,0 +1,6 @@
+//Override the new operator to use the memory leak detection from visual studio
+//Does not work with placement new
+#if defined(MSVC_CRT_MEMLEAK_DETECTION) && defined(_DEBUG) && defined(DBG_NEW)
+	#pragma push_macro("new")
+	#define new DBG_NEW
+#endif
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index da55301cce..f2e3905be6 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -1,602 +1,604 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug - MemLeak|Win32">
-      <Configuration>Debug - MemLeak</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug - MemLeak|x64">
-      <Configuration>Debug - MemLeak</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Utilities\AutoPause.cpp" />
-    <ClCompile Include="..\Utilities\Log.cpp" />
-    <ClCompile Include="..\Utilities\rFile.cpp" />
-    <ClCompile Include="..\Utilities\rMsgBox.cpp" />
-    <ClCompile Include="..\Utilities\rPlatform.cpp" />
-    <ClCompile Include="..\Utilities\rTime.cpp" />
-    <ClCompile Include="..\Utilities\rXml.cpp" />
-    <ClCompile Include="..\Utilities\SMutex.cpp" />
-    <ClCompile Include="..\Utilities\SSemaphore.cpp" />
-    <ClCompile Include="..\Utilities\StrFmt.cpp" />
-    <ClCompile Include="..\Utilities\Thread.cpp" />
-    <ClCompile Include="Crypto\aes.cpp" />
-    <ClCompile Include="Crypto\key_vault.cpp" />
-    <ClCompile Include="Crypto\lz.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Crypto\sha1.cpp" />
-    <ClCompile Include="Crypto\unedat.cpp" />
-    <ClCompile Include="Crypto\unpkg.cpp" />
-    <ClCompile Include="Crypto\unself.cpp" />
-    <ClCompile Include="Crypto\utils.cpp" />
-    <ClCompile Include="Emu\ARMv7\ARMv7Thread.cpp" />
-    <ClCompile Include="Emu\Audio\AL\OpenALThread.cpp" />
-    <ClCompile Include="Emu\Audio\AudioDumper.cpp" />
-    <ClCompile Include="Emu\Audio\AudioManager.cpp" />
-    <ClCompile Include="Emu\Cell\MFC.cpp" />
-    <ClCompile Include="Emu\Cell\PPCDecoder.cpp" />
-    <ClCompile Include="Emu\Cell\PPCThread.cpp" />
-    <ClCompile Include="Emu\Cell\PPUThread.cpp" />
-    <ClCompile Include="Emu\Cell\RawSPUThread.cpp" />
-    <ClCompile Include="Emu\Cell\SPURecompilerCore.cpp" />
-    <ClCompile Include="Emu\Cell\SPURSManager.cpp" />
-    <ClCompile Include="Emu\Cell\SPUThread.cpp" />
-    <ClCompile Include="Emu\CPU\CPUThread.cpp" />
-    <ClCompile Include="Emu\CPU\CPUThreadManager.cpp" />
-    <ClCompile Include="Emu\DbgCommand.cpp" />
-    <ClCompile Include="Emu\Event.cpp" />
-    <ClCompile Include="Emu\FS\VFS.cpp" />
-    <ClCompile Include="Emu\FS\vfsDevice.cpp" />
-    <ClCompile Include="Emu\FS\vfsDeviceLocalFile.cpp" />
-    <ClCompile Include="Emu\FS\vfsDir.cpp" />
-    <ClCompile Include="Emu\FS\vfsDirBase.cpp" />
-    <ClCompile Include="Emu\FS\vfsFile.cpp" />
-    <ClCompile Include="Emu\FS\vfsFileBase.cpp" />
-    <ClCompile Include="Emu\FS\vfsLocalDir.cpp" />
-    <ClCompile Include="Emu\FS\vfsLocalFile.cpp" />
-    <ClCompile Include="Emu\FS\vfsStream.cpp" />
-    <ClCompile Include="Emu\FS\vfsStreamMemory.cpp" />
-    <ClCompile Include="Emu\HDD\HDD.cpp" />
-    <ClCompile Include="Emu\Io\Keyboard.cpp" />
-    <ClCompile Include="Emu\Io\Mouse.cpp" />
-    <ClCompile Include="Emu\Io\Pad.cpp" />
-    <ClCompile Include="Emu\Memory\Memory.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLBuffers.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLGSRender.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLProgram.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLProgramBuffer.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp" />
-    <ClCompile Include="Emu\RSX\GL\OpenGL.cpp" />
-    <ClCompile Include="Emu\RSX\GSManager.cpp" />
-    <ClCompile Include="Emu\RSX\GSRender.cpp" />
-    <ClCompile Include="Emu\RSX\RSXTexture.cpp" />
-    <ClCompile Include="Emu\RSX\RSXThread.cpp" />
-    <ClCompile Include="Emu\Memory\vm.cpp" />
-    <ClCompile Include="Emu\SysCalls\Callback.cpp" />
-    <ClCompile Include="Emu\SysCalls\FuncList.cpp" />
-    <ClCompile Include="Emu\SysCalls\LogBase.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\lv2Fs.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_cond.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_event.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_event_flag.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_interrupt.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_lwcond.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_lwmutex.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_memory.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_mmapper.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_mutex.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_ppu_thread.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_process.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_prx.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_rsx.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_rwlock.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_semaphore.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_spinlock.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_spu.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_time.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_timer.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_trace.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_tty.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\sys_vm.cpp" />
-    <ClCompile Include="Emu\SysCalls\ModuleManager.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellAdec.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellAtrac.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellAudio.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellBgdl.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellCamera.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellCelp8Enc.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellCelpEnc.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellDmux.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellFiber.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellFont.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellFontFT.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellGame.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellGcmSys.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellGem.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellGifDec.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellHttpUtil.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellImejp.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellJpgDec.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellJpgEnc.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellKey2char.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellL10n.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellLv2dbg.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellMic.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellMsgDialog.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellMusicDecode.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellMusicExport.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellNetCtl.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellOvis.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellPamf.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellPhotoDecode.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellPhotoExport.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellPhotoImport.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellPngDec.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellPngEnc.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellPrint.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSail.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellResc.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellRtc.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellRudp.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSailRec.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellScreenshot.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSearch.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSheap.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSpurs.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSpursJq.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSsl.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSubdisplay.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSync.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSync2.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSysmodule.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSysutil.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSysutilAp.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSaveData.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellUsbd.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellUsbpspcm.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellUserInfo.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellVdec.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellVoice.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellVpost.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\libmixer.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\libsnd3.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\libsynth2.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\sceNp.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\sceNpClans.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\sceNpCommerce2.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\sceNpSns.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\sceNpTrophy.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\sceNpTus.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellKb.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellMouse.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellPad.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\sysPrxForUser.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\sys_fs.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\sys_http.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\sys_io.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\sys_net.cpp" />
-    <ClCompile Include="Emu\SysCalls\Static.cpp" />
-    <ClCompile Include="Emu\SysCalls\SysCalls.cpp" />
-    <ClCompile Include="Emu\System.cpp" />
-    <ClCompile Include="Ini.cpp" />
-    <ClCompile Include="Loader\ELF.cpp" />
-    <ClCompile Include="Loader\ELF32.cpp" />
-    <ClCompile Include="Loader\ELF64.cpp" />
-    <ClCompile Include="Loader\Loader.cpp" />
-    <ClCompile Include="Loader\PKG.cpp" />
-    <ClCompile Include="Loader\PSF.cpp" />
-    <ClCompile Include="Loader\SELF.cpp" />
-    <ClCompile Include="Loader\TROPUSR.cpp" />
-    <ClCompile Include="Loader\TRP.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Utilities\AutoPause.h" />
-    <ClInclude Include="..\Utilities\BEType.h" />
-    <ClInclude Include="..\Utilities\GNU.h" />
-    <ClInclude Include="..\Utilities\MTRingbuffer.h" />
-    <ClInclude Include="..\Utilities\Log.h" />
-    <ClInclude Include="..\Utilities\rFile.h" />
-    <ClInclude Include="..\Utilities\rMsgBox.h" />
-    <ClInclude Include="..\Utilities\rPlatform.h" />
-    <ClInclude Include="..\Utilities\rTime.h" />
-    <ClInclude Include="..\Utilities\rXml.h" />
-    <ClInclude Include="..\Utilities\simpleini\ConvertUTF.h" />
-    <ClInclude Include="..\Utilities\simpleini\SimpleIni.h" />
-    <ClInclude Include="..\Utilities\SMutex.h" />
-    <ClInclude Include="..\Utilities\SQueue.h" />
-    <ClInclude Include="..\Utilities\SSemaphore.h" />
-    <ClInclude Include="..\Utilities\StrFmt.h" />
-    <ClInclude Include="..\Utilities\Thread.h" />
-    <ClInclude Include="..\Utilities\Timer.h" />
-    <ClInclude Include="Crypto\aes.h" />
-    <ClInclude Include="Crypto\key_vault.h" />
-    <ClInclude Include="Crypto\lz.h" />
-    <ClInclude Include="Crypto\sha1.h" />
-    <ClInclude Include="Crypto\unedat.h" />
-    <ClInclude Include="Crypto\unpkg.h" />
-    <ClInclude Include="Crypto\unself.h" />
-    <ClInclude Include="Crypto\utils.h" />
-    <ClInclude Include="Emu\ARMv7\ARMv7Decoder.h" />
-    <ClInclude Include="Emu\ARMv7\ARMv7DisAsm.h" />
-    <ClInclude Include="Emu\ARMv7\ARMv7Interpreter.h" />
-    <ClInclude Include="Emu\ARMv7\ARMv7Opcodes.h" />
-    <ClInclude Include="Emu\ARMv7\ARMv7Thread.h" />
-    <ClInclude Include="Emu\Audio\AL\OpenALThread.h" />
-    <ClInclude Include="Emu\Audio\AudioDumper.h" />
-    <ClInclude Include="Emu\Audio\AudioManager.h" />
-    <ClInclude Include="Emu\Cell\MFC.h" />
-    <ClInclude Include="Emu\Cell\PPCDecoder.h" />
-    <ClInclude Include="Emu\Cell\PPCDisAsm.h" />
-    <ClInclude Include="Emu\Cell\PPCInstrTable.h" />
-    <ClInclude Include="Emu\Cell\PPCThread.h" />
-    <ClInclude Include="Emu\Cell\PPUDecoder.h" />
-    <ClInclude Include="Emu\Cell\PPUDisAsm.h" />
-    <ClInclude Include="Emu\Cell\PPUInstrTable.h" />
-    <ClInclude Include="Emu\Cell\PPUInterpreter.h" />
-    <ClInclude Include="Emu\Cell\PPUOpcodes.h" />
-    <ClInclude Include="Emu\Cell\PPUThread.h" />
-    <ClInclude Include="Emu\Cell\RawSPUThread.h" />
-    <ClInclude Include="Emu\Cell\SPUDecoder.h" />
-    <ClInclude Include="Emu\Cell\SPUDisAsm.h" />
-    <ClInclude Include="Emu\Cell\SPUInstrTable.h" />
-    <ClInclude Include="Emu\Cell\SPUInterpreter.h" />
-    <ClInclude Include="Emu\Cell\SPUOpcodes.h" />
-    <ClInclude Include="Emu\Cell\SPURecompiler.h" />
-    <ClInclude Include="Emu\Cell\SPURSManager.h" />
-    <ClInclude Include="Emu\Cell\SPUThread.h" />
-    <ClInclude Include="Emu\CPU\CPUDecoder.h" />
-    <ClInclude Include="Emu\CPU\CPUDisAsm.h" />
-    <ClInclude Include="Emu\CPU\CPUInstrTable.h" />
-    <ClInclude Include="Emu\CPU\CPUThread.h" />
-    <ClInclude Include="Emu\CPU\CPUThreadManager.h" />
-    <ClInclude Include="Emu\DbgCommand.h" />
-    <ClInclude Include="Emu\Event.h" />
-    <ClInclude Include="Emu\FS\VFS.h" />
-    <ClInclude Include="Emu\FS\vfsDevice.h" />
-    <ClInclude Include="Emu\FS\vfsDeviceLocalFile.h" />
-    <ClInclude Include="Emu\FS\vfsDir.h" />
-    <ClInclude Include="Emu\FS\vfsDirBase.h" />
-    <ClInclude Include="Emu\FS\vfsFile.h" />
-    <ClInclude Include="Emu\FS\vfsFileBase.h" />
-    <ClInclude Include="Emu\FS\vfsLocalDir.h" />
-    <ClInclude Include="Emu\FS\vfsLocalFile.h" />
-    <ClInclude Include="Emu\FS\vfsStream.h" />
-    <ClInclude Include="Emu\FS\vfsStreamMemory.h" />
-    <ClInclude Include="Emu\GameInfo.h" />
-    <ClInclude Include="Emu\HDD\HDD.h" />
-    <ClInclude Include="Emu\IdManager.h" />
-    <ClInclude Include="Emu\Io\Keyboard.h" />
-    <ClInclude Include="Emu\Io\KeyboardHandler.h" />
-    <ClInclude Include="Emu\Io\Mouse.h" />
-    <ClInclude Include="Emu\Io\MouseHandler.h" />
-    <ClInclude Include="Emu\Io\Null\NullKeyboardHandler.h" />
-    <ClInclude Include="Emu\Io\Null\NullMouseHandler.h" />
-    <ClInclude Include="Emu\Io\Null\NullPadHandler.h" />
-    <ClInclude Include="Emu\Io\Pad.h" />
-    <ClInclude Include="Emu\Io\PadHandler.h" />
-    <ClInclude Include="Emu\Memory\Memory.h" />
-    <ClInclude Include="Emu\Memory\MemoryBlock.h" />
-    <ClInclude Include="Emu\RSX\GCM.h" />
-    <ClInclude Include="Emu\RSX\GL\GLBuffers.h" />
-    <ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h" />
-    <ClInclude Include="Emu\RSX\GL\GLGSRender.h" />
-    <ClInclude Include="Emu\RSX\GL\GLProcTable.h" />
-    <ClInclude Include="Emu\RSX\GL\GLProgram.h" />
-    <ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h" />
-    <ClInclude Include="Emu\RSX\GL\GLShaderParam.h" />
-    <ClInclude Include="Emu\RSX\GL\GLVertexProgram.h" />
-    <ClInclude Include="Emu\RSX\GL\OpenGL.h" />
-    <ClInclude Include="Emu\RSX\GSManager.h" />
-    <ClInclude Include="Emu\RSX\GSRender.h" />
-    <ClInclude Include="Emu\RSX\Null\NullGSRender.h" />
-    <ClInclude Include="Emu\RSX\RSXFragmentProgram.h" />
-    <ClInclude Include="Emu\RSX\RSXTexture.h" />
-    <ClInclude Include="Emu\RSX\RSXThread.h" />
-    <ClInclude Include="Emu\RSX\RSXVertexProgram.h" />
-    <ClInclude Include="Emu\RSX\sysutil_video.h" />
-    <ClInclude Include="Emu\Memory\vm.h" />
-    <ClInclude Include="Emu\Memory\vm_ptr.h" />
-    <ClInclude Include="Emu\Memory\vm_ref.h" />
-    <ClInclude Include="Emu\Memory\vm_var.h" />
-    <ClInclude Include="Emu\SysCalls\Callback.h" />
-    <ClInclude Include="Emu\SysCalls\ErrorCodes.h" />
-    <ClInclude Include="Emu\SysCalls\LogBase.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\lv2Fs.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_cond.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_event.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_event_flag.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_interrupt.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_lwcond.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_lwmutex.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_memory.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_mmapper.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_mutex.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_ppu_thread.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_process.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_prx.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_rsx.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_rwlock.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_semaphore.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_spinlock.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_spu.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_time.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_timer.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_trace.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_tty.h" />
-    <ClInclude Include="Emu\SysCalls\lv2\sys_vm.h" />
-    <ClInclude Include="Emu\SysCalls\ModuleManager.h" />
-    <ClInclude Include="Emu\SysCalls\Modules.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellAdec.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellAtrac.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellDmux.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellFiber.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellFont.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellFontFT.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellGame.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellGcmSys.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellGem.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellGifDec.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellJpgDec.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellL10n.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellNetCtl.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellMsgDialog.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellPad.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellPamf.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellPngDec.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellSail.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellResc.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellRtc.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellSpurs.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellSpursJq.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellSync.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellSync2.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellSysutil.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellSaveData.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellUserInfo.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellVdec.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellVpost.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\libmixer.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\libsnd3.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\libsynth2.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\sceNp.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\sceNpClans.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\sceNpCommerce2.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\sceNpSns.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\sceNpTrophy.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\sceNpTus.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellKb.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\cellMouse.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\sysPrxForUser.h" />
-    <ClInclude Include="Emu\SysCalls\Modules\sys_net.h" />
-    <ClInclude Include="Emu\SysCalls\SC_FUNC.h" />
-    <ClInclude Include="Emu\SysCalls\Static.h" />
-    <ClInclude Include="Emu\SysCalls\SysCalls.h" />
-    <ClInclude Include="Emu\System.h" />
-    <ClInclude Include="Ini.h" />
-    <ClInclude Include="Loader\ELF.h" />
-    <ClInclude Include="Loader\ELF32.h" />
-    <ClInclude Include="Loader\ELF64.h" />
-    <ClInclude Include="Loader\Loader.h" />
-    <ClInclude Include="Loader\PKG.h" />
-    <ClInclude Include="Loader\PSF.h" />
-    <ClInclude Include="Loader\SELF.h" />
-    <ClInclude Include="Loader\TROPUSR.h" />
-    <ClInclude Include="Loader\TRP.h" />
-    <ClInclude Include="stdafx.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C4A10229-4712-4BD2-B63E-50D93C67A038}</ProjectGuid>
-    <RootNamespace>emucore</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <IntDir>$(Platform)\$(Configuration)\emucore\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">
-    <IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <IntDir>$(Platform)\$(Configuration)\emucore\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <IntDir>$(Platform)\$(Configuration)\emucore\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;MSVC_CRT_MEMLEAK_DETECTION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">
-    <ClCompile>
-      <WarningLevel>Level2</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;MSVC_CRT_MEMLEAK_DETECTION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>false</SDLCheck>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>false</SDLCheck>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug - MemLeak|Win32">
+      <Configuration>Debug - MemLeak</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug - MemLeak|x64">
+      <Configuration>Debug - MemLeak</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Utilities\AutoPause.cpp" />
+    <ClCompile Include="..\Utilities\Log.cpp" />
+    <ClCompile Include="..\Utilities\rFile.cpp" />
+    <ClCompile Include="..\Utilities\rMsgBox.cpp" />
+    <ClCompile Include="..\Utilities\rPlatform.cpp" />
+    <ClCompile Include="..\Utilities\rTime.cpp" />
+    <ClCompile Include="..\Utilities\rXml.cpp" />
+    <ClCompile Include="..\Utilities\SMutex.cpp" />
+    <ClCompile Include="..\Utilities\SSemaphore.cpp" />
+    <ClCompile Include="..\Utilities\StrFmt.cpp" />
+    <ClCompile Include="..\Utilities\Thread.cpp" />
+    <ClCompile Include="Crypto\aes.cpp" />
+    <ClCompile Include="Crypto\key_vault.cpp" />
+    <ClCompile Include="Crypto\lz.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="Crypto\sha1.cpp" />
+    <ClCompile Include="Crypto\unedat.cpp" />
+    <ClCompile Include="Crypto\unpkg.cpp" />
+    <ClCompile Include="Crypto\unself.cpp" />
+    <ClCompile Include="Crypto\utils.cpp" />
+    <ClCompile Include="Emu\ARMv7\ARMv7Thread.cpp" />
+    <ClCompile Include="Emu\Audio\AL\OpenALThread.cpp" />
+    <ClCompile Include="Emu\Audio\AudioDumper.cpp" />
+    <ClCompile Include="Emu\Audio\AudioManager.cpp" />
+    <ClCompile Include="Emu\Cell\MFC.cpp" />
+    <ClCompile Include="Emu\Cell\PPCDecoder.cpp" />
+    <ClCompile Include="Emu\Cell\PPCThread.cpp" />
+    <ClCompile Include="Emu\Cell\PPUThread.cpp" />
+    <ClCompile Include="Emu\Cell\RawSPUThread.cpp" />
+    <ClCompile Include="Emu\Cell\SPURecompilerCore.cpp" />
+    <ClCompile Include="Emu\Cell\SPURSManager.cpp" />
+    <ClCompile Include="Emu\Cell\SPUThread.cpp" />
+    <ClCompile Include="Emu\CPU\CPUThread.cpp" />
+    <ClCompile Include="Emu\CPU\CPUThreadManager.cpp" />
+    <ClCompile Include="Emu\DbgCommand.cpp" />
+    <ClCompile Include="Emu\Event.cpp" />
+    <ClCompile Include="Emu\FS\VFS.cpp" />
+    <ClCompile Include="Emu\FS\vfsDevice.cpp" />
+    <ClCompile Include="Emu\FS\vfsDeviceLocalFile.cpp" />
+    <ClCompile Include="Emu\FS\vfsDir.cpp" />
+    <ClCompile Include="Emu\FS\vfsDirBase.cpp" />
+    <ClCompile Include="Emu\FS\vfsFile.cpp" />
+    <ClCompile Include="Emu\FS\vfsFileBase.cpp" />
+    <ClCompile Include="Emu\FS\vfsLocalDir.cpp" />
+    <ClCompile Include="Emu\FS\vfsLocalFile.cpp" />
+    <ClCompile Include="Emu\FS\vfsStream.cpp" />
+    <ClCompile Include="Emu\FS\vfsStreamMemory.cpp" />
+    <ClCompile Include="Emu\HDD\HDD.cpp" />
+    <ClCompile Include="Emu\Io\Keyboard.cpp" />
+    <ClCompile Include="Emu\Io\Mouse.cpp" />
+    <ClCompile Include="Emu\Io\Pad.cpp" />
+    <ClCompile Include="Emu\Memory\Memory.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLBuffers.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLGSRender.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLProgram.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLProgramBuffer.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp" />
+    <ClCompile Include="Emu\RSX\GL\OpenGL.cpp" />
+    <ClCompile Include="Emu\RSX\GSManager.cpp" />
+    <ClCompile Include="Emu\RSX\GSRender.cpp" />
+    <ClCompile Include="Emu\RSX\RSXTexture.cpp" />
+    <ClCompile Include="Emu\RSX\RSXThread.cpp" />
+    <ClCompile Include="Emu\Memory\vm.cpp" />
+    <ClCompile Include="Emu\SysCalls\Callback.cpp" />
+    <ClCompile Include="Emu\SysCalls\FuncList.cpp" />
+    <ClCompile Include="Emu\SysCalls\LogBase.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\lv2Fs.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_cond.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_event.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_event_flag.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_interrupt.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_lwcond.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_lwmutex.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_memory.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_mmapper.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_mutex.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_ppu_thread.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_process.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_prx.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_rsx.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_rwlock.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_semaphore.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_spinlock.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_spu.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_time.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_timer.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_trace.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_tty.cpp" />
+    <ClCompile Include="Emu\SysCalls\lv2\sys_vm.cpp" />
+    <ClCompile Include="Emu\SysCalls\ModuleManager.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellAdec.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellAtrac.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellAudio.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellBgdl.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellCamera.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellCelp8Enc.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellCelpEnc.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellDmux.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellFiber.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellFont.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellFontFT.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellGame.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellGcmSys.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellGem.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellGifDec.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellHttpUtil.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellImejp.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellJpgDec.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellJpgEnc.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellKey2char.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellL10n.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellLv2dbg.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellMic.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellMsgDialog.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellMusicDecode.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellMusicExport.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellNetCtl.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellOvis.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellPamf.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellPhotoDecode.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellPhotoExport.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellPhotoImport.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellPngDec.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellPngEnc.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellPrint.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellSail.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellResc.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellRtc.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellRudp.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellSailRec.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellScreenshot.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellSearch.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellSheap.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellSpurs.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellSpursJq.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellSsl.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellSubdisplay.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellSync.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellSync2.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellSysmodule.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellSysutil.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellSysutilAp.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellSaveData.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellUsbd.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellUsbpspcm.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellUserInfo.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellVdec.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellVoice.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellVpost.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\libmixer.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\libsnd3.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\libsynth2.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\sceNp.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpClans.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpCommerce2.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpSns.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpTrophy.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpTus.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellKb.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellMouse.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellPad.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\sysPrxForUser.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\sys_fs.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\sys_http.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\sys_io.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\sys_net.cpp" />
+    <ClCompile Include="Emu\SysCalls\Static.cpp" />
+    <ClCompile Include="Emu\SysCalls\SysCalls.cpp" />
+    <ClCompile Include="Emu\System.cpp" />
+    <ClCompile Include="Ini.cpp" />
+    <ClCompile Include="Loader\ELF.cpp" />
+    <ClCompile Include="Loader\ELF32.cpp" />
+    <ClCompile Include="Loader\ELF64.cpp" />
+    <ClCompile Include="Loader\Loader.cpp" />
+    <ClCompile Include="Loader\PKG.cpp" />
+    <ClCompile Include="Loader\PSF.cpp" />
+    <ClCompile Include="Loader\SELF.cpp" />
+    <ClCompile Include="Loader\TROPUSR.cpp" />
+    <ClCompile Include="Loader\TRP.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Utilities\AutoPause.h" />
+    <ClInclude Include="..\Utilities\BEType.h" />
+    <ClInclude Include="..\Utilities\GNU.h" />
+    <ClInclude Include="..\Utilities\MTRingbuffer.h" />
+    <ClInclude Include="..\Utilities\Log.h" />
+    <ClInclude Include="..\Utilities\rFile.h" />
+    <ClInclude Include="..\Utilities\rMsgBox.h" />
+    <ClInclude Include="..\Utilities\rPlatform.h" />
+    <ClInclude Include="..\Utilities\rTime.h" />
+    <ClInclude Include="..\Utilities\rXml.h" />
+    <ClInclude Include="..\Utilities\simpleini\ConvertUTF.h" />
+    <ClInclude Include="..\Utilities\simpleini\SimpleIni.h" />
+    <ClInclude Include="..\Utilities\SMutex.h" />
+    <ClInclude Include="..\Utilities\SQueue.h" />
+    <ClInclude Include="..\Utilities\SSemaphore.h" />
+    <ClInclude Include="..\Utilities\StrFmt.h" />
+    <ClInclude Include="..\Utilities\Thread.h" />
+    <ClInclude Include="..\Utilities\Timer.h" />
+    <ClInclude Include="Crypto\aes.h" />
+    <ClInclude Include="Crypto\key_vault.h" />
+    <ClInclude Include="Crypto\lz.h" />
+    <ClInclude Include="Crypto\sha1.h" />
+    <ClInclude Include="Crypto\unedat.h" />
+    <ClInclude Include="Crypto\unpkg.h" />
+    <ClInclude Include="Crypto\unself.h" />
+    <ClInclude Include="Crypto\utils.h" />
+    <ClInclude Include="define_new_memleakdetect.h" />
+    <ClInclude Include="Emu\ARMv7\ARMv7Decoder.h" />
+    <ClInclude Include="Emu\ARMv7\ARMv7DisAsm.h" />
+    <ClInclude Include="Emu\ARMv7\ARMv7Interpreter.h" />
+    <ClInclude Include="Emu\ARMv7\ARMv7Opcodes.h" />
+    <ClInclude Include="Emu\ARMv7\ARMv7Thread.h" />
+    <ClInclude Include="Emu\Audio\AL\OpenALThread.h" />
+    <ClInclude Include="Emu\Audio\AudioDumper.h" />
+    <ClInclude Include="Emu\Audio\AudioManager.h" />
+    <ClInclude Include="Emu\Cell\MFC.h" />
+    <ClInclude Include="Emu\Cell\PPCDecoder.h" />
+    <ClInclude Include="Emu\Cell\PPCDisAsm.h" />
+    <ClInclude Include="Emu\Cell\PPCInstrTable.h" />
+    <ClInclude Include="Emu\Cell\PPCThread.h" />
+    <ClInclude Include="Emu\Cell\PPUDecoder.h" />
+    <ClInclude Include="Emu\Cell\PPUDisAsm.h" />
+    <ClInclude Include="Emu\Cell\PPUInstrTable.h" />
+    <ClInclude Include="Emu\Cell\PPUInterpreter.h" />
+    <ClInclude Include="Emu\Cell\PPUOpcodes.h" />
+    <ClInclude Include="Emu\Cell\PPUThread.h" />
+    <ClInclude Include="Emu\Cell\RawSPUThread.h" />
+    <ClInclude Include="Emu\Cell\SPUDecoder.h" />
+    <ClInclude Include="Emu\Cell\SPUDisAsm.h" />
+    <ClInclude Include="Emu\Cell\SPUInstrTable.h" />
+    <ClInclude Include="Emu\Cell\SPUInterpreter.h" />
+    <ClInclude Include="Emu\Cell\SPUOpcodes.h" />
+    <ClInclude Include="Emu\Cell\SPURecompiler.h" />
+    <ClInclude Include="Emu\Cell\SPURSManager.h" />
+    <ClInclude Include="Emu\Cell\SPUThread.h" />
+    <ClInclude Include="Emu\CPU\CPUDecoder.h" />
+    <ClInclude Include="Emu\CPU\CPUDisAsm.h" />
+    <ClInclude Include="Emu\CPU\CPUInstrTable.h" />
+    <ClInclude Include="Emu\CPU\CPUThread.h" />
+    <ClInclude Include="Emu\CPU\CPUThreadManager.h" />
+    <ClInclude Include="Emu\DbgCommand.h" />
+    <ClInclude Include="Emu\Event.h" />
+    <ClInclude Include="Emu\FS\VFS.h" />
+    <ClInclude Include="Emu\FS\vfsDevice.h" />
+    <ClInclude Include="Emu\FS\vfsDeviceLocalFile.h" />
+    <ClInclude Include="Emu\FS\vfsDir.h" />
+    <ClInclude Include="Emu\FS\vfsDirBase.h" />
+    <ClInclude Include="Emu\FS\vfsFile.h" />
+    <ClInclude Include="Emu\FS\vfsFileBase.h" />
+    <ClInclude Include="Emu\FS\vfsLocalDir.h" />
+    <ClInclude Include="Emu\FS\vfsLocalFile.h" />
+    <ClInclude Include="Emu\FS\vfsStream.h" />
+    <ClInclude Include="Emu\FS\vfsStreamMemory.h" />
+    <ClInclude Include="Emu\GameInfo.h" />
+    <ClInclude Include="Emu\HDD\HDD.h" />
+    <ClInclude Include="Emu\IdManager.h" />
+    <ClInclude Include="Emu\Io\Keyboard.h" />
+    <ClInclude Include="Emu\Io\KeyboardHandler.h" />
+    <ClInclude Include="Emu\Io\Mouse.h" />
+    <ClInclude Include="Emu\Io\MouseHandler.h" />
+    <ClInclude Include="Emu\Io\Null\NullKeyboardHandler.h" />
+    <ClInclude Include="Emu\Io\Null\NullMouseHandler.h" />
+    <ClInclude Include="Emu\Io\Null\NullPadHandler.h" />
+    <ClInclude Include="Emu\Io\Pad.h" />
+    <ClInclude Include="Emu\Io\PadHandler.h" />
+    <ClInclude Include="Emu\Memory\Memory.h" />
+    <ClInclude Include="Emu\Memory\MemoryBlock.h" />
+    <ClInclude Include="Emu\RSX\GCM.h" />
+    <ClInclude Include="Emu\RSX\GL\GLBuffers.h" />
+    <ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h" />
+    <ClInclude Include="Emu\RSX\GL\GLGSRender.h" />
+    <ClInclude Include="Emu\RSX\GL\GLProcTable.h" />
+    <ClInclude Include="Emu\RSX\GL\GLProgram.h" />
+    <ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h" />
+    <ClInclude Include="Emu\RSX\GL\GLShaderParam.h" />
+    <ClInclude Include="Emu\RSX\GL\GLVertexProgram.h" />
+    <ClInclude Include="Emu\RSX\GL\OpenGL.h" />
+    <ClInclude Include="Emu\RSX\GSManager.h" />
+    <ClInclude Include="Emu\RSX\GSRender.h" />
+    <ClInclude Include="Emu\RSX\Null\NullGSRender.h" />
+    <ClInclude Include="Emu\RSX\RSXFragmentProgram.h" />
+    <ClInclude Include="Emu\RSX\RSXTexture.h" />
+    <ClInclude Include="Emu\RSX\RSXThread.h" />
+    <ClInclude Include="Emu\RSX\RSXVertexProgram.h" />
+    <ClInclude Include="Emu\RSX\sysutil_video.h" />
+    <ClInclude Include="Emu\Memory\vm.h" />
+    <ClInclude Include="Emu\Memory\vm_ptr.h" />
+    <ClInclude Include="Emu\Memory\vm_ref.h" />
+    <ClInclude Include="Emu\Memory\vm_var.h" />
+    <ClInclude Include="Emu\SysCalls\Callback.h" />
+    <ClInclude Include="Emu\SysCalls\ErrorCodes.h" />
+    <ClInclude Include="Emu\SysCalls\LogBase.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\lv2Fs.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_cond.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_event.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_event_flag.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_interrupt.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_lwcond.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_lwmutex.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_memory.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_mmapper.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_mutex.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_ppu_thread.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_process.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_prx.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_rsx.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_rwlock.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_semaphore.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_spinlock.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_spu.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_time.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_timer.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_trace.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_tty.h" />
+    <ClInclude Include="Emu\SysCalls\lv2\sys_vm.h" />
+    <ClInclude Include="Emu\SysCalls\ModuleManager.h" />
+    <ClInclude Include="Emu\SysCalls\Modules.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellAdec.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellAtrac.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellDmux.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellFiber.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellFont.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellFontFT.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellGame.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellGcmSys.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellGem.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellGifDec.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellJpgDec.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellL10n.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellNetCtl.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellMsgDialog.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellPad.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellPamf.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellPngDec.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellSail.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellResc.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellRtc.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellSpurs.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellSpursJq.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellSync.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellSync2.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellSysutil.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellSaveData.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellUserInfo.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellVdec.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellVpost.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\libmixer.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\libsnd3.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\libsynth2.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\sceNp.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpClans.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpCommerce2.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpSns.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpTrophy.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpTus.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellKb.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\cellMouse.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\sysPrxForUser.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\sys_net.h" />
+    <ClInclude Include="Emu\SysCalls\SC_FUNC.h" />
+    <ClInclude Include="Emu\SysCalls\Static.h" />
+    <ClInclude Include="Emu\SysCalls\SysCalls.h" />
+    <ClInclude Include="Emu\System.h" />
+    <ClInclude Include="Ini.h" />
+    <ClInclude Include="Loader\ELF.h" />
+    <ClInclude Include="Loader\ELF32.h" />
+    <ClInclude Include="Loader\ELF64.h" />
+    <ClInclude Include="Loader\Loader.h" />
+    <ClInclude Include="Loader\PKG.h" />
+    <ClInclude Include="Loader\PSF.h" />
+    <ClInclude Include="Loader\SELF.h" />
+    <ClInclude Include="Loader\TROPUSR.h" />
+    <ClInclude Include="Loader\TRP.h" />
+    <ClInclude Include="restore_new.h" />
+    <ClInclude Include="stdafx.h" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C4A10229-4712-4BD2-B63E-50D93C67A038}</ProjectGuid>
+    <RootNamespace>emucore</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|Win32'">
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+    <IntDir>$(Platform)\$(Configuration)\emucore\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">
+    <IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+    <IntDir>$(Platform)\$(Configuration)\emucore\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;.\OpenAL\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+    <IntDir>$(Platform)\$(Configuration)\emucore\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>false</SDLCheck>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>false</SDLCheck>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;MSVC_CRT_MEMLEAK_DETECTION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>false</SDLCheck>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <ExceptionHandling>Async</ExceptionHandling>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">
+    <ClCompile>
+      <WarningLevel>Level2</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>false</SDLCheck>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;MSVC_CRT_MEMLEAK_DETECTION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <ExceptionHandling>Async</ExceptionHandling>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>false</SDLCheck>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>false</SDLCheck>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <ExceptionHandling>Async</ExceptionHandling>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 91ffd91b80..e0d50650bc 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -1,1208 +1,1214 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Crypto">
-      <UniqueIdentifier>{d614f6ff-cd3b-40c4-8a76-1ff82b68d3d4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu">
-      <UniqueIdentifier>{ad58328f-b041-41e0-ad17-dbad7d193051}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\SysCalls">
-      <UniqueIdentifier>{d79d0db9-c3fc-480a-9979-175b82ffecf7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\SysCalls\lv2">
-      <UniqueIdentifier>{269371f1-45b7-4ca9-a4a7-376e6e62a8ba}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\SysCalls\Modules">
-      <UniqueIdentifier>{4317ac27-38e4-4f8d-9bac-496f9b00f615}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\Io">
-      <UniqueIdentifier>{1df5b438-f263-4ff4-9b86-a9ea368f2106}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\FS">
-      <UniqueIdentifier>{b26b6b08-a8ce-4bb5-8339-c5352a23ce96}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\HDD">
-      <UniqueIdentifier>{28902cf4-4fa6-428b-ab94-6b410fd5077f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\Cell">
-      <UniqueIdentifier>{13d20086-2188-425a-9856-0440fe6f79f2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\CPU">
-      <UniqueIdentifier>{037247b4-0370-4193-a25d-bc9d075bf0a7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\ARMv7">
-      <UniqueIdentifier>{93b1cff1-0158-4327-a437-e9abcac8d724}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\Audio">
-      <UniqueIdentifier>{5a18e5b1-2632-4849-ba94-e7a2ea0b78fa}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\Audio\AL">
-      <UniqueIdentifier>{f5d19014-3c8f-43d2-bb46-af3d7f4add2b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\Memory">
-      <UniqueIdentifier>{960c535f-dabe-4f7e-b73f-fb0fac60d7c0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Loader">
-      <UniqueIdentifier>{cd540262-1ecb-4160-a69f-95704e32f2d0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Utilities">
-      <UniqueIdentifier>{be701b55-2a3d-4692-a3bf-347681ab1c7e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Utilities\SimpleIni">
-      <UniqueIdentifier>{84c34dd1-4c49-4ecf-8ee2-4165c14f24be}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\RSX">
-      <UniqueIdentifier>{fadb4b36-57af-4583-891d-d22ff369e266}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\RSX\Null">
-      <UniqueIdentifier>{4adca4fa-b90f-4662-9eb0-1d29cf3cd2eb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\RSX\GL">
-      <UniqueIdentifier>{6f1da5b2-52c5-416b-9b5c-b9897bc1b300}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\Io\Null">
-      <UniqueIdentifier>{fcac6852-b45f-4cf2-afee-cf56bcea14e5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\SysCalls\currently_unused">
-      <UniqueIdentifier>{ead7494f-a872-4b4d-a864-1a61c3b6012f}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Crypto\aes.cpp">
-      <Filter>Crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="Crypto\key_vault.cpp">
-      <Filter>Crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="Crypto\lz.cpp">
-      <Filter>Crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="Crypto\sha1.cpp">
-      <Filter>Crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="Crypto\unedat.cpp">
-      <Filter>Crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="Crypto\unpkg.cpp">
-      <Filter>Crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="Crypto\unself.cpp">
-      <Filter>Crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="Crypto\utils.cpp">
-      <Filter>Crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\System.cpp">
-      <Filter>Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Event.cpp">
-      <Filter>Emu\SysCalls</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Callback.cpp">
-      <Filter>Emu\SysCalls</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\FuncList.cpp">
-      <Filter>Emu\SysCalls</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules.cpp">
-      <Filter>Emu\SysCalls</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Static.cpp">
-      <Filter>Emu\SysCalls</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\SysCalls.cpp">
-      <Filter>Emu\SysCalls</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellAdec.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellAtrac.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellAudio.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellDmux.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellFont.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellFontFT.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellGame.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellGcmSys.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellGifDec.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellJpgDec.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellL10n.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellNetCtl.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellPamf.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellPngDec.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSail.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellResc.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellRtc.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSpurs.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSync.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSysmodule.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSysutil.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSysutilAp.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellUserInfo.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellVdec.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellVpost.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\libmixer.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\sceNp.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\sceNpClans.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\sceNpCommerce2.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\sceNpSns.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\sceNpTrophy.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\sceNpTus.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\sysPrxForUser.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\sys_fs.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\sys_io.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\sys_net.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\Keyboard.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\Mouse.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\Pad.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\VFS.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\vfsDevice.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\vfsDeviceLocalFile.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\vfsDir.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\vfsDirBase.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\vfsFile.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\vfsFileBase.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\vfsLocalDir.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\vfsLocalFile.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\vfsStream.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\vfsStreamMemory.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\HDD\HDD.cpp">
-      <Filter>Emu\HDD</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\MFC.cpp">
-      <Filter>Emu\Cell</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\PPCDecoder.cpp">
-      <Filter>Emu\Cell</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\PPCThread.cpp">
-      <Filter>Emu\Cell</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\PPUThread.cpp">
-      <Filter>Emu\Cell</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\RawSPUThread.cpp">
-      <Filter>Emu\Cell</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\SPURecompilerCore.cpp">
-      <Filter>Emu\Cell</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\SPURSManager.cpp">
-      <Filter>Emu\Cell</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\SPUThread.cpp">
-      <Filter>Emu\Cell</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\CPU\CPUThread.cpp">
-      <Filter>Emu\CPU</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\CPU\CPUThreadManager.cpp">
-      <Filter>Emu\CPU</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\ARMv7\ARMv7Thread.cpp">
-      <Filter>Emu\ARMv7</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Audio\AudioManager.cpp">
-      <Filter>Emu\Audio</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Audio\AudioDumper.cpp">
-      <Filter>Emu\Audio</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Audio\AL\OpenALThread.cpp">
-      <Filter>Emu\Audio\AL</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Memory\Memory.cpp">
-      <Filter>Emu\Memory</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\ELF.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\ELF32.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\ELF64.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\Loader.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\PKG.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\PSF.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\SELF.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\TROPUSR.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\TRP.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\SMutex.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\StrFmt.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\Thread.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\ModuleManager.cpp">
-      <Filter>Emu\SysCalls</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellBgdl.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellCamera.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellCelp8Enc.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellCelpEnc.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellGem.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellHttpUtil.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellImejp.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellJpgEnc.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellKey2char.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellLv2dbg.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellMic.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellMusicDecode.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellMusicExport.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellOvis.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellPhotoDecode.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellPhotoExport.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellPhotoImport.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellPngEnc.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellPrint.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellRudp.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSail.cpp">
-      <Filter>Emu\Cell\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSailRec.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellScreenshot.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSearch.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSheap.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSsl.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSubdisplay.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellUsbd.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellUsbpspcm.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellVoice.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\libsnd3.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\libsynth2.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\sys_http.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\SSemaphore.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_process.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_prx.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_memory.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_timer.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_lwcond.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_rwlock.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_lwmutex.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_cond.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_mutex.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_semaphore.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_rsx.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_spinlock.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_ppu_thread.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_tty.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_vm.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_trace.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_event.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_spu.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_time.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_interrupt.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_mmapper.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\lv2Fs.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\Log.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellMsgDialog.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\GLProgram.cpp">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\GLProgramBuffer.cpp">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\OpenGL.cpp">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\GLBuffers.cpp">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\GLGSRender.cpp">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GSManager.cpp">
-      <Filter>Emu\RSX</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GSRender.cpp">
-      <Filter>Emu\RSX</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\RSXTexture.cpp">
-      <Filter>Emu\RSX</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\RSXThread.cpp">
-      <Filter>Emu\RSX</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\sys_event_flag.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\AutoPause.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\LogBase.cpp">
-      <Filter>Emu\SysCalls</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\DbgCommand.cpp">
-      <Filter>Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Ini.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSync2.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSpursJq.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellFiber.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\rFile.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\rMsgBox.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\rPlatform.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\rTime.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\rXml.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Memory\vm.cpp">
-      <Filter>Emu\Memory</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellMouse.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellKb.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellPad.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSaveData.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Crypto\aes.h">
-      <Filter>Crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="Crypto\key_vault.h">
-      <Filter>Crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="Crypto\lz.h">
-      <Filter>Crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="Crypto\sha1.h">
-      <Filter>Crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="Crypto\unedat.h">
-      <Filter>Crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="Crypto\unpkg.h">
-      <Filter>Crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="Crypto\unself.h">
-      <Filter>Crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="Crypto\utils.h">
-      <Filter>Crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\GameInfo.h">
-      <Filter>Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\System.h">
-      <Filter>Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Callback.h">
-      <Filter>Emu\SysCalls</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\ErrorCodes.h">
-      <Filter>Emu\SysCalls</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules.h">
-      <Filter>Emu\SysCalls</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\SC_FUNC.h">
-      <Filter>Emu\SysCalls</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\SysCalls.h">
-      <Filter>Emu\SysCalls</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellAdec.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellAtrac.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellDmux.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellFont.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellGem.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellGifDec.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellJpgDec.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellNetCtl.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellPamf.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellPngDec.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellSail.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellResc.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellRtc.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellSpurs.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellSysutil.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellUserInfo.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellVdec.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellVpost.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\libmixer.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\sceNp.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\sceNpClans.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\sceNpCommerce2.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\sceNpSns.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\sceNpTrophy.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\sceNpTus.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\sys_net.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\Keyboard.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\KeyboardHandler.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\Mouse.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\MouseHandler.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\Pad.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\PadHandler.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\FS\VFS.h">
-      <Filter>Emu\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\FS\vfsDevice.h">
-      <Filter>Emu\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\FS\vfsDeviceLocalFile.h">
-      <Filter>Emu\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\FS\vfsDir.h">
-      <Filter>Emu\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\FS\vfsDirBase.h">
-      <Filter>Emu\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\FS\vfsFile.h">
-      <Filter>Emu\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\FS\vfsFileBase.h">
-      <Filter>Emu\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\FS\vfsLocalDir.h">
-      <Filter>Emu\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\FS\vfsLocalFile.h">
-      <Filter>Emu\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\FS\vfsStream.h">
-      <Filter>Emu\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\FS\vfsStreamMemory.h">
-      <Filter>Emu\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\HDD\HDD.h">
-      <Filter>Emu\HDD</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\MFC.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPCDecoder.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPCDisAsm.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPCInstrTable.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPCThread.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPUDecoder.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPUDisAsm.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPUInstrTable.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPUInterpreter.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPUOpcodes.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPUThread.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\RawSPUThread.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\SPUDecoder.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\SPUDisAsm.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\SPUInstrTable.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\SPUInterpreter.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\SPUOpcodes.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\SPURecompiler.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\SPURSManager.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\SPUThread.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\CPU\CPUDecoder.h">
-      <Filter>Emu\CPU</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\CPU\CPUDisAsm.h">
-      <Filter>Emu\CPU</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\CPU\CPUInstrTable.h">
-      <Filter>Emu\CPU</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\CPU\CPUThread.h">
-      <Filter>Emu\CPU</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\CPU\CPUThreadManager.h">
-      <Filter>Emu\CPU</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\ARMv7\ARMv7Decoder.h">
-      <Filter>Emu\ARMv7</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\ARMv7\ARMv7DisAsm.h">
-      <Filter>Emu\ARMv7</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\ARMv7\ARMv7Interpreter.h">
-      <Filter>Emu\ARMv7</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\ARMv7\ARMv7Opcodes.h">
-      <Filter>Emu\ARMv7</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\ARMv7\ARMv7Thread.h">
-      <Filter>Emu\ARMv7</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Audio\AudioDumper.h">
-      <Filter>Emu\Audio</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Audio\AudioManager.h">
-      <Filter>Emu\Audio</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Audio\AL\OpenALThread.h">
-      <Filter>Emu\Audio\AL</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Memory\Memory.h">
-      <Filter>Emu\Memory</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Memory\MemoryBlock.h">
-      <Filter>Emu\Memory</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\ELF.h">
-      <Filter>Loader</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\ELF32.h">
-      <Filter>Loader</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\ELF64.h">
-      <Filter>Loader</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\Loader.h">
-      <Filter>Loader</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\PKG.h">
-      <Filter>Loader</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\PSF.h">
-      <Filter>Loader</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\SELF.h">
-      <Filter>Loader</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\TROPUSR.h">
-      <Filter>Loader</Filter>
-    </ClInclude>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\BEType.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\SMutex.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\SQueue.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\StrFmt.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\Thread.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\Timer.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\ModuleManager.h">
-      <Filter>Emu\SysCalls</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Static.h">
-      <Filter>Emu\SysCalls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\simpleini\ConvertUTF.h">
-      <Filter>Utilities\SimpleIni</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\simpleini\SimpleIni.h">
-      <Filter>Utilities\SimpleIni</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\DbgCommand.h">
-      <Filter>Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\libsnd3.h">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\libsynth2.h">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Event.h">
-      <Filter>Emu\SysCalls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\SSemaphore.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_process.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_prx.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_memory.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_timer.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_lwcond.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_rwlock.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_lwmutex.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_cond.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_mutex.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_semaphore.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_rsx.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_spinlock.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_ppu_thread.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_tty.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_vm.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_trace.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_event.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_spu.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_time.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_interrupt.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_mmapper.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\lv2Fs.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\Log.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellGame.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellMsgDialog.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellSync.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\LogBase.h">
-      <Filter>Emu\SysCalls</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellGcmSys.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\sysPrxForUser.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Null\NullGSRender.h">
-      <Filter>Emu\RSX\Null</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\GLGSRender.h">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\GLProcTable.h">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\GLProgram.h">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\GLShaderParam.h">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\GLVertexProgram.h">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\OpenGL.h">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\GLBuffers.h">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h">
-      <Filter>Emu\RSX\GL</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GSManager.h">
-      <Filter>Emu\RSX</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GSRender.h">
-      <Filter>Emu\RSX</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\RSXFragmentProgram.h">
-      <Filter>Emu\RSX</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\RSXTexture.h">
-      <Filter>Emu\RSX</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\RSXThread.h">
-      <Filter>Emu\RSX</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\RSXVertexProgram.h">
-      <Filter>Emu\RSX</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\sysutil_video.h">
-      <Filter>Emu\RSX</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GCM.h">
-      <Filter>Emu\RSX</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\lv2\sys_event_flag.h">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\AutoPause.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellL10n.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\IdManager.h">
-      <Filter>Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellFontFT.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Ini.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\Null\NullPadHandler.h">
-      <Filter>Emu\Io\Null</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\Null\NullKeyboardHandler.h">
-      <Filter>Emu\Io\Null</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\Null\NullMouseHandler.h">
-      <Filter>Emu\Io\Null</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellSync2.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellSpursJq.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellFiber.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\MTRingbuffer.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\rFile.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\rMsgBox.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\rPlatform.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\rTime.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\rXml.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\GNU.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\TRP.h">
-      <Filter>Loader</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Memory\vm.h">
-      <Filter>Emu\Memory</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Memory\vm_ptr.h">
-      <Filter>Emu\Memory</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Memory\vm_ref.h">
-      <Filter>Emu\Memory</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Memory\vm_var.h">
-      <Filter>Emu\Memory</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellPad.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellKb.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellMouse.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\Modules\cellSaveData.h">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClInclude>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Crypto">
+      <UniqueIdentifier>{d614f6ff-cd3b-40c4-8a76-1ff82b68d3d4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu">
+      <UniqueIdentifier>{ad58328f-b041-41e0-ad17-dbad7d193051}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\SysCalls">
+      <UniqueIdentifier>{d79d0db9-c3fc-480a-9979-175b82ffecf7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\SysCalls\lv2">
+      <UniqueIdentifier>{269371f1-45b7-4ca9-a4a7-376e6e62a8ba}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\SysCalls\Modules">
+      <UniqueIdentifier>{4317ac27-38e4-4f8d-9bac-496f9b00f615}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\Io">
+      <UniqueIdentifier>{1df5b438-f263-4ff4-9b86-a9ea368f2106}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\FS">
+      <UniqueIdentifier>{b26b6b08-a8ce-4bb5-8339-c5352a23ce96}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\HDD">
+      <UniqueIdentifier>{28902cf4-4fa6-428b-ab94-6b410fd5077f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\Cell">
+      <UniqueIdentifier>{13d20086-2188-425a-9856-0440fe6f79f2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\CPU">
+      <UniqueIdentifier>{037247b4-0370-4193-a25d-bc9d075bf0a7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\ARMv7">
+      <UniqueIdentifier>{93b1cff1-0158-4327-a437-e9abcac8d724}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\Audio">
+      <UniqueIdentifier>{5a18e5b1-2632-4849-ba94-e7a2ea0b78fa}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\Audio\AL">
+      <UniqueIdentifier>{f5d19014-3c8f-43d2-bb46-af3d7f4add2b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\Memory">
+      <UniqueIdentifier>{960c535f-dabe-4f7e-b73f-fb0fac60d7c0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Loader">
+      <UniqueIdentifier>{cd540262-1ecb-4160-a69f-95704e32f2d0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Utilities">
+      <UniqueIdentifier>{be701b55-2a3d-4692-a3bf-347681ab1c7e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Utilities\SimpleIni">
+      <UniqueIdentifier>{84c34dd1-4c49-4ecf-8ee2-4165c14f24be}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\RSX">
+      <UniqueIdentifier>{fadb4b36-57af-4583-891d-d22ff369e266}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\RSX\Null">
+      <UniqueIdentifier>{4adca4fa-b90f-4662-9eb0-1d29cf3cd2eb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\RSX\GL">
+      <UniqueIdentifier>{6f1da5b2-52c5-416b-9b5c-b9897bc1b300}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\Io\Null">
+      <UniqueIdentifier>{fcac6852-b45f-4cf2-afee-cf56bcea14e5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\SysCalls\currently_unused">
+      <UniqueIdentifier>{ead7494f-a872-4b4d-a864-1a61c3b6012f}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Crypto\aes.cpp">
+      <Filter>Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="Crypto\key_vault.cpp">
+      <Filter>Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="Crypto\lz.cpp">
+      <Filter>Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="Crypto\sha1.cpp">
+      <Filter>Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="Crypto\unedat.cpp">
+      <Filter>Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="Crypto\unpkg.cpp">
+      <Filter>Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="Crypto\unself.cpp">
+      <Filter>Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="Crypto\utils.cpp">
+      <Filter>Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\System.cpp">
+      <Filter>Emu</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Event.cpp">
+      <Filter>Emu\SysCalls</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Callback.cpp">
+      <Filter>Emu\SysCalls</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\FuncList.cpp">
+      <Filter>Emu\SysCalls</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules.cpp">
+      <Filter>Emu\SysCalls</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Static.cpp">
+      <Filter>Emu\SysCalls</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\SysCalls.cpp">
+      <Filter>Emu\SysCalls</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellAdec.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellAtrac.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellAudio.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellDmux.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellFont.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellFontFT.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellGame.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellGcmSys.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellGifDec.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellJpgDec.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellL10n.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellNetCtl.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellPamf.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellPngDec.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSail.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellResc.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellRtc.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSpurs.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSync.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSysmodule.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSysutil.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSysutilAp.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellUserInfo.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellVdec.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellVpost.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\libmixer.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\sceNp.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpClans.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpCommerce2.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpSns.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpTrophy.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpTus.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\sysPrxForUser.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\sys_fs.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\sys_io.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\sys_net.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Io\Keyboard.cpp">
+      <Filter>Emu\Io</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Io\Mouse.cpp">
+      <Filter>Emu\Io</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Io\Pad.cpp">
+      <Filter>Emu\Io</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\FS\VFS.cpp">
+      <Filter>Emu\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\FS\vfsDevice.cpp">
+      <Filter>Emu\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\FS\vfsDeviceLocalFile.cpp">
+      <Filter>Emu\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\FS\vfsDir.cpp">
+      <Filter>Emu\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\FS\vfsDirBase.cpp">
+      <Filter>Emu\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\FS\vfsFile.cpp">
+      <Filter>Emu\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\FS\vfsFileBase.cpp">
+      <Filter>Emu\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\FS\vfsLocalDir.cpp">
+      <Filter>Emu\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\FS\vfsLocalFile.cpp">
+      <Filter>Emu\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\FS\vfsStream.cpp">
+      <Filter>Emu\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\FS\vfsStreamMemory.cpp">
+      <Filter>Emu\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\HDD\HDD.cpp">
+      <Filter>Emu\HDD</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Cell\MFC.cpp">
+      <Filter>Emu\Cell</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Cell\PPCDecoder.cpp">
+      <Filter>Emu\Cell</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Cell\PPCThread.cpp">
+      <Filter>Emu\Cell</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Cell\PPUThread.cpp">
+      <Filter>Emu\Cell</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Cell\RawSPUThread.cpp">
+      <Filter>Emu\Cell</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Cell\SPURecompilerCore.cpp">
+      <Filter>Emu\Cell</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Cell\SPURSManager.cpp">
+      <Filter>Emu\Cell</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Cell\SPUThread.cpp">
+      <Filter>Emu\Cell</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\CPU\CPUThread.cpp">
+      <Filter>Emu\CPU</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\CPU\CPUThreadManager.cpp">
+      <Filter>Emu\CPU</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\ARMv7Thread.cpp">
+      <Filter>Emu\ARMv7</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Audio\AudioManager.cpp">
+      <Filter>Emu\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Audio\AudioDumper.cpp">
+      <Filter>Emu\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Audio\AL\OpenALThread.cpp">
+      <Filter>Emu\Audio\AL</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Memory\Memory.cpp">
+      <Filter>Emu\Memory</Filter>
+    </ClCompile>
+    <ClCompile Include="Loader\ELF.cpp">
+      <Filter>Loader</Filter>
+    </ClCompile>
+    <ClCompile Include="Loader\ELF32.cpp">
+      <Filter>Loader</Filter>
+    </ClCompile>
+    <ClCompile Include="Loader\ELF64.cpp">
+      <Filter>Loader</Filter>
+    </ClCompile>
+    <ClCompile Include="Loader\Loader.cpp">
+      <Filter>Loader</Filter>
+    </ClCompile>
+    <ClCompile Include="Loader\PKG.cpp">
+      <Filter>Loader</Filter>
+    </ClCompile>
+    <ClCompile Include="Loader\PSF.cpp">
+      <Filter>Loader</Filter>
+    </ClCompile>
+    <ClCompile Include="Loader\SELF.cpp">
+      <Filter>Loader</Filter>
+    </ClCompile>
+    <ClCompile Include="Loader\TROPUSR.cpp">
+      <Filter>Loader</Filter>
+    </ClCompile>
+    <ClCompile Include="Loader\TRP.cpp">
+      <Filter>Loader</Filter>
+    </ClCompile>
+    <ClCompile Include="stdafx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Utilities\SMutex.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Utilities\StrFmt.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Utilities\Thread.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\ModuleManager.cpp">
+      <Filter>Emu\SysCalls</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellBgdl.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellCamera.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellCelp8Enc.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellCelpEnc.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellGem.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellHttpUtil.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellImejp.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellJpgEnc.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellKey2char.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellLv2dbg.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellMic.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellMusicDecode.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellMusicExport.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellOvis.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellPhotoDecode.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellPhotoExport.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellPhotoImport.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellPngEnc.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellPrint.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellRudp.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSail.cpp">
+      <Filter>Emu\Cell\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSailRec.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellScreenshot.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSearch.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSheap.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSsl.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSubdisplay.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellUsbd.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellUsbpspcm.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellVoice.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\libsnd3.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\libsynth2.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\sys_http.cpp">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Utilities\SSemaphore.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_process.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_prx.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_memory.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_timer.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_lwcond.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_rwlock.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_lwmutex.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_cond.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_mutex.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_semaphore.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_rsx.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_spinlock.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_ppu_thread.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_tty.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_vm.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_trace.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_event.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_spu.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_time.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_interrupt.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_mmapper.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\lv2Fs.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Utilities\Log.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellMsgDialog.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\GLProgram.cpp">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\GLProgramBuffer.cpp">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\OpenGL.cpp">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\GLBuffers.cpp">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\GLGSRender.cpp">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GSManager.cpp">
+      <Filter>Emu\RSX</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GSRender.cpp">
+      <Filter>Emu\RSX</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\RSXTexture.cpp">
+      <Filter>Emu\RSX</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\RSXThread.cpp">
+      <Filter>Emu\RSX</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\lv2\sys_event_flag.cpp">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Utilities\AutoPause.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\LogBase.cpp">
+      <Filter>Emu\SysCalls</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\DbgCommand.cpp">
+      <Filter>Emu</Filter>
+    </ClCompile>
+    <ClCompile Include="Ini.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSync2.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSpursJq.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellFiber.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Utilities\rFile.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Utilities\rMsgBox.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Utilities\rPlatform.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Utilities\rTime.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Utilities\rXml.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Memory\vm.cpp">
+      <Filter>Emu\Memory</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellMouse.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellKb.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellPad.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSaveData.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Crypto\aes.h">
+      <Filter>Crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="Crypto\key_vault.h">
+      <Filter>Crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="Crypto\lz.h">
+      <Filter>Crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="Crypto\sha1.h">
+      <Filter>Crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="Crypto\unedat.h">
+      <Filter>Crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="Crypto\unpkg.h">
+      <Filter>Crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="Crypto\unself.h">
+      <Filter>Crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="Crypto\utils.h">
+      <Filter>Crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\GameInfo.h">
+      <Filter>Emu</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\System.h">
+      <Filter>Emu</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Callback.h">
+      <Filter>Emu\SysCalls</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\ErrorCodes.h">
+      <Filter>Emu\SysCalls</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules.h">
+      <Filter>Emu\SysCalls</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\SC_FUNC.h">
+      <Filter>Emu\SysCalls</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\SysCalls.h">
+      <Filter>Emu\SysCalls</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellAdec.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellAtrac.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellDmux.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellFont.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellGem.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellGifDec.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellJpgDec.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellNetCtl.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellPamf.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellPngDec.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellSail.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellResc.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellRtc.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellSpurs.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellSysutil.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellUserInfo.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellVdec.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellVpost.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\libmixer.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\sceNp.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpClans.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpCommerce2.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpSns.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpTrophy.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpTus.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\sys_net.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Io\Keyboard.h">
+      <Filter>Emu\Io</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Io\KeyboardHandler.h">
+      <Filter>Emu\Io</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Io\Mouse.h">
+      <Filter>Emu\Io</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Io\MouseHandler.h">
+      <Filter>Emu\Io</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Io\Pad.h">
+      <Filter>Emu\Io</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Io\PadHandler.h">
+      <Filter>Emu\Io</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\FS\VFS.h">
+      <Filter>Emu\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\FS\vfsDevice.h">
+      <Filter>Emu\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\FS\vfsDeviceLocalFile.h">
+      <Filter>Emu\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\FS\vfsDir.h">
+      <Filter>Emu\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\FS\vfsDirBase.h">
+      <Filter>Emu\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\FS\vfsFile.h">
+      <Filter>Emu\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\FS\vfsFileBase.h">
+      <Filter>Emu\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\FS\vfsLocalDir.h">
+      <Filter>Emu\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\FS\vfsLocalFile.h">
+      <Filter>Emu\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\FS\vfsStream.h">
+      <Filter>Emu\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\FS\vfsStreamMemory.h">
+      <Filter>Emu\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\HDD\HDD.h">
+      <Filter>Emu\HDD</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\MFC.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\PPCDecoder.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\PPCDisAsm.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\PPCInstrTable.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\PPCThread.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\PPUDecoder.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\PPUDisAsm.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\PPUInstrTable.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\PPUInterpreter.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\PPUOpcodes.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\PPUThread.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\RawSPUThread.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\SPUDecoder.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\SPUDisAsm.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\SPUInstrTable.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\SPUInterpreter.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\SPUOpcodes.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\SPURecompiler.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\SPURSManager.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\SPUThread.h">
+      <Filter>Emu\Cell</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\CPU\CPUDecoder.h">
+      <Filter>Emu\CPU</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\CPU\CPUDisAsm.h">
+      <Filter>Emu\CPU</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\CPU\CPUInstrTable.h">
+      <Filter>Emu\CPU</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\CPU\CPUThread.h">
+      <Filter>Emu\CPU</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\CPU\CPUThreadManager.h">
+      <Filter>Emu\CPU</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\ARMv7\ARMv7Decoder.h">
+      <Filter>Emu\ARMv7</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\ARMv7\ARMv7DisAsm.h">
+      <Filter>Emu\ARMv7</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\ARMv7\ARMv7Interpreter.h">
+      <Filter>Emu\ARMv7</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\ARMv7\ARMv7Opcodes.h">
+      <Filter>Emu\ARMv7</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\ARMv7\ARMv7Thread.h">
+      <Filter>Emu\ARMv7</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Audio\AudioDumper.h">
+      <Filter>Emu\Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Audio\AudioManager.h">
+      <Filter>Emu\Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Audio\AL\OpenALThread.h">
+      <Filter>Emu\Audio\AL</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Memory\Memory.h">
+      <Filter>Emu\Memory</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Memory\MemoryBlock.h">
+      <Filter>Emu\Memory</Filter>
+    </ClInclude>
+    <ClInclude Include="Loader\ELF.h">
+      <Filter>Loader</Filter>
+    </ClInclude>
+    <ClInclude Include="Loader\ELF32.h">
+      <Filter>Loader</Filter>
+    </ClInclude>
+    <ClInclude Include="Loader\ELF64.h">
+      <Filter>Loader</Filter>
+    </ClInclude>
+    <ClInclude Include="Loader\Loader.h">
+      <Filter>Loader</Filter>
+    </ClInclude>
+    <ClInclude Include="Loader\PKG.h">
+      <Filter>Loader</Filter>
+    </ClInclude>
+    <ClInclude Include="Loader\PSF.h">
+      <Filter>Loader</Filter>
+    </ClInclude>
+    <ClInclude Include="Loader\SELF.h">
+      <Filter>Loader</Filter>
+    </ClInclude>
+    <ClInclude Include="Loader\TROPUSR.h">
+      <Filter>Loader</Filter>
+    </ClInclude>
+    <ClInclude Include="stdafx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\BEType.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\SMutex.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\SQueue.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\StrFmt.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\Thread.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\Timer.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\ModuleManager.h">
+      <Filter>Emu\SysCalls</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Static.h">
+      <Filter>Emu\SysCalls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\simpleini\ConvertUTF.h">
+      <Filter>Utilities\SimpleIni</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\simpleini\SimpleIni.h">
+      <Filter>Utilities\SimpleIni</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\DbgCommand.h">
+      <Filter>Emu</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\libsnd3.h">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\libsynth2.h">
+      <Filter>Emu\SysCalls\currently_unused</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Event.h">
+      <Filter>Emu\SysCalls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\SSemaphore.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_process.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_prx.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_memory.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_timer.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_lwcond.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_rwlock.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_lwmutex.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_cond.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_mutex.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_semaphore.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_rsx.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_spinlock.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_ppu_thread.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_tty.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_vm.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_trace.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_event.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_spu.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_time.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_interrupt.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_mmapper.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\lv2Fs.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\Log.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellGame.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellMsgDialog.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellSync.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\LogBase.h">
+      <Filter>Emu\SysCalls</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellGcmSys.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\sysPrxForUser.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\Null\NullGSRender.h">
+      <Filter>Emu\RSX\Null</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\GLGSRender.h">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\GLProcTable.h">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\GLProgram.h">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\GLShaderParam.h">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\GLVertexProgram.h">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\OpenGL.h">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\GLBuffers.h">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h">
+      <Filter>Emu\RSX\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GSManager.h">
+      <Filter>Emu\RSX</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GSRender.h">
+      <Filter>Emu\RSX</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\RSXFragmentProgram.h">
+      <Filter>Emu\RSX</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\RSXTexture.h">
+      <Filter>Emu\RSX</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\RSXThread.h">
+      <Filter>Emu\RSX</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\RSXVertexProgram.h">
+      <Filter>Emu\RSX</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\sysutil_video.h">
+      <Filter>Emu\RSX</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GCM.h">
+      <Filter>Emu\RSX</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\lv2\sys_event_flag.h">
+      <Filter>Emu\SysCalls\lv2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\AutoPause.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellL10n.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\IdManager.h">
+      <Filter>Emu</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellFontFT.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Ini.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Io\Null\NullPadHandler.h">
+      <Filter>Emu\Io\Null</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Io\Null\NullKeyboardHandler.h">
+      <Filter>Emu\Io\Null</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Io\Null\NullMouseHandler.h">
+      <Filter>Emu\Io\Null</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellSync2.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellSpursJq.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellFiber.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\MTRingbuffer.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\rFile.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\rMsgBox.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\rPlatform.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\rTime.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\rXml.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\GNU.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="Loader\TRP.h">
+      <Filter>Loader</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Memory\vm.h">
+      <Filter>Emu\Memory</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Memory\vm_ptr.h">
+      <Filter>Emu\Memory</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Memory\vm_ref.h">
+      <Filter>Emu\Memory</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Memory\vm_var.h">
+      <Filter>Emu\Memory</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellPad.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellKb.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellMouse.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\cellSaveData.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="restore_new.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="define_new_memleakdetect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/rpcs3/restore_new.h b/rpcs3/restore_new.h
new file mode 100644
index 0000000000..592927c024
--- /dev/null
+++ b/rpcs3/restore_new.h
@@ -0,0 +1,5 @@
+//Restore the new operator if previously saved before overriding
+//Allow the use of placement new
+#if defined(MSVC_CRT_MEMLEAK_DETECTION) && defined(_DEBUG) && defined(DBG_NEW)
+	#pragma pop_macro("new")
+#endif
diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h
index 53bb1761f0..42ea227704 100644
--- a/rpcs3/stdafx.h
+++ b/rpcs3/stdafx.h
@@ -10,7 +10,7 @@
 
 #if defined(MSVC_CRT_MEMLEAK_DETECTION) && defined(_DEBUG) && !defined(DBG_NEW)
 	#define DBG_NEW new ( _NORMAL_BLOCK , __FILE__ , __LINE__ )
-	#define new DBG_NEW
+	#include "define_new_memleakdetect.h"
 #endif
 
 // This header should be frontend-agnostic, so don't assume wx includes everything