diff --git a/Makefile.common b/Makefile.common
index 3d93924940..12d949d4de 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -129,12 +129,12 @@ OBJ += frontend/frontend.o \
        tasks/task_file_transfer.o \
        content.o \
        libretro-common/encodings/encoding_utf.o \
-       libretro-common/file/file_list.o \
-       libretro-common/file/dir_list.o \
+       libretro-common/lists/file_list.o \
+       libretro-common/lists/dir_list.o \
        libretro-common/file/retro_dirent.o \
        libretro-common/file/retro_file.o \
        libretro-common/file/retro_stat.o \
-       libretro-common/string/string_list.o \
+       libretro-common/lists/string_list.o \
        libretro-common/string/stdstring.o \
        libretro-common/memmap/memalign.o \
        dir_list_special.o \
diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander
index eb4767b005..074d5c6167 100644
--- a/Makefile.ps3.salamander
+++ b/Makefile.ps3.salamander
@@ -24,12 +24,12 @@ PPU_SRCS		= frontend/frontend_salamander.c \
 				  frontend/drivers/platform_ps3.c \
 				  frontend/drivers/platform_null.c \
 				  libretro-common/file/file_path.c \
-				  libretro-common/file/dir_list.c \
+				  libretro-common/lists/dir_list.c \
+				  libretro-common/lists/string_list.c \
 				  libretro-common/file/retro_dirent.c \
 				  libretro-common/file/retro_stat.c \
 				  libretro-common/hash/rhash.c \
 				  libretro-common/string/stdstring.c \
-				  libretro-common/string/string_list.c \
 				  libretro-common/compat/compat_strl.c \
 				  libretro-common/file/retro_file.c \
 				  libretro-common/file/config_file.c \
diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander
index ed2b612aac..05f68a72dd 100644
--- a/Makefile.psp1.salamander
+++ b/Makefile.psp1.salamander
@@ -37,8 +37,8 @@ OBJS = frontend/frontend_salamander.o \
 		 frontend/drivers/platform_null.o \
 		 libretro-common/file/file_path.o \
 		 libretro-common/string/stdstring.o \
-		 libretro-common/string/string_list.o \
-		 libretro-common/file/dir_list.o \
+		 libretro-common/lists/string_list.o \
+		 libretro-common/lists/dir_list.o \
 		 libretro-common/file/retro_dirent.o \
 		 libretro-common/compat/compat_strl.o \
 		 libretro-common/file/config_file.o \
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index a31de60af1..49aecf388d 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -47,8 +47,8 @@ OBJ = frontend/frontend_salamander.o \
 		libretro-common/file/file_path.o \
 		libretro-common/hash/rhash.o \
 		libretro-common/string/stdstring.o \
-		libretro-common/string/string_list.o \
-		libretro-common/file/dir_list.o \
+		libretro-common/lists/string_list.o \
+		libretro-common/lists/dir_list.o \
 		libretro-common/file/retro_file.o \
 		libretro-common/file/retro_dirent.o \
 		libretro-common/file/retro_stat.o \
diff --git a/audio/audio_dsp_filter.c b/audio/audio_dsp_filter.c
index 4762c3cc9b..1fbeb1a5e4 100644
--- a/audio/audio_dsp_filter.c
+++ b/audio/audio_dsp_filter.c
@@ -23,7 +23,7 @@
 
 #include <file/file_path.h>
 #include <file/config_file_userdata.h>
-#include <file/dir_list.h>
+#include <lists/dir_list.h>
 
 #include "audio_dsp_filter.h"
 #include "audio_filters/dspfilter.h"
diff --git a/autosave.c b/autosave.c
index 3e33ce25c4..8d05db87c9 100644
--- a/autosave.c
+++ b/autosave.c
@@ -20,7 +20,7 @@
 
 #include <boolean.h>
 
-#include <string/string_list.h>
+#include <lists/string_list.h>
 #include <rthreads/rthreads.h>
 
 #include "autosave.h"
