diff --git a/TOOLS/old-makefile b/TOOLS/old-makefile
index 6d5a014cdd..8a3f41a7af 100644
--- a/TOOLS/old-makefile
+++ b/TOOLS/old-makefile
@@ -70,11 +70,11 @@ SOURCES-$(GL)                   += video/out/opengl/common.c \
 SOURCES-$(ENCODING)             += video/out/vo_lavc.c audio/out/ao_lavc.c \
                                    common/encode_lavc.c
 
-SOURCES-$(GL_X11)               += video/out/x11_common.c video/out/opengl/x11.c
-SOURCES-$(EGL_X11)              += video/out/x11_common.c video/out/opengl/x11egl.c \
+SOURCES-$(GL_X11)               += video/out/x11_common.c video/out/opengl/context_x11.c
+SOURCES-$(EGL_X11)              += video/out/x11_common.c video/out/opengl/context_x11egl.c \
                                    video/out/opengl/egl_helpers.c
 SOURCES-$(GL_WAYLAND)           += video/out/wayland_common.c \
-                                   video/out/opengl/wayland.c
+                                   video/out/opengl/context_wayland.c
 
 SOURCES-$(JACK)                 += audio/out/ao_jack.c
 SOURCES-$(OPENAL)               += audio/out/ao_openal.c
diff --git a/video/out/opengl/angle.c b/video/out/opengl/context_angle.c
similarity index 100%
rename from video/out/opengl/angle.c
rename to video/out/opengl/context_angle.c
diff --git a/video/out/opengl/cocoa.c b/video/out/opengl/context_cocoa.c
similarity index 100%
rename from video/out/opengl/cocoa.c
rename to video/out/opengl/context_cocoa.c
diff --git a/video/out/opengl/drm_egl.c b/video/out/opengl/context_drm_egl.c
similarity index 100%
rename from video/out/opengl/drm_egl.c
rename to video/out/opengl/context_drm_egl.c
diff --git a/video/out/opengl/dxinterop.c b/video/out/opengl/context_dxinterop.c
similarity index 100%
rename from video/out/opengl/dxinterop.c
rename to video/out/opengl/context_dxinterop.c
diff --git a/video/out/opengl/rpi.c b/video/out/opengl/context_rpi.c
similarity index 100%
rename from video/out/opengl/rpi.c
rename to video/out/opengl/context_rpi.c
diff --git a/video/out/opengl/rpi.h b/video/out/opengl/context_rpi.h
similarity index 100%
rename from video/out/opengl/rpi.h
rename to video/out/opengl/context_rpi.h
diff --git a/video/out/opengl/w32.c b/video/out/opengl/context_w32.c
similarity index 100%
rename from video/out/opengl/w32.c
rename to video/out/opengl/context_w32.c
diff --git a/video/out/opengl/wayland.c b/video/out/opengl/context_wayland.c
similarity index 100%
rename from video/out/opengl/wayland.c
rename to video/out/opengl/context_wayland.c
diff --git a/video/out/opengl/x11.c b/video/out/opengl/context_x11.c
similarity index 100%
rename from video/out/opengl/x11.c
rename to video/out/opengl/context_x11.c
diff --git a/video/out/opengl/x11egl.c b/video/out/opengl/context_x11egl.c
similarity index 100%
rename from video/out/opengl/x11egl.c
rename to video/out/opengl/context_x11egl.c
diff --git a/video/out/vo_rpi.c b/video/out/vo_rpi.c
index cf051cfbc2..7ed6c39b49 100644
--- a/video/out/vo_rpi.c
+++ b/video/out/vo_rpi.c
@@ -40,7 +40,7 @@
 #include "sub/osd.h"
 
 #include "opengl/osd.h"
-#include "opengl/rpi.h"
+#include "opengl/context_rpi.h"
 
 struct priv {
     DISPMANX_DISPLAY_HANDLE_T display;
diff --git a/wscript_build.py b/wscript_build.py
index dd7a25704c..a6ec6795b5 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -311,11 +311,18 @@ def build(ctx):
         ( "video/out/cocoa_common.m",            "cocoa" ),
         ( "video/out/dither.c" ),
         ( "video/out/filter_kernels.c" ),
-        ( "video/out/opengl/cocoa.c",            "gl-cocoa" ),
         ( "video/out/opengl/common.c",           "gl" ),
         ( "video/out/opengl/context.c",          "gl" ),
+        ( "video/out/opengl/context_angle.c",    "egl-angle" ),
+        ( "video/out/opengl/context_cocoa.c",    "gl-cocoa" ),
+        ( "video/out/opengl/context_drm_egl.c",  "egl-drm" ),
+        ( "video/out/opengl/context_dxinterop.c","gl-dxinterop" ),
+        ( "video/out/opengl/context_rpi.c",      "rpi" ),
+        ( "video/out/opengl/context_wayland.c",  "gl-wayland" ),
+        ( "video/out/opengl/context_w32.c",      "gl-win32" ),
+        ( "video/out/opengl/context_x11.c",      "gl-x11" ),
+        ( "video/out/opengl/context_x11egl.c",   "egl-x11" ),
         ( "video/out/opengl/egl_helpers.c",      "egl-helpers" ),
-        ( "video/out/opengl/rpi.c",              "rpi" ),
         ( "video/out/opengl/hwdec.c",            "gl" ),
         ( "video/out/opengl/hwdec_dxva2.c",      "gl-win32" ),
         ( "video/out/opengl/hwdec_vaegl.c",      "vaapi-egl" ),
@@ -329,13 +336,6 @@ def build(ctx):
         ( "video/out/opengl/utils.c",            "gl" ),
         ( "video/out/opengl/video.c",            "gl" ),
         ( "video/out/opengl/video_shaders.c",    "gl" ),
-        ( "video/out/opengl/w32.c",              "gl-win32" ),
-        ( "video/out/opengl/angle.c",            "egl-angle" ),
-        ( "video/out/opengl/dxinterop.c",        "gl-dxinterop" ),
-        ( "video/out/opengl/wayland.c",          "gl-wayland" ),
-        ( "video/out/opengl/x11.c",              "gl-x11" ),
-        ( "video/out/opengl/x11egl.c",           "egl-x11" ),
-        ( "video/out/opengl/drm_egl.c",          "egl-drm" ),
         ( "video/out/vo.c" ),
         ( "video/out/vo_caca.c",                 "caca" ),
         ( "video/out/vo_drm.c",                  "drm" ),