diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index 2fa0189bde..1d9a64596d 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -16,10 +16,8 @@
 
 #include "menu_common.h"
 
-void menu_update_system_info(void *data, bool *load_no_rom)
+void menu_update_system_info(menu_handle_t *menu, bool *load_no_rom)
 {
-   menu_handle_t *menu = (menu_handle_t*)data;
-
 #ifdef HAVE_DYNAMIC
    libretro_free_system_info(&menu->info);
    if (*g_settings.libretro)
@@ -171,13 +169,8 @@ void load_menu_game_history(unsigned game_index)
 #endif
 }
 
-static void menu_init_history(void *data)
+static void menu_init_history(menu_handle_t *menu)
 {
-   menu_handle_t *menu = (menu_handle_t*)data;
-
-   if (!menu)
-      return;
-
    if (menu->history)
    {
       rom_history_free(menu->history);
@@ -200,13 +193,8 @@ static void menu_init_history(void *data)
    }
 }
 
-static void menu_update_libretro_info(void *data)
+static void menu_update_libretro_info(menu_handle_t *menu)
 {
-   menu_handle_t *menu = (menu_handle_t*)data;
-
-   if (!menu)
-      return;
-
 #ifndef HAVE_DYNAMIC
    retro_get_system_info(&menu->info);
 #endif
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 13e4616271..92c448ddac 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -118,7 +118,7 @@ int menu_defer_core(void *data, const char *dir, const char *path, char *deferre
 uint64_t menu_input(void);
 
 void menu_flush_stack_type(unsigned final_type);
-void menu_update_system_info(void *data, bool *load_no_rom);
+void menu_update_system_info(menu_handle_t *menu, bool *load_no_rom);
 void menu_build_scroll_indices(void *data);
 
 #ifdef __cplusplus