diff --git a/Makefile.common b/Makefile.common
index f326a59049..8a76af68e4 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -132,7 +132,7 @@ OBJ += frontend/frontend.o \
 		screenshot.o \
 		libretro-sdk/gfx/scaler/scaler.o \
 		gfx/shader/shader_null.o \
-		gfx/shader/shader_context.o \
+		gfx/video_shader_driver.o \
 		gfx/shader/shader_parse.o \
 		libretro-sdk/gfx/scaler/pixconv.o \
 		libretro-sdk/gfx/scaler/scaler_int.o \
diff --git a/gfx/d3d/d3d.h b/gfx/d3d/d3d.h
index 8a94f6ff3e..4e80bc0a2a 100644
--- a/gfx/d3d/d3d.h
+++ b/gfx/d3d/d3d.h
@@ -46,7 +46,7 @@
 #include "../../driver.h"
 
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
-#include "../shader/shader_context.h"
+#include "../video_shader_driver.h"
 #endif
 
 #include "../fonts/d3d_font.h"
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 2e5b3ba336..f81528a499 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -49,7 +49,7 @@
 #include <string/string_list.h>
 #endif
 
-#include "../shader/shader_context.h"
+#include "../video_shader_driver.h"
 
 /* Used for the last pass when rendering to the back buffer. */
 static const GLfloat vertexes_flipped[] = {
diff --git a/gfx/fonts/gl_raster_font.c b/gfx/fonts/gl_raster_font.c
index 72ce08d671..e3f003cf2d 100644
--- a/gfx/fonts/gl_raster_font.c
+++ b/gfx/fonts/gl_raster_font.c
@@ -16,7 +16,7 @@
 
 #include "../gfx_common.h"
 #include "../gl_common.h"
-#include "../shader/shader_context.h"
+#include "../video_shader_driver.h"
 
 #define emit(c, vx, vy) do { \
    font_vertex[     2 * (6 * i + c) + 0] = (x + (delta_x + off_x + vx * width) * scale) * inv_win_width; \
diff --git a/gfx/gl_common.h b/gfx/gl_common.h
index ae2ee038d1..6e4befde8a 100644
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@@ -22,7 +22,7 @@
 #include <gfx/math/matrix_4x4.h>
 #include <gfx/scaler/scaler.h>
 #include "fonts/gl_font.h"
-#include "shader/shader_context.h"
+#include "video_shader_driver.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
diff --git a/gfx/shader/shader_gl_cg.c b/gfx/shader/shader_gl_cg.c
index bc9d090ea5..b7fe044c63 100644
--- a/gfx/shader/shader_gl_cg.c
+++ b/gfx/shader/shader_gl_cg.c
@@ -20,7 +20,7 @@
 #endif
 
 #include <stdint.h>
-#include "shader_context.h"
+#include "../video_shader_driver.h"
 
 #include <Cg/cg.h>
 
diff --git a/gfx/shader/shader_glsl.h b/gfx/shader/shader_glsl.h
index 0be7d6c256..0af251e5d8 100644
--- a/gfx/shader/shader_glsl.h
+++ b/gfx/shader/shader_glsl.h
@@ -18,8 +18,10 @@
 #define __RARCH_GLSL_H
 
 #include <boolean.h>
-#include "shader_context.h"
+#include "../video_shader_driver.h"
 
 void gl_glsl_set_get_proc_address(gfx_ctx_proc_t (*proc)(const char*));
+
 void gl_glsl_set_context_type(bool core_profile, unsigned major, unsigned minor);
+
 #endif
diff --git a/gfx/shader/shader_hlsl.h b/gfx/shader/shader_hlsl.h
index b3ac8e038e..ec8ffb578d 100644
--- a/gfx/shader/shader_hlsl.h
+++ b/gfx/shader/shader_hlsl.h
@@ -18,7 +18,7 @@
 #ifndef __RARCH_HLSL_H
 #define __RARCH_HLSL_H
 
-#include "shader_context.h"
+#include "../video_shader_driver.h"
 #include <stdint.h>
 
 void hlsl_set_proj_matrix(XMMATRIX rotation_value);
diff --git a/gfx/shader/shader_null.c b/gfx/shader/shader_null.c
index ac917e7a15..cfbccd9ed4 100644
--- a/gfx/shader/shader_null.c
+++ b/gfx/shader/shader_null.c
@@ -31,7 +31,7 @@
 #include "../gl_common.h"
 #endif
 
-#include "shader_context.h"
+#include "../video_shader_driver.h"
 #include <stdlib.h>
 
 static void shader_null_deinit(void) { }
diff --git a/gfx/shader/shader_context.c b/gfx/video_shader_driver.c
similarity index 93%
rename from gfx/shader/shader_context.c
rename to gfx/video_shader_driver.c
index bef65b6cce..2276f30402 100644
--- a/gfx/shader/shader_context.c
+++ b/gfx/video_shader_driver.c
@@ -13,14 +13,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "shader_context.h"
-#include "../../retroarch_logger.h"
+#include "video_shader_driver.h"
+#include "../retroarch_logger.h"
 #include <string.h>
 
-#ifdef HAVE_CONFIG_H
-#include "../../config.h"
-#endif
-
 static const shader_backend_t *shader_ctx_drivers[] = {
 #ifdef HAVE_CG
    &gl_cg_backend,
diff --git a/gfx/shader/shader_context.h b/gfx/video_shader_driver.h
similarity index 95%
rename from gfx/shader/shader_context.h
rename to gfx/video_shader_driver.h
index 73de244d1a..f0f4eef743 100644
--- a/gfx/shader/shader_context.h
+++ b/gfx/video_shader_driver.h
@@ -13,16 +13,16 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SHADER_CONTEXT_H__
-#define SHADER_CONTEXT_H__
+#ifndef VIDEO_SHADER_DRIVER_H__
+#define VIDEO_SHADER_DRIVER_H__
 
 #include <boolean.h>
 
 #ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include "../config.h"
 #endif
 
-#include "../video_context.h"
+#include "video_context.h"
 #include <gfx/math/matrix_4x4.h>
 
 typedef struct shader_backend
@@ -78,7 +78,7 @@ extern const shader_backend_t shader_null_backend;
 #define HAVE_SHADER_MANAGER
 #endif
 
-#include "shader_parse.h"
+#include "shader/shader_parse.h"
 
 #define GL_SHADER_STOCK_BLEND (GFX_MAX_SHADERS - 1)
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 3ed0e252a7..0c290e6553 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -134,7 +134,7 @@ VIDEO SHADERS
 ============================================================ */
 
 #ifdef HAVE_SHADERS
-#include "../gfx/shader/shader_context.c"
+#include "../gfx/video_shader_driver.c"
 #include "../gfx/shader/shader_parse.c"
 #include "../gfx/shader/shader_null.c"
 
diff --git a/menu/menu.h b/menu/menu.h
index 762748aaf9..8f2815a5c7 100644
--- a/menu/menu.h
+++ b/menu/menu.h
@@ -28,7 +28,7 @@
 #include "../../core_info.h"
 #include "../../playlist.h"
 #include "menu_input.h"
-#include "../../gfx/shader/shader_context.h"
+#include "../../gfx/video_shader_driver.h"
 
 #ifdef HAVE_RGUI
 #define MENU_TEXTURE_FULLSCREEN false
diff --git a/menu/menu_shader.h b/menu/menu_shader.h
index 97100887f8..698a4daa18 100644
--- a/menu/menu_shader.h
+++ b/menu/menu_shader.h
@@ -17,7 +17,7 @@
 #ifndef _MENU_SHADER_MANAGER_H
 #define _MENU_SHADER_MANAGER_H
 
-#include "../gfx/shader/shader_context.h"
+#include "../gfx/video_shader_driver.h"
 
 #ifdef __cplusplus
 extern "C" {