diff --git a/plugins/zzogl-pg/opengl/CMakeLists.txt b/plugins/zzogl-pg/opengl/CMakeLists.txt
index 1f835e4df8..0c0a806823 100644
--- a/plugins/zzogl-pg/opengl/CMakeLists.txt
+++ b/plugins/zzogl-pg/opengl/CMakeLists.txt
@@ -107,6 +107,7 @@ set(zzoglHeaders
     zerogsmath.h
     zpipe.h
     ZZoglCRTC.h
+    ZZGl.h
     ZZLog.h)
 
 # zzogl S sources
diff --git a/plugins/zzogl-pg/opengl/GSmain.cpp b/plugins/zzogl-pg/opengl/GSmain.cpp
index f838e95e27..287f7af6e7 100644
--- a/plugins/zzogl-pg/opengl/GSmain.cpp
+++ b/plugins/zzogl-pg/opengl/GSmain.cpp
@@ -21,15 +21,7 @@
 #include <io.h>
 #endif
 
-#include <stdarg.h>
 #include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-
-#include <list>
-#include <vector>
-#include <map>
 #include <string>
 
 using namespace std;
diff --git a/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp b/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp
index dc08160093..ff8f004e54 100644
--- a/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp
+++ b/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp
@@ -134,6 +134,7 @@
 			<Option compile="0" />
 			<Option link="0" />
 		</Unit>
+		<Unit filename="../../ZZGl.h" />
 		<Unit filename="../../ZZKeyboard.cpp" />
 		<Unit filename="../../ZZLog.cpp" />
 		<Unit filename="../../ZZLog.h" />
diff --git a/plugins/zzogl-pg/opengl/Regs.cpp b/plugins/zzogl-pg/opengl/Regs.cpp
index ea4a6a6a0b..4bb405841e 100644
--- a/plugins/zzogl-pg/opengl/Regs.cpp
+++ b/plugins/zzogl-pg/opengl/Regs.cpp
@@ -16,11 +16,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
 #include "GS.h"
 #include "Mem.h"
 #include "Regs.h"
diff --git a/plugins/zzogl-pg/opengl/Win32/zerogsogl.vcxproj b/plugins/zzogl-pg/opengl/Win32/zerogsogl.vcxproj
index 7d5c7f22e2..c4c3527f09 100644
--- a/plugins/zzogl-pg/opengl/Win32/zerogsogl.vcxproj
+++ b/plugins/zzogl-pg/opengl/Win32/zerogsogl.vcxproj
@@ -201,6 +201,7 @@
     <ClInclude Include="..\targets.h" />
     <ClInclude Include="Win32.h" />
     <ClInclude Include="..\x86.h" />
+    <ClInclude Include="..\ZZGl.h" />
     <ClInclude Include="..\ZZLog.h" />
     <ClInclude Include="..\zerogs.h" />
     <ClInclude Include="..\zerogsmath.h" />
diff --git a/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj b/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj
index b20022f49b..69e4e2c5cc 100644
--- a/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj
+++ b/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj
@@ -461,6 +461,10 @@
 				RelativePath="..\x86.h"
 				>
 			</File>
+			<File
+				RelativePath="..\ZZGl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\ZZLog.h"
 				>
