diff --git a/configuration.c b/configuration.c
index 0d8e935011..32a216bf73 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1142,10 +1142,10 @@ static void config_set_defaults(void)
 
    /* Make sure settings from other configs carry over into defaults
     * for another config. */
-   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL))
-      dir_clear(RARCH_DIR_SAVEFILE);
-   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL))
-      dir_clear(RARCH_DIR_SAVESTATE);
+   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_SAVE_PATH))
+      dir_clear_savefile();
+   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH))
+      dir_clear_savestate();
 
    *settings->path.libretro_info = '\0';
    if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DIRECTORY, NULL))
@@ -2098,7 +2098,7 @@ static bool config_load_file(const char *path, bool set_defaults,
    if (string_is_equal(settings->directory.overlay, "default"))
       *settings->directory.overlay = '\0';
    if (string_is_equal(dir_get_osk_overlay(), "default"))
-      dir_clear(RARCH_DIR_OSK_OVERLAY);
+      dir_clear_osk_overlay();
 #endif
    if (string_is_equal(settings->directory.system, "default"))
       *settings->directory.system = '\0';
diff --git a/dirs.c b/dirs.c
index 8cd35725ba..1c809527d6 100644
--- a/dirs.c
+++ b/dirs.c
@@ -212,34 +212,32 @@ size_t dir_get_osk_overlay_size(void)
 
 /* clear functions */
 
-void dir_clear(enum rarch_dir_type type)
+void dir_clear_system(void)
 {
-   switch (type)
-   {
-      case RARCH_DIR_SYSTEM:
-         *dir_system = '\0';
-         break;
-      case RARCH_DIR_SAVEFILE:
-         *dir_savefile = '\0';
-         break;
-      case RARCH_DIR_SAVESTATE:
-         *dir_savestate = '\0';
-         break;
-      case RARCH_DIR_OSK_OVERLAY:
-         *dir_osk_overlay = '\0';
-         break;
-      case RARCH_DIR_NONE:
-      default:
-         break;
-   }
+   *dir_system = '\0';
+}
+
+void dir_clear_savefile(void)
+{
+   *dir_savefile = '\0';
+}
+
+void dir_clear_savestate(void)
+{
+   *dir_savestate = '\0';
+}
+
+void dir_clear_osk_overlay(void)
+{
+   *dir_osk_overlay = '\0';
 }
 
 void dir_clear_all(void)
 {
-   dir_clear(RARCH_DIR_SYSTEM);
-   dir_clear(RARCH_DIR_OSK_OVERLAY);
-   dir_clear(RARCH_DIR_SAVEFILE);
-   dir_clear(RARCH_DIR_SAVESTATE);
+   dir_clear_system();
+   dir_clear_osk_overlay();
+   dir_clear_savefile();
+   dir_clear_savestate();
 }
 
 /* get ptr functions */
diff --git a/dirs.h b/dirs.h
index f172d04474..9a4c282b2c 100644
--- a/dirs.h
+++ b/dirs.h
@@ -21,15 +21,6 @@
 
 RETRO_BEGIN_DECLS
 
-enum rarch_dir_type
-{
-   RARCH_DIR_NONE = 0,
-   RARCH_DIR_SYSTEM,
-   RARCH_DIR_SAVEFILE,
-   RARCH_DIR_SAVESTATE,
-   RARCH_DIR_OSK_OVERLAY
-};
-
 /* init functions */
 
 bool dir_init_shader(void);
@@ -54,7 +45,13 @@ bool dir_is_osk_overlay_empty(void);
 
 /* clear functions */
 
-void dir_clear(enum rarch_dir_type type);
+void dir_clear_system(void);
+
+void dir_clear_savefile(void);
+
+void dir_clear_savestate(void);
+
+void dir_clear_osk_overlay(void);
 
 void dir_clear_all(void);