diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 06ca062f0cc..2daa6b5e456 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -399,6 +399,10 @@ if [ "$HAVE_OPENGL" != 'no' ] && [ "$HAVE_OPENGLES" != 'yes' ]; then
    elif [ "$OS" = 'Win32' ]; then
       check_header '' OPENGL "GL/gl.h"
       check_lib '' OPENGL -lopengl32
+   elif [ "$HAVE_GLX" = 'no' ]; then
+      # Use vendor-neutral OpenGL implementation instead of GLX
+      check_header '' OPENGL "GL/gl.h"
+      check_lib '' OPENGL -lOpenGL
    else
       check_header '' OPENGL "GL/gl.h"
       check_lib '' OPENGL -lGL
diff --git a/qb/config.params.sh b/qb/config.params.sh
index f0de7db5636..1f1ea15637e 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -183,6 +183,7 @@ HAVE_VIDEOCORE=auto        # Broadcom Videocore 4 support
 HAVE_DRMINGW=no            # DrMingw exception handler
 HAVE_CDROM=auto            # CD-ROM support
 HAVE_GLSL=yes              # GLSL shaders support
+HAVE_GLX=auto              # GLX support (set this to 'off' for vendor-neutral OpenGL impl)
 HAVE_SLANG=auto            # slang support
 C89_SLANG=no
 HAVE_GLSLANG=auto          # glslang support (requires C++11)
diff --git a/runahead.c b/runahead.c
index 5d07622ac00..de606cddd39 100644
--- a/runahead.c
+++ b/runahead.c
@@ -335,7 +335,7 @@ static char *copy_core_to_temp_file(
    int64_t  dll_file_size      = 0;
    const char  *core_base_name = path_basename_nocompression(core_path);
 
-   if (strlen(core_base_name) == 0)
+   if (string_is_empty(core_base_name))
       return NULL;
 
    if (!(tmpdir = get_tmpdir_alloc(dir_libretro)))