diff --git a/Source/Core/VideoCommon/VideoCommon.vcproj b/Source/Core/VideoCommon/VideoCommon.vcproj
index ba9174c7aa..502d104e48 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcproj
@@ -459,6 +459,98 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="ShaderManagers"
+			>
+			<File
+				RelativePath=".\Src\PixelShaderManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\PixelShaderManager.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Util"
+			>
+			<File
+				RelativePath=".\Src\ImageWrite.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\ImageWrite.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\IndexGenerator.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\IndexGenerator.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\LookUpTables.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\LookUpTables.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Profiler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Profiler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Statistics.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Statistics.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\VideoState.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\VideoState.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\XFBConvert.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AssemblerOutput="4"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AssemblerOutput="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\Src\XFBConvert.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="VertexLoading"
+			>
+		</Filter>
 		<File
 			RelativePath=".\Src\DataReader.h"
 			>
@@ -471,30 +563,6 @@
 			RelativePath=".\Src\Fifo.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Src\ImageWrite.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\ImageWrite.h"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\IndexGenerator.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\IndexGenerator.h"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\LookUpTables.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\LookUpTables.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Src\NativeVertexFormat.h"
 			>
@@ -515,34 +583,10 @@
 			RelativePath=".\Src\OpcodeDecoding.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Src\PixelShaderManager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\PixelShaderManager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\Profiler.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\Profiler.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Src\SConscript"
 			>
 		</File>
-		<File
-			RelativePath=".\Src\Statistics.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\Statistics.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Src\TextureDecoder.cpp"
 			>
@@ -567,38 +611,6 @@
 			RelativePath=".\Src\VideoCommon.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Src\VideoState.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\VideoState.h"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\XFBConvert.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AssemblerOutput="4"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AssemblerOutput="4"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\Src\XFBConvert.h"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Color.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Color.cpp
index 5c56f4faee..ebb1c62dcc 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Color.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Color.cpp
@@ -18,11 +18,12 @@
 #ifndef _VERTEXLOADERCOLOR_H
 #define _VERTEXLOADERCOLOR_H
 
-#include "Globals.h"
+#include "Common.h"
+#include "VideoCommon.h"
 #include "LookUpTables.h"
 #include "VertexLoader.h"
-#include "VertexManager.h"
 #include "VertexLoader_Color.h"
+#include "NativeVertexWriter.h"
 
 #define RSHIFT 0
 #define GSHIFT 8
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Normal.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Normal.cpp
index df3ca8a375..da2f990594 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Normal.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Normal.cpp
@@ -15,11 +15,11 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Globals.h"
-#include "Config.h"
+#include "Common.h"
+#include "VideoCommon.h"
 #include "VertexLoader.h"
-#include "VertexManager.h"
 #include "VertexLoader_Normal.h"
+#include "NativeVertexWriter.h"
 
 #define LOG_NORM8() PRIM_LOG("norm: %f %f %f, ", ((s8*)VertexManager::s_pCurBufferPointer)[-3]/127.0f, ((s8*)VertexManager::s_pCurBufferPointer)[-2]/127.0f, ((s8*)VertexManager::s_pCurBufferPointer)[-1]/127.0f);
 #define LOG_NORM16() PRIM_LOG("norm: %f %f %f, ", ((s16*)VertexManager::s_pCurBufferPointer)[-3]/32767.0f, ((s16*)VertexManager::s_pCurBufferPointer)[-2]/32767.0f, ((s16*)VertexManager::s_pCurBufferPointer)[-1]/32767.0f);
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Position.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Position.cpp
index 72c72daaa2..4dfd1c1869 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Position.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_Position.cpp
@@ -18,10 +18,11 @@
 #ifndef VERTEXLOADER_POSITION_H
 #define VERTEXLOADER_POSITION_H
 
-#include "Globals.h"
+#include "Common.h"
+#include "VideoCommon.h"
 #include "VertexLoader.h"
-#include "VertexManager.h"
 #include "VertexLoader_Position.h"
+#include "NativeVertexWriter.h"
 
 extern float posScale;
 extern TVtxAttr *pVtxAttr;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_TextCoord.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_TextCoord.cpp
index 01f1fe56ad..bd6cb43f99 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_TextCoord.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader_TextCoord.cpp
@@ -18,10 +18,11 @@
 #ifndef VERTEXLOADER_TEXCOORD_H
 #define VERTEXLOADER_TEXCOORD_H
 
-#include "Globals.h"
+#include "Common.h"
+#include "VideoCommon.h"
 #include "VertexLoader.h"
-#include "VertexManager.h"
 #include "VertexLoader_Position.h"
+#include "NativeVertexWriter.h"
 
 #define LOG_TEX1() PRIM_LOG("tex: %f, ", ((float*)VertexManager::s_pCurBufferPointer)[0]);
 #define LOG_TEX2() PRIM_LOG("tex: %f %f, ", ((float*)VertexManager::s_pCurBufferPointer)[0], ((float*)VertexManager::s_pCurBufferPointer)[1]);