diff --git a/Makefile.common b/Makefile.common
index 46ed71bde9..6f736ebd7c 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1264,8 +1264,11 @@ ifeq ($(HAVE_VULKAN), 1)
    OBJ += gfx/drivers/vulkan.o \
           gfx/common/vulkan_common.o \
           $(LIBRETRO_COMM_DIR)/vulkan/vulkan_symbol_wrapper.o \
-          gfx/drivers_font/vulkan_raster_font.o \
-          gfx/drivers_shader/shader_vulkan.o
+          gfx/drivers_font/vulkan_raster_font.o
+
+   ifeq ($(HAVE_SLANG), 1)
+      OBJ += gfx/drivers_shader/shader_vulkan.o
+   endif
 
    ifeq ($(HAVE_VULKAN_DISPLAY), 1)
       OBJ += gfx/drivers_context/khr_display_ctx.o
@@ -1281,7 +1284,7 @@ endif
 ifeq ($(HAVE_OPENGL_CORE), 1)
    OBJ += gfx/drivers/gl_core.o \
           gfx/drivers_font/gl_core_raster_font.o \
-          gfx/drivers_shader/shader_gl_core.o
+			 gfx/drivers_shader/shader_gl_core.o
    ifeq ($(HAVE_MENU_COMMON), 1)
       OBJ += menu/drivers_display/menu_display_gl_core.o
    endif
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 77fcf69834..7d2ca6542e 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -529,32 +529,25 @@ fi
 if [ "$HAVE_SLANG" = 'no' ] ||
    [ "$HAVE_GLSLANG" = 'no' ] ||
    [ "$HAVE_SPIRV_CROSS" = 'no' ]; then
-   die : 'Notice: slang/glslang/SPIRV Cross disabled, disabling video drivers:'
 
 if [ "$HAVE_SLANG" != "no" ]; then
+   die : 'Notice: slang disabled.'
    HAVE_SLANG=no
 fi
 if [ "$HAVE_GLSLANG" != "no" ]; then
+   die : 'Notice: glslang disabled.'
    HAVE_GLSLANG=no
 fi
 if [ "$HAVE_SPIRV_CROSS" != "no" ]; then
+   die : 'Notice: SPIRV-Cross disabled.'
    HAVE_SPIRV_CROSS=no
 fi
-
-if [ "$HAVE_D3D11" != "no" ]; then
-   die : 'd3d11'
-   HAVE_D3D11=no
-fi
-if [ "$HAVE_D3D12" != "no" ]; then
-   die : 'd3d12'
-   HAVE_D3D12=no
-fi
 if [ "$HAVE_OPENGL_CORE" != "no" ]; then
-   die : 'glcore'
+   die : 'Notice: glcore disabled.'
    HAVE_OPENGL_CORE=no
 fi
 if [ "$HAVE_VULKAN" != "no" ]; then
-   die : 'vulkan'
+   die : 'Notice: vulkan disabled.'
    HAVE_VULKAN=no
 fi
 fi