diff --git a/gfx/common/gl1_common.h b/gfx/common/gl1_common.h
index 37e6177928..9a84c1b363 100644
--- a/gfx/common/gl1_common.h
+++ b/gfx/common/gl1_common.h
@@ -39,12 +39,12 @@
 #endif
 #endif
 
-#include "../../retroarch.h"
+#include "../video_driver.h"
 
 #ifdef VITA
 #define GL_RGBA8     GL_RGBA
 #define GL_RGB8      GL_RGB
-#define GL_BGRA_EXT  GL_RGBA // Currently unsupported in vitaGL
+#define GL_BGRA_EXT  GL_RGBA /* Currently unsupported in vitaGL */
 #define GL_CLAMP     GL_CLAMP_TO_EDGE
 #endif
 
diff --git a/gfx/common/gl2_common.h b/gfx/common/gl2_common.h
index 867d2ae901..09d204339f 100644
--- a/gfx/common/gl2_common.h
+++ b/gfx/common/gl2_common.h
@@ -31,8 +31,8 @@
 #include <glsym/glsym.h>
 #include <formats/image.h>
 
+#include "../video_driver.h"
 #include "../video_coord_array.h"
-#include "../../retroarch.h"
 
 RETRO_BEGIN_DECLS
 
diff --git a/gfx/common/gl3_common.h b/gfx/common/gl3_common.h
index 2ef4e6769b..cd6c5b5089 100644
--- a/gfx/common/gl3_common.h
+++ b/gfx/common/gl3_common.h
@@ -32,8 +32,8 @@
 #include <glsym/glsym.h>
 #include <formats/image.h>
 
+#include "../video_driver.h"
 #include "../video_coord_array.h"
-#include "../../retroarch.h"
 #include "../drivers_shader/shader_gl3.h"
 
 RETRO_BEGIN_DECLS
diff --git a/gfx/drivers_shader/shader_gl3.cpp b/gfx/drivers_shader/shader_gl3.cpp
index 2505742d13..f0a158d2e1 100644
--- a/gfx/drivers_shader/shader_gl3.cpp
+++ b/gfx/drivers_shader/shader_gl3.cpp
@@ -34,6 +34,7 @@
 
 #include "../common/gl3_common.h"
 
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../msg_hash.h"