(libretro-common) move 'lists' files to lists/

2024-11-23 07:59:42 +00:00 · 2016-03-20 14:53:54 +01:00 · 2016-03-20 14:53:54 +01:00 · 93b7dc1bdd
commit 93b7dc1bdd
parent ef4a1a3c0f
67 changed files with 83 additions and 82 deletions
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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"
--- 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"
--- 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"
--- 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"
--- 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>

--- 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"

--- 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>

--- 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"
--- 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
 {
--- 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"
--- 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>

--- 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"
--- 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"
--- 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"
--- 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>
--- 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>
--- 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
--- 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"
--- 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;

--- 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"
--- 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
--- 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"
--- 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>

--- 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>
--- 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
--- 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]; \
--- 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
--- a/libretro-common/include/lists/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" {
--- a/libretro-common/include/lists/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).
--- a/libretro-common/include/string/string_list.h
+++ b/libretro-common/include/string/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).
--- a/libretro-common/lists/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>
--- a/libretro-common/lists/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,
--- a/libretro-common/string/string_list.c
+++ b/libretro-common/string/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>
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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>

--- 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"

--- 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>
--- 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"
--- 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"
--- 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>
--- 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"
--- 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"
--- 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"
--- 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>

--- 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" {
--- 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"
--- 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>
--- 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
--- 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>
--- 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
 {
--- 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>

--- 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>
--- 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"
--- 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>
--- 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>

--- 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"
--- 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"