diff --git a/Makefile.common b/Makefile.common
index 45db8d1b7f..f210ccb8bb 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -374,7 +374,7 @@ ifeq ($(HAVE_OPENGL), 1)
    DEFINES += -DHAVE_OPENGL -DHAVE_GLSL
    OBJ += gfx/drivers/gl.o \
 			 gfx/gl_common.o \
-			 gfx/video_context.o \
+			 gfx/video_context_driver.o \
 			 gfx/context/gfx_null_ctx.o \
 			 gfx/fonts/gl_font.o \
 			 gfx/fonts/gl_raster_font.o \
diff --git a/apple/common/apple_gfx_context.c.inl b/apple/common/apple_gfx_context.c.inl
index 758b53eee1..83b91e1260 100644
--- a/apple/common/apple_gfx_context.c.inl
+++ b/apple/common/apple_gfx_context.c.inl
@@ -4,7 +4,7 @@
 #endif
 
 #include "../../gfx/gfx_common.h"
-#include "../../gfx/video_context.h"
+#include "../../gfx/video_context_driver.h"
 #include "../../gfx/gl_common.h"
 
 //#define HAVE_NSOPENGL
diff --git a/gfx/context/emscriptenegl_ctx.c b/gfx/context/emscriptenegl_ctx.c
index 431f6b5af4..88e9241e64 100644
--- a/gfx/context/emscriptenegl_ctx.c
+++ b/gfx/context/emscriptenegl_ctx.c
@@ -15,7 +15,7 @@
  */
 
 #include "../../driver.h"
-#include "../video_context.h"
+#include "../video_context_driver.h"
 #include "../gl_common.h"
 #include "../gfx_common.h"
 
diff --git a/gfx/context/gfx_null_ctx.c b/gfx/context/gfx_null_ctx.c
index 223e30ccde..a6dd7a0a84 100644
--- a/gfx/context/gfx_null_ctx.c
+++ b/gfx/context/gfx_null_ctx.c
@@ -17,7 +17,7 @@
 // Null context.
 
 #include "../../driver.h"
-#include "../video_context.h"
+#include "../video_context_driver.h"
 #include "../gfx_common.h"
 
 static void gfx_ctx_null_swap_interval(void *data, unsigned interval)
diff --git a/gfx/context/ps3_ctx.c b/gfx/context/ps3_ctx.c
index 132e55c6ec..74f393926e 100644
--- a/gfx/context/ps3_ctx.c
+++ b/gfx/context/ps3_ctx.c
@@ -37,7 +37,7 @@
 
 #include "../gl_common.h"
 
