diff --git a/Source/3rd Party/wx/src/common/filename.cpp b/Source/3rd Party/wx/src/common/filename.cpp
index fcbc0e720..2002da92e 100644
--- a/Source/3rd Party/wx/src/common/filename.cpp	
+++ b/Source/3rd Party/wx/src/common/filename.cpp	
@@ -103,6 +103,7 @@
     #include <shlobj.h>         // for CLSID_ShellLink
     #include "wx/msw/missing.h"
     #include "wx/msw/ole/oleutils.h"
+	#include <Shellapi.h>
 #endif
 
 #if defined(__WXMAC__)
diff --git a/Source/3rd Party/wx/src/msw/filedlg.cpp b/Source/3rd Party/wx/src/msw/filedlg.cpp
index a0c0ace94..fcd68b62a 100644
--- a/Source/3rd Party/wx/src/msw/filedlg.cpp	
+++ b/Source/3rd Party/wx/src/msw/filedlg.cpp	
@@ -39,6 +39,10 @@
     #include "wx/math.h"
 #endif
 
+#ifdef __WXMSW__
+#include <CdErr.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/Source/3rd Party/wx/src/msw/gdiimage.cpp b/Source/3rd Party/wx/src/msw/gdiimage.cpp
index 7f86bf36b..f4615913b 100644
--- a/Source/3rd Party/wx/src/msw/gdiimage.cpp	
+++ b/Source/3rd Party/wx/src/msw/gdiimage.cpp	
@@ -55,6 +55,10 @@
 #include <shellapi.h>
 #endif
 
+#ifdef __WXMSW__
+#include <shellapi.h>
+#endif
+
 #include "wx/file.h"
 
 #include "wx/listimpl.cpp"
diff --git a/Source/3rd Party/wx/src/msw/graphics.cpp b/Source/3rd Party/wx/src/msw/graphics.cpp
index d0a19506d..b558de65e 100644
--- a/Source/3rd Party/wx/src/msw/graphics.cpp	
+++ b/Source/3rd Party/wx/src/msw/graphics.cpp	
@@ -15,6 +15,9 @@
 #endif
 
 #include "wx/dc.h"
+#include <rpc.h>
+#include <rpcndr.h>
+#include <Unknwn.h>
 
 #if wxUSE_GRAPHICS_CONTEXT
 
diff --git a/Source/3rd Party/wx/src/msw/ole/activex.cpp b/Source/3rd Party/wx/src/msw/ole/activex.cpp
index 185acb6ab..949bfa854 100644
--- a/Source/3rd Party/wx/src/msw/ole/activex.cpp	
+++ b/Source/3rd Party/wx/src/msw/ole/activex.cpp	
@@ -531,7 +531,7 @@ public:
     #elif defined(_UNICODE)
     GetObjectW
     #else
