diff --git a/Makefile b/Makefile
index 21c8ca1aaf..9ec4f11672 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ OBJDIR := obj-unix
 
 OBJ :=
 LIBS :=
-DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY
+DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL
 DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
 
 ifneq ($(findstring BSD,$(OS)),)
diff --git a/Makefile.common b/Makefile.common
index 80dc89e373..80e132cc49 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -200,7 +200,6 @@ OBJ += frontend/frontend.o \
        input/input_driver.o \
        led/led_driver.o \
        led/null_led_driver.o \
-       led/overlay_led_driver.o \
        gfx/video_coord_array.o \
        gfx/video_display_server.o \
        gfx/video_driver.o \
@@ -220,8 +219,6 @@ OBJ += frontend/frontend.o \
 		 input/input_autodetect_builtin.o \
        input/input_keymaps.o \
        input/input_remapping.o \
-       tasks/task_overlay.o \
-       input/input_overlay.o \
        $(LIBRETRO_COMM_DIR)/queues/fifo_queue.o \
        managers/core_option_manager.o \
        $(LIBRETRO_COMM_DIR)/compat/compat_fnmatch.o \
@@ -796,6 +793,10 @@ endif
 
 ifeq ($(HAVE_OVERLAY), 1)
    DEFINES += -DHAVE_OVERLAY
+   OBJ += \
+	  tasks/task_overlay.o \
+	  input/input_overlay.o \
+	  led/overlay_led_driver.o
 endif
 
 ifeq ($(HAVE_STB_FONT), 1)
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index 182a1fda7e..afb5d0db8e 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -932,7 +932,9 @@ static void vulkan_free(void *data)
       font_driver_free_osd();
 
       vulkan_deinit_static_resources(vk);
+#ifdef HAVE_OVERLAY
       vulkan_overlay_free(vk);
+#endif
 
       if (vk->filter_chain)
          vulkan_filter_chain_free((vulkan_filter_chain_t*)vk->filter_chain);
@@ -2610,8 +2612,6 @@ video_driver_t video_vulkan = {
 
 #ifdef HAVE_OVERLAY
    vulkan_get_overlay_interface,
-#else
-   NULL,
 #endif
    vulkan_get_poke_interface,
    NULL,                         /* vulkan_wrap_type_to_enum */
diff --git a/led/led_driver.c b/led/led_driver.c
index 074505973c..fb1e796078 100644
--- a/led/led_driver.c
+++ b/led/led_driver.c
@@ -20,11 +20,6 @@
 #include "../verbosity.h"
 
 static led_driver_t *current_led_driver = NULL;
-extern led_driver_t *null_led_driver;
-extern led_driver_t *overlay_led_driver;
-#if HAVE_RPILED
-extern led_driver_t *rpi_led_driver;
-#endif
 
 bool led_driver_init(void)
 {
@@ -36,14 +31,15 @@ bool led_driver_init(void)
 
    current_led_driver = null_led_driver;
 
+#ifdef HAVE_OVERLAY
    if(string_is_equal("overlay",drivername))
       current_led_driver = overlay_led_driver;
+#endif
+
 #if HAVE_RPILED
-   else if(string_is_equal("rpi", drivername))
+   if(string_is_equal("rpi", drivername))
       current_led_driver = rpi_led_driver;
 #endif          
-   else
-      current_led_driver = null_led_driver;
 
    RARCH_LOG("[LED]: LED driver = '%s' %p\n",
          drivername,current_led_driver);
diff --git a/led/led_driver.h b/led/led_driver.h
index 1d801b2a7c..1e6dc8ba0c 100644
--- a/led/led_driver.h
+++ b/led/led_driver.h
@@ -42,6 +42,7 @@ void led_driver_free(void);
 void led_driver_set_led(int led,int value);
 
 extern led_driver_t *null_led_driver;
+extern led_driver_t *overlay_led_driver;
 extern led_driver_t *rpi_led_driver;
 
 RETRO_END_DECLS
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 00fef57db3..e0ceab530f 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -11,6 +11,7 @@ HAVE_MATERIALUI=auto       # MaterialUI menu
 HAVE_XMB=auto              # XMB menu
 HAVE_ZARCH=no              # Zarch menu
 HAVE_NUKLEAR=no            # Nuklear menu
+HAVE_OVERLAY=yes           # Overlay support
 HAVE_DYNAMIC=yes           # Dynamic loading of libretro library
 HAVE_SDL=auto              # SDL support
 C89_SDL=no