diff --git a/Externals/wxWidgets/build/msw/wx_adv.vcproj b/Externals/wxWidgets/build/msw/wx_adv.vcproj
index af46b1816e..ab845dcbab 100644
--- a/Externals/wxWidgets/build/msw/wx_adv.vcproj
+++ b/Externals/wxWidgets/build/msw/wx_adv.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="wxAdv28"
 	ProjectGUID="{71B16F46-0B00-4EDA-B253-D6D9D03A215C}"
 	TargetFrameworkVersion="0"
@@ -123,9 +123,9 @@
 				AdditionalOptions="/EHsc "
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\Include;..\..\Include\msvc;..\..\..\zlib;..\..\src\png"
-				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__"
 				MinimalRebuild="true"
-				RuntimeLibrary="3"
+				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
@@ -2128,10 +2128,6 @@
 		<Filter
 			Name="Setup Headers"
 			>
-			<File
-				RelativePath="..\..\include\wx\univ\setup.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\setup.h"
 				>
@@ -2196,6 +2192,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\setup.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="MSW Headers"
diff --git a/Externals/wxWidgets/include/msvc/wx/setup.h b/Externals/wxWidgets/include/msvc/wx/setup.h
index 3f0e0cd5e4..a1ce91fa17 100644
--- a/Externals/wxWidgets/include/msvc/wx/setup.h
+++ b/Externals/wxWidgets/include/msvc/wx/setup.h
@@ -9,6 +9,47 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+
+
+
+// =======================================================
+// A guide to all the setup.h versions
+// -------------
+/* The included setup files are:
+
+   include\msvc\wx\setup.h			+ This file
+   include\wx\msw\wince\setup.h		- Not used in regular builds
+   lib\vc_lib\msw\wx\setup.h		+ Library configuration, Release and DebugFast builds
+   lib\vc_lib\mswd\wx\setup.h		+ Library configuration, Debug builds
+   lib\vc_dll\msw\wx\setup.h		- Not used, dll version only
+   lib\vc_dll\mswd\wx\setup.h		- Not used, dll version only
+
+   These are identical or almost identical and I'm not sure which one that applies
+   in case they are different:
+
+   include\wx\setup.h				?
+   include\wx\msw\setup.h			?
+   include\wx\univ\setup.h			?
+   include\wx\msw\setup0.h			- The original univ file, not used
+
+   The configuration consistency check files:
+   
+   include\wx\chkconf.h				?
+   include\wx\msw\chkconf.h			?
+   include\wx\univ\chkconf.h		?
+   include\wx\msw\wince\chkconf.h	- Not used in regular builds
+
+   Issues:
+   
+   The Debug build will break in CFrame::InitBitmaps() at the ConvertToImage() line
+   with a "assert "wxWidgets Debug Alert, bmp.Ok()" error message, the cause is unknown,
+   to me at least.
+*/
+// =============
+
+
+
+
 // VC++ IDE predefines _DEBUG and _UNICODE for the new projects itself, but
 // the other symbols (WXUSINGDLL, __WXUNIVERSAL__, ...) should be defined
 // explicitly!
diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj
index c4516fded2..a1a9c3423e 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcproj
@@ -458,6 +458,7 @@
 				Name="VCPostBuildEventTool"
 				Description="Copying Data\* to $(TargetDir)"
 				CommandLine="xcopy &quot;$(SolutionDir)..\Data&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;echo Copying External .dlls&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\Cg64\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\SDL\x64\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\WiiUse\X64\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;"
+				ExcludedFromBuild="false"
 			/>
 		</Configuration>
 		<Configuration
@@ -605,7 +606,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/EHsc "
+				AdditionalOptions="/EHsc"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"