diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj
index ec220cc320..a26ca9d374 100644
--- a/pcsx2/pcsx2.vcxproj
+++ b/pcsx2/pcsx2.vcxproj
@@ -504,12 +504,18 @@
     <ClCompile Include="GS\Renderers\Common\GSVertexTrace.cpp" />
     <ClCompile Include="GS\Window\GSWnd.cpp" />
     <ClCompile Include="GS\Window\GSWndDX.cpp" />
+    <ClCompile Include="GS\Window\GSWndEGL.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="GS\Window\GSWndWGL.cpp" />
     <ClCompile Include="Utilities\FileUtils.cpp" />
     <ClCompile Include="Dump.cpp" />
     <ClCompile Include="x86\iMisc.cpp" />
     <ClCompile Include="Pcsx2Config.cpp" />
     <ClCompile Include="windows\FlatFileReaderWindows.cpp" />
+    <ClCompile Include="Darwin\DarwinFlatFileReader.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="SaveState.cpp" />
     <ClCompile Include="SourceLog.cpp" />
     <ClCompile Include="System\SysCoreThread.cpp" />
@@ -697,6 +703,7 @@
     <ClInclude Include="CDVD\CompressedFileReader.h" />
     <ClInclude Include="CDVD\CompressedFileReaderUtils.h" />
     <ClInclude Include="CDVD\CsoFileReader.h" />
+    <ClInclude Include="CDVD\ChdFileReader.h" />
     <ClInclude Include="CDVD\GzippedFileReader.h" />
     <ClInclude Include="CDVD\ThreadedFileReader.h" />
     <ClInclude Include="CDVD\zlib_indexed.h" />
@@ -738,6 +745,7 @@
     <ClInclude Include="GameDatabase.h" />
     <ClInclude Include="Gif_Unit.h" />
     <ClInclude Include="gui\AppGameDatabase.h" />
+    <ClInclude Include="gui\i18n.h" />
     <ClInclude Include="gui\DriveList.h" />
     <ClInclude Include="gui\Saveslots.h" />
     <ClInclude Include="gui\Debugger\BreakpointWindow.h" />
@@ -791,6 +799,8 @@
     <ClInclude Include="GS\Renderers\OpenGL\GLLoader.h" />
     <ClInclude Include="GS\Renderers\OpenGL\GLState.h" />
     <ClInclude Include="GS\GS.h" />
+    <ClInclude Include="GS\GS_codegen.h" />
+    <ClInclude Include="GS\GS_types.h" />
     <ClInclude Include="GS\GSAlignedClass.h" />
     <ClInclude Include="GS\GSBlock.h" />
     <ClInclude Include="GS\GSCapture.h" />
@@ -856,12 +866,14 @@
     <ClInclude Include="GS\Renderers\Common\GSVertexTrace.h" />
     <ClInclude Include="GS\Window\GSWnd.h" />
     <ClInclude Include="GS\Window\GSWndDX.h" />
+    <ClInclude Include="GS\Window\GSWndEGL.h" />
     <ClInclude Include="GS\Window\GSWndWGL.h" />
     <ClInclude Include="GS\resource.h" />
     <ClInclude Include="IPU\IPUdma.h" />
     <ClInclude Include="Mdec.h" />
     <ClInclude Include="Patch.h" />
     <ClInclude Include="PrecompiledHeader.h" />
+    <ClInclude Include="sio_internal.h" />
     <ClInclude Include="ps2\pgif.h" />
     <ClInclude Include="Recording\InputRecording.h" />
     <ClInclude Include="Recording\InputRecordingControls.h" />
@@ -933,10 +945,12 @@
     <ClInclude Include="SaveState.h" />
     <ClInclude Include="System.h" />
     <ClInclude Include="System\SysThreads.h" />
+    <ClInclude Include="System\RecTypes.h" />
     <ClInclude Include="Counters.h" />
     <ClInclude Include="Dmac.h" />
     <ClInclude Include="Hardware.h" />
     <ClInclude Include="Hw.h" />