-#include "../video_context.h"
+#include "../video_context_driver.h"
 
 typedef struct gfx_ctx_ps3_data
 {
diff --git a/gfx/context/vc_egl_ctx.c b/gfx/context/vc_egl_ctx.c
index d847c54f64..85d294cb62 100644
--- a/gfx/context/vc_egl_ctx.c
+++ b/gfx/context/vc_egl_ctx.c
@@ -15,7 +15,7 @@
  */
 
 #include "../../driver.h"
-#include "../video_context.h"
+#include "../video_context_driver.h"
 #include "../gl_common.h"
 #include "../gfx_common.h"
 
diff --git a/gfx/context/wgl_ctx.c b/gfx/context/wgl_ctx.c
index fa80af1395..567bd7f95b 100644
--- a/gfx/context/wgl_ctx.c
+++ b/gfx/context/wgl_ctx.c
@@ -22,7 +22,7 @@
 #endif
 
 #include "../../driver.h"
-#include "../video_context.h"
+#include "../video_context_driver.h"
 #include "../gl_common.h"
 #include "../gfx_common.h"
 #include "win32_common.h"
diff --git a/gfx/d3d/d3d.h b/gfx/d3d/d3d.h
index 4e80bc0a2a..db86dd87a6 100644
--- a/gfx/d3d/d3d.h
+++ b/gfx/d3d/d3d.h
@@ -50,7 +50,7 @@
 #endif
 
 #include "../fonts/d3d_font.h"
-#include "../video_context.h"
+#include "../video_context_driver.h"
 #include "../gfx_common.h"
 
 #ifdef HAVE_CG
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index f81528a499..b315666cb8 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -38,7 +38,7 @@
 
 #include "../gl_common.h"
 #include "../gfx_common.h"
-#include "../video_context.h"
+#include "../video_context_driver.h"
 #include <compat/strl.h>
 
 #ifdef HAVE_GLSL
diff --git a/gfx/drivers/omap_gfx.c b/gfx/drivers/omap_gfx.c
index 3c5cfb4f02..b8000623b3 100644
--- a/gfx/drivers/omap_gfx.c
+++ b/gfx/drivers/omap_gfx.c
@@ -21,7 +21,7 @@
 #include "../../retroarch.h"
 #include <gfx/scaler/scaler.h>
 #include "../gfx_common.h"
-#include "../video_context.h"
+#include "../video_context_driver.h"
 #include "../fonts/fonts.h"
 
 #include <sys/ioctl.h>
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index a332f38fa8..379b854146 100644
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@@ -23,7 +23,7 @@
 #include "../../retroarch.h"
 #include <gfx/scaler/scaler.h>
 #include "../gfx_common.h"
-#include "../video_context.h"
+#include "../video_context_driver.h"
 #include "../fonts/fonts.h"
 
 #ifdef HAVE_X11
diff --git a/gfx/drivers/sdl_gfx.c b/gfx/drivers/sdl_gfx.c
index 0e400e5a3a..8e357145fd 100644
--- a/gfx/drivers/sdl_gfx.c
+++ b/gfx/drivers/sdl_gfx.c
@@ -21,7 +21,7 @@
 #include "../../general.h"
 #include <gfx/scaler/scaler.h>
 #include "../gfx_common.h"
-#include "../video_context.h"
+#include "../video_context_driver.h"
 #include "../fonts/fonts.h"
 
 #ifdef HAVE_X11
diff --git a/gfx/drivers/vg.c b/gfx/drivers/vg.c
index 1edc1964db..6ceb608b4b 100644
--- a/gfx/drivers/vg.c
+++ b/gfx/drivers/vg.c
@@ -19,7 +19,7 @@
 #include <VG/vgext.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
-#include "../video_context.h"
+#include "../video_context_driver.h"
 #include <gfx/math/matrix_3x3.h>
 #include "../../libretro.h"
 #include "../../general.h"
diff --git a/gfx/video_context.c b/gfx/video_context_driver.c
similarity index 99%
rename from gfx/video_context.c
rename to gfx/video_context_driver.c
index e02db81926..06499bebe8 100644
--- a/gfx/video_context.c
+++ b/gfx/video_context_driver.c
@@ -15,7 +15,7 @@
  */
 
 #include "../general.h"
-#include "video_context.h"
+#include "video_context_driver.h"
 #include <string.h>
 
 #ifdef HAVE_CONFIG_H
diff --git a/gfx/video_context.h b/gfx/video_context_driver.h
similarity index 98%
rename from gfx/video_context.h
rename to gfx/video_context_driver.h
index 64639551f6..0797fd610f 100644
--- a/gfx/video_context.h
+++ b/gfx/video_context_driver.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIDEO_CONTEXT_H
-#define __VIDEO_CONTEXT_H
+#ifndef __VIDEO_CONTEXT_DRIVER_H
+#define __VIDEO_CONTEXT_DRIVER_H
 
 #include <boolean.h>
 #include "../driver.h"
diff --git a/gfx/video_shader_driver.h b/gfx/video_shader_driver.h
index f0f4eef743..e9bded1ec6 100644
--- a/gfx/video_shader_driver.h
+++ b/gfx/video_shader_driver.h
@@ -22,7 +22,7 @@
 #include "../config.h"
 #endif
 
-#include "video_context.h"
+#include "video_context_driver.h"
 #include <gfx/math/matrix_4x4.h>
 
 typedef struct shader_backend
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 99a5acd522..750f175ee6 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -86,7 +86,7 @@ CHEATS
 VIDEO CONTEXT
 ============================================================ */
 
-#include "../gfx/video_context.c"
+#include "../gfx/video_context_driver.c"
 #include "../gfx/context/gfx_null_ctx.c"
 
 #if defined(__CELLOS_LV2__)
diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c
index ba2adc0f1d..c365c4f73a 100644
--- a/input/drivers/sdl_input.c
+++ b/input/drivers/sdl_input.c
@@ -17,7 +17,7 @@
 #include "../../driver.h"
 
 #include "SDL.h"
-#include "../../gfx/video_context.h"
+#include "../../gfx/video_context_driver.h"
 #include <boolean.h>
 #include "../../general.h"
 #include <stdint.h>
diff --git a/menu/disp/rmenu_xui.cpp b/menu/disp/rmenu_xui.cpp
index f464792e11..c706458b13 100644
--- a/menu/disp/rmenu_xui.cpp
+++ b/menu/disp/rmenu_xui.cpp
@@ -25,7 +25,7 @@
 #include "../menu_list.h"
 
 #include "../../gfx/gfx_common.h"
-#include "../../gfx/video_context.h"
+#include "../../gfx/video_context_driver.h"
 
 #include "../../settings_data.h"
 #include "../../general.h"