diff --git a/Makefile.common b/Makefile.common
index fe562faed4..2e5266de3a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -370,7 +370,7 @@ ifeq ($(HAVE_OPENGL), 1)
    DEFINES += -DHAVE_OPENGL -DHAVE_GLSL
    OBJ += gfx/drivers/gl.o \
 			 gfx/gl_common.o \
-			 gfx/gfx_context.o \
+			 gfx/video_context.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 6832360cce..758b53eee1 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/gfx_context.h"
+#include "../../gfx/video_context.h"
 #include "../../gfx/gl_common.h"
 
 //#define HAVE_NSOPENGL
diff --git a/gfx/context/drm_egl_ctx.c b/gfx/context/drm_egl_ctx.c
index 8ae17257f3..962e451d7e 100644
--- a/gfx/context/drm_egl_ctx.c
+++ b/gfx/context/drm_egl_ctx.c
@@ -19,7 +19,7 @@
  */
 
 #include "../../driver.h"
-#include "../gfx_context.h"
+#include "../video_context.h"
 #include "../gl_common.h"
 #include "../gfx_common.h"
 #include <file/dir_list.h>
diff --git a/gfx/context/emscriptenegl_ctx.c b/gfx/context/emscriptenegl_ctx.c
index 321bf13eed..431f6b5af4 100644
--- a/gfx/context/emscriptenegl_ctx.c
+++ b/gfx/context/emscriptenegl_ctx.c
@@ -15,7 +15,7 @@
  */
 
 #include "../../driver.h"
-#include "../gfx_context.h"
+#include "../video_context.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 630e5427a0..223e30ccde 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 "../gfx_context.h"
+#include "../video_context.h"
 #include "../gfx_common.h"
 
 static void gfx_ctx_null_swap_interval(void *data, unsigned interval)
diff --git a/gfx/context/glx_ctx.c b/gfx/context/glx_ctx.c
index b2644f2a45..1b535ace98 100644
--- a/gfx/context/glx_ctx.c
+++ b/gfx/context/glx_ctx.c
@@ -15,7 +15,7 @@
  */
 
 #include "../../driver.h"
-#include "../gfx_context.h"
+#include "../video_context.h"
 #include "../gl_common.h"
 #include "../gfx_common.h"
 #include "x11_common.h"
diff --git a/gfx/context/ps3_ctx.c b/gfx/context/ps3_ctx.c
index 7c36996147..132e55c6ec 100644
--- a/gfx/context/ps3_ctx.c
+++ b/gfx/context/ps3_ctx.c
@@ -37,7 +37,7 @@
 
 #include "../gl_common.h"
 
