diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index 2fcf515b05..3cefc3427e 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -454,11 +454,11 @@ end:
 }
 
 
+#ifdef HAVE_LIBRETRODB
 static int deferred_push_cursor_manager_list_generic(
       menu_displaylist_info_t *info, enum database_query_type type)
 {
    int ret                       = -1;
-#ifdef HAVE_LIBRETRODB
    char query[PATH_MAX_LENGTH];
    struct string_list *str_list  = string_split(info->path, "|"); 
 
@@ -477,7 +477,6 @@ static int deferred_push_cursor_manager_list_generic(
 
 end:
    string_list_free(str_list);
-#endif
    return ret;
 }
 
@@ -576,6 +575,7 @@ static int deferred_push_cursor_manager_list_deferred_query_rdb_entry_releaseyea
 {
    return deferred_push_cursor_manager_list_generic(info, DATABASE_QUERY_ENTRY_RELEASEDATE_YEAR);
 }
+#endif
 
 #if 0
 static int deferred_push_cursor_manager_list_deferred_query_subsearch(
@@ -1119,6 +1119,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
             case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST:
                BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred);
                break;
+#ifdef HAVE_LIBRETRODB
             case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_PUBLISHER:
                BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_publisher);
                break;
@@ -1167,6 +1168,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
             case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_RELEASEYEAR:
                BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_releaseyear);
                break;
+#endif
             case MENU_ENUM_LABEL_CORE_INFORMATION:
                BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_information);
                break;
@@ -1406,6 +1408,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
             case MENU_LABEL_DEFERRED_DATABASE_MANAGER_LIST:
                BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_database_manager_list_deferred);
                break;
+#ifdef HAVE_LIBRETRODB
             case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST:
                BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred);
                break;
@@ -1457,6 +1460,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
             case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_RELEASEYEAR:
                BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_releaseyear);
                break;
+#endif
             case MENU_LABEL_CORE_INFORMATION:
                BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_information);
                break;
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 51ec58fcd9..0537f23495 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -6057,10 +6057,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          break;
       case DISPLAYLIST_SHADER_PRESET:
          {
+            struct string_list *str_list;
+#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_VULKAN)
             union string_list_elem_attr attr;
-            struct string_list *str_list     = string_list_new();
-
             attr.i = 0;
+#endif
+            str_list = string_list_new();
 
             filebrowser_clear_type();
             info->type_default = FILE_TYPE_SHADER_PRESET;
@@ -6080,13 +6082,17 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          break;
       case DISPLAYLIST_SHADER_PASS:
          {
+            struct string_list *str_list;
+#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_VULKAN)
             union string_list_elem_attr attr;
-            struct string_list *str_list     = string_list_new();
+            attr.i = 0;
+#endif
+
+            str_list = string_list_new();
 
             filebrowser_clear_type();
             info->type_default = FILE_TYPE_SHADER;
 
-            attr.i = 0;
 
 #ifdef HAVE_CG
             string_list_append(str_list, "cg", attr);
diff --git a/tasks/task_screenshot.c b/tasks/task_screenshot.c
index 87058af37f..9ea7c9a783 100644
--- a/tasks/task_screenshot.c
+++ b/tasks/task_screenshot.c
@@ -86,7 +86,6 @@ typedef struct
  **/
 static void task_screenshot_handler(retro_task_t *task)
 {
-   settings_t *settings           = config_get_ptr();
    screenshot_task_state_t *state = (screenshot_task_state_t*)task->state;
    bool is_paused                 = runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL);
    bool ret                       = false;
@@ -155,6 +154,8 @@ static void task_screenshot_handler(retro_task_t *task)
 
 #ifdef HAVE_IMAGEVIEWER
    if (ret && !state->silence)
+   {
+      settings_t *settings = config_get_ptr();
       if (
             settings->history_list_enable 
             && g_defaults.image_history 
@@ -169,6 +170,7 @@ static void task_screenshot_handler(retro_task_t *task)
                )
          )
          playlist_write_file(g_defaults.image_history);
+   }
 #endif
 
    task->progress = 100;