diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index b20ff6ae15..f50b39d648 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -909,7 +909,7 @@ static int action_ok_shader_pass_load(const char *path,
 
 static int  generic_action_ok_help(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx,
-      unsigned id, menu_help_type_t id2)
+      unsigned id, enum menu_help_type id2)
 {
    const char               *lbl  = menu_hash_to_str(id);
    menu_handle_t            *menu = NULL;
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 760d0873bb..65c4ac36f2 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2320,9 +2320,9 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool ho
    for (i = 0; i < list_size; i++)
    {
       bool is_dir;
-      const char *path            = NULL;
-      char label[PATH_MAX_LENGTH] = {0};
-      menu_file_type_t file_type  = MENU_FILE_NONE;
+      char label[PATH_MAX_LENGTH];
+      const char *path              = NULL;
+      enum menu_file_type file_type = MENU_FILE_NONE;
 
       switch (str_list->elems[i].attr.i)
       {
@@ -2349,7 +2349,7 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool ho
                   break;
                }
             }
-            file_type = (menu_file_type_t)info->type_default;
+            file_type = (enum menu_file_type)info->type_default;
             break;
       }
 
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index e5bc6fa0f2..b402f2a65b 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -72,7 +72,7 @@ enum menu_environ_cb
    MENU_ENVIRON_LAST
 };
 
-typedef enum
+enum menu_help_type
 {
    MENU_HELP_NONE       = 0,
    MENU_HELP_WELCOME,
@@ -85,7 +85,7 @@ typedef enum
    MENU_HELP_AUDIO_VIDEO_TROUBLESHOOTING,
    MENU_HELP_SCANNING_CONTENT,
    MENU_HELP_LAST
-} menu_help_type_t;
+};
 
 enum menu_state_changes
 {
@@ -174,7 +174,7 @@ enum rarch_menu_ctl_state
    RARCH_MENU_CTL_BIND_INIT
 };
 
-typedef enum
+enum menu_file_type
 {
    MENU_FILE_NONE = 0,
    MENU_FILE_PLAIN,
@@ -239,7 +239,7 @@ typedef enum
    MENU_SETTING_HORIZONTAL_MENU,
    MENU_INFO_MESSAGE,
    MENU_FILE_TYPE_T_LAST
-} menu_file_type_t;
+};
 
 typedef enum
 {
@@ -281,8 +281,8 @@ typedef enum
 typedef struct
 {
    bool push_help_screen;
-   unsigned         help_screen_id;
-   menu_help_type_t help_screen_type;
+   unsigned            help_screen_id;
+   enum menu_help_type help_screen_type;
 
    bool defer_core;
    char deferred_path[PATH_MAX_LENGTH];