diff --git a/command_event.c b/command_event.c
index d0860501a0..0c1be108c4 100644
--- a/command_event.c
+++ b/command_event.c
@@ -17,7 +17,7 @@
 
 #include <compat/strl.h>
 #include <file/file_path.h>
-#include <file/dir_list.h>
+#include <lists/dir_list.h>
 #include <string/stdstring.h>
 
 #include "command_event.h"
diff --git a/content.c b/content.c
index 448b02aea3..4dd1fccb2d 100644
--- a/content.c
+++ b/content.c
@@ -49,7 +49,7 @@
 #include <retro_stat.h>
 #include <retro_assert.h>
 
-#include <string/string_list.h>
+#include <lists/string_list.h>
 #include <string/stdstring.h>
 
 #include "msg_hash.h"
diff --git a/core_info.c b/core_info.c
index 1434adbb27..fd2c359692 100644
--- a/core_info.c
+++ b/core_info.c
@@ -16,7 +16,7 @@
  */
 
 #include <file/file_path.h>
-#include <file/dir_list.h>
+#include <lists/dir_list.h>
 #include <file/file_archive.h>
 #include <compat/strl.h>
 
diff --git a/core_options.c b/core_options.c
index ecbd7272cc..92cdfdf3b5 100644
--- a/core_options.c
+++ b/core_options.c
@@ -17,12 +17,12 @@
 #include <string.h>
 
 #include <file/config_file.h>
-#include <file/dir_list.h>
+#include <lists/dir_list.h>
+#include <lists/string_list.h>
 #include <compat/posix_string.h>
 #include <compat/strl.h>
 #include <retro_miscellaneous.h>
 #include <string/stdstring.h>
-#include <string/string_list.h>
 
 #include "libretro.h"
 
diff --git a/cores/libretro-imageviewer/image_core.c b/cores/libretro-imageviewer/image_core.c
index d4bb8e2d4d..771776e0f5 100644
--- a/cores/libretro-imageviewer/image_core.c
+++ b/cores/libretro-imageviewer/image_core.c
@@ -5,7 +5,7 @@
 #include <assert.h>
 
 #include <boolean.h>
-#include <file/dir_list.h>
+#include <lists/dir_list.h>
 #include <file/file_path.h>
 #include <compat/strl.h>
 
diff --git a/dir_list_special.c b/dir_list_special.c
index e02073d341..f36c4462b6 100644
--- a/dir_list_special.c
+++ b/dir_list_special.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <file/dir_list.h>
+#include <lists/dir_list.h>
 
 #include "dir_list_special.h"
 #include "frontend/frontend_driver.h"
