diff --git a/configuration.c b/configuration.c
index 8a47ab3759..a6a051b9e5 100644
--- a/configuration.c
+++ b/configuration.c
@@ -2085,7 +2085,7 @@ static bool config_load_file(const char *path, bool set_defaults,
 #ifdef HAVE_OVERLAY
    if (string_is_equal(settings->directory.overlay, "default"))
       *settings->directory.overlay = '\0';
-   if (string_is_equal(dir_get_osk_overlay(), "default"))
+   if (string_is_equal(dir_get(RARCH_DIR_OSK_OVERLAY), "default"))
       dir_clear(RARCH_DIR_OSK_OVERLAY);
 #endif
    if (string_is_equal(settings->directory.system, "default"))
diff --git a/dirs.c b/dirs.c
index 1e86cc7285..1321667c90 100644
--- a/dirs.c
+++ b/dirs.c
@@ -266,24 +266,24 @@ char *dir_get_savestate_ptr(void)
 
 /* get functions */
 
-const char *dir_get_osk_overlay(void)
+const char *dir_get(enum rarch_dir_type type)
 {
-   return dir_osk_overlay;
-}
+   switch (type)
+   {
+      case RARCH_DIR_OSK_OVERLAY:
+         return dir_osk_overlay;
+      case RARCH_DIR_SYSTEM:
+         return dir_system;
+      case RARCH_DIR_SAVEFILE:
+         return dir_savefile;
+      case RARCH_DIR_SAVESTATE:
+         return dir_savestate;
+      case RARCH_DIR_NONE:
+      default:
+         break;
+   }
 
-const char *dir_get_system(void)
-{
-   return dir_system;
-}
-
-const char *dir_get_savefile(void)
-{
-   return dir_savefile;
-}
-
-const char *dir_get_savestate(void)
-{
-   return dir_savestate;
+   return NULL;
 }
 
 /* set functions */
diff --git a/dirs.h b/dirs.h
index 61cfb8178f..84dbdf2b4b 100644
--- a/dirs.h
+++ b/dirs.h
@@ -76,13 +76,7 @@ char *dir_get_osk_overlay_ptr(void);
 
 /* get functions */
 
-const char *dir_get_osk_overlay(void);
-
-const char *dir_get_savefile(void);
-
-const char *dir_get_savestate(void);
-
-const char *dir_get_system(void);
+const char *dir_get(enum rarch_dir_type type);
 
 /* set functions */
 
diff --git a/dynamic.c b/dynamic.c
index 8284d2feac..7dddcc0821 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -1039,7 +1039,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
 
             *(const char**)data = dir_get_system_ptr();
             RARCH_LOG("Environ SYSTEM_DIRECTORY: \"%s\".\n",
-                  dir_get_system());
+                  dir_get(RARCH_DIR_SYSTEM));
          }
          else
          {
diff --git a/paths.c b/paths.c
index dbe8927fc4..ebba007bfe 100644
--- a/paths.c
+++ b/paths.c
@@ -80,8 +80,8 @@ void path_set_redirect(void)
    uint32_t library_name_hash                  = 0;
    bool check_library_name_hash                = false;
    rarch_system_info_t      *info              = NULL;
-   const char *old_savefile_dir                = dir_get_savefile();
-   const char *old_savestate_dir               = dir_get_savestate();
+   const char *old_savefile_dir                = dir_get(RARCH_DIR_SAVEFILE);
+   const char *old_savestate_dir               = dir_get(RARCH_DIR_SAVESTATE);
 
    runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &info);
 
@@ -360,11 +360,11 @@ static bool path_init_subsystem(void)
 
             snprintf(ext, sizeof(ext), ".%s", mem->extension);
 
-            if (path_is_directory(dir_get_savefile()))
+            if (path_is_directory(dir_get(RARCH_DIR_SAVEFILE)))
             {
                /* Use SRAM dir */
                /* Redirect content fullpath to save directory. */
-               strlcpy(path, dir_get_savefile(), sizeof(path));
+               strlcpy(path, dir_get(RARCH_DIR_SAVEFILE), sizeof(path));
                fill_pathname_dir(path,
                      subsystem_fullpaths->elems[i].data, ext,
                      sizeof(path));
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 95cdfd348e..97fd84713b 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -848,9 +848,9 @@ static void menu_content_environment_get(int *argc, char *argv[],
    if (!path_is_empty(RARCH_PATH_CONFIG))
       wrap_args->config_path   = path_get(RARCH_PATH_CONFIG);
    if (!dir_is_empty(RARCH_DIR_SAVEFILE))
-      wrap_args->sram_path     = dir_get_savefile();
+      wrap_args->sram_path     = dir_get(RARCH_DIR_SAVEFILE);
    if (!dir_is_empty(RARCH_DIR_SAVESTATE))
-      wrap_args->state_path    = dir_get_savestate();
+      wrap_args->state_path    = dir_get(RARCH_DIR_SAVESTATE);
    if (fullpath && *fullpath)
       wrap_args->content_path  = fullpath;
    if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_LIBRETRO))