diff --git a/Source/Core/Common/Src/Timer.h b/Source/Core/Common/Src/Timer.h
index ae7b7ee9fc..be8ee4a11c 100644
--- a/Source/Core/Common/Src/Timer.h
+++ b/Source/Core/Common/Src/Timer.h
@@ -19,6 +19,7 @@
 #define _TIMER_H
 
 #include "Common.h"
+#include <string>
 
 namespace Common
 {
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h b/Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h
index 46580d01f1..41e52bf346 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h
@@ -8,7 +8,11 @@
 #include "Config.h"
 #include "pluginspecs_video.h"
 
+#ifdef _WIN32
 #include <GLew/glew.h>
+#else
+#include <GL/glew.h>
+#endif
 
 #if defined(__APPLE__)
 #include <OpenGL/gl.h>
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp b/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp
index 962edda0ad..b884f57ac2 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp
@@ -109,12 +109,12 @@ void DllConfig(HWND _hParent)
     frame.ShowModal();
 }
 
-void Video_Initialize(SVideoInitialize* _pVideoInitialize)
+void Initialize(void *init)
 {
-    if (_pVideoInitialize == NULL)
-        return;
     frameCount = 0;
-    g_VideoInitialize = *_pVideoInitialize;
+    SVideoInitialize *_pVideoInitialize = (SVideoInitialize*)init;
+    g_VideoInitialize = *(_pVideoInitialize); // Create a shortcut to _pVideoInitialize that can also update it
+
     InitLUTs();
     InitXFBConvTables();
     g_Config.Load();
@@ -130,7 +130,7 @@ void Video_Initialize(SVideoInitialize* _pVideoInitialize)
     Renderer::AddMessage("Dolphin OpenGL Video Plugin" ,5000);
 }
 
-void Video_DoState(unsigned char **ptr, int mode) {
+void DoState(unsigned char **ptr, int mode) {
 #ifndef _WIN32
 	OpenGL_MakeCurrent();
 #endif
@@ -173,7 +173,7 @@ void Video_Prepare(void)
     TextureConverter::Init();
 }
 
-void Video_Shutdown(void) 
+void Shutdown(void) 
 {
     TextureConverter::Shutdown();
     VertexLoaderManager::Shutdown();