diff --git a/Source/Core/VideoBackends/OGL/Src/GLUtil.cpp b/Source/Core/VideoBackends/OGL/Src/GLUtil.cpp
index 256b30ace8..eb05e8cddc 100644
--- a/Source/Core/VideoBackends/OGL/Src/GLUtil.cpp
+++ b/Source/Core/VideoBackends/OGL/Src/GLUtil.cpp
@@ -10,7 +10,6 @@
 #include "ConfigManager.h"
 
 #include "Render.h"
-#include "VertexShaderManager.h"
 
 #include "GLUtil.h"
 
diff --git a/Source/Core/VideoBackends/OGL/Src/Render.cpp b/Source/Core/VideoBackends/OGL/Src/Render.cpp
index aae7c5164f..ac36f3aa08 100644
--- a/Source/Core/VideoBackends/OGL/Src/Render.cpp
+++ b/Source/Core/VideoBackends/OGL/Src/Render.cpp
@@ -1661,7 +1661,7 @@ void Renderer::RestoreAPIState()
 	SetDepthMode();
 	SetBlendMode(true);
 	SetLogicOpMode();
-	VertexShaderManager::SetViewportChanged();
+	UpdateViewport();
 
 #ifndef USE_GLES3
 	glPolygonMode(GL_FRONT_AND_BACK, g_ActiveConfig.bWireFrame ? GL_LINE : GL_FILL);
diff --git a/Source/Core/VideoBackends/OGL/Src/TextureCache.cpp b/Source/Core/VideoBackends/OGL/Src/TextureCache.cpp
index c3349f5f2c..65dcdce41d 100644
--- a/Source/Core/VideoBackends/OGL/Src/TextureCache.cpp
+++ b/Source/Core/VideoBackends/OGL/Src/TextureCache.cpp
@@ -37,7 +37,6 @@
 #include "TextureCache.h"
 #include "TextureConverter.h"
 #include "TextureDecoder.h"
-#include "VertexShaderManager.h"
 #include "VideoConfig.h"
 
 namespace OGL
@@ -391,7 +390,6 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
 	}
 
 	FramebufferManager::SetFramebuffer(0);
-	VertexShaderManager::SetViewportChanged();
 
 	GL_REPORT_ERRORD();
 
diff --git a/Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp
index d4ce2eb5bb..05742ddc95 100644
--- a/Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp
+++ b/Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp
@@ -9,7 +9,6 @@
 #include "TextureConversionShader.h"
 #include "TextureCache.h"
 #include "ProgramShaderCache.h"
-#include "VertexShaderManager.h"
 #include "FramebufferManager.h"
 #include "Globals.h"
 #include "VideoConfig.h"
@@ -350,7 +349,6 @@ void EncodeToRamYUYV(GLuint srcTexture, const TargetRectangle& sourceRc, u8* des
 		
 	EncodeToRamUsingShader(srcTexture, sourceRc, destAddr, dstWidth / 2, dstHeight, 0, false, false);
 	FramebufferManager::SetFramebuffer(0);
-	VertexShaderManager::SetViewportChanged();
 	TextureCache::DisableStage(0);
 	g_renderer->RestoreAPIState();
 	GL_REPORT_ERRORD();
@@ -426,8 +424,6 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTextur
 	
 	GL_REPORT_ERRORD();
 
-	VertexShaderManager::SetViewportChanged();
-
 	FramebufferManager::SetFramebuffer(0);
 
 	g_renderer->RestoreAPIState();