diff --git a/video/out/opengl/rpi.h b/video/out/opengl/rpi.h
index e00762b632..5ce893e9e3 100644
--- a/video/out/opengl/rpi.h
+++ b/video/out/opengl/rpi.h
@@ -1,6 +1,6 @@
 #include <bcm_host.h>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
+
+#include "common.h"
 
 struct mp_egl_rpi {
     struct mp_log *log;
diff --git a/wscript b/wscript
index 2cc1965d92..8093ea396c 100644
--- a/wscript
+++ b/wscript
@@ -612,11 +612,6 @@ video_output_features = [
         'deps': [ 'x11', 'c11-tls' ],
         'groups': [ 'gl' ],
         'func': check_pkg_config('egl', 'gl'),
-    } , {
-        'name': 'egl',
-        'desc': 'EGL',
-        'deps': [ 'egl-x11' ],
-        'func': check_true,
     } , {
         'name': '--gl-wayland',
         'desc': 'OpenGL Wayland Backend',
@@ -708,6 +703,11 @@ video_output_features = [
         'desc': 'OpenGL video outputs',
         'deps_any': [ 'gl-cocoa', 'gl-x11', 'gl-win32', 'gl-wayland', 'rpi' ],
         'func': check_true
+    } , {
+        'name': 'egl',
+        'desc': 'EGL',
+        'deps_any': [ 'egl-x11', 'rpi' , 'gl-wayland' ],
+        'func': check_true,
     }
 ]