diff --git a/Makefile.common b/Makefile.common
index ba2d50c883..a8bbbb18cb 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -118,7 +118,7 @@ OBJ += frontend/frontend.o \
 		screenshot.o \
 		gfx/scaler/scaler.o \
 		gfx/shader/shader_null.o \
-		gfx/shader/shader_common.o \
+		gfx/shader/shader_context.o \
 		gfx/shader/shader_parse.o \
 		gfx/scaler/pixconv.o \
 		gfx/scaler/scaler_int.o \
diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c
index b38f5b47ae..9e14145bdf 100644
--- a/frontend/menu/disp/lakka.c
+++ b/frontend/menu/disp/lakka.c
@@ -28,12 +28,11 @@
 #include "../../../general.h"
 #include "../../../gfx/gfx_common.h"
 #include "../../../gfx/gl_common.h"
-#include "../../../gfx/shader/shader_common.h"
+#include "../../../gfx/shader/shader_context.h"
 #include "../../../config.def.h"
 #include "../../../file.h"
 #include "../../../dynamic.h"
 #include "../../../compat/posix_string.h"
-#include "../../../gfx/shader/shader_parse.h"
 #include "../../../performance.h"
 #include "../../../input/input_common.h"
 
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 5778c6e8d6..7304f7021c 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -31,7 +31,7 @@
 #include "../../input/input_common.h"
 #include "../../input/keyboard_line.h"
 #include "../../performance.h"
-#include "../../gfx/shader/shader_common.h"
+#include "../../gfx/shader/shader_context.h"
 
 #ifdef HAVE_RGUI
 #define MENU_TEXTURE_FULLSCREEN false
diff --git a/frontend/menu/menu_shader.c b/frontend/menu/menu_shader.c
index cfa33ea3e1..00616fafe2 100644
--- a/frontend/menu/menu_shader.c
+++ b/frontend/menu/menu_shader.c
@@ -14,11 +14,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../gfx/shader/shader_common.h"
+#include "menu_shader.h"
 #include "menu_action.h"
 #include "menu_common.h"
 #include "menu_entries.h"
-#include "menu_shader.h"
 #include "../../settings_data.h"
 
 #ifdef HAVE_SHADER_MANAGER
diff --git a/frontend/menu/menu_shader.h b/frontend/menu/menu_shader.h
index 1e35404dc1..833b374b81 100644
--- a/frontend/menu/menu_shader.h
+++ b/frontend/menu/menu_shader.h
@@ -21,7 +21,7 @@
 #define HAVE_SHADER_MANAGER
 #endif
 
-#include "../../gfx/shader/shader_parse.h"
+#include "../../gfx/shader/shader_context.h"
 
 void menu_shader_manager_init(void *data);
 
diff --git a/gfx/d3d/d3d.hpp b/gfx/d3d/d3d.hpp
index 0742ac8090..9895563e10 100644
--- a/gfx/d3d/d3d.hpp
+++ b/gfx/d3d/d3d.hpp
@@ -43,8 +43,7 @@
 #include "../../driver.h"
 
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
-#include "../shader/shader_parse.h"
-#include "../shader/shader_common.h"
+#include "../shader/shader_context.h"
 #endif
 
 #include "../fonts/d3d_font.h"
diff --git a/gfx/fonts/gl_raster_font.c b/gfx/fonts/gl_raster_font.c
index 2e4f8828f9..6d409350d5 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_common.h"
+#include "../shader/shader_context.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.c b/gfx/gl.c
index ea938bbdf3..526bf30e66 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -45,7 +45,7 @@
 #include "shader/shader_glsl.h"
 #endif
 
-#include "shader/shader_common.h"
+#include "shader/shader_context.h"
 
 /* Used for the last pass when rendering to the back buffer. */
 static const GLfloat vertexes_flipped[] = {
diff --git a/gfx/gl_common.h b/gfx/gl_common.h
index 1091653370..970c278cf2 100644
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@@ -22,8 +22,7 @@
 #include "gfx_context.h"
 #include "scaler/scaler.h"
 #include "fonts/gl_font.h"
-#include "shader/shader_common.h"
-#include "shader/shader_parse.h"
+#include "shader/shader_context.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
diff --git a/gfx/shader/shader_cg.c b/gfx/shader/shader_cg.c
index 025fac5174..deda4525cb 100644
--- a/gfx/shader/shader_cg.c
+++ b/gfx/shader/shader_cg.c
@@ -23,7 +23,7 @@
 #endif
 
 #include <stdint.h>
-#include "shader_common.h"
+#include "shader_context.h"
 #include <Cg/cg.h>
 #include <Cg/cgGL.h>
 #include "../../general.h"
diff --git a/gfx/shader/shader_common.c b/gfx/shader/shader_context.c
similarity index 99%
rename from gfx/shader/shader_common.c
rename to gfx/shader/shader_context.c
index d76fe8214b..ae7215a17b 100644
--- a/gfx/shader/shader_common.c
+++ b/gfx/shader/shader_context.c
@@ -13,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "shader_common.h"
+#include "shader_context.h"
 #include "../../retroarch_logger.h"
 
 #ifdef HAVE_OPENGL
diff --git a/gfx/shader/shader_common.h b/gfx/shader/shader_context.h
similarity index 98%
rename from gfx/shader/shader_common.h
rename to gfx/shader/shader_context.h
index 617c0c399b..6aa74c9825 100644
--- a/gfx/shader/shader_common.h
+++ b/gfx/shader/shader_context.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SHADERS_COMMON_H__
-#define SHADERS_COMMON_H__
+#ifndef SHADER_CONTEXT_H__
+#define SHADER_CONTEXT_H__
 
 #include "../../boolean.h"
 
diff --git a/gfx/shader/shader_glsl.h b/gfx/shader/shader_glsl.h
index 3b3c4e6f67..546fc7b5bc 100644
--- a/gfx/shader/shader_glsl.h
+++ b/gfx/shader/shader_glsl.h
@@ -18,7 +18,7 @@
 #define __RARCH_GLSL_H
 
 #include "../../boolean.h"
-#include "shader_common.h"
+#include "shader_context.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);
diff --git a/gfx/shader/shader_hlsl.h b/gfx/shader/shader_hlsl.h
index 5d4972b26d..a945075fe4 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_common.h"
+#include "shader_context.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 9c818ef0ce..8291deb695 100644
--- a/gfx/shader/shader_null.c
+++ b/gfx/shader/shader_null.c
@@ -29,7 +29,7 @@
 #endif
 
 #include "../gfx_context.h"
-#include "shader_common.h"
+#include "shader_context.h"
 #include <stdlib.h>
 
 static void shader_null_deinit(void) { }
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 793be3d63c..91075fb687 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -146,7 +146,7 @@ VIDEO CONTEXT
 VIDEO SHADERS
 ============================================================ */
 #ifdef HAVE_SHADERS
-#include "../gfx/shader/shader_common.c"
+#include "../gfx/shader/shader_context.c"
 #include "../gfx/shader/shader_parse.c"
 #include "../gfx/shader/shader_null.c"