+    <ClInclude Include="ps2\HwInternal.h" />
     <ClInclude Include="Cache.h" />
     <ClInclude Include="Memory.h" />
     <ClInclude Include="vtlb.h" />
@@ -963,6 +977,7 @@
     <ClInclude Include="R5900.h" />
     <ClInclude Include="R5900Exceptions.h" />
     <ClInclude Include="R5900OpcodeTables.h" />
+    <ClInclude Include="COP0.h" />
     <ClInclude Include="x86\iCOP0.h" />
     <ClInclude Include="x86\iFPU.h" />
     <ClInclude Include="x86\iMMI.h" />
@@ -1023,6 +1038,7 @@
     </CustomBuildStep>
     <ClInclude Include="x86\BaseblockEx.h" />
     <ClInclude Include="ps2\BiosTools.h" />
+    <ClInclude Include="MemoryTypes.h" />
     <ClInclude Include="x86\iCore.h" />
     <ClInclude Include="CDVD\IsoFS\IsoDirectory.h" />
     <ClInclude Include="CDVD\IsoFS\IsoFile.h" />
@@ -1040,6 +1056,7 @@
     <ClInclude Include="gui\App.h" />
     <ClInclude Include="gui\AppCommon.h" />
     <ClInclude Include="gui\AppConfig.h" />
+    <ClInclude Include="gui\AppAccelerators.h" />
     <ClInclude Include="gui\AppCoreThread.h" />
     <ClInclude Include="gui\AppEventListeners.h" />
     <ClInclude Include="gui\AppForwardDefs.h" />
@@ -1050,9 +1067,14 @@
     <ClInclude Include="gui\GSFrame.h" />
     <ClInclude Include="gui\IsoDropTarget.h" />
     <ClInclude Include="gui\MainFrame.h" />
+    <ClInclude Include="gui\MemoryCardFile.h" />
+    <ClInclude Include="gui\MemoryCardFolder.h" />
     <ClInclude Include="gui\pxEventThread.h" />
     <ClInclude Include="gui\RecentIsoList.h" />
+    <ClInclude Include="PathDefs.h" />
+    <ClInclude Include="SysForwardDefs.h" />
     <ClInclude Include="ZipTools\ThreadedZipTools.h" />
+    <ClInclude Include="cheatscpp.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="$(SolutionDir)3rdparty\wxwidgets3.0\include\wx\msw\wx.rc">
diff --git a/pcsx2/pcsx2.vcxproj.filters b/pcsx2/pcsx2.vcxproj.filters
index f8cd23e754..c7164a4c76 100644
--- a/pcsx2/pcsx2.vcxproj.filters
+++ b/pcsx2/pcsx2.vcxproj.filters
@@ -276,6 +276,9 @@
     <None Include="Docs\License.txt">
       <Filter>Docs</Filter>
     </None>
+    <None Include="ps2\eeHwTraceLog.inl">
+      <Filter>System\Ps2\EmotionEngine\Hardware</Filter>
+    </None>
     <None Include="x86\microVU_Alloc.inl">
       <Filter>System\Ps2\EmotionEngine\VU\Dynarec\microVU</Filter>
     </None>
@@ -854,13 +857,27 @@
     <ClCompile Include="Linux\LnxKeyCodes.cpp">
       <Filter>AppHost\Linux</Filter>
     </ClCompile>