diff --git a/dir_list_special.h b/dir_list_special.h
index 8ed3f969dd..2321f6757f 100644
--- a/dir_list_special.h
+++ b/dir_list_special.h
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 enum dir_list_type
 {
diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c
index 34d4c81f50..b75aa11b43 100644
--- a/frontend/drivers/platform_ctr.c
+++ b/frontend/drivers/platform_ctr.c
@@ -23,7 +23,7 @@
 
 #include <file/file_path.h>
 #ifndef IS_SALAMANDER
-#include <file/file_list.h>
+#include <lists/file_list.h>
 #endif
 
 #include "../frontend_driver.h"
diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c
index d41e41435a..a01679a8e2 100644
--- a/frontend/drivers/platform_gx.c
+++ b/frontend/drivers/platform_gx.c
@@ -31,7 +31,7 @@
 
 #include <file/file_path.h>
 #ifndef IS_SALAMANDER
-#include <file/file_list.h>
+#include <lists/file_list.h>
 #endif
 #include <string/stdstring.h>
 
diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c
index e8ddd7b032..73e3de1874 100644
--- a/frontend/drivers/platform_ps3.c
+++ b/frontend/drivers/platform_ps3.c
@@ -29,7 +29,7 @@
 
 #include <file/file_path.h>
 #ifndef IS_SALAMANDER
-#include <file/file_list.h>
+#include <lists/file_list.h>
 #endif
 
 #include "../frontend_driver.h"
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index d7c6f4c371..abecd97b3e 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -34,7 +34,7 @@ int scePowerSetArmClockFrequency(int freq);
 #include <boolean.h>
 #include <file/file_path.h>
 #ifndef IS_SALAMANDER
-#include <file/file_list.h>
+#include <lists/file_list.h>
 #endif
 
 #include "../frontend_driver.h"
diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c
index a43e41ade5..f0a2067541 100644
--- a/frontend/drivers/platform_win32.c
+++ b/frontend/drivers/platform_win32.c
@@ -21,7 +21,7 @@
 #include <boolean.h>
 #include <retro_miscellaneous.h>
 #include <dynamic/dylib.h>
-#include <file/file_list.h>
+#include <lists/file_list.h>
 
 #include "../frontend_driver.h"
 #include "../../general.h"
diff --git a/frontend/drivers/platform_xdk.cpp b/frontend/drivers/platform_xdk.cpp
index 3187fc2b5f..6948de4449 100644
--- a/frontend/drivers/platform_xdk.cpp
+++ b/frontend/drivers/platform_xdk.cpp
@@ -23,7 +23,7 @@
 
 #include <file/file_path.h>
 #ifndef IS_SALAMANDER
-#include <file/file_list.h>
+#include <lists/file_list.h>
 #endif
 #include <retro_miscellaneous.h>
 #include <string/stdstring.h>
diff --git a/frontend/frontend_salamander.c b/frontend/frontend_salamander.c
index 5ede03c109..dc8373469e 100644
--- a/frontend/frontend_salamander.c
+++ b/frontend/frontend_salamander.c
@@ -21,7 +21,7 @@
 
 #include <file/config_file.h>
 #include <file/file_path.h>
-#include <file/dir_list.h>
+#include <lists/dir_list.h>
 #include <retro_miscellaneous.h>
 #include <string/stdstring.h>
 #include <compat/strl.h>
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 9c6a41a0b4..9b4e36cd79 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -58,7 +58,7 @@
 #endif
 
 #ifdef GL_DEBUG
-#include <string/string_list.h>
+#include <lists/string_list.h>
 #endif
 
 #ifdef HAVE_MENU
diff --git a/gfx/drivers_context/drm_ctx.c b/gfx/drivers_context/drm_ctx.c
index e6c8e3e305..cd9d831b65 100644
--- a/gfx/drivers_context/drm_ctx.c
+++ b/gfx/drivers_context/drm_ctx.c
@@ -32,7 +32,7 @@
 #include <libdrm/drm.h>
 #include <gbm.h>
 
-#include <file/dir_list.h>
+#include <lists/dir_list.h>
 #include <retro_file.h>
 
 #include "../../verbosity.h"
diff --git a/gfx/drivers_shader/glslang_util.cpp b/gfx/drivers_shader/glslang_util.cpp
index f2d12308de..57b8c788d8 100644
--- a/gfx/drivers_shader/glslang_util.cpp
+++ b/gfx/drivers_shader/glslang_util.cpp
@@ -17,12 +17,13 @@
 #include <string>
 #include <sstream>
 
+#include <retro_file.h>
+#include <lists/string_list.h>
+
 #include "glslang_util.hpp"
 #include "glslang.hpp"
 
 #include "../../general.h"
-#include <retro_file.h>
-#include <string/string_list.h>
 
 using namespace std;
 
diff --git a/gfx/video_filter.c b/gfx/video_filter.c
index 45adaaef31..aef309c3b0 100644
--- a/gfx/video_filter.c
+++ b/gfx/video_filter.c
@@ -18,7 +18,7 @@
 
 #include <file/config_file_userdata.h>
 #include <file/file_path.h>
-#include <file/dir_list.h>
+#include <lists/dir_list.h>
 #include <dynamic/dylib.h>
 
 #include "../frontend/frontend_driver.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 2cf4a7da08..dc108cfca0 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -634,16 +634,16 @@ FILE
 #include "../content.c"
 #include "../libretro-common/file/file_path.c"
 #include "../file_path_special.c"
-#include "../libretro-common/file/dir_list.c"
+#include "../libretro-common/lists/dir_list.c"
+#include "../libretro-common/lists/string_list.c"
+#include "../libretro-common/lists/file_list.c"
 #include "../libretro-common/file/retro_dirent.c"
 #include "../libretro-common/file/retro_file.c"
 #include "../libretro-common/file/retro_stat.c"
 #include "../dir_list_special.c"
 #include "../string_list_special.c"
-#include "../libretro-common/string/string_list.c"
 #include "../libretro-common/string/stdstring.c"
 #include "../libretro-common/file/nbio/nbio_stdio.c"
-#include "../libretro-common/file/file_list.c"
 
 /*============================================================
 MESSAGE
diff --git a/input/drivers_keyboard/keyboard_event_xkb.c b/input/drivers_keyboard/keyboard_event_xkb.c
index 7b1db47ff0..c768e15fb3 100644
--- a/input/drivers_keyboard/keyboard_event_xkb.c
+++ b/input/drivers_keyboard/keyboard_event_xkb.c
@@ -18,7 +18,7 @@
  * which can be passed to keyboard callback in a sensible way. */
 #include <xkbcommon/xkbcommon.h>
 
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #include "../input_joypad_driver.h"
 #include "../input_keymaps.h"
diff --git a/input/input_autodetect.c b/input/input_autodetect.c
index 55ac2a01ea..4cdf487fe1 100644
--- a/input/input_autodetect.c
+++ b/input/input_autodetect.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <file/dir_list.h>
+#include <lists/dir_list.h>
 #include <file/file_path.h>
 #include <string/stdstring.h>
 
diff --git a/input/input_overlay.c b/input/input_overlay.c
index 68e2f1dc0d..a4100bdbbf 100644
--- a/input/input_overlay.c
+++ b/input/input_overlay.c
@@ -22,7 +22,7 @@
 #include <compat/posix_string.h>
 #include <file/file_path.h>
 #include <retro_assert.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 #include <file/config_file.h>
 #include <formats/image.h>
 #include <clamping.h>
diff --git a/libretro-common/file/config_file.c b/libretro-common/file/config_file.c
index 8a1b4024ea..ae8281a402 100644
--- a/libretro-common/file/config_file.c
+++ b/libretro-common/file/config_file.c
@@ -42,7 +42,7 @@
 #include <file/config_file.h>
 #include <file/file_path.h>
 #include <retro_stat.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 #include <rhash.h>
 
 #define MAX_INCLUDE_DEPTH 16
diff --git a/libretro-common/file/config_file_userdata.c b/libretro-common/file/config_file_userdata.c
index 1b5b403b70..be0b60e204 100644
--- a/libretro-common/file/config_file_userdata.c
+++ b/libretro-common/file/config_file_userdata.c
@@ -22,7 +22,7 @@
 
 #include <file/config_file_userdata.h>
 #include <file/file_path.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #define get_array_setup() \
    char key[2][256]; \
diff --git a/libretro-common/file/file_archive.c b/libretro-common/file/file_archive.c
index f198386029..f1227b954e 100644
--- a/libretro-common/file/file_archive.c
+++ b/libretro-common/file/file_archive.c
@@ -44,7 +44,7 @@
 #include <retro_file.h>
 #include <retro_stat.h>
 #include <retro_miscellaneous.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #ifndef CENTRAL_FILE_HEADER_SIGNATURE
 #define CENTRAL_FILE_HEADER_SIGNATURE 0x02014b50
diff --git a/libretro-common/include/file/dir_list.h b/libretro-common/include/lists/dir_list.h
similarity index 96%
rename from libretro-common/include/file/dir_list.h
rename to libretro-common/include/lists/dir_list.h
index 6fc3e0f6b1..bfbda4dda3 100644
--- a/libretro-common/include/file/dir_list.h
+++ b/libretro-common/include/lists/dir_list.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (dir_list.h).
@@ -23,7 +23,7 @@
 #ifndef __LIBRETRO_SDK_DIR_LIST_H
 #define __LIBRETRO_SDK_DIR_LIST_H
 
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/libretro-common/include/file/file_list.h b/libretro-common/include/lists/file_list.h
similarity index 98%
rename from libretro-common/include/file/file_list.h
rename to libretro-common/include/lists/file_list.h
index 4bf13ffc66..b47b13311d 100644
--- a/libretro-common/include/file/file_list.h
+++ b/libretro-common/include/lists/file_list.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (file_list.h).
diff --git a/libretro-common/include/string/string_list.h b/libretro-common/include/lists/string_list.h
similarity index 98%
rename from libretro-common/include/string/string_list.h
rename to libretro-common/include/lists/string_list.h
index c6040cc14d..4168116f78 100644
--- a/libretro-common/include/string/string_list.h
+++ b/libretro-common/include/lists/string_list.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (string_list.h).
diff --git a/libretro-common/file/dir_list.c b/libretro-common/lists/dir_list.c
similarity index 98%
rename from libretro-common/file/dir_list.c
rename to libretro-common/lists/dir_list.c
index 79fe1d2e25..8bcb3f3fbe 100644
--- a/libretro-common/file/dir_list.c
+++ b/libretro-common/lists/dir_list.c
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (dir_list.c).
@@ -22,9 +22,9 @@
 
 #include <stdlib.h>
 
-#include <file/dir_list.h>
+#include <lists/dir_list.h>
+#include <lists/string_list.h>
 #include <file/file_path.h>
-#include <string/string_list.h>
 
 #include <compat/strl.h>
 #include <retro_dirent.h>
diff --git a/libretro-common/file/file_list.c b/libretro-common/lists/file_list.c
similarity index 99%
rename from libretro-common/file/file_list.c
rename to libretro-common/lists/file_list.c
index b0dc5872e8..e713bdf836 100644
--- a/libretro-common/file/file_list.c
+++ b/libretro-common/lists/file_list.c
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (file_list.c).
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include <retro_common.h>
-#include <file/file_list.h>
+#include <lists/file_list.h>
 #include <compat/strcasestr.h>
 
 void file_list_push(file_list_t *list,
diff --git a/libretro-common/string/string_list.c b/libretro-common/lists/string_list.c
similarity index 98%
rename from libretro-common/string/string_list.c
rename to libretro-common/lists/string_list.c
index 8e6ecdcdfb..3448053d6b 100644
--- a/libretro-common/string/string_list.c
+++ b/libretro-common/lists/string_list.c
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (string_list.c).
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <string/string_list.h>
+#include <lists/string_list.h>
 #include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <compat/strl.h>
diff --git a/libretro_version_1.c b/libretro_version_1.c
index ac185e9a11..404402c3f5 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -23,7 +23,7 @@
 
 #include <retro_inline.h>
 #include <boolean.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #include "libretro.h"
 #include "libretro_version_1.h"
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index 6c9c5f88c4..56abf8e6df 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -15,7 +15,7 @@
 
 #include <file/file_path.h>
 #include <string/stdstring.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #include "../menu_driver.h"
 #include "../menu_cbs.h"
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 7a1bc6a3f6..5af935ccce 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -15,7 +15,7 @@
 
 #include <file/file_path.h>
 #include <string/stdstring.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #include "../menu_driver.h"
 #include "../menu_animation.h"
diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 8c12d11812..0cbcbf842a 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -15,7 +15,7 @@
 
 #include <file/file_path.h>
 #include <string/stdstring.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #include "../menu_driver.h"
 #include "../menu_cbs.h"
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 8ad61e4e05..335622b385 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -18,7 +18,7 @@
 #include <retro_stat.h>
 #include <retro_file.h>
 #include <string/stdstring.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #include "../menu_driver.h"
 #include "../menu_cbs.h"
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index a3d59fa92c..cb89eb05c3 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -14,7 +14,7 @@
  */
 
 #include <file/file_path.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 #include <string/stdstring.h>
 
 #include "../menu_driver.h"
diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
index fc8c18a7f4..1cbfd14566 100644
--- a/menu/cbs/menu_cbs_start.c
+++ b/menu/cbs/menu_cbs_start.c
@@ -14,7 +14,7 @@
  */
 
 #include <file/file_path.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #include "../menu_driver.h"
 #include "../menu_cbs.h"
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index 4acc682ca4..a97924a5b1 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -13,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string/string_list.h>
+#include <lists/string_list.h>
 #include <string/stdstring.h>
 #include <file/file_path.h>
 
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 36c11395a1..f692632256 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -26,7 +26,7 @@
 #include <formats/image.h>
 #include <gfx/math/matrix_4x4.h>
 #include <string/stdstring.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #include "menu_generic.h"
 
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index f9b6b437ca..7daf99eed2 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -22,7 +22,7 @@
 #include <limits.h>
 
 #include <string/stdstring.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 #include <compat/posix_string.h>
 #include <encodings/utf.h>
 #include <file/file_path.h>
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index d80e41c381..1b7321dc0f 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -25,7 +25,7 @@
 #include <compat/strl.h>
 #include <formats/image.h>
 #include <string/stdstring.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 #include <gfx/math/matrix_4x4.h>
 
 #include "menu_generic.h"
diff --git a/menu/drivers/xui.cpp b/menu/drivers/xui.cpp
index 66a98bd2f6..a8f8f1f922 100644
--- a/menu/drivers/xui.cpp
+++ b/menu/drivers/xui.cpp
@@ -25,7 +25,7 @@
 #include <xuiapp.h>
 
 #include <file/file_path.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 #include <queues/message_queue.h>
 
 #include "menu_generic.h"
diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c
index 79b74aa04e..9acd78eea9 100644
--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@@ -23,7 +23,7 @@
 #include <limits.h>
 
 #include <file/file_path.h>
-#include <file/dir_list.h>
+#include <lists/dir_list.h>
 #include <compat/posix_string.h>
 #include <gfx/math/matrix_4x4.h>
 #include <string/stdstring.h>
diff --git a/menu/drivers/zr.c b/menu/drivers/zr.c
index cb5cc54ad5..9add4472c5 100644
--- a/menu/drivers/zr.c
+++ b/menu/drivers/zr.c
@@ -29,7 +29,7 @@
 #include <formats/image.h>
 #include <gfx/math/matrix_4x4.h>
 #include <string/stdstring.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #include "menu_generic.h"
 #include "zr_menu.h"
diff --git a/menu/drivers/zr_menu.c b/menu/drivers/zr_menu.c
index c858e4ab30..219555bf3c 100644
--- a/menu/drivers/zr_menu.c
+++ b/menu/drivers/zr_menu.c
@@ -26,7 +26,7 @@
 
 #include <file/file_path.h>
 #include <string/stdstring.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #include "../menu_driver.h"
 #include "../menu_hash.h"
diff --git a/menu/menu_cbs.c b/menu/menu_cbs.c
index 4f318292ed..e1ae0d439a 100644
--- a/menu/menu_cbs.c
+++ b/menu/menu_cbs.c
@@ -15,7 +15,7 @@
 
 #include <compat/strl.h>
 #include <string/stdstring.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #include "menu_driver.h"
 #include "menu_hash.h"
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 568558e4b6..73c127d720 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -15,10 +15,10 @@
 
 #include <stddef.h>
 
-#include <file/file_list.h>
+#include <lists/file_list.h>
+#include <lists/dir_list.h>
 #include <file/file_path.h>
 #include <file/file_archive.h>
-#include <file/dir_list.h>
 #include <retro_stat.h>
 #include <string/stdstring.h>
 
diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h
index 8f6dcb4a22..a3131ff4be 100644
--- a/menu/menu_displaylist.h
+++ b/menu/menu_displaylist.h
@@ -20,7 +20,7 @@
 
 #include <boolean.h>
 #include <retro_miscellaneous.h>
-#include <file/file_list.h>
+#include <lists/file_list.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/menu/menu_entry.c b/menu/menu_entry.c
index 2a58e57fd3..56a8106fb1 100644
--- a/menu/menu_entry.c
+++ b/menu/menu_entry.c
@@ -15,7 +15,7 @@
  */
 
 #include <compat/strl.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #include "menu_driver.h"
 #include "menu_display.h"
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index e175f7a927..2bde372279 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -23,7 +23,7 @@
 
 #endif
 
-#include <file/file_list.h>
+#include <lists/file_list.h>
 #include <file/file_path.h>
 #include <file/config_file.h>
 #include <string/stdstring.h>
diff --git a/retroarch.c b/retroarch.c
index 725ad44861..fbe6eb6e18 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -25,7 +25,7 @@
 
 #include <boolean.h>
 #include <string/stdstring.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #ifdef _WIN32
 #ifdef _XBOX
diff --git a/runloop.c b/runloop.c
index 545c42bac7..5decb561aa 100644
--- a/runloop.c
+++ b/runloop.c
@@ -19,7 +19,7 @@
 #include <stdarg.h>
 #include <math.h>
 
-#include <file/dir_list.h>
+#include <lists/dir_list.h>
 #include <file/file_path.h>
 #include <retro_inline.h>
 #include <retro_assert.h>
diff --git a/string_list_special.h b/string_list_special.h
index 8d3ab7de0e..287a0b09f1 100644
--- a/string_list_special.h
+++ b/string_list_special.h
@@ -18,7 +18,7 @@
 
 #include <stddef.h>
 
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 enum string_list_type
 {
diff --git a/tasks/task_database.c b/tasks/task_database.c
index 1ba19f3ef5..4688162898 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -18,7 +18,7 @@
 #include <retro_miscellaneous.h>
 #include <retro_endianness.h>
 #include <string/stdstring.h>
-#include <file/dir_list.h>
+#include <lists/dir_list.h>
 #include <file/file_path.h>
 #include <queues/message_queue.h>
 
diff --git a/tasks/task_decompress.c b/tasks/task_decompress.c
index f31e79c2d4..f25cd2adb1 100644
--- a/tasks/task_decompress.c
+++ b/tasks/task_decompress.c
@@ -17,7 +17,7 @@
 #include "../config.h"
 #endif
 
-#include <string/string_list.h>
+#include <lists/string_list.h>
 #include <string/stdstring.h>
 #include <file/file_path.h>
 #include <file/file_archive.h>
diff --git a/tasks/task_file_transfer.c b/tasks/task_file_transfer.c
index 0935213a8a..17ea8012bd 100644
--- a/tasks/task_file_transfer.c
+++ b/tasks/task_file_transfer.c
@@ -22,7 +22,7 @@
 #include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <queues/message_queue.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 #include <rhash.h>
 
 #include "tasks_internal.h"
diff --git a/tasks/task_http.c b/tasks/task_http.c
index dfa077574d..3d069493a8 100644
--- a/tasks/task_http.c
+++ b/tasks/task_http.c
@@ -16,7 +16,7 @@
 #include <retro_miscellaneous.h>
 #include <net/net_http.h>
 #include <queues/message_queue.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 #include <string/stdstring.h>
 #include <compat/strl.h>
 #include <file/file_path.h>
diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index ab34f39f35..4952ca5d75 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -18,7 +18,7 @@
 #include <retro_miscellaneous.h>
 #include <file/file_path.h>
 #include <file/config_file.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 #include <string/stdstring.h>
 #include <rhash.h>
 
diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m
index d6f5a80824..ec746db3c8 100644
--- a/ui/drivers/cocoa/cocoatouch_menu.m
+++ b/ui/drivers/cocoa/cocoatouch_menu.m
@@ -20,7 +20,7 @@
 #include <file/file_path.h>
 #include <retro_miscellaneous.h>
 #include <string/stdstring.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
 
 #include "cocoa_common.h"
 #include "../../../input/input_config.h"
diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h
index 2441abe9ae..39f0cc31c8 100644
--- a/ui/ui_companion_driver.h
+++ b/ui/ui_companion_driver.h
@@ -20,7 +20,7 @@
 #include <stddef.h>
 #include <boolean.h>
 
-#include <file/file_list.h>
+#include <lists/file_list.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"