diff --git a/Source/Core/Common/GL/GLInterface/WGL.cpp b/Source/Core/Common/GL/GLInterface/WGL.cpp
index c8d0ccce0d..56017a89b4 100644
--- a/Source/Core/Common/GL/GLInterface/WGL.cpp
+++ b/Source/Core/Common/GL/GLInterface/WGL.cpp
@@ -3,14 +3,10 @@
 // Refer to the license.txt file included.
 
 #include <string>
+#include <windows.h>
 
 #include "Common/GL/GLInterface/WGL.h"
-
-#include "Core/Host.h"
-
-#include "VideoCommon/RenderBase.h"
-#include "VideoCommon/VertexShaderManager.h"
-#include "VideoCommon/VideoConfig.h"
+#include "Common/Logging/Log.h"
 
 static HDC hDC = nullptr;       // Private GDI Device Context
 static HGLRC hRC = nullptr;     // Permanent Rendering Context
diff --git a/Source/Core/Common/GL/GLUtil.cpp b/Source/Core/Common/GL/GLUtil.cpp
index 30530f4aa8..3cb8499b0d 100644
--- a/Source/Core/Common/GL/GLUtil.cpp
+++ b/Source/Core/Common/GL/GLUtil.cpp
@@ -2,33 +2,14 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Common/IniFile.h"
-#include "Common/StringUtil.h"
 #include "Common/GL/GLInterfaceBase.h"
 #include "Common/GL/GLUtil.h"
-
-#include "Core/ConfigManager.h"
-#include "Core/Core.h"
-
-#include "VideoBackends/OGL/Render.h"
-#include "VideoBackends/OGL/VideoBackend.h"
-
-#include "VideoCommon/VideoConfig.h"
+#include "Common/Logging/Log.h"
 
 cInterfaceBase *GLInterface;
 static GLuint attributelessVAO = 0;
 static GLuint attributelessVBO = 0;
 
-namespace OGL
-{
-
-// Draw messages on top of the screen
-unsigned int VideoBackend::PeekMessages()
-{
-	return GLInterface->PeekMessages();
-}
-
-}
 void InitInterface()
 {
 	GLInterface = HostGL_CreateGLInterface();
diff --git a/Source/Core/Common/GL/GLUtil.h b/Source/Core/Common/GL/GLUtil.h
index 73b8dfd2c4..1c3a9d8256 100644
--- a/Source/Core/Common/GL/GLUtil.h
+++ b/Source/Core/Common/GL/GLUtil.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "Common/MathUtil.h"
 #include "Common/GL/GLExtensions/GLExtensions.h"
 
 #ifndef _WIN32
diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp
index 29fb24cfa9..edeb569ec1 100644
--- a/Source/Core/VideoBackends/OGL/main.cpp
+++ b/Source/Core/VideoBackends/OGL/main.cpp
@@ -84,6 +84,12 @@ Make AA apply instantly during gameplay if possible
 namespace OGL
 {
 
+// Draw messages on top of the screen
+unsigned int VideoBackend::PeekMessages()
+{
+	return GLInterface->PeekMessages();
+}
+
 std::string VideoBackend::GetName() const
 {
 	return "OGL";