-    GetObjectA
+    GetObject
     #endif
     (LPOLESTR pszItem, DWORD, IBindCtx *, REFIID, void ** ppvObject)
     {
diff --git a/Source/3rd Party/wx/src/msw/ole/dataobj.cpp b/Source/3rd Party/wx/src/msw/ole/dataobj.cpp
index b06e4b6e6..aa1675021 100644
--- a/Source/3rd Party/wx/src/msw/ole/dataobj.cpp	
+++ b/Source/3rd Party/wx/src/msw/ole/dataobj.cpp	
@@ -49,6 +49,7 @@
 
 #include <oleauto.h>
 #include <shlobj.h>
+#include <ShellAPI.h>
 
 #include "wx/msw/ole/oleutils.h"
 
diff --git a/Source/3rd Party/wx/src/msw/ole/oleutils.cpp b/Source/3rd Party/wx/src/msw/ole/oleutils.cpp
index e12b1760d..b2ba8a57a 100644
--- a/Source/3rd Party/wx/src/msw/ole/oleutils.cpp	
+++ b/Source/3rd Party/wx/src/msw/ole/oleutils.cpp	
@@ -41,6 +41,10 @@
     #define UUID_DEFINED
 #endif
 
+#ifdef __WXMSW__
+#include <Rpc.h>
+#endif
+
 // OLE
 #ifndef __WXWINCE__
 #include  "wx/msw/ole/uuid.h"
diff --git a/Source/3rd Party/wx/src/msw/printdlg.cpp b/Source/3rd Party/wx/src/msw/printdlg.cpp
index bdc2451f5..0196b3ce4 100644
--- a/Source/3rd Party/wx/src/msw/printdlg.cpp	
+++ b/Source/3rd Party/wx/src/msw/printdlg.cpp	
@@ -34,6 +34,11 @@
     #include "wx/cmndata.h"
 #endif
 
+#ifdef __WXMSW__
+#include <WinSpool.h>
+#include <CdErr.h>
+#endif
+
 #include "wx/printdlg.h"
 #include "wx/msw/printdlg.h"
 #include "wx/msw/dcprint.h"
diff --git a/Source/3rd Party/wx/src/msw/textctrl.cpp b/Source/3rd Party/wx/src/msw/textctrl.cpp
index 7195c1c28..343814aeb 100644
--- a/Source/3rd Party/wx/src/msw/textctrl.cpp	
+++ b/Source/3rd Party/wx/src/msw/textctrl.cpp	
@@ -55,6 +55,7 @@
 #include "wx/msw/private.h"
 #include "wx/msw/winundef.h"
 #include "wx/msw/mslu.h"
+#include <OleIdl.h>
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/Source/3rd Party/wx/src/msw/utils.cpp b/Source/3rd Party/wx/src/msw/utils.cpp
index 9b59d1b69..17795b030 100644
--- a/Source/3rd Party/wx/src/msw/utils.cpp	
+++ b/Source/3rd Party/wx/src/msw/utils.cpp	
@@ -18,6 +18,7 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
+#include <Winsock2.h>
 
 #ifdef __BORLANDC__
     #pragma hdrstop
diff --git a/Source/3rd Party/wx/wx_base.vcproj b/Source/3rd Party/wx/wx_base.vcproj
index cb168334c..e9e391f35 100644
--- a/Source/3rd Party/wx/wx_base.vcproj	
+++ b/Source/3rd Party/wx/wx_base.vcproj	
@@ -53,7 +53,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\lib\wxbase28d.lib"
+				OutputFile="$(OutDir)\lib\wxbase30d.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -109,7 +109,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\lib\wxbase28.lib"
+				OutputFile="$(OutDir)\lib\wxbase30.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -166,10 +166,6 @@
 				RelativePath="src\common\convauto.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\common\datacmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\datetime.cpp"
 				>
@@ -430,10 +426,6 @@
 				RelativePath="src\common\wfstream.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\common\wxchar.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\xti.cpp"
 				>
diff --git a/Source/3rd Party/wx/wx_core.vcproj b/Source/3rd Party/wx/wx_core.vcproj
index 3b185d741..3c7b16b9f 100644
--- a/Source/3rd Party/wx/wx_core.vcproj	
+++ b/Source/3rd Party/wx/wx_core.vcproj	
@@ -54,7 +54,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="Comctl32.lib Rpcrt4.lib"
-				OutputFile="$(OutDir)\lib\wxmsw28d_core.lib"
+				OutputFile="$(OutDir)\lib\wxmsw30d_core.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -111,7 +111,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="Comctl32.lib Rpcrt4.lib"
-				OutputFile="$(OutDir)\lib\wxmsw28_core.lib"
+				OutputFile="$(OutDir)\lib\wxmsw30_core.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -788,10 +788,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath=".\src\msw\gsockmsw.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\msw\helpchm.cpp"
 				>
@@ -944,10 +940,6 @@
 				RelativePath="src\msw\settings.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\msw\slider95.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\msw\spinbutt.cpp"
 				>
@@ -964,10 +956,6 @@
 				RelativePath="src\msw\statbox.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\msw\statbr95.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\msw\statline.cpp"
 				>
@@ -976,10 +964,6 @@
 				RelativePath="src\msw\stattext.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\msw\tbar95.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\msw\textctrl.cpp"
 				>
@@ -1274,10 +1258,6 @@
 				RelativePath="src\generic\numdlgg.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\generic\panelg.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\generic\printps.cpp"
 				>
@@ -3763,11 +3743,11 @@
 				>
 			</File>
 			<File
-				RelativePath="include\wx\persist\splitter.h"
+				RelativePath="include\wx\splitter.h"
 				>
 			</File>
 			<File
-				RelativePath="include\wx\splitter.h"
+				RelativePath="include\wx\persist\splitter.h"
 				>
 			</File>
 			<File
@@ -3851,11 +3831,11 @@
 				>
 			</File>
 			<File
-				RelativePath="include\wx\ribbon\toolbar.h"
+				RelativePath="include\wx\toolbar.h"
 				>
 			</File>
 			<File
-				RelativePath="include\wx\toolbar.h"
+				RelativePath="include\wx\ribbon\toolbar.h"
 				>
 			</File>
 			<File
@@ -3867,11 +3847,11 @@
 				>
 			</File>
 			<File
-				RelativePath="include\wx\persist\toplevel.h"
+				RelativePath="include\wx\toplevel.h"
 				>
 			</File>
 			<File
-				RelativePath="include\wx\toplevel.h"
+				RelativePath="include\wx\persist\toplevel.h"
 				>
 			</File>
 			<File
@@ -3879,11 +3859,11 @@
 				>
 			</File>
 			<File
-				RelativePath="include\wx\persist\treebook.h"
+				RelativePath="include\wx\treebook.h"
 				>
 			</File>
 			<File
-				RelativePath="include\wx\treebook.h"
+				RelativePath="include\wx\persist\treebook.h"
 				>
 			</File>
 			<File