diff --git a/Makefile.common b/Makefile.common
index 119fd669af..14dcad1b07 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -180,7 +180,6 @@ OBJ += frontend/frontend_driver.o \
        $(LIBRETRO_COMM_DIR)/lists/string_list.o \
        $(LIBRETRO_COMM_DIR)/string/stdstring.o \
        $(LIBRETRO_COMM_DIR)/memmap/memalign.o \
-       list_special.o \
        $(LIBRETRO_COMM_DIR)/file/nbio/nbio_stdio.o
 
 ifneq ($(findstring Linux,$(OS)),)
diff --git a/griffin/griffin.c b/griffin/griffin.c
index c8fd68b462..2ca9826e74 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -983,7 +983,6 @@ FILE
 #include "../libretro-common/media/media_detect_cd.c"
 #endif
 
-#include "../list_special.c"
 #include "../libretro-common/string/stdstring.c"
 #include "../libretro-common/file/nbio/nbio_stdio.c"
 #if defined(__linux__)
diff --git a/list_special.c b/list_special.c
deleted file mode 100644
index 27318d169c..0000000000
--- a/list_special.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *  Copyright (C) 2016-2019 - Brad Parker
- *
- *  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/>.
- */
-
-#include <string.h>
-
-#include <lists/dir_list.h>
-#include <lists/string_list.h>
-#include <compat/strl.h>
-
-#include <audio/audio_resampler.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_MENU
-#include "menu/menu_driver.h"
-#endif
-
-#ifdef HAVE_WIFI
-#include "wifi/wifi_driver.h"
-#endif
-
-#include "list_special.h"
-#include "frontend/frontend_driver.h"
-#include "core_info.h"
-#include "midi/midi_driver.h"
-#include "configuration.h"
-#include "retroarch.h"
-
-struct string_list *dir_list_new_special(const char *input_dir,
-      enum dir_list_type type, const char *filter)
-{
-#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
-   char ext_shaders[255];
-#endif
-   char ext_name[255];
-   const char *exts                  = NULL;
-   bool recursive                    = false;
-   settings_t *settings              = config_get_ptr();
-
-   switch (type)
-   {
-      case DIR_LIST_AUTOCONFIG:
-         exts = filter;
-         break;
-      case DIR_LIST_CORES:
-         {
-            ext_name[0]         = '\0';
-
-            if (!frontend_driver_get_core_extension(ext_name, sizeof(ext_name)))
-               return NULL;
-
-            exts = ext_name;
-         }
-         break;
-      case DIR_LIST_RECURSIVE:
-         recursive = true;
-         /* fall-through */
-      case DIR_LIST_CORE_INFO:
-         {
-            core_info_list_t *list = NULL;
-            core_info_get_list(&list);
-
-            if (list)
-               exts = list->all_ext;
-         }
-         break;
-      case DIR_LIST_SHADERS:
-#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
-         {
-            union string_list_elem_attr attr;
-            struct string_list *str_list     = string_list_new();
-
-            if (!str_list)
-               return NULL;
-
-            ext_shaders[0]                   = '\0';
-
-            attr.i = 0;
-
-            if (video_shader_is_supported(RARCH_SHADER_CG))
-            {
-               string_list_append(str_list, "cgp", attr);
-               string_list_append(str_list, "cg", attr);
-            }
-
-            if (video_shader_is_supported(RARCH_SHADER_GLSL))
-            {
-               string_list_append(str_list, "glslp", attr);
-               string_list_append(str_list, "glsl", attr);
-            }
-
-            if (video_shader_is_supported(RARCH_SHADER_SLANG))
-            {
-               string_list_append(str_list, "slangp", attr);
-               string_list_append(str_list, "slang", attr);
-            }
-
-            string_list_join_concat(ext_shaders, sizeof(ext_shaders), str_list, "|");
-            string_list_free(str_list);
-            exts = ext_shaders;
-         }
-#endif
-         break;
-      case DIR_LIST_COLLECTIONS:
-         exts = "lpl";
-         break;
-      case DIR_LIST_DATABASES:
-         exts = "rdb";
-         break;
-      case DIR_LIST_PLAIN:
-         exts = filter;
-         break;
-      case DIR_LIST_NONE:
-      default:
-         return NULL;
-   }
-
-   return dir_list_new(input_dir, exts, false,
-         settings->bools.show_hidden_files,
-         type == DIR_LIST_CORE_INFO, recursive);
-}
-
-struct string_list *string_list_new_special(enum string_list_type type,
-      void *data, unsigned *len, size_t *list_size)
-{
-   union string_list_elem_attr attr;
-   unsigned i;
-   core_info_list_t *core_info_list = NULL;
-   const core_info_t *core_info     = NULL;
-   struct string_list *s            = string_list_new();
-
-   if (!s || !len)
-      goto error;
-
-   attr.i = 0;
-   *len   = 0;
-
-   switch (type)
-   {
-      case STRING_LIST_MENU_DRIVERS:
-#ifdef HAVE_MENU
-         for (i = 0; menu_driver_find_handle(i); i++)
-         {
-            const char *opt  = menu_driver_find_ident(i);
-            *len            += strlen(opt) + 1;
-
-            string_list_append(s, opt, attr);
-         }
-         break;
-#endif
-      case STRING_LIST_CAMERA_DRIVERS:
-         for (i = 0; camera_driver_find_handle(i); i++)
-         {
-            const char *opt  = camera_driver_find_ident(i);
-            *len            += strlen(opt) + 1;
-
-            string_list_append(s, opt, attr);
-         }
-         break;
-      case STRING_LIST_WIFI_DRIVERS:
-#ifdef HAVE_WIFI
-         for (i = 0; wifi_driver_find_handle(i); i++)
-         {
-            const char *opt  = wifi_driver_find_ident(i);
-            *len            += strlen(opt) + 1;
-
-            string_list_append(s, opt, attr);
-         }
-         break;
-#endif
-      case STRING_LIST_LOCATION_DRIVERS:
-         for (i = 0; location_driver_find_handle(i); i++)
-         {
-            const char *opt  = location_driver_find_ident(i);
-            *len            += strlen(opt) + 1;
-            string_list_append(s, opt, attr);
-         }
-         break;
-      case STRING_LIST_AUDIO_DRIVERS:
-         for (i = 0; audio_driver_find_handle(i); i++)
-         {
-            const char *opt  = audio_driver_find_ident(i);
-            *len            += strlen(opt) + 1;
-
-            string_list_append(s, opt, attr);
-         }
-         break;
-      case STRING_LIST_AUDIO_RESAMPLER_DRIVERS:
-         for (i = 0; audio_resampler_driver_find_handle(i); i++)
-         {
-            const char *opt  = audio_resampler_driver_find_ident(i);
-            *len            += strlen(opt) + 1;
-
-            string_list_append(s, opt, attr);
-         }
-         break;
-      case STRING_LIST_VIDEO_DRIVERS:
-         for (i = 0; video_driver_find_handle(i); i++)
-         {
-            const char *opt  = video_driver_find_ident(i);
-            *len            += strlen(opt) + 1;
-
-            string_list_append(s, opt, attr);
-         }
-         break;
-      case STRING_LIST_INPUT_DRIVERS:
-         for (i = 0; input_driver_find_handle(i); i++)
-         {
-            const char *opt  = input_driver_find_ident(i);
-            *len            += strlen(opt) + 1;
-
-            string_list_append(s, opt, attr);
-         }
-         break;
-      case STRING_LIST_INPUT_HID_DRIVERS:
-#ifdef HAVE_HID
-         for (i = 0; hid_driver_find_handle(i); i++)
-         {
-            const char *opt  = hid_driver_find_ident(i);
-            *len            += strlen(opt) + 1;
-
-            string_list_append(s, opt, attr);
-         }
-#endif
-         break;
-      case STRING_LIST_INPUT_JOYPAD_DRIVERS:
-         for (i = 0; joypad_driver_find_handle(i); i++)
-         {
-            const char *opt  = joypad_driver_find_ident(i);
-            *len            += strlen(opt) + 1;
-
-            string_list_append(s, opt, attr);
-         }
-         break;
-      case STRING_LIST_RECORD_DRIVERS:
-         for (i = 0; record_driver_find_handle(i); i++)
-         {
-            const char *opt  = record_driver_find_ident(i);
-            *len            += strlen(opt) + 1;
-
-            string_list_append(s, opt, attr);
-         }
-         break;
-      case STRING_LIST_MIDI_DRIVERS:
-         for (i = 0; midi_driver_find_handle(i); i++)
-         {
-            const char *opt  = midi_driver_find_ident(i);
-            *len            += strlen(opt) + 1;
-
-            string_list_append(s, opt, attr);
-         }
-         break;
-      case STRING_LIST_SUPPORTED_CORES_PATHS:
-         core_info_get_list(&core_info_list);
-
-         core_info_list_get_supported_cores(core_info_list,
-               (const char*)data, &core_info, list_size);
-
-         if (!core_info)
-            goto error;
-
-         if (*list_size == 0)
-            goto error;
-
-         for (i = 0; i < *list_size; i++)
-         {
-            const core_info_t *info = (const core_info_t*)&core_info[i];
-            const char *opt = info->path;
-
-            if (!opt)
-               goto error;
-
-            *len += strlen(opt) + 1;
-            string_list_append(s, opt, attr);
-         }
-         break;
-      case STRING_LIST_SUPPORTED_CORES_NAMES:
-         core_info_get_list(&core_info_list);
-         core_info_list_get_supported_cores(core_info_list,
-               (const char*)data, &core_info, list_size);
-
-         if (!core_info)
-            goto error;
-
-         if (*list_size == 0)
-            goto error;
-
-         for (i = 0; i < *list_size; i++)
-         {
-            core_info_t *info = (core_info_t*)&core_info[i];
-            const char  *opt  = info->display_name;
-
-            if (!opt)
-               goto error;
-
-            *len            += strlen(opt) + 1;
-            string_list_append(s, opt, attr);
-         }
-         break;
-      case STRING_LIST_NONE:
-      default:
-         goto error;
-   }
-
-   return s;
-
-error:
-   string_list_free(s);
-   s    = NULL;
-   return NULL;
-}
-
-const char *char_list_new_special(enum string_list_type type, void *data)
-{
-   unsigned len = 0;
-   size_t list_size;
-   struct string_list *s = string_list_new_special(type, data, &len, &list_size);
-   char         *options = (len > 0) ? (char*)calloc(len, sizeof(char)): NULL;
-
-   if (options && s)
-      string_list_join_concat(options, len, s, "|");
-
-   string_list_free(s);
-   s = NULL;
-
-   return options;
-}
diff --git a/retroarch.c b/retroarch.c
index 1671feeb2b..8426a59651 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1007,6 +1007,306 @@ static char current_savefile_dir[PATH_MAX_LENGTH]       = {0};
 static char current_savestate_dir[PATH_MAX_LENGTH]      = {0};
 static char dir_savestate[PATH_MAX_LENGTH]              = {0};
 
