diff --git a/Makefile.common b/Makefile.common
index 070226794e..c90f6a968e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,3 +1,9 @@
+HAVE_LIBRETRODB = 1
+
+ifeq ($(HAVE_LIBRETRODB), 1)
+	DEFINES += -DHAVE_LIBRETRODB
+endif
+
 ifeq ($(HAVE_FBO), 1)
    DEFINES += -DHAVE_FBO
 endif
@@ -165,11 +171,13 @@ OBJ += frontend/frontend.o \
 
 # LibretroDB
 
+ifeq ($(HAVE_LIBRETRODB), 1)
 OBJ += libretrodb/bintree.o \
 		 libretrodb/rarchdb.o \
 		 libretrodb/query.o \
 		 libretrodb/rmsgpack.o \
 		 libretrodb/rmsgpack_dom.o
+endif
 
 # Miscellaneous
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index e623029efa..692da66d97 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -14,6 +14,8 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */
 
+#define HAVE_LIBRETRODB
+
 #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
 #define HAVE_SHADERS
 #endif
@@ -805,11 +807,13 @@ XML
 /*============================================================
  LIBRETRODB
 ============================================================ */
+#ifdef HAVE_LIBRETRODB
 #include "../libretrodb/bintree.c"
 #include "../libretrodb/rarchdb.c"
 #include "../libretrodb/rmsgpack.c"
 #include "../libretrodb/rmsgpack_dom.c"
 #include "../libretrodb/query.c"
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/settings_data.c b/settings_data.c
index f33ffb1857..e6f2c8bef0 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -3353,11 +3353,13 @@ static bool setting_data_append_list_main_menu_options(
          subgroup_info.name);
 #endif
 
+#ifdef HAVE_LIBRETRODB
    CONFIG_ACTION(
          "database_manager_list",
          "Database Manager",
          group_info.name,
          subgroup_info.name);
+#endif
 
    if (g_settings.history_list_enable)
    {
@@ -5832,6 +5834,7 @@ static bool setting_data_append_list_path_options(
          list_info,
          SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR | SD_FLAG_BROWSER_ACTION);
 
+#ifdef HAVE_LIBRETRODB
    CONFIG_DIR(
          g_settings.content_database,
          "content_database_path",
@@ -5846,6 +5849,7 @@ static bool setting_data_append_list_path_options(
          list,
          list_info,
          SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR | SD_FLAG_BROWSER_ACTION);
+#endif
 
    CONFIG_DIR(
          g_settings.cheat_database,