diff --git a/Source/Core/VideoCommon/Src/NativeVertexWriter.cpp b/Source/Core/VideoCommon/Src/NativeVertexWriter.cpp
new file mode 100644
index 0000000000..f99aaf98bd
--- /dev/null
+++ b/Source/Core/VideoCommon/Src/NativeVertexWriter.cpp
@@ -0,0 +1,26 @@
+// Copyright (C) 2003-2008 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#include "Common.h"
+#include "NativeVertexWriter.h"
+
+namespace VertexManager
+{
+
+u8* s_pCurBufferPointer = NULL;
+
+}
\ No newline at end of file
diff --git a/Source/Core/VideoCommon/Src/NativeVertexWriter.h b/Source/Core/VideoCommon/Src/NativeVertexWriter.h
new file mode 100644
index 0000000000..f4680d42d2
--- /dev/null
+++ b/Source/Core/VideoCommon/Src/NativeVertexWriter.h
@@ -0,0 +1,37 @@
+// Copyright (C) 2003-2008 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#ifndef _NATIVE_VERTEX_WRITER
+#define _NATIVE_VERTEX_WRITER
+
+// TODO: rename
+namespace VertexManager
+{
+
+void AddVertices(int primitive, int numvertices);
+void Flush(); // flushes the current buffer
+
+// These two don't really belong here and are not relevant for D3D - TODO, find better place to put them.
+int GetRemainingSize();  // remaining space in the current buffer.
+void EnableComponents(u32 components);  // very implementation specific - D3D9 won't need this one.
+
+// TODO: move, rename.
+extern u8* s_pCurBufferPointer;
+
+}
+
+#endif
diff --git a/Source/Core/VideoCommon/Src/SConscript b/Source/Core/VideoCommon/Src/SConscript
index 0b8c44cbc4..63d7996662 100644
--- a/Source/Core/VideoCommon/Src/SConscript
+++ b/Source/Core/VideoCommon/Src/SConscript
@@ -15,6 +15,7 @@ files = [
 	"VertexShader.cpp",
 	"VertexShaderManager.cpp",
 	"ImageWrite.cpp",
+	"NativeVertexWriter.cpp",
 	"Statistics.cpp",
 	"Fifo.cpp",
 	"VideoState.cpp",
diff --git a/Source/Core/VideoCommon/VideoCommon.vcproj b/Source/Core/VideoCommon/VideoCommon.vcproj
index c5471a6164..ba9174c7aa 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcproj
@@ -499,6 +499,14 @@
 			RelativePath=".\Src\NativeVertexFormat.h"
 			>
 		</File>
+		<File
+			RelativePath=".\Src\NativeVertexWriter.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\NativeVertexWriter.h"
+			>
+		</File>
 		<File
 			RelativePath=".\Src\OpcodeDecoding.cpp"
 			>
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp
index 34a953097d..8efe459a6d 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp
@@ -29,11 +29,11 @@
 
 #include "LookUpTables.h"
 #include "Statistics.h"
-#include "VertexManager.h"
 #include "VertexLoaderManager.h"
 #include "VertexLoader.h"
 #include "BPMemory.h"
 #include "DataReader.h"
+#include "NativeVertexWriter.h"
 
 #include "VertexLoader_Position.h"
 #include "VertexLoader_Normal.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
index b2d65971b6..e9c60149d5 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
@@ -33,9 +33,6 @@ static u8 *s_pBaseBufferPointer = NULL;
 static std::vector< std::pair<u32, u32> > s_vStoredPrimitives; // every element, mode and count to be passed to glDrawArrays
 static u32 s_prevcomponents; // previous state set
 
-u8* s_pCurBufferPointer = NULL;
-
-
 static const GLenum c_primitiveType[8] =
 {
     GL_QUADS,
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h
index 451c847a9e..58b3197527 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h
@@ -15,11 +15,11 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-
 #ifndef _VERTEXMANAGER_H
 #define _VERTEXMANAGER_H
 
 #include "CPMemory.h"
+#include "NativeVertexWriter.h"
 
 // Handles the OpenGL details of drawing lots of vertices quickly.
 // Other functionality is moving out.
@@ -31,16 +31,6 @@ void Shutdown();
 
 void ResetBuffer();
 
-void AddVertices(int primitive, int numvertices);
-void Flush(); // flushes the current buffer
-
-int GetRemainingSize();  // remaining space in the current buffer.
-
-void EnableComponents(u32 components);  // very implementation specific - D3D9 won't need this one.
-
-// TODO: move, rename.
-extern u8* s_pCurBufferPointer;
-
 };
 
 #endif  // _VERTEXMANAGER_H