diff --git a/Makefile.common b/Makefile.common
index 7d5f8e43c8..13b3d4e24d 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -256,7 +256,6 @@ OBJ += \
        $(LIBRETRO_COMM_DIR)/file/file_path.o \
        $(LIBRETRO_COMM_DIR)/file/file_path_io.o \
        file_path_special.o \
-       file_path_str.o \
        $(LIBRETRO_COMM_DIR)/hash/rhash.o \
        input/common/input_hid_common.o \
        led/led_driver.o \
diff --git a/configuration.c b/configuration.c
index 7e3f0a3b81..f22bed688c 100644
--- a/configuration.c
+++ b/configuration.c
@@ -2508,7 +2508,7 @@ void config_set_defaults(void *data)
 
          fill_pathname_join(config_file_path,
                settings->paths.directory_menu_config,
-               file_path_str(FILE_PATH_MAIN_CONFIG),
+               FILE_PATH_MAIN_CONFIG,
                sizeof(config_file_path));
          path_set(RARCH_PATH_CONFIG,
                config_file_path);
@@ -2668,7 +2668,7 @@ static config_file_t *open_default_config_file(void)
    fill_pathname_application_dir(app_path, sizeof(app_path));
 #endif
    fill_pathname_resolve_relative(conf_path, app_path,
-         file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(conf_path));
+         FILE_PATH_MAIN_CONFIG, sizeof(conf_path));
 
    conf = config_file_new_from_path_to_string(conf_path);
 
@@ -2678,7 +2678,7 @@ static config_file_t *open_default_config_file(void)
             sizeof(application_data)))
       {
          fill_pathname_join(conf_path, application_data,
-               file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(conf_path));
+               FILE_PATH_MAIN_CONFIG, sizeof(conf_path));
          conf = config_file_new_from_path_to_string(conf_path);
       }
    }
@@ -2695,7 +2695,7 @@ static config_file_t *open_default_config_file(void)
          /* Since this is a clean config file, we can
           * safely use config_save_on_exit. */
          fill_pathname_resolve_relative(conf_path, app_path,
-               file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(conf_path));
+               FILE_PATH_MAIN_CONFIG, sizeof(conf_path));
          config_set_bool(conf, "config_save_on_exit", true);
          saved = config_file_write(conf, conf_path, true);
       }
@@ -2721,7 +2721,7 @@ static config_file_t *open_default_config_file(void)
    path_mkdir(application_data);
 
    fill_pathname_join(conf_path, application_data,
-         file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(conf_path));
+         FILE_PATH_MAIN_CONFIG, sizeof(conf_path));
    conf = config_file_new_from_path_to_string(conf_path);
 
    if (!conf)
@@ -2753,7 +2753,7 @@ static config_file_t *open_default_config_file(void)
    if (has_application_data)
    {
       fill_pathname_join(conf_path, application_data,
-            file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(conf_path));
+            FILE_PATH_MAIN_CONFIG, sizeof(conf_path));
       RARCH_LOG("Looking for config in: \"%s\".\n", conf_path);
       conf = config_file_new_from_path_to_string(conf_path);
    }
@@ -2778,7 +2778,7 @@ static config_file_t *open_default_config_file(void)
 
       fill_pathname_basedir(basedir, application_data, sizeof(basedir));
       fill_pathname_join(conf_path, application_data,
-            file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(conf_path));
+            FILE_PATH_MAIN_CONFIG, sizeof(conf_path));
 
       dir_created = path_mkdir(basedir);
 
@@ -2792,7 +2792,7 @@ static config_file_t *open_default_config_file(void)
          /* Build a retroarch.cfg path from the
           * global config directory (/etc). */
          fill_pathname_join(skeleton_conf, GLOBAL_CONFIG_DIR,
-            file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(skeleton_conf));
+            FILE_PATH_MAIN_CONFIG, sizeof(skeleton_conf));
 
          conf = config_file_new_from_path_to_string(skeleton_conf);
          if (conf)
@@ -3134,12 +3134,12 @@ static bool config_load_file(global_t *global,
          fill_pathname_resolve_relative(
                settings->paths.path_content_history,
                path_config,
-               file_path_str(FILE_PATH_CONTENT_HISTORY),
+               FILE_PATH_CONTENT_HISTORY,
                sizeof(settings->paths.path_content_history));
       else
          fill_pathname_join(settings->paths.path_content_history,
                settings->paths.directory_content_history,
-               file_path_str(FILE_PATH_CONTENT_HISTORY),
+               FILE_PATH_CONTENT_HISTORY,
                sizeof(settings->paths.path_content_history));
    }
 
@@ -3149,12 +3149,12 @@ static bool config_load_file(global_t *global,
          fill_pathname_resolve_relative(
                settings->paths.path_content_favorites,
                path_config,
-               file_path_str(FILE_PATH_CONTENT_FAVORITES),
+               FILE_PATH_CONTENT_FAVORITES,
                sizeof(settings->paths.path_content_favorites));
       else
          fill_pathname_join(settings->paths.path_content_favorites,
                settings->paths.directory_content_history,
-               file_path_str(FILE_PATH_CONTENT_FAVORITES),
+               FILE_PATH_CONTENT_FAVORITES,
                sizeof(settings->paths.path_content_favorites));
    }
 
@@ -3164,12 +3164,12 @@ static bool config_load_file(global_t *global,
          fill_pathname_resolve_relative(
                settings->paths.path_content_music_history,
                path_config,
-               file_path_str(FILE_PATH_CONTENT_MUSIC_HISTORY),
+               FILE_PATH_CONTENT_MUSIC_HISTORY,
                sizeof(settings->paths.path_content_music_history));
       else
          fill_pathname_join(settings->paths.path_content_music_history,
                settings->paths.directory_content_history,
-               file_path_str(FILE_PATH_CONTENT_MUSIC_HISTORY),
+               FILE_PATH_CONTENT_MUSIC_HISTORY,
                sizeof(settings->paths.path_content_music_history));
    }
 
@@ -3179,12 +3179,12 @@ static bool config_load_file(global_t *global,
          fill_pathname_resolve_relative(
                settings->paths.path_content_video_history,
                path_config,
-               file_path_str(FILE_PATH_CONTENT_VIDEO_HISTORY),
+               FILE_PATH_CONTENT_VIDEO_HISTORY,
                sizeof(settings->paths.path_content_video_history));
       else
          fill_pathname_join(settings->paths.path_content_video_history,
                settings->paths.directory_content_history,
-               file_path_str(FILE_PATH_CONTENT_VIDEO_HISTORY),
+               FILE_PATH_CONTENT_VIDEO_HISTORY,
                sizeof(settings->paths.path_content_video_history));
    }
 
@@ -3194,12 +3194,12 @@ static bool config_load_file(global_t *global,
          fill_pathname_resolve_relative(
                settings->paths.path_content_image_history,
                path_config,
-               file_path_str(FILE_PATH_CONTENT_IMAGE_HISTORY),
+               FILE_PATH_CONTENT_IMAGE_HISTORY,
                sizeof(settings->paths.path_content_image_history));
       else
          fill_pathname_join(settings->paths.path_content_image_history,
                settings->paths.directory_content_history,
-               file_path_str(FILE_PATH_CONTENT_IMAGE_HISTORY),
+               FILE_PATH_CONTENT_IMAGE_HISTORY,
                sizeof(settings->paths.path_content_image_history));
    }
 
diff --git a/core_backup.c b/core_backup.c
index d758cb2c95..2e09fd5fd6 100644
--- a/core_backup.c
+++ b/core_backup.c
@@ -163,7 +163,7 @@ bool core_backup_get_backup_path(
          (unsigned)time_info.tm_sec,
          crc,
          (unsigned)backup_mode,
-         file_path_str(FILE_PATH_CORE_BACKUP_EXTENSION));
+         FILE_PATH_CORE_BACKUP_EXTENSION);
 
    if ((n < 0) || (n >= 128))
       n = 0; /* Silence GCC warnings... */
@@ -199,7 +199,7 @@ enum core_backup_type core_backup_get_backup_type(const char *backup_path)
 
    /* Check if this is an archived backup */
    if (string_is_equal_noncase(backup_ext,
-         file_path_str(FILE_PATH_CORE_BACKUP_EXTENSION_NO_DOT)))
+         FILE_PATH_CORE_BACKUP_EXTENSION_NO_DOT))
    {
       const char *backup_filename = NULL;
       const char *src_ext         = NULL;
@@ -516,7 +516,7 @@ core_backup_list_t *core_backup_list_init(
    /* Get backup file list */
    dir_list = dir_list_new(
          backup_dir,
-         file_path_str(FILE_PATH_CORE_BACKUP_EXTENSION),
+         FILE_PATH_CORE_BACKUP_EXTENSION,
          false, /* include_dirs */
          false, /* include_hidden */
          false, /* include_compressed */
diff --git a/core_info.c b/core_info.c
index 22f8af603a..0879cae0df 100644
--- a/core_info.c
+++ b/core_info.c
@@ -231,7 +231,6 @@ static config_file_t *core_info_list_iterate(
 static char *core_info_get_core_lock_file_path(const char *core_path)
 {
    char *lock_file_path      = NULL;
-   const char *lock_file_ext = file_path_str(FILE_PATH_LOCK_EXTENSION);
    size_t len;
 
    if (string_is_empty(core_path))
@@ -241,7 +240,7 @@ static char *core_info_get_core_lock_file_path(const char *core_path)
     * allocating all strings dynamically... */
 
    /* Get path length */
-   len = (strlen(core_path) + strlen(lock_file_ext) + 1) * sizeof(char);
+   len = (strlen(core_path) + STRLEN_CONST(FILE_PATH_LOCK_EXTENSION) + 1) * sizeof(char);
 
    /* Allocate string */
    lock_file_path = (char*)malloc(len);
@@ -252,7 +251,7 @@ static char *core_info_get_core_lock_file_path(const char *core_path)
 
    /* Lock file is just core path + 'lock' extension */
    strlcpy(lock_file_path, core_path, len);
-   strlcat(lock_file_path, lock_file_ext, len);
+   strlcat(lock_file_path, FILE_PATH_LOCK_EXTENSION, len);
 
    return lock_file_path;
 }
diff --git a/core_updater_list.c b/core_updater_list.c
index b1ff3ba6dc..ffe610c91b 100644
--- a/core_updater_list.c
+++ b/core_updater_list.c
@@ -474,7 +474,7 @@ static bool core_updater_list_set_paths(
    /* > Add proper file extension */
    strlcat(
          local_info_path,
-         file_path_str(FILE_PATH_CORE_INFO_EXTENSION),
+         FILE_PATH_CORE_INFO_EXTENSION,
          sizeof(local_info_path));
 
    if (entry->local_info_path)
diff --git a/disk_index_file.c b/disk_index_file.c
index 52276ee7be..99ac739e19 100644
--- a/disk_index_file.c
+++ b/disk_index_file.c
@@ -334,7 +334,7 @@ bool disk_index_file_init(
          content_name, sizeof(disk_index_file_path));
    strlcat(
          disk_index_file_path,
-         file_path_str(FILE_PATH_DISK_CONTROL_INDEX_EXTENSION),
+         FILE_PATH_DISK_CONTROL_INDEX_EXTENSION,
          sizeof(disk_index_file_path));
    if (string_is_empty(disk_index_file_path))
       goto error;
diff --git a/file_path_special.h b/file_path_special.h
index 6a908fbe66..8fce3158a1 100644
--- a/file_path_special.h
+++ b/file_path_special.h
@@ -27,80 +27,81 @@
 
 RETRO_BEGIN_DECLS
 
-enum file_path_enum
-{
-   FILE_PATH_UNKNOWN = 0,
-   FILE_PATH_CONTENT_BASENAME,
-   FILE_PATH_DETECT,
-   FILE_PATH_NUL,
-   FILE_PATH_LUTRO_PLAYLIST,
-   FILE_PATH_CONTENT_HISTORY,
-   FILE_PATH_CONTENT_FAVORITES,
-   FILE_PATH_CONTENT_MUSIC_HISTORY,
-   FILE_PATH_CONTENT_VIDEO_HISTORY,
-   FILE_PATH_CONTENT_IMAGE_HISTORY,
-   FILE_PATH_BACKGROUND_IMAGE,
-   FILE_PATH_TTF_FONT,
-   FILE_PATH_MAIN_CONFIG,
-   FILE_PATH_CORE_OPTIONS_CONFIG,
-   FILE_PATH_ASSETS_ZIP,
-   FILE_PATH_AUTOCONFIG_ZIP,
-   FILE_PATH_CORE_INFO_ZIP,
-   FILE_PATH_OVERLAYS_ZIP,
-   FILE_PATH_DATABASE_RDB_ZIP,
-   FILE_PATH_SHADERS_SLANG_ZIP,
-   FILE_PATH_SHADERS_GLSL_ZIP,
-   FILE_PATH_SHADERS_CG_ZIP,
-   FILE_PATH_CHEATS_ZIP,
-   FILE_PATH_LAKKA_URL,
-   FILE_PATH_CORE_THUMBNAILS_URL,
-   FILE_PATH_CORE_THUMBNAILPACKS_URL,
-   FILE_PATH_INDEX_DIRS_URL,
-   FILE_PATH_NETPLAY_ROOM_LIST_URL,
-   FILE_PATH_INDEX_URL,
-   FILE_PATH_INDEX_EXTENDED_URL,
-   FILE_PATH_CGP_EXTENSION,
-   FILE_PATH_GLSLP_EXTENSION,
-   FILE_PATH_SLANGP_EXTENSION,
-   FILE_PATH_SRM_EXTENSION,
-   FILE_PATH_PNG_EXTENSION,
-   FILE_PATH_BMP_EXTENSION,
-   FILE_PATH_TGA_EXTENSION,
-   FILE_PATH_JPEG_EXTENSION,
-   FILE_PATH_JPG_EXTENSION,
-   FILE_PATH_UPS_EXTENSION,
-   FILE_PATH_OPT_EXTENSION,
-   FILE_PATH_IPS_EXTENSION,
-   FILE_PATH_BPS_EXTENSION,
-   FILE_PATH_STATE_EXTENSION,
-   FILE_PATH_RTC_EXTENSION,
-   FILE_PATH_REMAP_EXTENSION,
-   FILE_PATH_CHT_EXTENSION,
-   FILE_PATH_LPL_EXTENSION,
-   FILE_PATH_LPL_EXTENSION_NO_DOT,
-   FILE_PATH_RDB_EXTENSION,
-   FILE_PATH_RDB_EXTENSION_NO_DOT,
-   FILE_PATH_BSV_EXTENSION,
-   FILE_PATH_AUTO_EXTENSION,
-   FILE_PATH_ZIP_EXTENSION,
-   FILE_PATH_7Z_EXTENSION,
-   FILE_PATH_OGG_EXTENSION,
-   FILE_PATH_MP3_EXTENSION,
-   FILE_PATH_FLAC_EXTENSION,
-   FILE_PATH_WAV_EXTENSION,
-   FILE_PATH_MOD_EXTENSION,
-   FILE_PATH_S3M_EXTENSION,
-   FILE_PATH_XM_EXTENSION,
-   FILE_PATH_CONFIG_EXTENSION,
-   FILE_PATH_CORE_INFO_EXTENSION,
-   FILE_PATH_RUNTIME_EXTENSION,
-   FILE_PATH_DEFAULT_EVENT_LOG,
-   FILE_PATH_EVENT_LOG_EXTENSION,
-   FILE_PATH_DISK_CONTROL_INDEX_EXTENSION,
-   FILE_PATH_CORE_BACKUP_EXTENSION,
-   FILE_PATH_CORE_BACKUP_EXTENSION_NO_DOT,
-   FILE_PATH_LOCK_EXTENSION
-};
+#define FILE_PATH_UNKNOWN          "null"
+#define FILE_PATH_CONTENT_BASENAME "content.png"
+#define FILE_PATH_DETECT           "DETECT"
+#define FILE_PATH_LUTRO_PLAYLIST   "Lutro.lpl"
+#define FILE_PATH_NUL              "nul"
+#define FILE_PATH_CGP_EXTENSION ".cgp"
+#define FILE_PATH_GLSLP_EXTENSION ".glslp"
+#define FILE_PATH_SLANGP_EXTENSION ".slangp"
+#define FILE_PATH_AUTO_EXTENSION ".auto"
+#define FILE_PATH_BSV_EXTENSION ".bsv"
+#define FILE_PATH_OPT_EXTENSION ".opt"
+#define FILE_PATH_CORE_INFO_EXTENSION ".info"
+#define FILE_PATH_CONFIG_EXTENSION ".cfg"
+#define FILE_PATH_REMAP_EXTENSION ".rmp"
+#define FILE_PATH_RTC_EXTENSION ".rtc"
+#define FILE_PATH_CHT_EXTENSION ".cht"
+#define FILE_PATH_SRM_EXTENSION ".srm"
+#define FILE_PATH_STATE_EXTENSION ".state"
+#define FILE_PATH_LPL_EXTENSION ".lpl"
+#define FILE_PATH_LPL_EXTENSION_NO_DOT "lpl"
+#define FILE_PATH_PNG_EXTENSION ".png"
+#define FILE_PATH_MP3_EXTENSION ".mp3"
+#define FILE_PATH_FLAC_EXTENSION ".flac"
+#define FILE_PATH_OGG_EXTENSION ".ogg"
+#define FILE_PATH_WAV_EXTENSION ".wav"
+#define FILE_PATH_MOD_EXTENSION ".mod"
+#define FILE_PATH_S3M_EXTENSION ".s3m"
+#define FILE_PATH_XM_EXTENSION ".xm"
+#define FILE_PATH_JPEG_EXTENSION ".jpeg"
+#define FILE_PATH_BMP_EXTENSION ".bmp"
+#define FILE_PATH_TGA_EXTENSION ".tga"
+#define FILE_PATH_JPG_EXTENSION ".jpg"
+#define FILE_PATH_UPS_EXTENSION ".ups"
+#define FILE_PATH_IPS_EXTENSION ".ips"
+#define FILE_PATH_BPS_EXTENSION ".bps"
+#define FILE_PATH_RDB_EXTENSION ".rdb"
+#define FILE_PATH_RDB_EXTENSION_NO_DOT "rdb"
+#define FILE_PATH_ZIP_EXTENSION ".zip"
+#define FILE_PATH_7Z_EXTENSION ".7z"
+#define FILE_PATH_INDEX_URL ".index"
+#define FILE_PATH_INDEX_DIRS_URL ".index-dirs"
+#define FILE_PATH_INDEX_EXTENDED_URL ".index-extended"
+#define FILE_PATH_NETPLAY_ROOM_LIST_URL "registry.lpl"
+#define FILE_PATH_CORE_THUMBNAILS_URL "http//thumbnails.libretro.com"
+#define FILE_PATH_CORE_THUMBNAILPACKS_URL "http//thumbnailpacks.libretro.com"
+#ifdef HAVE_LAKKA_NIGHTLY
+#define FILE_PATH_LAKKA_URL "http//nightly.builds.lakka.tv/.updater"
+#else
+#define FILE_PATH_LAKKA_URL "http//le.builds.lakka.tv"
+#endif
+#define FILE_PATH_SHADERS_GLSL_ZIP "shaders_glsl.zip"
+#define FILE_PATH_SHADERS_SLANG_ZIP "shaders_slang.zip"
+#define FILE_PATH_SHADERS_CG_ZIP "shaders_cg.zip"
+#define FILE_PATH_DATABASE_RDB_ZIP "database-rdb.zip"
+#define FILE_PATH_OVERLAYS_ZIP "overlays.zip"
+#define FILE_PATH_CORE_INFO_ZIP "info.zip"
+#define FILE_PATH_CHEATS_ZIP "cheats.zip"
+#define FILE_PATH_ASSETS_ZIP "assets.zip"
+#define FILE_PATH_AUTOCONFIG_ZIP "autoconfig.zip"
+#define FILE_PATH_CONTENT_HISTORY "content_history.lpl"
+#define FILE_PATH_CONTENT_FAVORITES "content_favorites.lpl"
+#define FILE_PATH_CONTENT_MUSIC_HISTORY "content_music_history.lpl"
+#define FILE_PATH_CONTENT_VIDEO_HISTORY "content_video_history.lpl"
+#define FILE_PATH_CONTENT_IMAGE_HISTORY "content_image_history.lpl"
+#define FILE_PATH_CORE_OPTIONS_CONFIG "retroarch-core-options.cfg"
+#define FILE_PATH_MAIN_CONFIG "retroarch.cfg"
+#define FILE_PATH_BACKGROUND_IMAGE "bg.png"
+#define FILE_PATH_TTF_FONT "font.ttf"
+#define FILE_PATH_RUNTIME_EXTENSION ".lrtl"
+#define FILE_PATH_DEFAULT_EVENT_LOG "retroarch.log"
+#define FILE_PATH_EVENT_LOG_EXTENSION ".log"
+#define FILE_PATH_DISK_CONTROL_INDEX_EXTENSION ".ldci"
+#define FILE_PATH_CORE_BACKUP_EXTENSION ".lcbk"
+#define FILE_PATH_CORE_BACKUP_EXTENSION_NO_DOT "lcbk"
+#define FILE_PATH_LOCK_EXTENSION ".lck"
 
 enum application_special_type
 {
@@ -125,8 +126,6 @@ enum application_special_type
    APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_DISCORD_AVATARS
 };
 
-const char *file_path_str(enum file_path_enum enum_idx);
-
 bool fill_pathname_application_data(char *s, size_t len);
 
 void fill_pathname_application_special(char *s, size_t len, enum application_special_type type);
diff --git a/file_path_str.c b/file_path_str.c
deleted file mode 100644
index fdf7e92174..0000000000
--- a/file_path_str.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "file_path_special.h"
-
-const char *file_path_str(enum file_path_enum enum_idx)
-{
-   switch (enum_idx)
-   {
-      case FILE_PATH_DETECT:
-         return "DETECT";
-      case FILE_PATH_CONTENT_BASENAME:
-         return "content.png";
-      case FILE_PATH_LUTRO_PLAYLIST:
-         return "Lutro.lpl";
-      case FILE_PATH_NUL:
-         return "nul";
-      case FILE_PATH_CGP_EXTENSION:
-         return ".cgp";
-      case FILE_PATH_GLSLP_EXTENSION:
-         return ".glslp";
-      case FILE_PATH_SLANGP_EXTENSION:
-         return ".slangp";
-      case FILE_PATH_AUTO_EXTENSION:
-         return ".auto";
-      case FILE_PATH_BSV_EXTENSION:
-         return ".bsv";
-      case FILE_PATH_OPT_EXTENSION:
-         return ".opt";
-      case FILE_PATH_CORE_INFO_EXTENSION:
-         return ".info";
-      case FILE_PATH_CONFIG_EXTENSION:
-         return ".cfg";
-      case FILE_PATH_REMAP_EXTENSION:
-         return ".rmp";
-      case FILE_PATH_RTC_EXTENSION:
-         return ".rtc";
-      case FILE_PATH_CHT_EXTENSION:
-         return ".cht";
-      case FILE_PATH_SRM_EXTENSION:
-         return ".srm";
-      case FILE_PATH_STATE_EXTENSION:
-         return ".state";
-      case FILE_PATH_LPL_EXTENSION:
-         return ".lpl";
-      case FILE_PATH_LPL_EXTENSION_NO_DOT:
-         return "lpl";
-      case FILE_PATH_PNG_EXTENSION:
-         return ".png";
-      case FILE_PATH_MP3_EXTENSION:
-         return ".mp3";
-      case FILE_PATH_FLAC_EXTENSION:
-         return ".flac";
-      case FILE_PATH_OGG_EXTENSION:
-         return ".ogg";
-      case FILE_PATH_WAV_EXTENSION:
-         return ".wav";
-      case FILE_PATH_MOD_EXTENSION:
-         return ".mod";
-      case FILE_PATH_S3M_EXTENSION:
-         return ".s3m";
-      case FILE_PATH_XM_EXTENSION:
-         return ".xm";
-      case FILE_PATH_JPEG_EXTENSION:
-         return ".jpeg";
-      case FILE_PATH_BMP_EXTENSION:
-         return ".bmp";
-      case FILE_PATH_TGA_EXTENSION:
-         return ".tga";
-      case FILE_PATH_JPG_EXTENSION:
-         return ".jpg";
-      case FILE_PATH_UPS_EXTENSION:
-         return ".ups";
-      case FILE_PATH_IPS_EXTENSION:
-         return ".ips";
-      case FILE_PATH_BPS_EXTENSION:
-         return ".bps";
-      case FILE_PATH_RDB_EXTENSION:
-         return ".rdb";
-      case FILE_PATH_RDB_EXTENSION_NO_DOT:
-         return "rdb";
-      case FILE_PATH_ZIP_EXTENSION:
-         return ".zip";
-      case FILE_PATH_7Z_EXTENSION:
-         return ".7z";
-      case FILE_PATH_INDEX_URL:
-         return ".index";
-      case FILE_PATH_INDEX_DIRS_URL:
-         return ".index-dirs";
-      case FILE_PATH_INDEX_EXTENDED_URL:
-         return ".index-extended";
-      case FILE_PATH_NETPLAY_ROOM_LIST_URL:
-         return "registry.lpl";
-      case FILE_PATH_CORE_THUMBNAILS_URL:
-         return "http://thumbnails.libretro.com";
-      case FILE_PATH_CORE_THUMBNAILPACKS_URL:
-         return "http://thumbnailpacks.libretro.com";
-      case FILE_PATH_LAKKA_URL:
-#ifdef HAVE_LAKKA_NIGHTLY
-         return "http://nightly.builds.lakka.tv/.updater";
-#else
-         return "http://le.builds.lakka.tv";
-#endif
-      case FILE_PATH_SHADERS_GLSL_ZIP:
-         return "shaders_glsl.zip";
-      case FILE_PATH_SHADERS_SLANG_ZIP:
-         return "shaders_slang.zip";
-      case FILE_PATH_SHADERS_CG_ZIP:
-         return "shaders_cg.zip";
-      case FILE_PATH_DATABASE_RDB_ZIP:
-         return "database-rdb.zip";
-      case FILE_PATH_OVERLAYS_ZIP:
-         return "overlays.zip";
-      case FILE_PATH_CORE_INFO_ZIP:
-         return "info.zip";
-      case FILE_PATH_CHEATS_ZIP:
-         return "cheats.zip";
-      case FILE_PATH_ASSETS_ZIP:
-         return "assets.zip";
-      case FILE_PATH_AUTOCONFIG_ZIP:
-         return "autoconfig.zip";
-      case FILE_PATH_CONTENT_HISTORY:
-         return "content_history.lpl";
-      case FILE_PATH_CONTENT_FAVORITES:
-         return "content_favorites.lpl";
-      case FILE_PATH_CONTENT_MUSIC_HISTORY:
-         return "content_music_history.lpl";
-      case FILE_PATH_CONTENT_VIDEO_HISTORY:
-         return "content_video_history.lpl";
-      case FILE_PATH_CONTENT_IMAGE_HISTORY:
-         return "content_image_history.lpl";
-      case FILE_PATH_CORE_OPTIONS_CONFIG:
-         return "retroarch-core-options.cfg";
-      case FILE_PATH_MAIN_CONFIG:
-         return "retroarch.cfg";
-      case FILE_PATH_BACKGROUND_IMAGE:
-         return "bg.png";
-      case FILE_PATH_TTF_FONT:
-         return "font.ttf";
-      case FILE_PATH_RUNTIME_EXTENSION:
-         return ".lrtl";
-      case FILE_PATH_DEFAULT_EVENT_LOG:
-         return "retroarch.log";
-      case FILE_PATH_EVENT_LOG_EXTENSION:
-         return ".log";
-      case FILE_PATH_DISK_CONTROL_INDEX_EXTENSION:
-         return ".ldci";
-      case FILE_PATH_CORE_BACKUP_EXTENSION:
-         return ".lcbk";
-      case FILE_PATH_CORE_BACKUP_EXTENSION_NO_DOT:
-         return "lcbk";
-      case FILE_PATH_LOCK_EXTENSION:
-         return ".lck";
-      case FILE_PATH_UNKNOWN:
-      default:
-         break;
-   }
-
-   return "null";
-}
diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c
index dcf654b89f..dc61bdb496 100644
--- a/frontend/drivers/platform_ctr.c
+++ b/frontend/drivers/platform_ctr.c
@@ -125,7 +125,7 @@ static void frontend_ctr_get_environment_settings(int* argc, char* argv[],
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_LOGS], g_defaults.dirs[DEFAULT_DIR_PORT],
                       "logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS]));
    fill_pathname_join(g_defaults.path_config, g_defaults.dirs[DEFAULT_DIR_PORT],
-                      file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
+                      FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config));
 }
 
 static void frontend_ctr_deinit(void* data)
diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c
index 0398a1cfd0..e7d24e35a5 100644
--- a/frontend/drivers/platform_emscripten.c
+++ b/frontend/drivers/platform_emscripten.c
@@ -149,7 +149,7 @@ static void frontend_emscripten_get_env(int *argc, char *argv[],
    strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY],
          user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
    fill_pathname_join(g_defaults.path_config, user_path,
-         file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
+         FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config));
 
    for (i = 0; i < DEFAULT_DIR_LAST; i++)
    {
diff --git a/frontend/drivers/platform_orbis.c b/frontend/drivers/platform_orbis.c
index 7c3dfb9f3d..43a41da111 100644
--- a/frontend/drivers/platform_orbis.c
+++ b/frontend/drivers/platform_orbis.c
@@ -178,7 +178,7 @@ static void frontend_orbis_get_environment_settings(int *argc, char *argv[],
    strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY],
          user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
    fill_pathname_join(g_defaults.path_config, user_path,
-         file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
+         FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config));
 
 #ifndef IS_SALAMANDER
    params          = (struct rarch_main_wrap*)params_data;
diff --git a/frontend/drivers/platform_ps2.c b/frontend/drivers/platform_ps2.c
index 7dce24faa8..4070fb53d6 100644
--- a/frontend/drivers/platform_ps2.c
+++ b/frontend/drivers/platform_ps2.c
@@ -84,7 +84,7 @@ static void create_path_names(void)
    strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY],
          user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
    fill_pathname_join(g_defaults.path_config, user_path,
-         file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
+         FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config));
 }
 
 static void poweroffCallback(void *arg)
diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c
index 15ccfdb498..077e20a7ef 100644
--- a/frontend/drivers/platform_ps3.c
+++ b/frontend/drivers/platform_ps3.c
@@ -133,7 +133,7 @@ static void fill_derived_paths(void)
 		       g_defaults.dirs[DEFAULT_DIR_CORE],
 		       "shaders_cg", sizeof(g_defaults.dirs[DEFAULT_DIR_SHADER]));
     fill_pathname_join(g_defaults.path_config, g_defaults.dirs[DEFAULT_DIR_PORT],
-		       file_path_str(FILE_PATH_MAIN_CONFIG),  sizeof(g_defaults.path_config));
+		       FILE_PATH_MAIN_CONFIG,  sizeof(g_defaults.path_config));
     fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_OVERLAY],
 		       g_defaults.dirs[DEFAULT_DIR_CORE],
 		       "overlays", sizeof(g_defaults.dirs[DEFAULT_DIR_OVERLAY]));
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index fc9e87627f..4ef627e64e 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -146,7 +146,7 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
    strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY],
          user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
    fill_pathname_join(g_defaults.path_config, user_path,
-         file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
+         FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config));
 #else
 
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], g_defaults.dirs[DEFAULT_DIR_PORT],
@@ -184,7 +184,7 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
    strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY],
          user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
    fill_pathname_join(g_defaults.path_config, user_path,
-         file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
+         FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config));
 #endif
 
 #ifndef IS_SALAMANDER
diff --git a/frontend/drivers/platform_qnx.c b/frontend/drivers/platform_qnx.c
index 10d0965cff..3145cca490 100644
--- a/frontend/drivers/platform_qnx.c
+++ b/frontend/drivers/platform_qnx.c
@@ -139,7 +139,7 @@ static void frontend_qnx_get_environment_settings(int *argc, char *argv[],
    strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY],
          user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
    fill_pathname_join(g_defaults.path_config, user_path,
-         file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
+         FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config));
 
    /* bundle copy */
    snprintf(data_assets_path,
diff --git a/frontend/drivers/platform_switch.c b/frontend/drivers/platform_switch.c
index 264b388b6a..700227ac61 100644
--- a/frontend/drivers/platform_switch.c
+++ b/frontend/drivers/platform_switch.c
@@ -274,7 +274,7 @@ static void frontend_switch_get_environment_settings(
 
    fill_pathname_join(g_defaults.path_config,
          g_defaults.dirs[DEFAULT_DIR_PORT],
-         file_path_str(FILE_PATH_MAIN_CONFIG),
+         FILE_PATH_MAIN_CONFIG,
          sizeof(g_defaults.path_config));
 }
 
diff --git a/frontend/drivers/platform_wiiu.c b/frontend/drivers/platform_wiiu.c
index e5c8a76c6a..1dab67518a 100644
--- a/frontend/drivers/platform_wiiu.c
+++ b/frontend/drivers/platform_wiiu.c
@@ -134,7 +134,7 @@ static void frontend_wiiu_get_environment_settings(int *argc, char *argv[],
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_LOGS], g_defaults.dirs[DEFAULT_DIR_CORE],
          "logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS]));
    fill_pathname_join(g_defaults.path_config, g_defaults.dirs[DEFAULT_DIR_PORT],
-         file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
+         FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config));
 
    for (i = 0; i < DEFAULT_DIR_LAST; i++)
    {
diff --git a/frontend/drivers/platform_xdk.c b/frontend/drivers/platform_xdk.c
index 0b7b7cc9fe..9c39f5ca35 100644
--- a/frontend/drivers/platform_xdk.c
+++ b/frontend/drivers/platform_xdk.c
@@ -102,7 +102,7 @@ static void frontend_xdk_get_environment_settings(int *argc, char *argv[],
    strlcpy(g_defaults.dirs[DEFAULT_DIR_CORE],
          "D:", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
    fill_pathname_join(g_defaults.path_config, g_defaults.dirs[DEFAULT_DIR_CORE],
-         file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
+         FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE],
          g_defaults.dirs[DEFAULT_DIR_CORE],
          "savestates",
diff --git a/gfx/gfx_thumbnail_path.c b/gfx/gfx_thumbnail_path.c
index 83fe45e93a..b26f48e979 100644
--- a/gfx/gfx_thumbnail_path.c
+++ b/gfx/gfx_thumbnail_path.c
@@ -283,10 +283,10 @@ bool gfx_thumbnail_set_system(gfx_thumbnail_path_data_t *path_data,
       playlist_valid =
             (string_is_equal(system, "history") &&
              string_is_equal(playlist_file,
-                file_path_str(FILE_PATH_CONTENT_HISTORY))) ||
+                FILE_PATH_CONTENT_HISTORY)) ||
             (string_is_equal(system, "favorites") &&
              string_is_equal(playlist_file,
-                file_path_str(FILE_PATH_CONTENT_FAVORITES)));
+                FILE_PATH_CONTENT_FAVORITES));
       
       if (!playlist_valid)
       {
diff --git a/griffin/griffin.c b/griffin/griffin.c
index b5b38e2d8a..c9cae29d5b 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1047,7 +1047,6 @@ FILE
 #include "../libretro-common/file/file_path.c"
 #include "../libretro-common/file/file_path_io.c"
 #include "../file_path_special.c"
-#include "../file_path_str.c"
 #include "../libretro-common/lists/dir_list.c"
 #include "../libretro-common/lists/string_list.c"
 #include "../libretro-common/lists/file_list.c"
diff --git a/manual_content_scan.c b/manual_content_scan.c
index 00abe152a6..e1cd4a8b98 100644
--- a/manual_content_scan.c
+++ b/manual_content_scan.c
@@ -797,7 +797,7 @@ bool manual_content_scan_get_task_config(
 
    strlcat(
          task_config->database_name,
-         file_path_str(FILE_PATH_LPL_EXTENSION),
+         FILE_PATH_LPL_EXTENSION,
          sizeof(task_config->database_name));
 
    /* ...which can in turn be used to generate the
diff --git a/menu/cbs/menu_cbs_label.c b/menu/cbs/menu_cbs_label.c
index 7c9ed651f9..c9b801ceec 100644
--- a/menu/cbs/menu_cbs_label.c
+++ b/menu/cbs/menu_cbs_label.c
@@ -70,10 +70,10 @@ static int action_bind_label_playlist_collection_entry(
             "lpl"))
    {
       /* Handle content history */
-      if (string_is_equal(playlist_file, file_path_str(FILE_PATH_CONTENT_HISTORY)))
+      if (string_is_equal(playlist_file, FILE_PATH_CONTENT_HISTORY))
          strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_HISTORY_TAB), len);
       /* Handle favourites */
-      else if (string_is_equal(playlist_file, file_path_str(FILE_PATH_CONTENT_FAVORITES)))
+      else if (string_is_equal(playlist_file, FILE_PATH_CONTENT_FAVORITES))
          strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FAVORITES_TAB), len);
       /* Handle collection playlists */
       else
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index b76d3af226..b60a159667 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -4109,7 +4109,7 @@ static int generic_action_ok_network(const char *path,
       case MENU_ENUM_LABEL_CB_LAKKA_LIST:
          /* TODO unhardcode this path */
          fill_pathname_join(url_path,
-               file_path_str(FILE_PATH_LAKKA_URL),
+               FILE_PATH_LAKKA_URL,
                lakka_get_project(), sizeof(url_path));
          fill_pathname_join(url_path, url_path,
                ".index",
@@ -4384,7 +4384,7 @@ static int action_ok_download_generic(const char *path,
       case MENU_ENUM_LABEL_CB_LAKKA_DOWNLOAD:
 #ifdef HAVE_LAKKA
          /* TODO unhardcode this path*/
-         fill_pathname_join(s, file_path_str(FILE_PATH_LAKKA_URL),
+         fill_pathname_join(s, FILE_PATH_LAKKA_URL,
                lakka_get_project(), sizeof(s));
 #endif
          break;
diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
index 8371c6377e..4971bb10cf 100644
--- a/menu/cbs/menu_cbs_start.c
+++ b/menu/cbs/menu_cbs_start.c
@@ -345,8 +345,8 @@ static int action_start_playlist_association(
       return -1;
 
    /* Set default core path + name to DETECT */
-   playlist_set_default_core_path(playlist, file_path_str(FILE_PATH_DETECT));
-   playlist_set_default_core_name(playlist, file_path_str(FILE_PATH_DETECT));
+   playlist_set_default_core_path(playlist, FILE_PATH_DETECT);
+   playlist_set_default_core_name(playlist, FILE_PATH_DETECT);
    playlist_write_file(playlist);
 
    return 0;
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index 03304545cd..6ea18537cb 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -322,10 +322,10 @@ static int action_get_title_deferred_playlist_list(const char *path, const char
             "lpl"))
    {
       /* Handle content history */
-      if (string_is_equal(playlist_file, file_path_str(FILE_PATH_CONTENT_HISTORY)))
+      if (string_is_equal(playlist_file, FILE_PATH_CONTENT_HISTORY))
          strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_HISTORY_TAB), len);
       /* Handle favourites */
-      else if (string_is_equal(playlist_file, file_path_str(FILE_PATH_CONTENT_FAVORITES)))
+      else if (string_is_equal(playlist_file, FILE_PATH_CONTENT_FAVORITES))
          strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FAVORITES_TAB), len);
       /* Handle collection playlists */
       else
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 4c9cbd0fce..d3d2382e6f 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -2186,7 +2186,7 @@ static void materialui_refresh_playlist_icon_list(materialui_handle_t *mui)
       if (string_ends_with_size(playlist_file, "_history.lpl",
             strlen(playlist_file), STRLEN_CONST("_history.lpl")) ||
           string_is_equal(playlist_file,
-               file_path_str(FILE_PATH_CONTENT_FAVORITES)))
+               FILE_PATH_CONTENT_FAVORITES))
          continue;
 
       /* Playlist is valid - generate image file name */
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 1f43c202af..397e6219e1 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2353,7 +2353,7 @@ static void menu_displaylist_set_new_playlist(
                strlen(playlist_file_name), STRLEN_CONST("_history.lpl")))
          playlist_config.capacity = content_history_size;
       else if (string_is_equal(playlist_file_name,
-                     file_path_str(FILE_PATH_CONTENT_FAVORITES)) &&
+                     FILE_PATH_CONTENT_FAVORITES) &&
                (content_favorites_size >= 0))
          playlist_config.capacity = (unsigned)content_favorites_size;
    }
@@ -2847,8 +2847,8 @@ static int menu_displaylist_parse_horizontal_content_actions(
                         const char *playlist_file = path_basename(playlist_path);
 
                         if (!string_is_empty(playlist_file))
-                           remove_entry_enabled = string_is_equal(playlist_file, file_path_str(FILE_PATH_CONTENT_HISTORY)) ||
-                              string_is_equal(playlist_file, file_path_str(FILE_PATH_CONTENT_FAVORITES));
+                           remove_entry_enabled = string_is_equal(playlist_file, FILE_PATH_CONTENT_HISTORY) ||
+                              string_is_equal(playlist_file, FILE_PATH_CONTENT_FAVORITES);
                      }
                   }
                }
@@ -3183,7 +3183,7 @@ static unsigned menu_displaylist_parse_playlists(
                string_ends_with_size(path, "_history.lpl",
                   strlen(path), STRLEN_CONST("_history.lpl"))
             || string_is_equal(playlist_file,
-               file_path_str(FILE_PATH_CONTENT_FAVORITES)))
+               FILE_PATH_CONTENT_FAVORITES))
          continue;
 
       file_type = FILE_TYPE_PLAYLIST_COLLECTION;
@@ -3444,7 +3444,7 @@ static unsigned menu_displaylist_parse_playlist_manager_list(
                   string_ends_with_size(path, "_history.lpl",
                      strlen(path), STRLEN_CONST("_history.lpl"))
                || string_is_equal(playlist_file,
-                  file_path_str(FILE_PATH_CONTENT_FAVORITES)))
+                  FILE_PATH_CONTENT_FAVORITES))
             continue;
 
          menu_entries_append_enum(info->list,
@@ -3528,7 +3528,7 @@ static bool menu_displaylist_parse_playlist_manager_settings(
     * > This is only shown for collection playlists
     *   (i.e. it is not relevant for history/favourites) */
    if (!is_content_history &&
-       !string_is_equal(playlist_file, file_path_str(FILE_PATH_CONTENT_FAVORITES)))
+       !string_is_equal(playlist_file, FILE_PATH_CONTENT_FAVORITES))
       menu_entries_append_enum(info->list,
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_MANAGER_DEFAULT_CORE),
             msg_hash_to_str(MENU_ENUM_LABEL_PLAYLIST_MANAGER_DEFAULT_CORE),
@@ -10110,7 +10110,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                && string_ends_with(info->path, ".lpl"))
          {
             if (string_is_equal(info->path,
-                     file_path_str(FILE_PATH_CONTENT_HISTORY)))
+                     FILE_PATH_CONTENT_HISTORY))
             {
                if (menu_displaylist_ctl(DISPLAYLIST_HISTORY, info))
                   return menu_displaylist_process(info);
@@ -10118,7 +10118,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
             }
 
             if (string_is_equal(info->path,
-                     file_path_str(FILE_PATH_CONTENT_FAVORITES)))
+                     FILE_PATH_CONTENT_FAVORITES))
             {
                if (menu_displaylist_ctl(DISPLAYLIST_FAVORITES, info))
                   return menu_displaylist_process(info);
@@ -11751,10 +11751,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                   if (frontend_driver_get_core_extension(ext_names, sizeof(ext_names)))
                   {
                      strlcat(ext_names, "|", sizeof(ext_names));
-                     strlcat(ext_names, file_path_str(FILE_PATH_CORE_BACKUP_EXTENSION_NO_DOT), sizeof(ext_names));
+                     strlcat(ext_names, FILE_PATH_CORE_BACKUP_EXTENSION_NO_DOT, sizeof(ext_names));
                   }
                   else
-                     strlcpy(ext_names, file_path_str(FILE_PATH_CORE_BACKUP_EXTENSION_NO_DOT), sizeof(ext_names));
+                     strlcpy(ext_names, FILE_PATH_CORE_BACKUP_EXTENSION_NO_DOT, sizeof(ext_names));
 
                   info->exts      = strdup(ext_names);
                }
