diff --git a/griffin/griffin.c b/griffin/griffin.c
index 7c77f0aa45..efcdb1b1a1 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -14,10 +14,6 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef HAVE_LIBRETRODB
-#define HAVE_LIBRETRODB
-#endif
-
 #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
 #define HAVE_SHADERS
 #endif
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index fdfcbfcc88..37893f7027 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -963,12 +963,12 @@ static int create_string_list_rdb_entry_int(const char *desc, const char *label,
 static int deferred_push_rdb_entry_detail(void *data, void *userdata,
       const char *path, const char *label, unsigned type)
 {
+   int ret = 0;
 #ifdef HAVE_LIBRETRODB
    content_playlist_t *playlist;
    char query[PATH_MAX_LENGTH];
    char path_rdl[PATH_MAX_LENGTH], path_base[PATH_MAX_LENGTH];
    unsigned i, j;
-   int ret = 0;
    database_info_list_t *db_info = NULL;
    file_list_t *list = NULL;
    file_list_t *menu_list = NULL;
@@ -3041,6 +3041,7 @@ static int deferred_push_video_shader_preset_parameters(void *data, void *userda
 static int deferred_push_video_shader_parameters(void *data, void *userdata,
       const char *path, const char *label, unsigned type)
 {
+#ifdef HAVE_SHADER_MANAGER
    struct video_shader *shader = video_shader_driver_get_current_shader();
    if (!shader)
       return 0;
@@ -3048,6 +3049,9 @@ static int deferred_push_video_shader_parameters(void *data, void *userdata,
    return deferred_push_video_shader_parameters_common(data, userdata,
          path, label, type,
          shader, MENU_SETTINGS_SHADER_PARAMETER_0);
+#else
+   return 0;
+#endif
 }
 
 static int deferred_push_settings(void *data, void *userdata,
diff --git a/runloop_data.c b/runloop_data.c
index a27fd7f8b4..18859377f6 100644
--- a/runloop_data.c
+++ b/runloop_data.c
@@ -381,6 +381,7 @@ static void rarch_main_iterate_rdl(void)
       return;
    }
 
+#ifdef HAVE_LIBRETRODB
    if (!driver.menu->rdl->iterating)
    {
       msg_queue_clear(g_extern.msg_queue);
@@ -392,6 +393,7 @@ static void rarch_main_iterate_rdl(void)
    }
 
    database_info_write_rdl_iterate(driver.menu->rdl);
+#endif
 
 }
 #endif