diff --git a/Makefile b/Makefile
index a11c84ae98..4a10ac881a 100644
--- a/Makefile
+++ b/Makefile
@@ -216,7 +216,6 @@ ifeq ($(HAVE_OPENGL), 1)
 
    ifeq ($(HAVE_VIDEOCORE), 1)
       OBJ += gfx/context/vc_egl_ctx.o
-		# videocore's libs set later
    endif
 
    ifeq ($(HAVE_X11), 1)
@@ -257,10 +256,6 @@ ifeq ($(HAVE_VG), 1)
    LIBS += $(VG_LIBS)
 endif
 
-ifeq ($(HAVE_VIDEOCORE), 1)
-   LIBS += -lbcm_host -lvcos -lvchiq_arm -lEGL
-endif
-
 ifeq ($(HAVE_XVIDEO), 1)
    OBJ += gfx/xvideo.o
    LIBS += $(XVIDEO_LIBS) 
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 9ceeeecee2..4deecd6061 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -30,7 +30,7 @@ if [ "$HAVE_VIDEOCORE" = 'yes' ]; then
    [ -d /opt/vc/include/interface/vcos/pthreads ] && add_include_dirs /opt/vc/include/interface/vcos/pthreads
    [ -d /opt/vc/include/interface/vmcs_host/linux ] && add_include_dirs /opt/vc/include/interface/vmcs_host/linux
    HAVE_GLES='auto'
-   EXTRA_GL_LIBS="-lGLESv2 -lbcm_host -lvcos -lvchiq_arm"
+   EXTRA_GL_LIBS="-lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm"
 fi
 
 if [ "$HAVE_NEON" = "yes" ]; then
diff --git a/qb/qb.libs.sh b/qb/qb.libs.sh
index f58ede455c..34670f306e 100644
--- a/qb/qb.libs.sh
+++ b/qb/qb.libs.sh
@@ -40,6 +40,8 @@ check_lib()	#$1 = HAVE_$1	$2 = lib	$3 = function in lib	$4 = extralibs
 		echo "Forced to build with library $2, but cannot locate. Exiting ..."
 		exit 1
 	}
+
+	/bin/true
 }
 
 check_lib_cxx()	#$1 = HAVE_$1	$2 = lib	$3 = function in lib	$4 = extralibs	$5 = critical error message [checked only if non-empty]
@@ -66,6 +68,8 @@ check_lib_cxx()	#$1 = HAVE_$1	$2 = lib	$3 = function in lib	$4 = extralibs	$5 =
 		}
 	
 	}
+
+	/bin/true
 }
 
 check_code_c()