-#include "../gfx_context.h"
+#include "../video_context.h"
 
 typedef struct gfx_ctx_ps3_data
 {
diff --git a/gfx/context/sdl_gl_ctx.c b/gfx/context/sdl_gl_ctx.c
index 536ba41f3e..0e22610883 100644
--- a/gfx/context/sdl_gl_ctx.c
+++ b/gfx/context/sdl_gl_ctx.c
@@ -15,7 +15,7 @@
  */
 
 #include "../../driver.h"
-#include "../gfx_context.h"
+#include "../video_context.h"
 #include "../gl_common.h"
 #include "../gfx_common.h"
 
diff --git a/gfx/context/vc_egl_ctx.c b/gfx/context/vc_egl_ctx.c
index 8f68ad235f..d847c54f64 100644
--- a/gfx/context/vc_egl_ctx.c
+++ b/gfx/context/vc_egl_ctx.c
@@ -15,7 +15,7 @@
  */
 
 #include "../../driver.h"
-#include "../gfx_context.h"
+#include "../video_context.h"
 #include "../gl_common.h"
 #include "../gfx_common.h"
 
diff --git a/gfx/context/wgl_ctx.c b/gfx/context/wgl_ctx.c
index bc4a71e7f5..fa80af1395 100644
--- a/gfx/context/wgl_ctx.c
+++ b/gfx/context/wgl_ctx.c
@@ -22,7 +22,7 @@
 #endif
 
 #include "../../driver.h"
-#include "../gfx_context.h"
+#include "../video_context.h"
 #include "../gl_common.h"
 #include "../gfx_common.h"
 #include "win32_common.h"
diff --git a/gfx/context/xegl_ctx.c b/gfx/context/xegl_ctx.c
index 3e24f0feb7..1e72a91fab 100644
--- a/gfx/context/xegl_ctx.c
+++ b/gfx/context/xegl_ctx.c
@@ -19,7 +19,7 @@
  */
 
 #include "../../driver.h"
-#include "../gfx_context.h"
+#include "../video_context.h"
 #include "../gl_common.h"
 #include "../gfx_common.h"
 #include "x11_common.h"
diff --git a/gfx/d3d/d3d.h b/gfx/d3d/d3d.h
index 9491fa4f3f..8a94f6ff3e 100644
--- a/gfx/d3d/d3d.h
+++ b/gfx/d3d/d3d.h
@@ -50,7 +50,7 @@
 #endif
 
 #include "../fonts/d3d_font.h"
-#include "../gfx_context.h"
+#include "../video_context.h"
 #include "../gfx_common.h"
 
 #ifdef HAVE_CG
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index eaf7ec362c..2e5b3ba336 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -38,7 +38,7 @@
 
 #include "../gl_common.h"
 #include "../gfx_common.h"
-#include "../gfx_context.h"
+#include "../video_context.h"
 #include <compat/strl.h>
 
 #ifdef HAVE_GLSL
diff --git a/gfx/drivers/omap_gfx.c b/gfx/drivers/omap_gfx.c
index d5194d3485..3c5cfb4f02 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 "../gfx_context.h"
+#include "../video_context.h"
 #include "../fonts/fonts.h"
 
 #include <sys/ioctl.h>
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index 4ed2ba13c0..a332f38fa8 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 "../gfx_context.h"
+#include "../video_context.h"
 #include "../fonts/fonts.h"
 
 #ifdef HAVE_X11
diff --git a/gfx/drivers/sdl_gfx.c b/gfx/drivers/sdl_gfx.c
index e9ed6ac3c9..0e400e5a3a 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 "../gfx_context.h"
+#include "../video_context.h"
 #include "../fonts/fonts.h"
 
 #ifdef HAVE_X11
diff --git a/gfx/drivers/vg.c b/gfx/drivers/vg.c
index ce7cb3402d..1edc1964db 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 "../gfx_context.h"
+#include "../video_context.h"
 #include <gfx/math/matrix_3x3.h>
 #include "../../libretro.h"
 #include "../../general.h"
diff --git a/gfx/gl_common.h b/gfx/gl_common.h
index ada57a5a26..ec2d27a56a 100644
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@@ -20,7 +20,7 @@
 #include "../general.h"
 #include "fonts/fonts.h"
 #include <gfx/math/matrix_4x4.h>
-#include "gfx_context.h"
+#include "video_context.h"
 #include <gfx/scaler/scaler.h>
 #include "fonts/gl_font.h"
 #include "shader/shader_context.h"
diff --git a/gfx/shader/shader_context.h b/gfx/shader/shader_context.h
index dccf93b339..73de244d1a 100644
--- a/gfx/shader/shader_context.h
+++ b/gfx/shader/shader_context.h
@@ -22,7 +22,7 @@
 #include "../../config.h"
 #endif
 
-#include "../gfx_context.h"
+#include "../video_context.h"
 #include <gfx/math/matrix_4x4.h>
 
 typedef struct shader_backend
diff --git a/gfx/shader/shader_glsl.c b/gfx/shader/shader_glsl.c
index 8b34f9267a..19ddad2e2e 100644
--- a/gfx/shader/shader_glsl.c
+++ b/gfx/shader/shader_glsl.c
@@ -27,7 +27,7 @@
 #include "../../config.h"
 #endif
 
-#include "../gfx_context.h"
+#include "../video_context.h"
 #include <stdlib.h>
 
 #ifdef HAVE_OPENGL
diff --git a/gfx/shader/shader_null.c b/gfx/shader/shader_null.c
index e98795330e..840fa711e1 100644
--- a/gfx/shader/shader_null.c
+++ b/gfx/shader/shader_null.c
@@ -31,7 +31,7 @@
 #include "../gl_common.h"
 #endif
 
-#include "../gfx_context.h"
+#include "../video_context.h"
 #include "shader_context.h"
 #include <stdlib.h>
 
diff --git a/gfx/gfx_context.c b/gfx/video_context.c
similarity index 99%
rename from gfx/gfx_context.c
rename to gfx/video_context.c
index ec0413afc7..e02db81926 100644
--- a/gfx/gfx_context.c
+++ b/gfx/video_context.c
@@ -15,8 +15,7 @@
  */
 
 #include "../general.h"
-#include "gfx_context.h"
-#include "../general.h"
+#include "video_context.h"
 #include <string.h>
 
 #ifdef HAVE_CONFIG_H
diff --git a/gfx/gfx_context.h b/gfx/video_context.h
similarity index 99%
rename from gfx/gfx_context.h
rename to gfx/video_context.h
index 795225fb98..64639551f6 100644
--- a/gfx/gfx_context.h
+++ b/gfx/video_context.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GFX_CONTEXT_H
-#define __GFX_CONTEXT_H
+#ifndef __VIDEO_CONTEXT_H
+#define __VIDEO_CONTEXT_H
 
 #include <boolean.h>
 #include "../driver.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 8f0494612b..5a6fe01dd5 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -86,7 +86,7 @@ CHEATS
 VIDEO CONTEXT
 ============================================================ */
 
-#include "../gfx/gfx_context.c"
+#include "../gfx/video_context.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 0fd3301da3..ba2adc0f1d 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/gfx_context.h"
+#include "../../gfx/video_context.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 af187809df..7fc6033592 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/gfx_context.h"
+#include "../../gfx/video_context.h"
 
 #include "../../settings_data.h"
 #include "../../general.h"