diff --git a/core_info.h b/core_info.h
index ca9fd2a229..2800cd2edf 100644
--- a/core_info.h
+++ b/core_info.h
@@ -37,6 +37,8 @@ typedef struct
 
 typedef struct
 {
+   bool supports_no_game;
+   size_t firmware_count;
    char *path;
    void *config_data;
    char *display_name;
@@ -57,10 +59,7 @@ typedef struct
    struct string_list *authors_list;
    struct string_list *permissions_list;
    struct string_list *licenses_list;
-
    core_info_firmware_t *firmware;
-   size_t firmware_count;
-   bool supports_no_game;
    void *userdata;
 } core_info_t;
 
diff --git a/database_info.h b/database_info.h
index 04e7ab1589..2664577e6f 100644
--- a/database_info.h
+++ b/database_info.h
@@ -81,6 +81,18 @@ typedef struct
 
 typedef struct
 {
+   int analog_supported;
+   int rumble_supported;
+   int coop_supported;
+   uint32_t crc32;
+   unsigned size;
+   unsigned famitsu_magazine_rating;
+   unsigned edge_magazine_rating;
+   unsigned edge_magazine_issue;
+   unsigned max_users;
+   unsigned releasemonth;
+   unsigned releaseyear;
+   unsigned tgdb_rating;
    char *name;
    char *rom_name;
    char *serial;
@@ -97,27 +109,15 @@ typedef struct
    char *pegi_rating;
    char *cero_rating;
    char *enhancement_hw;
-   uint32_t crc32;
    char *sha1;
    char *md5;
-   unsigned size;
-   unsigned famitsu_magazine_rating;
-   unsigned edge_magazine_rating;
-   unsigned edge_magazine_issue;
-   unsigned max_users;
-   unsigned releasemonth;
-   unsigned releaseyear;
-   unsigned tgdb_rating;
-   int analog_supported;
-   int rumble_supported;
-   int coop_supported;
    void *userdata;
 } database_info_t;
 
 typedef struct
 {
-   database_info_t *list;
    size_t count;
+   database_info_t *list;
 } database_info_list_t;
 
 database_info_list_t *database_info_list_new(const char *rdb_path,