diff --git a/plugins/zzogl-pg/opengl/ZZGl.h b/plugins/zzogl-pg/opengl/ZZGl.h
new file mode 100644
index 0000000000..6d242dcbed
--- /dev/null
+++ b/plugins/zzogl-pg/opengl/ZZGl.h
@@ -0,0 +1,53 @@
+#ifndef ZZGL_H_INCLUDED
+#define ZZGL_H_INCLUDED
+
+#include "PS2Etypes.h"
+#include "PS2Edefs.h"
+
+// Need this before gl.h
+#ifdef _WIN32
+
+#include <windows.h>
+#include <GL/gl.h>
+#include <GL/glext.h>
+#include "glprocs.h"
+
+#else
+
+// adding glew support instead of glXGetProcAddress (thanks to scaught)
+#include <GL/glew.h>
+#include <GL/gl.h>
+#include <GL/glext.h>
+#include <GL/glx.h>
+
+inline void* wglGetProcAddress(const char* x)
+{
+	return (void*)glXGetProcAddress((const GLubyte*)x);
+}
+
+#endif
+
+#include <Cg/cg.h>
+#include <Cg/cgGL.h>
+
+// GL prototypes
+extern PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT;
+extern PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT;
+extern PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT;
+extern PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT;
+extern PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT;
+extern PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC glGetRenderbufferParameterivEXT;
+extern PFNGLISFRAMEBUFFEREXTPROC glIsFramebufferEXT;
+extern PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT;
+extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
+extern PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT;
+extern PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT;
+extern PFNGLFRAMEBUFFERTEXTURE1DEXTPROC glFramebufferTexture1DEXT;
+extern PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT;
+extern PFNGLFRAMEBUFFERTEXTURE3DEXTPROC glFramebufferTexture3DEXT;
+extern PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT;
+extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC glGetFramebufferAttachmentParameterivEXT;
+extern PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT;
+extern PFNGLDRAWBUFFERSPROC glDrawBuffers;
+
+#endif // ZZGL_H_INCLUDED
diff --git a/plugins/zzogl-pg/opengl/targets.cpp b/plugins/zzogl-pg/opengl/targets.cpp
index d391ae1bd2..5b318b91ef 100644
--- a/plugins/zzogl-pg/opengl/targets.cpp
+++ b/plugins/zzogl-pg/opengl/targets.cpp
@@ -20,12 +20,7 @@
 #include <Cg/cg.h>
 #include <Cg/cgGL.h>
 
-#include <stdio.h>
-
-#include <malloc.h>
-#include <assert.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "Mem.h"
 #include "x86.h"
diff --git a/plugins/zzogl-pg/opengl/zerogs.h b/plugins/zzogl-pg/opengl/zerogs.h
index 706cf6928a..a653fa30c4 100644
--- a/plugins/zzogl-pg/opengl/zerogs.h
+++ b/plugins/zzogl-pg/opengl/zerogs.h
@@ -24,42 +24,12 @@
 #endif
 
 // ----------------------------- Includes
-#include "PS2Etypes.h"
-#include "PS2Edefs.h"
-
-// Need this before gl.h
-#ifdef _WIN32
-
-#include <windows.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
-#include "glprocs.h"
-
-#else
-
-// adding glew support instead of glXGetProcAddress (thanks to scaught)
-#include <GL/glew.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
-#include <GL/glx.h>
-
-inline void* wglGetProcAddress(const char* x)
-{
-	return (void*)glXGetProcAddress((const GLubyte*)x);
-}
-
-#endif
-
-#include <Cg/cg.h>
-#include <Cg/cgGL.h>
-
-//#include <assert.h>
-
 #include <list>
 #include <vector>
 #include <map>
 #include <string>
 
+#include "ZZGl.h"
 #include "GS.h"
 #include "CRC.h"
 #include "rasterfont.h" // simple font
@@ -840,24 +810,24 @@ inline void CluttingForFlushedTex(tex0Info* tex0, u32 Data, int ictx)
 }
 };
 
-// GL prototypes
-extern PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT;
-extern PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT;
-extern PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT;
-extern PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT;
-extern PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT;
-extern PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC glGetRenderbufferParameterivEXT;
-extern PFNGLISFRAMEBUFFEREXTPROC glIsFramebufferEXT;
-extern PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT;
-extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
-extern PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT;
-extern PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT;
-extern PFNGLFRAMEBUFFERTEXTURE1DEXTPROC glFramebufferTexture1DEXT;
-extern PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT;
-extern PFNGLFRAMEBUFFERTEXTURE3DEXTPROC glFramebufferTexture3DEXT;
-extern PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT;
-extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC glGetFramebufferAttachmentParameterivEXT;
-extern PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT;
-extern PFNGLDRAWBUFFERSPROC glDrawBuffers;
+//// GL prototypes
+//extern PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT;
+//extern PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT;
+//extern PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT;
+//extern PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT;
+//extern PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT;
+//extern PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC glGetRenderbufferParameterivEXT;
+//extern PFNGLISFRAMEBUFFEREXTPROC glIsFramebufferEXT;
+//extern PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT;
+//extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
+//extern PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT;
+//extern PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT;
+//extern PFNGLFRAMEBUFFERTEXTURE1DEXTPROC glFramebufferTexture1DEXT;
+//extern PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT;
+//extern PFNGLFRAMEBUFFERTEXTURE3DEXTPROC glFramebufferTexture3DEXT;
+//extern PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT;
+//extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC glGetFramebufferAttachmentParameterivEXT;
+//extern PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT;
+//extern PFNGLDRAWBUFFERSPROC glDrawBuffers;
 
 #endif