+struct string_list *dir_list_new_special(const char *input_dir,
+      enum dir_list_type type, const char *filter)
+{
+#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
+   char ext_shaders[255];
+#endif
+   char ext_name[255];
+   const char *exts                  = NULL;
+   bool recursive                    = false;
+   settings_t *settings              = configuration_settings;
+
+   switch (type)
+   {
+      case DIR_LIST_AUTOCONFIG:
+         exts = filter;
+         break;
+      case DIR_LIST_CORES:
+         {
+            ext_name[0]         = '\0';
+
+            if (!frontend_driver_get_core_extension(ext_name, sizeof(ext_name)))
+               return NULL;
+
+            exts = ext_name;
+         }
+         break;
+      case DIR_LIST_RECURSIVE:
+         recursive = true;
+         /* fall-through */
+      case DIR_LIST_CORE_INFO:
+         {
+            core_info_list_t *list = NULL;
+            core_info_get_list(&list);
+
+            if (list)
+               exts = list->all_ext;
+         }
+         break;
+      case DIR_LIST_SHADERS:
+#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
+         {
+            union string_list_elem_attr attr;
+            struct string_list *str_list     = string_list_new();
+
+            if (!str_list)
+               return NULL;
+
+            ext_shaders[0]                   = '\0';
+
+            attr.i = 0;
+
+            if (video_shader_is_supported(RARCH_SHADER_CG))
+            {
+               string_list_append(str_list, "cgp", attr);
+               string_list_append(str_list, "cg", attr);
+            }
+
+            if (video_shader_is_supported(RARCH_SHADER_GLSL))
+            {
+               string_list_append(str_list, "glslp", attr);
+               string_list_append(str_list, "glsl", attr);
+            }
+
+            if (video_shader_is_supported(RARCH_SHADER_SLANG))
+            {
+               string_list_append(str_list, "slangp", attr);
+               string_list_append(str_list, "slang", attr);
+            }
+
+            string_list_join_concat(ext_shaders, sizeof(ext_shaders), str_list, "|");
+            string_list_free(str_list);
+            exts = ext_shaders;
+         }
+#endif
+         break;
+      case DIR_LIST_COLLECTIONS:
+         exts = "lpl";
+         break;
+      case DIR_LIST_DATABASES:
+         exts = "rdb";
+         break;
+      case DIR_LIST_PLAIN:
+         exts = filter;
+         break;
+      case DIR_LIST_NONE:
+      default:
+         return NULL;
+   }
+
+   return dir_list_new(input_dir, exts, false,
+         settings->bools.show_hidden_files,
+         type == DIR_LIST_CORE_INFO, recursive);
+}
+
+struct string_list *string_list_new_special(enum string_list_type type,
+      void *data, unsigned *len, size_t *list_size)
+{
+   union string_list_elem_attr attr;
+   unsigned i;
+   core_info_list_t *core_info_list = NULL;
+   const core_info_t *core_info     = NULL;
+   struct string_list *s            = string_list_new();
+
+   if (!s || !len)
+      goto error;
+
+   attr.i = 0;
+   *len   = 0;
+
+   switch (type)
+   {
+      case STRING_LIST_MENU_DRIVERS:
+#ifdef HAVE_MENU
+         for (i = 0; menu_driver_find_handle(i); i++)
+         {
+            const char *opt  = menu_driver_find_ident(i);
+            *len            += strlen(opt) + 1;
+
+            string_list_append(s, opt, attr);
+         }
+         break;
+#endif
+      case STRING_LIST_CAMERA_DRIVERS:
+         for (i = 0; camera_driver_find_handle(i); i++)
+         {
+            const char *opt  = camera_driver_find_ident(i);
+            *len            += strlen(opt) + 1;
+
+            string_list_append(s, opt, attr);
+         }
+         break;
+      case STRING_LIST_WIFI_DRIVERS:
+#ifdef HAVE_WIFI
+         for (i = 0; wifi_driver_find_handle(i); i++)
+         {
+            const char *opt  = wifi_driver_find_ident(i);
+            *len            += strlen(opt) + 1;
+
+            string_list_append(s, opt, attr);
+         }
+         break;
+#endif
+      case STRING_LIST_LOCATION_DRIVERS:
+         for (i = 0; location_driver_find_handle(i); i++)
+         {
+            const char *opt  = location_driver_find_ident(i);
+            *len            += strlen(opt) + 1;
+            string_list_append(s, opt, attr);
+         }
+         break;
+      case STRING_LIST_AUDIO_DRIVERS:
+         for (i = 0; audio_driver_find_handle(i); i++)
+         {
+            const char *opt  = audio_driver_find_ident(i);
+            *len            += strlen(opt) + 1;
+
+            string_list_append(s, opt, attr);
+         }
+         break;
+      case STRING_LIST_AUDIO_RESAMPLER_DRIVERS:
+         for (i = 0; audio_resampler_driver_find_handle(i); i++)
+         {
+            const char *opt  = audio_resampler_driver_find_ident(i);
+            *len            += strlen(opt) + 1;
+
+            string_list_append(s, opt, attr);
+         }
+         break;
+      case STRING_LIST_VIDEO_DRIVERS:
+         for (i = 0; video_driver_find_handle(i); i++)
+         {
+            const char *opt  = video_driver_find_ident(i);
+            *len            += strlen(opt) + 1;
+
+            string_list_append(s, opt, attr);
+         }
+         break;
+      case STRING_LIST_INPUT_DRIVERS:
+         for (i = 0; input_driver_find_handle(i); i++)
+         {
+            const char *opt  = input_driver_find_ident(i);
+            *len            += strlen(opt) + 1;
+
+            string_list_append(s, opt, attr);
+         }
+         break;
+      case STRING_LIST_INPUT_HID_DRIVERS:
+#ifdef HAVE_HID
+         for (i = 0; hid_driver_find_handle(i); i++)
+         {
+            const char *opt  = hid_driver_find_ident(i);
+            *len            += strlen(opt) + 1;
+
+            string_list_append(s, opt, attr);
+         }
+#endif
+         break;
+      case STRING_LIST_INPUT_JOYPAD_DRIVERS:
+         for (i = 0; joypad_driver_find_handle(i); i++)
+         {
+            const char *opt  = joypad_driver_find_ident(i);
+            *len            += strlen(opt) + 1;
+
+            string_list_append(s, opt, attr);
+         }
+         break;
+      case STRING_LIST_RECORD_DRIVERS:
+         for (i = 0; record_driver_find_handle(i); i++)
+         {
+            const char *opt  = record_driver_find_ident(i);
+            *len            += strlen(opt) + 1;
+
+            string_list_append(s, opt, attr);
+         }
+         break;
+      case STRING_LIST_MIDI_DRIVERS:
+         for (i = 0; midi_driver_find_handle(i); i++)
+         {
+            const char *opt  = midi_driver_find_ident(i);
+            *len            += strlen(opt) + 1;
+
+            string_list_append(s, opt, attr);
+         }
+         break;
+      case STRING_LIST_SUPPORTED_CORES_PATHS:
+         core_info_get_list(&core_info_list);
+
+         core_info_list_get_supported_cores(core_info_list,
+               (const char*)data, &core_info, list_size);
+
+         if (!core_info)
+            goto error;
+
+         if (*list_size == 0)
+            goto error;
+
+         for (i = 0; i < *list_size; i++)
+         {
+            const core_info_t *info = (const core_info_t*)&core_info[i];
+            const char *opt = info->path;
+
+            if (!opt)
+               goto error;
+
+            *len += strlen(opt) + 1;
+            string_list_append(s, opt, attr);
+         }
+         break;
+      case STRING_LIST_SUPPORTED_CORES_NAMES:
+         core_info_get_list(&core_info_list);
+         core_info_list_get_supported_cores(core_info_list,
+               (const char*)data, &core_info, list_size);
+
+         if (!core_info)
+            goto error;
+
+         if (*list_size == 0)
+            goto error;
+
+         for (i = 0; i < *list_size; i++)
+         {
+            core_info_t *info = (core_info_t*)&core_info[i];
+            const char  *opt  = info->display_name;
+
+            if (!opt)
+               goto error;
+
+            *len            += strlen(opt) + 1;
+            string_list_append(s, opt, attr);
+         }
+         break;
+      case STRING_LIST_NONE:
+      default:
+         goto error;
+   }
+
+   return s;
+
+error:
+   string_list_free(s);
+   s    = NULL;
+   return NULL;
+}
+
+const char *char_list_new_special(enum string_list_type type, void *data)
+{
+   unsigned len = 0;
+   size_t list_size;
+   struct string_list *s = string_list_new_special(type, data, &len, &list_size);
+   char         *options = (len > 0) ? (char*)calloc(len, sizeof(char)): NULL;
+
+   if (options && s)
+      string_list_join_concat(options, len, s, "|");
+
+   string_list_free(s);
+   s = NULL;
+
+   return options;
+}
+
 static void path_set_redirect(void)
 {
    size_t path_size                            = PATH_MAX_LENGTH * sizeof(char);