diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 0d3d92db88..3eb3a1cbe5 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -1197,7 +1197,7 @@ static void gl_init_textures(gl_t *gl, const video_info_t *video)
    (void)texture_fmt;
 
 #if defined(HAVE_EGL) && defined(HAVE_OPENGLES2)
-   // Use regular textures if we use HW render.
+   /* Use regular textures if we use HW render. */
    gl->egl_images = !gl->hw_render_use && gl_check_eglimage_proc() &&
       gfx_ctx_image_buffer_init(gl, video);
 #else
diff --git a/griffin/griffin.c b/griffin/griffin.c
index d308cfbf3f..c6e16e0ffa 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -116,13 +116,7 @@ VIDEO CONTEXT
 #if defined(HAVE_VIDEOCORE)
 #include "../gfx/drivers_context/vc_egl_ctx.c"
 #endif
-#if defined(HAVE_X11) && !defined(HAVE_OPENGLES)
-#include "../gfx/drivers_context/glx_ctx.c"
-#endif
 
-#if defined(HAVE_EGL)
-#include "../gfx/drivers_context/xegl_ctx.c"
-#endif
 
 #if defined(_WIN32) && !defined(_XBOX)
 #include "../gfx/drivers_context/wgl_ctx.c"
@@ -131,8 +125,17 @@ VIDEO CONTEXT
 
 #endif
 
-#ifdef HAVE_X11
+#if defined(HAVE_X11)
 #include "../gfx/common/x11_common.c"
+
+#ifndef HAVE_OPENGLES
+#include "../gfx/drivers_context/glx_ctx.c"
+#endif
+
+#ifdef HAVE_EGL
+#include "../gfx/drivers_context/xegl_ctx.c"
+#endif
+
 #endif