-    <ClCompile Include="gui\ExecutorThread.cpp" />
-    <ClCompile Include="gui\UpdateUI.cpp" />
-    <ClCompile Include="gui\SysState.cpp" />
-    <ClCompile Include="ZipTools\thread_gzip.cpp" />
-    <ClCompile Include="ZipTools\thread_lzma.cpp" />
-    <ClCompile Include="GameDatabase.cpp" />
-    <ClCompile Include="Patch_Memory.cpp" />
+    <ClCompile Include="gui\ExecutorThread.cpp">
+      <Filter>AppHost</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\UpdateUI.cpp">
+      <Filter>AppHost</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\SysState.cpp">
+      <Filter>AppHost</Filter>
+    </ClCompile>
+    <ClCompile Include="ZipTools\thread_gzip.cpp">
+      <Filter>Misc</Filter>
+    </ClCompile>
+    <ClCompile Include="ZipTools\thread_lzma.cpp">
+      <Filter>Misc</Filter>
+    </ClCompile>
+    <ClCompile Include="GameDatabase.cpp">
+      <Filter>Misc</Filter>
+    </ClCompile>
+    <ClCompile Include="Patch_Memory.cpp">
+      <Filter>Misc</Filter>
+    </ClCompile>
     <ClCompile Include="IPU\IPUdma.cpp">
       <Filter>System\Ps2\IPU</Filter>
     </ClCompile>
@@ -888,6 +905,9 @@
     <ClCompile Include="windows\FlatFileReaderWindows.cpp">
       <Filter>System\ISO</Filter>
     </ClCompile>
+    <ClCompile Include="Darwin\DarwinFlatFileReader.cpp">
+      <Filter>System\ISO</Filter>
+    </ClCompile>
     <ClCompile Include="CDVD\InputIsoFile.cpp">
       <Filter>System\ISO</Filter>
     </ClCompile>
@@ -1617,6 +1637,9 @@
     <ClCompile Include="GS\Window\GSWndDX.cpp">
       <Filter>System\Ps2\GS\Window</Filter>
     </ClCompile>
+    <ClCompile Include="GS\Window\GSWndEGL.cpp">
+      <Filter>System\Ps2\GS\Window</Filter>
+    </ClCompile>
     <ClCompile Include="GS\Window\GSWndWGL.cpp">
       <Filter>System\Ps2\GS\Window</Filter>
     </ClCompile>
@@ -1661,6 +1684,9 @@
     <ClInclude Include="System\SysThreads.h">
       <Filter>System\Include</Filter>
     </ClInclude>
+    <ClInclude Include="System\RecTypes.h">
+      <Filter>System\Include</Filter>
+    </ClInclude>
     <ClInclude Include="Counters.h">
       <Filter>System\Ps2\EmotionEngine</Filter>
     </ClInclude>
@@ -1673,6 +1699,9 @@
     <ClInclude Include="Hw.h">
       <Filter>System\Ps2\EmotionEngine\Hardware</Filter>
     </ClInclude>
+    <ClInclude Include="ps2\HwInternal.h">
+      <Filter>System\Ps2\EmotionEngine\Hardware</Filter>
+    </ClInclude>
     <ClInclude Include="Cache.h">
       <Filter>System\Ps2\EmotionEngine\Memory</Filter>
     </ClInclude>
@@ -1745,6 +1774,9 @@
     <ClInclude Include="R5900OpcodeTables.h">
       <Filter>System\Ps2\EmotionEngine\EE</Filter>
     </ClInclude>
+    <ClInclude Include="COP0.h">
+      <Filter>System\Ps2\EmotionEngine\EE</Filter>
+    </ClInclude>
     <ClInclude Include="x86\iCOP0.h">
       <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
     </ClInclude>
@@ -1859,6 +1891,9 @@
     <ClInclude Include="ps2\BiosTools.h">
       <Filter>System\Ps2\Include</Filter>
     </ClInclude>
+    <ClInclude Include="MemoryTypes.h">
+      <Filter>System\Ps2\Include</Filter>
+    </ClInclude>
     <ClInclude Include="x86\iCore.h">
       <Filter>System\Ps2\iCore</Filter>
     </ClInclude>
@@ -1934,23 +1969,54 @@
     <ClInclude Include="gui\MainFrame.h">
       <Filter>AppHost\Include</Filter>
     </ClInclude>
