diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 9b57ebb55a..34c5ee5e5b 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -69,6 +69,8 @@ elif sys.platform == 'darwin':
 	else:
 		exe += 'NoGUI'
 
+	env.Depends(exe, env['libvideo'])
+
 	env.Install('#' + env['prefix'] + '/Dolphin.app/Contents/' +
 		'Frameworks/Cg.framework', source = [
 		'#Externals/Cg/Cg.framework/Cg',
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index 55087e657c..28a0453ea3 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -325,7 +325,8 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
 	GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL,
 		wxPoint(0, 0), wxSize(_twidth, _theight));
 	GLWin.glCanvas->Show(true);
-	GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
+	if (GLWin.glCtxt == NULL) // XXX dirty hack
+		GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
 
 #elif defined(__APPLE__)
 	NSOpenGLPixelFormatAttribute attr[2] = { NSOpenGLPFADoubleBuffer, 0 };
@@ -570,8 +571,8 @@ void OpenGL_Shutdown()
 {
 #if defined(USE_WX) && USE_WX
 	GLWin.glCanvas->Hide();
-	GLWin.glCanvas->Destroy();
-	delete GLWin.glCtxt;
+	// XXX GLWin.glCanvas->Destroy();
+	// XXX delete GLWin.glCtxt;
 #elif defined(__APPLE__)
         [GLWin.cocoaWin close];
         [GLWin.cocoaCtx clearDrawable];
diff --git a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
index 7abe14dcbd..ee67753dad 100644
--- a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
+++ b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
@@ -20,7 +20,7 @@ set(SRCS	Src/BPMemLoader.cpp
 			Src/TextureSampler.cpp
 			Src/TransformUnit.cpp
 			Src/VertexLoader.cpp
-			Src/VideoConfig.cpp
+			Src/SWVideoConfig.cpp
 			Src/XFMemLoader.cpp)
 
 if(wxWidgets_FOUND)
diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj
index 7ead9726d0..b926943c55 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj
+++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj
@@ -648,11 +648,11 @@
 			>
 		</File>
 		<File
-			RelativePath=".\Src\VideoConfig.cpp"
+			RelativePath=".\Src\SWVideoConfig.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\Src\VideoConfig.h"
+			RelativePath=".\Src\SWVideoConfig.h"
 			>
 		</File>
 		<File
diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj
index 72e18e710a..de442d3113 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj
+++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj
@@ -193,7 +193,7 @@
     <ClCompile Include="Src\TransformUnit.cpp" />
     <ClCompile Include="Src\VertexFormatConverter.cpp" />
     <ClCompile Include="Src\VertexLoader.cpp" />
-    <ClCompile Include="Src\VideoConfig.cpp" />
+    <ClCompile Include="Src\SWVideoConfig.cpp" />
     <ClCompile Include="Src\VideoConfigDialog.cpp" />
     <ClCompile Include="Src\Win32.cpp" />
     <ClCompile Include="Src\XFMemLoader.cpp" />
@@ -226,7 +226,7 @@
     <ClInclude Include="Src\VertexFormatConverter.h" />
     <ClInclude Include="Src\VertexLoader.h" />
     <ClInclude Include="Src\VertexLoader_Position.h" />
-    <ClInclude Include="Src\VideoConfig.h" />
+    <ClInclude Include="Src\SWVideoConfig.h" />
     <ClInclude Include="Src\VideoConfigDialog.h" />
     <ClInclude Include="Src\Win32.h" />
     <ClInclude Include="Src\XFMemLoader.h" />
@@ -251,4 +251,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp
index 02ca28ed3e..5a55dc25e2 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp
@@ -54,7 +54,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "XFMemLoader.h"
 #include "BPMemLoader.h"
 #include "Statistics.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 
 
 namespace Clipper
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.cpp
index 6b2d0733b4..1014a35e23 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.cpp
@@ -38,7 +38,7 @@ u8* g_pVideoData;
 
 #else
 
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "OpcodeDecoding.h"
 #include "VideoCommon.h"
 extern u8* g_pVideoData;
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp
index c14aced6f5..1fd5b40f1b 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp
@@ -21,7 +21,7 @@
 #include "DebugUtil.h"
 #include "BPMemLoader.h"
 #include "TextureSampler.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "EfbInterface.h"
 #include "Statistics.h"
 #include "HwRasterizer.h"
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp
index ee6c300468..cfa5c5e67b 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp
@@ -22,7 +22,7 @@
 #include "Renderer.h"
 #include "TextureEncoder.h"
 #include "Statistics.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "DebugUtil.h"
 #include "HwRasterizer.h"
 #include "CommandProcessor.h"
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp
index 48e18f12f0..2fd5905c9d 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp
@@ -16,7 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "main.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "IniFile.h"
 #include "Setup.h"
 
@@ -122,7 +122,8 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _twidth, int _theight
 	GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL,
 		wxPoint(0, 0), wxSize(_twidth, _theight));
 	GLWin.glCanvas->Show(true);
-	GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
+	if (GLWin.glCtxt == NULL) // XXX dirty hack
+		GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
 
 #elif defined(_WIN32)
 	// Create rendering window in Windows
@@ -384,8 +385,8 @@ void OpenGL_Shutdown()
 {
 #if defined(USE_WX) && USE_WX
 	GLWin.glCanvas->Hide();
-	GLWin.glCanvas->Destroy();
-	delete GLWin.glCtxt;
+	// XXX GLWin.glCanvas->Destroy();
+	// XXX delete GLWin.glCtxt;
 #elif defined(_WIN32)
 	if (hRC)                                            // Do We Have A Rendering Context?
 	{
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.h b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.h
index 26acaa86dd..33943fe00d 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.h
@@ -20,7 +20,7 @@
 #define _GLINIT_H_
 
 #include <string>
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "pluginspecs_video.h"
 
 #ifdef _WIN32
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
index 09ae528bb9..e73c28d2c2 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
@@ -24,7 +24,7 @@
 #include "XFMemLoader.h"
 #include "Tev.h"
 #include "Statistics.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 
 
 #define BLOCK_SIZE 2
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript
index e009d4d983..9a9c0b995c 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript
@@ -27,7 +27,7 @@ files = [
 	'TextureSampler.cpp',
 	'TransformUnit.cpp',
 	'VertexLoader.cpp',
-	'VideoConfig.cpp',
+	'SWVideoConfig.cpp',
 	'XFMemLoader.cpp',
 	]
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfig.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp
similarity index 99%
rename from Source/Plugins/Plugin_VideoSoftware/Src/VideoConfig.cpp
rename to Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp
index d23b592802..05a6cdddf2 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfig.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp
@@ -17,7 +17,7 @@
 
 #include "FileUtil.h"
 #include "IniFile.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 
 SWVideoConfig g_SWVideoConfig;
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfig.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/VideoConfig.h
rename to Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Statistics.h b/Source/Plugins/Plugin_VideoSoftware/Src/Statistics.h
index e6d8e0dbbd..3ffc0375b6 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Statistics.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/Statistics.h
@@ -16,7 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "CommonTypes.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 
 #ifndef _STATISTICS_H
 #define _STATISTICS_H
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
index 053a20fadf..3d2ecadec0 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
@@ -21,7 +21,7 @@
 #include "EfbInterface.h"
 #include "TextureSampler.h"
 #include "Statistics.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "DebugUtil.h"
 
 #include <math.h>
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h
index 679769dbd9..66278e99a5 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h
@@ -21,7 +21,7 @@
 #include <vector>
 #include <string>
 
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 
 #include <wx/wx.h>
 #include <wx/textctrl.h>
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp
index 5cd343e50e..0ff2798a2d 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp
@@ -23,7 +23,7 @@
 #include <wx/dialog.h>
 #include <wx/aboutdlg.h>
 
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "main.h"
 #include "Win32.h"
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp
index 4004c1cf14..8ece8c9500 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp
@@ -25,7 +25,7 @@
 
 #include "CommandProcessor.h"
 #include "OpcodeDecoder.h"
-#include "VideoConfig.h"
+#include "SWVideoConfig.h"
 #include "PixelEngine.h"
 #include "CommandProcessor.h"
 #include "BPMemLoader.h"