diff --git a/menu/menu.c b/menu/menu.c
index cfc0450a91..61d1423e55 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -210,14 +210,12 @@ error:
 
 /**
  * menu_free_list:
- * @data                     : Menu handle.
+ * @menu                     : Menu handle.
  *
  * Frees menu lists.
  **/
-void menu_free_list(void *data)
+void menu_free_list(menu_handle_t *menu)
 {
-   menu_handle_t *menu  = (menu_handle_t*)data;
-
    if (!menu)
       return;
 
@@ -227,13 +225,12 @@ void menu_free_list(void *data)
 
 /**
  * menu_free:
- * @info                     : Menu handle.
+ * @menu                     : Menu handle.
  *
  * Frees a menu handle
  **/
-void menu_free(void *data)
+void menu_free(menu_handle_t *menu)
 {
-   menu_handle_t *menu = (menu_handle_t*)data;
    global_t *global    = global_get_ptr();
 
    if (!menu)
@@ -275,8 +272,6 @@ void menu_free(void *data)
 
    if (global->core_info_current)
       free(global->core_info_current);
-
-   free(data);
 }
 
 void menu_apply_deferred_settings(void)
diff --git a/menu/menu.h b/menu/menu.h
index 04a9fcc475..8c03a2ad6e 100644
--- a/menu/menu.h
+++ b/menu/menu.h
@@ -156,11 +156,11 @@ void *menu_init(const void *data);
 
 /**
  * menu_free_list:
- * @data                     : Menu handle.
+ * @menu                     : Menu handle.
  *
  * Frees menu lists.
  **/
-void menu_free_list(void *data);
+void menu_free_list(menu_handle_t *menu);
 
 /**
  * menu_iterate:
@@ -178,11 +178,11 @@ int menu_iterate(retro_input_t input,
 
 /**
  * menu_free:
- * @info                     : Menu handle.
+ * @menu                     : Menu handle.
  *
  * Frees a menu handle
  **/
-void menu_free(void *data);
+void menu_free(menu_handle_t *menu);
 
 /**
  * menu_load_content: