diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c
index 361fc0d6c5..8745cfe23d 100644
--- a/libretro-common/file/file_path.c
+++ b/libretro-common/file/file_path.c
@@ -314,7 +314,7 @@ void fill_pathname_slash(char *path, size_t size)
 
    if (!last_slash)
    {
-      strlcat(path, path_default_slash(), size);
+      strlcat(path, PATH_DEFAULT_SLASH(), size);
       return;
    }
 
@@ -551,7 +551,7 @@ void path_basedir(char *path)
    if (last)
       last[1] = '\0';
    else
-      snprintf(path, 3, ".%s", path_default_slash());
+      snprintf(path, 3, "." PATH_DEFAULT_SLASH());
 }
 
 /**
@@ -809,7 +809,7 @@ size_t path_relative_to(char *out,
 
    /* Trim common beginning */
    for (i = 0, j = 0; path[i] && base[i] && path[i] == base[i]; i++)
-      if (path[i] == path_default_slash_c())
+      if (path[i] == PATH_DEFAULT_SLASH_C())
          j = i + 1;
 
    trimmed_path = path+j;
@@ -818,8 +818,8 @@ size_t path_relative_to(char *out,
    /* Each segment of base turns into ".." */
    out[0] = '\0';
    for (i = 0; trimmed_base[i]; i++)
-      if (trimmed_base[i] == path_default_slash_c())
-         strlcat(out, ".." path_default_slash(), size);
+      if (trimmed_base[i] == PATH_DEFAULT_SLASH_C())
+         strlcat(out, ".." PATH_DEFAULT_SLASH(), size);
 
    return strlcat(out, trimmed_path, size);
 }
@@ -1006,7 +1006,7 @@ void fill_pathname_expand_special(char *out_path,
 
          if (!path_char_is_slash(out_path[-1]))
          {
-            src_size = strlcpy(out_path, path_default_slash(), size);
+            src_size = strlcpy(out_path, PATH_DEFAULT_SLASH(), size);
             retro_assert(src_size < size);
 
             out_path += src_size;
@@ -1037,7 +1037,7 @@ void fill_pathname_expand_special(char *out_path,
 
          if (!path_char_is_slash(out_path[-1]))
          {
-            src_size = strlcpy(out_path, path_default_slash(), size);
+            src_size = strlcpy(out_path, PATH_DEFAULT_SLASH(), size);
             retro_assert(src_size < size);
 
             out_path += src_size;
@@ -1101,7 +1101,7 @@ void fill_pathname_abbreviate_special(char *out_path,
          if (!path_char_is_slash(*in_path))
          {
             retro_assert(strlcpy(out_path,
-                     path_default_slash(), size) < size);
+                     PATH_DEFAULT_SLASH(), size) < size);
             out_path++;
             size--;
          }
@@ -1140,7 +1140,7 @@ void path_basedir_wrapper(char *path)
    if (last)
       last[1] = '\0';
    else
-      snprintf(path, 3, ".%s", path_default_slash());
+      snprintf(path, 3, "." PATH_DEFAULT_SLASH());
 }
 
 #if !defined(RARCH_CONSOLE) && defined(RARCH_INTERNAL)
diff --git a/libretro-common/include/file/file_path.h b/libretro-common/include/file/file_path.h
index fb5afe4d2b..443734830b 100644
--- a/libretro-common/include/file/file_path.h
+++ b/libretro-common/include/file/file_path.h
@@ -473,11 +473,11 @@ void path_basedir_wrapper(char *path);
  * Returns: default slash separator.
  */
 #ifdef _WIN32
-#define path_default_slash() "\\"
-#define path_default_slash_c() '\\'
+#define PATH_DEFAULT_SLASH() "\\"
+#define PATH_DEFAULT_SLASH_C() '\\'
 #else
-#define path_default_slash() "/"
-#define path_default_slash_c() '/'
+#define PATH_DEFAULT_SLASH() "/"
+#define PATH_DEFAULT_SLASH_C() '/'
 #endif
 
 /**
diff --git a/manual_content_scan.c b/manual_content_scan.c
index 03bb4ab26c..3b8feabb6c 100644
--- a/manual_content_scan.c
+++ b/manual_content_scan.c
@@ -265,8 +265,8 @@ enum manual_content_scan_dat_file_path_status
  * Returns true if content directory is valid. */
 bool manual_content_scan_set_menu_content_dir(const char *content_dir)
 {
-   const char *dir_name = NULL;
    size_t len;
+   const char *dir_name = NULL;
 
    /* Sanity check */
    if (string_is_empty(content_dir))
@@ -283,14 +283,12 @@ bool manual_content_scan_set_menu_content_dir(const char *content_dir)
 
    /* Remove trailing slash, if required */
    len = strlen(scan_settings.content_dir);
-   if (len > 0)
-   {
-      if (scan_settings.content_dir[len - 1] == path_default_slash_c())
-         scan_settings.content_dir[len - 1] = '\0';
-   }
-   else
+   if (len <= 0)
       goto error;
 
+   if (scan_settings.content_dir[len - 1] == PATH_DEFAULT_SLASH_C())
+      scan_settings.content_dir[len - 1] = '\0';
+
    /* Handle case where path was a single slash... */
    if (string_is_empty(scan_settings.content_dir))
       goto error;
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index d0520eb204..39d54024a9 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -1935,7 +1935,8 @@ static void materialui_context_reset_textures(materialui_handle_t *mui)
             materialui_texture_path(i), icon_path, &mui->textures.list[i],
             TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL))
       {
-         RARCH_WARN("[GLUI] Asset missing: %s%s%s\n", icon_path, path_default_slash(), materialui_texture_path(i));
+         RARCH_WARN("[GLUI] Asset missing: %s%s%s\n", icon_path, 
+               PATH_DEFAULT_SLASH(), materialui_texture_path(i));
          has_all_assets = false;
       }
    }
diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c
index 56b4268988..e20d10eebf 100644
--- a/menu/drivers/ozone/ozone.c
+++ b/menu/drivers/ozone/ozone.c
@@ -766,7 +766,8 @@ static void ozone_context_reset(void *data, bool is_threaded)
                sizeof(buf),
                APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_DISCORD_AVATARS);
             if (!gfx_display_reset_textures_list(filename, buf, &ozone->textures[i], TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL))
-               RARCH_WARN("[OZONE] Asset missing: %s%s%s\n", ozone->png_path, path_default_slash(), filename);
+               RARCH_WARN("[OZONE] Asset missing: %s%s%s\n", ozone->png_path,
+                     PATH_DEFAULT_SLASH(), filename);
          }
          else
          {
@@ -774,7 +775,8 @@ static void ozone_context_reset(void *data, bool is_threaded)
             if (!gfx_display_reset_textures_list(filename, ozone->png_path, &ozone->textures[i], TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL))
             {
                ozone->has_all_assets = false;
-               RARCH_WARN("[OZONE] Asset missing: %s%s%s\n", ozone->png_path, path_default_slash(), filename);
+               RARCH_WARN("[OZONE] Asset missing: %s%s%s\n", ozone->png_path,
+                     PATH_DEFAULT_SLASH(), filename);
             }
 #if 0
          }
@@ -794,7 +796,8 @@ static void ozone_context_reset(void *data, bool is_threaded)
          if (!gfx_display_reset_textures_list(filename, ozone->tab_path, &ozone->tab_textures[i], TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL))
          {
             ozone->has_all_assets = false;
-            RARCH_WARN("[OZONE] Asset missing: %s%s%s\n", ozone->tab_path, path_default_slash(), filename);
+            RARCH_WARN("[OZONE] Asset missing: %s%s%s\n", ozone->tab_path,
+                  PATH_DEFAULT_SLASH(), filename);
          }
       }
 
@@ -808,7 +811,8 @@ static void ozone_context_reset(void *data, bool is_threaded)
          if (!gfx_display_reset_textures_list(ozone_entries_icon_texture_path(i), ozone->icons_path, &ozone->icons_textures[i], TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL))
          {
             ozone->has_all_assets = false;
-            RARCH_WARN("[OZONE] Asset missing: %s%s%s\n", ozone->icons_path, path_default_slash(), ozone_entries_icon_texture_path(i));
+            RARCH_WARN("[OZONE] Asset missing: %s%s%s\n", ozone->icons_path,
+                  PATH_DEFAULT_SLASH(), ozone_entries_icon_texture_path(i));
          }
       }
 
diff --git a/menu/drivers/ozone/ozone_sidebar.c b/menu/drivers/ozone/ozone_sidebar.c
index ea3aa806b4..104ba27718 100644
--- a/menu/drivers/ozone/ozone_sidebar.c
+++ b/menu/drivers/ozone/ozone_sidebar.c
@@ -902,16 +902,17 @@ void ozone_context_reset_horizontal_list(ozone_handle_t *ozone)
          fill_pathname_join_delim(sysname, sysname,
                "content.png", '-',
                PATH_MAX_LENGTH * sizeof(char));
-         strlcat(content_texturepath, icons_path, PATH_MAX_LENGTH * sizeof(char));
-
-         strlcat(content_texturepath, path_default_slash(), PATH_MAX_LENGTH * sizeof(char));
+         strlcat(content_texturepath, icons_path,
+               PATH_MAX_LENGTH * sizeof(char));
+         strlcat(content_texturepath, PATH_DEFAULT_SLASH(),
+               PATH_MAX_LENGTH * sizeof(char));
          strlcat(content_texturepath, sysname, PATH_MAX_LENGTH * sizeof(char));
 
          /* If the content icon doesn't exist return default-content */
          if (!path_is_valid(content_texturepath))
          {
-            strlcat(icons_path, path_default_slash(), PATH_MAX_LENGTH * sizeof(char));
-            strlcat(icons_path, "default", PATH_MAX_LENGTH * sizeof(char));
+            strlcat(icons_path,
+                  PATH_DEFAULT_SLASH() "default", PATH_MAX_LENGTH * sizeof(char));
             fill_pathname_join_delim(content_texturepath, icons_path,
                   "content.png", '-',
                   PATH_MAX_LENGTH * sizeof(char));
diff --git a/menu/drivers/ozone/ozone_texture.c b/menu/drivers/ozone/ozone_texture.c
index 5e1fefb8a9..7665e71ce2 100644
--- a/menu/drivers/ozone/ozone_texture.c
+++ b/menu/drivers/ozone/ozone_texture.c
@@ -811,12 +811,14 @@ bool ozone_reset_theme_textures(ozone_handle_t *ozone)
       for (i = 0; i < OZONE_THEME_TEXTURE_LAST; i++)
       {
          char filename[PATH_MAX_LENGTH];
-         strlcpy(filename, OZONE_THEME_TEXTURES_FILES[i], sizeof(filename));
+         strlcpy(filename, OZONE_THEME_TEXTURES_FILES[i],
+               sizeof(filename));
          strlcat(filename, ".png", sizeof(filename));
 
          if (!gfx_display_reset_textures_list(filename, theme_path, &theme->textures[i], TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL))
          {
-            RARCH_WARN("[OZONE] Asset missing: %s%s%s\n", theme_path, path_default_slash(), filename);
+            RARCH_WARN("[OZONE] Asset missing: %s%s%s\n", theme_path,
+                  PATH_DEFAULT_SLASH(), filename);
             result = false;
          }
       }
diff --git a/retroarch.c b/retroarch.c
index 95fe8b1dfb..9a479d5985 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -19865,9 +19865,9 @@ static char *copy_core_to_temp_file(struct rarch_state *p_rarch)
       return NULL;
 
    strcat_alloc(&retroarch_temp_path, temp_directory);
-   strcat_alloc(&retroarch_temp_path, path_default_slash());
+   strcat_alloc(&retroarch_temp_path, PATH_DEFAULT_SLASH());
    strcat_alloc(&retroarch_temp_path, "retroarch_temp");
-   strcat_alloc(&retroarch_temp_path, path_default_slash());
+   strcat_alloc(&retroarch_temp_path, PATH_DEFAULT_SLASH());
 
    if (!path_mkdir(retroarch_temp_path))
    {