diff --git a/playlist.c b/playlist.c
index f46a2649c5..9211ffa448 100644
--- a/playlist.c
+++ b/playlist.c
@@ -3006,7 +3006,7 @@ void playlist_get_db_name(playlist_t *playlist, size_t idx,
                && !string_ends_with_size(conf_path_basename, "_history.lpl",
                         strlen(conf_path_basename), STRLEN_CONST("_history.lpl"))
                && !string_is_equal(conf_path_basename,
-                        file_path_str(FILE_PATH_CONTENT_FAVORITES))
+                        FILE_PATH_CONTENT_FAVORITES)
             )
             *db_name = conf_path_basename;
       }
diff --git a/retroarch.c b/retroarch.c
index 3672184b60..f1ed21b034 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -11297,7 +11297,7 @@ static void path_set_redirect(struct rarch_state *p_rarch)
                : system && !string_is_empty(system->library_name)
                ? system->library_name
                : "",
-               file_path_str(FILE_PATH_SRM_EXTENSION),
+               FILE_PATH_SRM_EXTENSION,
                sizeof(global->name.savefile));
          RARCH_LOG("[Overrides]: %s \"%s\".\n",
                msg_hash_to_str(MSG_REDIRECTING_SAVEFILE_TO),
@@ -11312,7 +11312,7 @@ static void path_set_redirect(struct rarch_state *p_rarch)
                : system && !string_is_empty(system->library_name)
                ? system->library_name
                : "",
-               file_path_str(FILE_PATH_STATE_EXTENSION),
+               FILE_PATH_STATE_EXTENSION,
                sizeof(global->name.savestate));
          RARCH_LOG("[Overrides]: %s \"%s\".\n",
                msg_hash_to_str(MSG_REDIRECTING_SAVESTATE_TO),
@@ -11327,7 +11327,7 @@ static void path_set_redirect(struct rarch_state *p_rarch)
                !string_is_empty(p_rarch->path_main_basename)
                ? p_rarch->path_main_basename
                : "",
-               file_path_str(FILE_PATH_CHT_EXTENSION),
+               FILE_PATH_CHT_EXTENSION,
                sizeof(global->name.cheatfile));
          RARCH_LOG("[Overrides]: %s \"%s\".\n",
                msg_hash_to_str(MSG_REDIRECTING_CHEATFILE_TO),
diff --git a/runtime_file.c b/runtime_file.c
index 4b3d5e7d05..59d3efe1ea 100644
--- a/runtime_file.c
+++ b/runtime_file.c
@@ -395,7 +395,7 @@ runtime_log_t *runtime_log_init(
 
    /* Build final log file path */
    fill_pathname_join(log_file_path, log_file_dir, content_name, sizeof(log_file_path));
-   strlcat(log_file_path, file_path_str(FILE_PATH_RUNTIME_EXTENSION), sizeof(log_file_path));
+   strlcat(log_file_path, FILE_PATH_RUNTIME_EXTENSION, sizeof(log_file_path));
 
    if (string_is_empty(log_file_path))
       return NULL;
diff --git a/tasks/task_pl_thumbnail_download.c b/tasks/task_pl_thumbnail_download.c
index e2ac11a6fd..994a69e088 100644
--- a/tasks/task_pl_thumbnail_download.c
+++ b/tasks/task_pl_thumbnail_download.c
@@ -152,7 +152,7 @@ static bool get_thumbnail_paths(
    
    /* Generate remote path */
    snprintf(raw_url, sizeof(raw_url), "%s/%s/%s/%s",
-         file_path_str(FILE_PATH_CORE_THUMBNAILS_URL),
+         FILE_PATH_CORE_THUMBNAILS_URL,
          system_name,
          sub_dir,
          img_name
@@ -501,7 +501,7 @@ bool task_push_pl_thumbnail_download(
                STRLEN_CONST("_history.lpl")
                ) 
          || string_is_equal(playlist_file,
-            file_path_str(FILE_PATH_CONTENT_FAVORITES))
+            FILE_PATH_CONTENT_FAVORITES)
          || string_is_equal(system, "history")
          || string_is_equal(system, "favorites"))
       goto error;
diff --git a/ui/drivers/qt/ui_qt_window.cpp b/ui/drivers/qt/ui_qt_window.cpp
index cbb7941c13..c83567a395 100644
--- a/ui/drivers/qt/ui_qt_window.cpp
+++ b/ui/drivers/qt/ui_qt_window.cpp
@@ -1996,9 +1996,9 @@ void MainWindow::loadContent(const QHash<QString, QString> &contentHash)
 
       if (      string_is_empty(extension) 
             || !string_is_equal_noncase(
-            extension, file_path_str(FILE_PATH_LPL_EXTENSION_NO_DOT)))
+            extension, FILE_PATH_LPL_EXTENSION_NO_DOT))
          strlcat(
-               contentDbNameFull, file_path_str(FILE_PATH_LPL_EXTENSION),
+               contentDbNameFull, FILE_PATH_LPL_EXTENSION,
                      sizeof(contentDbNameFull));
    }