diff --git a/cheevos.c b/cheevos.c
index 9c3e474fe2..d7eb8c5e4e 100644
--- a/cheevos.c
+++ b/cheevos.c
@@ -955,7 +955,7 @@ static size_t cheevos_highest_bit(size_t n)
 
 void cheevos_parse_guest_addr(cheevos_var_t *var, unsigned value)
 {
-   rarch_system_info_t *system;
+   rarch_system_info_t *system = NULL;
    runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
 
    var->bank_id = -1;
@@ -1510,7 +1510,7 @@ uint8_t *cheevos_get_memory(const cheevos_var_t *var)
    
    if (var->bank_id >= 0)
    {
-      rarch_system_info_t *system;
+      rarch_system_info_t *system = NULL;
       runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
 
       if (system->mmaps.num_descriptors != 0)
diff --git a/database_info.c b/database_info.c
index d61803befb..6f927081ae 100644
--- a/database_info.c
+++ b/database_info.c
@@ -31,24 +31,6 @@
 #include "msg_hash.h"
 #include "verbosity.h"
 
-#define DB_QUERY_ENTRY                          0x1c310956U
-#define DB_QUERY_ENTRY_PUBLISHER                0x125e594dU
-#define DB_QUERY_ENTRY_DEVELOPER                0xcbd89be5U
-#define DB_QUERY_ENTRY_ORIGIN                   0x4ebaa767U
-#define DB_QUERY_ENTRY_FRANCHISE                0x77f9eff2U
-#define DB_QUERY_ENTRY_RATING                   0x68eba20fU
-#define DB_QUERY_ENTRY_BBFC_RATING              0x0a8e67f0U
-#define DB_QUERY_ENTRY_ELSPA_RATING             0x8bf6ab18U
-#define DB_QUERY_ENTRY_PEGI_RATING              0x5fc77328U
-#define DB_QUERY_ENTRY_CERO_RATING              0x24f6172cU
-#define DB_QUERY_ENTRY_ENHANCEMENT_HW           0x9866bda3U
-#define DB_QUERY_ENTRY_EDGE_MAGAZINE_RATING     0x1c7f8a43U
-#define DB_QUERY_ENTRY_EDGE_MAGAZINE_ISSUE      0xaaeebde7U
-#define DB_QUERY_ENTRY_FAMITSU_MAGAZINE_RATING  0xbf7ff5e7U
-#define DB_QUERY_ENTRY_RELEASEDATE_MONTH        0x2b36ce66U
-#define DB_QUERY_ENTRY_RELEASEDATE_YEAR         0x9c7c6e91U
-#define DB_QUERY_ENTRY_MAX_USERS                0xbfcba816U
-
 #define DB_CURSOR_ROM_NAME                      0x16bbcf13U
 #define DB_CURSOR_NAME                          0x7c9b0c46U
 #define DB_CURSOR_DESCRIPTION                   0x91b0c789U