+    <ClInclude Include="gui\MemoryCardFile.h">
+      <Filter>AppHost\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\MemoryCardFolder.h">
+      <Filter>AppHost\Include</Filter>
+    </ClInclude>
     <ClInclude Include="gui\RecentIsoList.h">
       <Filter>AppHost\Include</Filter>
     </ClInclude>
     <ClInclude Include="gui\Saveslots.h">
       <Filter>AppHost\Include</Filter>
     </ClInclude>
-    <ClInclude Include="gui\AppCoreThread.h" />
-    <ClInclude Include="gui\GSFrame.h" />
-    <ClInclude Include="gui\pxEventThread.h" />
-    <ClInclude Include="ZipTools\ThreadedZipTools.h" />
-    <ClInclude Include="GameDatabase.h" />
+    <ClInclude Include="gui\AppAccelerators.h">
+      <Filter>AppHost\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\AppCoreThread.h">
+      <Filter>AppHost\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\GSFrame.h">
+      <Filter>AppHost\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\pxEventThread.h">
+      <Filter>AppHost\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="PathDefs.h">
+      <Filter>AppHost\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="SysForwardDefs.h">
+      <Filter>AppHost\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="ZipTools\ThreadedZipTools.h">
+      <Filter>Misc</Filter>
+    </ClInclude>
+    <ClInclude Include="GameDatabase.h">
+      <Filter>Misc</Filter>
+    </ClInclude>
+    <ClInclude Include="cheatscpp.h">
+      <Filter>Misc</Filter>
+    </ClInclude>
     <ClInclude Include="IPU\IPUdma.h">
       <Filter>System\Ps2\IPU</Filter>
     </ClInclude>
     <ClInclude Include="gui\AppGameDatabase.h">
       <Filter>AppHost</Filter>
     </ClInclude>
+    <ClInclude Include="gui\i18n.h">
+      <Filter>AppHost</Filter>
+    </ClInclude>
     <ClInclude Include="gui\Panels\MemoryCardPanels.h">
       <Filter>AppHost\Panels</Filter>
     </ClInclude>
@@ -2020,6 +2086,9 @@
     <ClInclude Include="CDVD\ThreadedFileReader.h">
       <Filter>System\ISO</Filter>
     </ClInclude>
+    <ClInclude Include="CDVD\ChdFileReader.h">
+      <Filter>System\ISO</Filter>
+    </ClInclude>
     <ClInclude Include="CDVD\CsoFileReader.h">
       <Filter>System\ISO</Filter>
     </ClInclude>
@@ -2041,6 +2110,9 @@
     <ClInclude Include="IopGte.h">
       <Filter>System\Ps2\Iop</Filter>
     </ClInclude>
+    <ClInclude Include="sio_internal.h">
+      <Filter>System\Ps2\Iop</Filter>
+    </ClInclude>
     <ClInclude Include="ps2\pgif.h">
       <Filter>System\Ps2</Filter>
     </ClInclude>
@@ -2425,6 +2497,12 @@
     <ClInclude Include="GS\GS.h">
       <Filter>System\Ps2\GS</Filter>
     </ClInclude>
+    <ClInclude Include="GS\GS_codegen.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
+    <ClInclude Include="GS\GS_types.h">
+      <Filter>System\Ps2\GS</Filter>
+    </ClInclude>
     <ClInclude Include="GS\GSAlignedClass.h">
       <Filter>System\Ps2\GS</Filter>
     </ClInclude>
@@ -2630,6 +2708,9 @@
     <ClInclude Include="GS\Window\GSWndDX.h">
       <Filter>System\Ps2\GS\Window</Filter>
     </ClInclude>
+    <ClInclude Include="GS\Window\GSWndEGL.h">
+      <Filter>System\Ps2\GS\Window</Filter>
+    </ClInclude>
     <ClInclude Include="GS\Window\GSWndWGL.h">
       <Filter>System\Ps2\GS\Window</Filter>
     </ClInclude>