diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c
index d28f9dfb8f..cec561ad91 100644
--- a/frontend/drivers/platform_ctr.c
+++ b/frontend/drivers/platform_ctr.c
@@ -256,7 +256,7 @@ static int frontend_ctr_parse_drive_list(void *data)
       return -1;
 
    menu_entries_add_enum(list,
-         "sdmc:/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "sdmc:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
 #endif
 
    return 0;
diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
index 7849c7ea92..eb275c49bc 100644
--- a/frontend/drivers/platform_darwin.m
+++ b/frontend/drivers/platform_darwin.m
@@ -653,9 +653,9 @@ static int frontend_darwin_parse_drive_list(void *data)
    CFSearchPathForDirectoriesInDomains(CFDocumentDirectory, CFUserDomainMask, 1, home_dir_buf, sizeof(home_dir_buf));
 
    menu_entries_add_enum(list,
-         home_dir_buf, "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         home_dir_buf, "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list, "/", "",
-         MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
 
    ret = 0;
 
diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c
index bc40d2f04c..20f9ffd718 100644
--- a/frontend/drivers/platform_gx.c
+++ b/frontend/drivers/platform_gx.c
@@ -466,14 +466,14 @@ static int frontend_gx_parse_drive_list(void *data)
    file_list_t *list = (file_list_t*)data;
 #ifdef HW_RVL
    menu_entries_add_enum(list,
-         "sd:/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "sd:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "usb:/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "usb:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
 #endif
    menu_entries_add_enum(list,
-         "carda:/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "carda:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "cardb:/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "cardb:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
 #endif
 
    return 0;
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index 61cf8bd93f..edb67e39fb 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -1827,18 +1827,18 @@ static int frontend_android_parse_drive_list(void *data)
 {
    file_list_t *list = (file_list_t*)data;
 
-   // MENU_FILE_DIRECTORY is not working with labels, placeholders for now
+   /* FILE_TYPE_DIRECTORY is not working with labels, placeholders for now */
    menu_entries_add_enum(list,
-         app_dir, "Application Dir", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         app_dir, "Application Dir", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
          internal_storage_app_path, "External Application Dir", MSG_UNKNOWN,
-         MENU_FILE_DIRECTORY, 0, 0);
+         FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
          internal_storage_path, "Internal Memory",
-         MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
 
    menu_entries_add_enum(list, "/", "",
-         MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
 
    return 0;
 }
diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c
index 94ad2274fb..1f9d0d6f76 100644
--- a/frontend/drivers/platform_ps3.c
+++ b/frontend/drivers/platform_ps3.c
@@ -494,27 +494,27 @@ static int frontend_ps3_parse_drive_list(void *data)
    file_list_t *list = (file_list_t*)data;
 
    menu_entries_add_enum(list,
-         "/app_home/",   "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "/app_home/",   "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "/dev_hdd0/",   "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "/dev_hdd0/",   "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "/dev_hdd1/",   "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "/dev_hdd1/",   "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "/host_root/",  "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "/host_root/",  "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "/dev_usb000/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "/dev_usb000/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "/dev_usb001/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "/dev_usb001/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "/dev_usb002/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "/dev_usb002/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "/dev_usb003/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "/dev_usb003/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "/dev_usb004/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "/dev_usb004/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "/dev_usb005/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "/dev_usb005/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "/dev_usb006/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "/dev_usb006/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
 #endif
 
    return 0;
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index 8a5f908371..60663a5c97 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -370,14 +370,14 @@ static int frontend_psp_parse_drive_list(void *data)
 
 #ifdef VITA
    menu_entries_add_enum(list,
-         "cache0:/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "cache0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
 #else
    menu_entries_add_enum(list,
-         "ms0:/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "ms0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "ef0:/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "ef0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "host0:/", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "host0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
 #endif
 #endif
 
diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c
index 1b0f986656..ddf29ed612 100644
--- a/frontend/drivers/platform_win32.c
+++ b/frontend/drivers/platform_win32.c
@@ -229,7 +229,7 @@ static int frontend_win32_parse_drive_list(void *data)
       drive[0] = 'A' + i;
       if (drives & (1 << i))
          menu_entries_add_enum(list,
-               drive, "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+               drive, "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    }
 #endif
 
diff --git a/frontend/drivers/platform_xdk.cpp b/frontend/drivers/platform_xdk.cpp
index 90bfe9bd8d..4400444d7b 100644
--- a/frontend/drivers/platform_xdk.cpp
+++ b/frontend/drivers/platform_xdk.cpp
@@ -1368,18 +1368,18 @@ static int frontend_xdk_parse_drive_list(void *data)
 
 #if defined(_XBOX1)
    menu_entries_add_enum(list,
-         "C:", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "C:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "D:", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "D:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "E:", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "E:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "F:", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "F:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
    menu_entries_add_enum(list,
-         "G:", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "G:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
 #elif defined(_XBOX360)
    menu_entries_add_enum(list,
-         "game:", "", MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
+         "game:", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
 #endif
 #endif