diff --git a/database_info.c b/database_info.c
index 65110f647d..05fa7dbd02 100644
--- a/database_info.c
+++ b/database_info.c
@@ -35,7 +35,7 @@ int database_open_cursor(libretrodb_t *db,
    libretrodb_query_t *q = NULL;
 
    if (query) 
-      q = (libretrodb_query_t*)libretrodb_query_compile(db, query,
+      q = libretrodb_query_compile(db, query,
       strlen(query), &error);
     
    if (error)
@@ -66,7 +66,7 @@ int database_info_write_rdl(const char *dir)
    if (g_extern.core_info)
       exts = core_info_list_get_all_extensions(g_extern.core_info);
    
-   str_list = (struct string_list*)dir_list_new(dir, exts, false);
+   str_list = dir_list_new(dir, exts, false);
 
    if (!str_list)
       return -1;
@@ -147,7 +147,7 @@ database_info_list_t *database_info_list_new(const char *rdb_path, const char *q
       if (!database_info)
          goto error;
 
-      db_info = (database_info_t*)&database_info[i];
+      db_info = &database_info[i];
 
       db_info->name                   = NULL;
       db_info->description            = NULL;
@@ -305,7 +305,7 @@ void database_info_list_free(database_info_list_t *database_info_list)
 
    for (i = 0; i < database_info_list->count; i++)
    {
-      database_info_t *info = (database_info_t*)&database_info_list->list[i];
+      database_info_t *info = &database_info_list->list[i];
 
       if (!info)
          continue;
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index d498fe9bf4..9e0e67e1e2 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -888,7 +888,7 @@ static int deferred_push_rdb_entry_detail(void *data, void *userdata,
    for (i = 0; i < db_info->count; i++)
    {
       char tmp[PATH_MAX_LENGTH];
-      database_info_t *db_info_entry = (database_info_t*)&db_info->list[i];
+      database_info_t *db_info_entry = &db_info->list[i];
 
       if (!db_info_entry)
          continue;