diff --git a/Source/Core/VideoCommon/Src/SConscript b/Source/Core/VideoCommon/Src/SConscript
index 69724c541ef..8ae79982457 100644
--- a/Source/Core/VideoCommon/Src/SConscript
+++ b/Source/Core/VideoCommon/Src/SConscript
@@ -3,7 +3,7 @@
 Import('env')
 
 files = [
-	'Config.cpp',
+	'VideoConfig.cpp',
 	'GlobalControl.cpp',
 	'BPMemory.cpp',
 	'CPMemory.cpp',
diff --git a/Source/Core/VideoCommon/Src/Config.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp
similarity index 99%
rename from Source/Core/VideoCommon/Src/Config.cpp
rename to Source/Core/VideoCommon/Src/VideoConfig.cpp
index 331c91aed01..4c171f1db38 100644
--- a/Source/Core/VideoCommon/Src/Config.cpp
+++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp
@@ -19,7 +19,7 @@
 
 #include "Common.h"
 #include "IniFile.h"
-#include "Config.h"
+#include "VideoConfig.h"
 #include "VideoCommon.h"
 
 Config g_Config;
diff --git a/Source/Core/VideoCommon/Src/Config.h b/Source/Core/VideoCommon/Src/VideoConfig.h
similarity index 97%
rename from Source/Core/VideoCommon/Src/Config.h
rename to Source/Core/VideoCommon/Src/VideoConfig.h
index de4e94d0c52..07512e083ec 100644
--- a/Source/Core/VideoCommon/Src/Config.h
+++ b/Source/Core/VideoCommon/Src/VideoConfig.h
@@ -22,8 +22,8 @@
 // at the start of every frame. Noone should ever change members of g_ActiveConfig 
 // directly.
 
-#ifndef _PLUGIN_VIDEOOGL_CONFIG_H_
-#define _PLUGIN_VIDEOOGL_CONFIG_H_
+#ifndef _PLUGIN_VIDEO_CONFIG_H_
+#define _PLUGIN_VIDEO_CONFIG_H_
 
 #include "Common.h"
 #include "VideoCommon.h"
@@ -140,4 +140,4 @@ void UpdateActiveConfig();
 
 void ComputeDrawRectangle(int backbuffer_width, int backbuffer_height, bool flip, TargetRectangle *rc);
 
-#endif  // _PLUGIN_VIDEOOGL_CONFIG_H_
+#endif  // _PLUGIN_VIDEO_CONFIG_H_
diff --git a/Source/Core/VideoCommon/VideoCommon.vcproj b/Source/Core/VideoCommon/VideoCommon.vcproj
index eee7206a391..908b9f3ab23 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcproj
@@ -689,14 +689,6 @@
 				>
 			</File>
 		</Filter>
-		<File
-			RelativePath=".\Src\Config.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\Config.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Src\GlobalControl.cpp"
 			>
@@ -725,6 +717,14 @@
 			RelativePath=".\Src\VideoCommon.h"
 			>
 		</File>
+		<File
+			RelativePath=".\Src\VideoConfig.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\VideoConfig.h"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/BPFunctions.cpp b/Source/Plugins/Plugin_VideoDX9/Src/BPFunctions.cpp
index eb96696874e..eaff8df1bed 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/BPFunctions.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/BPFunctions.cpp
@@ -17,7 +17,7 @@
 
 #include "BPFunctions.h"
 #include "D3DBase.h"
-#include "Config.h"
+#include "VideoConfig.h"
 #include "Common.h"
 #include "TextureCache.h"
 #include "VertexManager.h"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.cpp
index 066058e38d7..737e117f38e 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.cpp
@@ -18,7 +18,7 @@
 #include <d3dx9.h>
 #include <string>
 
-#include "Config.h"
+#include "VideoConfig.h"
 #include "D3DShader.h"
 
 namespace D3D
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Debugger/Debugger.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Debugger/Debugger.cpp
index 553669ba1e2..9b14bb0ecc0 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/Debugger/Debugger.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/Debugger/Debugger.cpp
@@ -19,7 +19,7 @@
 #include "IniFile.h"
 #include "Debugger.h"
 
-#include "Config.h"
+#include "VideoConfig.h"
 #include "../Globals.h"
 #include "../D3DBase.h"
 
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp b/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp
index 799b720dbb4..b0406d94485 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp
@@ -23,7 +23,7 @@
 
 #include "D3DBase.h"
 
-#include "Config.h"
+#include "VideoConfig.h"
 
 #include "TextureCache.h"
 
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/EmuWindow.cpp b/Source/Plugins/Plugin_VideoDX9/Src/EmuWindow.cpp
index 120af9acaf3..43cdbbbef31 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/EmuWindow.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/EmuWindow.cpp
@@ -2,7 +2,7 @@
 #include <windows.h>
 
 #include "../../Core/Src/Core.h"
-#include "Config.h"
+#include "VideoConfig.h"
 #include "main.h"
 #include "EmuWindow.h"
 #include "Fifo.h"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Globals.h b/Source/Plugins/Plugin_VideoDX9/Src/Globals.h
index a6cab07ae0d..e2a0df8c4c8 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/Globals.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/Globals.h
@@ -19,7 +19,7 @@
 #define _GLOBALS_H_
 
 #include "Common.h"
-#include "Config.h"
+#include "VideoConfig.h"
 #include "main.h"
 
 #include "VideoCommon.h"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
index 117ba20e7a3..088f22faa4c 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
@@ -20,7 +20,7 @@
 #include "Statistics.h"
 #include "Utils.h"
 #include "Profiler.h"
-#include "Config.h"
+#include "VideoConfig.h"
 #include "PixelShaderGen.h"
 #include "PixelShaderManager.h"
 #include "PixelShaderCache.h"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
index 773eb6f21b8..63c6dd042ea 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
@@ -21,7 +21,7 @@
 #include "Common.h"
 #include "Statistics.h"
 
-#include "Config.h"
+#include "VideoConfig.h"
 #include "main.h"
 #include "VertexManager.h"
 #include "Render.h"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
index e9a7622c079..cdba5f2f4bb 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
@@ -22,7 +22,7 @@
 #include "Statistics.h"
 #include "Utils.h"
 #include "Profiler.h"
-#include "Config.h"
+#include "VideoConfig.h"
 #include "VertexShaderCache.h"
 #include "VertexLoader.h"
 #include "BPMemory.h"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
index bb1636799d4..4fa484cf71b 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
@@ -33,7 +33,7 @@ GFXDebuggerDX9 *m_DebuggerFrame = NULL;
 #include "svnrev.h"
 #include "resource.h"
 #include "main.h"
-#include "Config.h"
+#include "VideoConfig.h"
 #include "Fifo.h"
 #include "OpcodeDecoding.h"
 #include "TextureCache.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
index 03551bdb20a..1203bc37c38 100644
--- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
+++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
@@ -716,10 +716,6 @@
 		<Filter
 			Name="Decoder"
 			>
-			<File
-				RelativePath=".\Src\BPFunctions.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\Src\DLCache.cpp"
 				>
@@ -744,6 +740,10 @@
 		<Filter
 			Name="Render"
 			>
+			<File
+				RelativePath=".\Src\BPFunctions.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\Src\FramebufferManager.cpp"
 				>
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/BPFunctions.cpp b/Source/Plugins/Plugin_VideoOGL/Src/BPFunctions.cpp
index 2377c717858..80914668219 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/BPFunctions.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/BPFunctions.cpp
@@ -18,7 +18,7 @@
 #include "BPFunctions.h"
 #include "Globals.h"
 #include "Profiler.h"
-#include "Config.h"
+#include "VideoConfig.h"
 #include "VertexManager.h"
 #include "Render.h"
 #include "TextureMngr.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Debugger/Debugger.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Debugger/Debugger.cpp
index 36a63d1a3dc..a4c2de3ce92 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Debugger/Debugger.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Debugger/Debugger.cpp
@@ -19,7 +19,7 @@
 #include "IniFile.h"
 #include "Debugger.h"
 
-#include "Config.h"
+#include "VideoConfig.h"
 #include "../Globals.h"
 
 extern int g_Preset;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index 30ccc3186f0..839594771ca 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -16,7 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "Globals.h"
-#include "Config.h"
+#include "VideoConfig.h"
 #include "IniFile.h"
 #include "svnrev.h"
 #include "Setup.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
index 4fab388c582..98a769606ee 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
@@ -18,7 +18,7 @@
 #ifndef _GLINIT_H_
 #define _GLINIT_H_
 
-#include "Config.h"
+#include "VideoConfig.h"
 #include "MathUtil.h"
 #include "pluginspecs_video.h"
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
index ab6419cbdbd..ed12005227d 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
@@ -24,7 +24,7 @@
 
 #include "ConfigDlg.h"
 #include "../Globals.h"
-#include "Config.h"
+#include "VideoConfig.h"
 #include "../TextureMngr.h"
 #include "VertexShaderManager.h"
 #include "../PostProcessing.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Globals.h b/Source/Plugins/Plugin_VideoOGL/Src/Globals.h
index 7bd62b0fb98..b9796706f59 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Globals.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Globals.h
@@ -19,7 +19,7 @@
 #define _GLOBALS_H_
 
 #include "Common.h"
-#include "Config.h"
+#include "VideoConfig.h"
 
 #include "VideoCommon.h"
 #include "pluginspecs_video.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp b/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp
index b6795e3ff4b..8947d463edd 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp
@@ -24,7 +24,7 @@
 #include <wx/aboutdlg.h>
 
 #include "../Globals.h"
-#include "Config.h"
+#include "VideoConfig.h"
 #include "main.h"
 #include "Win32.h"
 #include "OnScreenDisplay.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
index 5caca614e1d..6006268416a 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
@@ -26,7 +26,7 @@
 #include <cmath>
 
 #include "Statistics.h"
-#include "Config.h"
+#include "VideoConfig.h"
 #include "ImageWrite.h"
 #include "Common.h"
 #include "Render.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp
index 93ebe767de0..ea06377f048 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp
@@ -15,9 +15,9 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "VideoCommon.h"
 #include "FileUtil.h"
-#include "Config.h"
+#include "VideoCommon.h"
+#include "VideoConfig.h"
 #include "GLUtil.h"
 #include "PostProcessing.h"
 #include "PixelShaderCache.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 4c6daacbe75..3bab443a088 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -33,7 +33,7 @@
 #endif
 
 #include "CommonPaths.h"
-#include "Config.h"
+#include "VideoConfig.h"
 #include "Profiler.h"
 #include "Statistics.h"
 #include "ImageWrite.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
index a6d1b2f6f6f..efe24a4fcd6 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
@@ -25,7 +25,7 @@
 #include "VertexShaderManager.h"
 #include "FramebufferManager.h"
 #include "Globals.h"
-#include "Config.h"
+#include "VideoConfig.h"
 #include "ImageWrite.h"
 #include "Render.h"
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp
index a8e733d7bb1..00e54d7d11f 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp
@@ -33,7 +33,7 @@
 #undef _interlockedbittestandreset64
 #endif
 
-#include "Config.h"
+#include "VideoConfig.h"
 #include "Hash.h"
 #include "Statistics.h"
 #include "Profiler.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
index b60545ce0f4..87069d221d1 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
@@ -22,7 +22,7 @@
 
 #include "Fifo.h"
 
-#include "Config.h"
+#include "VideoConfig.h"
 #include "Statistics.h"
 #include "MemoryUtil.h"
 #include "Profiler.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
index 063afd458f1..1da19803c16 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
@@ -19,7 +19,7 @@
 
 #include "Globals.h"
 #include "Profiler.h"
-#include "Config.h"
+#include "VideoConfig.h"
 #include "Statistics.h"
 
 #include "GLUtil.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index 8f24c5c6b61..d90949fe132 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -49,8 +49,6 @@ Make AA apply instantly during gameplay if possible
 
 */
 
-
-
 #include "Globals.h"
 #include "LogManager.h"
 #include "Thread.h"
@@ -69,7 +67,7 @@ GFXConfigDialogOGL *m_ConfigFrame = NULL;
 GFXDebuggerOGL *m_DebuggerFrame = NULL;
 #endif // HAVE_WX
 
-#include "Config.h"
+#include "VideoConfig.h"
 #include "LookUpTables.h"
 #include "ImageWrite.h"
 #include "Render.h"