Move file_path.c to libretro SDK

Makefile.common

@@ -96,7 +96,7 @@ OBJ += frontend/frontend.o \
 		dir_list.o \
 		libretro-sdk/string/string_list.o \
 		file_ops.o \
-		file_path.o \
+		libretro-sdk/file/file_path.o \
 		rarch_compr_file_path.o \
 		hash.o \
 		driver.o \
@@ -633,7 +633,7 @@ endif
 
 JOYCONFIG_OBJ += tools/retroarch-joyconfig.o \
 	conf/config_file.o \
-	file_path.o \
+	libretro-sdk/file/file_path.o \
 	libretro-sdk/string/string_list.o \
 	libretro-sdk/compat/compat.o \
 	tools/input_common_joyconfig.o

Makefile.ps3.salamander

@@ -19,7 +19,7 @@ endif
 STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
 
 PPU_CFLAGS		+= -I. -Ilibretro-sdk/include -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC -DRARCH_INTERNAL
-PPU_SRCS		= frontend/frontend_salamander.c frontend/frontend_context.c frontend/platform/platform_ps3.c frontend/platform/platform_null.c file_path.c dir_list.c libretro-sdk/string/string_list.c libretro-sdk/compat/compat.c conf/config_file.c
+PPU_SRCS		= frontend/frontend_salamander.c frontend/frontend_context.c frontend/platform/platform_ps3.c frontend/platform/platform_null.c libretro-sdk/file/file_path.c dir_list.c libretro-sdk/string/string_list.c libretro-sdk/compat/compat.c conf/config_file.c
 
 ifeq ($(HAVE_LOGGER), 1)
 PPU_CFLAGS		+= -DHAVE_LOGGER -Ilogger/netlogger

Makefile.psp1.salamander

@@ -31,7 +31,7 @@ PSP_EBOOT_TITLE = RetroArch
 PSP_EBOOT_ICON = psp1/ICON0.PNG
 PSP_EBOOT_PIC1 = psp1/PIC1.PNG
 
-OBJS = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_psp.o frontend/platform/platform_null.o file_path.o libretro-sdk/string/string_list.o dir_list.o libretro-sdk/compat/compat.o conf/config_file.o psp1/kernel_functions.o 
+OBJS = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_psp.o frontend/platform/platform_null.o libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o dir_list.o libretro-sdk/compat/compat.o conf/config_file.o psp1/kernel_functions.o 
 
 PSPSDK=$(shell psp-config --pspsdk-path)
 include $(PSPSDK)/lib/build.mak

Makefile.wii.salamander

@@ -39,7 +39,7 @@ LIBS := -lfat -lwiiuse -logc -lbte
 
 APP_BOOTER_DIR = wii/app_booter
 
-OBJ = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_gx.o frontend/platform/platform_wii.o frontend/platform/platform_null.o file_path.o libretro-sdk/string/string_list.o dir_list.o libretro-sdk/compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj
+OBJ = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_gx.o frontend/platform/platform_wii.o frontend/platform/platform_null.o libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o dir_list.o libretro-sdk/compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER

android/phoenix/jni/apk-extract/apk-extract.c

@@ -1,6 +1,6 @@
 #include "../../../../file_extract.h"
-#include "../../../../file.h"
-#include "../../../../file_path.h"
+#include "../../../../content.h"
+#include <file/file_path.h>
 
 #include <stdio.h>
 #include <string.h>

apple/iOS/browser.m

@@ -25,7 +25,7 @@
 #include "../../content.h"
 #include "../../dir_list.h"
 #include "../../file_ops.h"
-#include "../../file_path.h"
+#include <file/file_path.h>
 
 static const void* const associated_module_key = &associated_module_key;
 

apple/iOS/menu.m

@@ -17,7 +17,7 @@
 #include "../common/RetroArch_Apple.h"
 #include "../../input/input_common.h"
 #include "../../input/apple_input.h"
-#include "../../file_path.h"
+#include <file/file_path.h>
 #include "menu.h"
 
 /*********************************************/

audio/dsp_filter.c

@@ -20,7 +20,7 @@
 #include "../dynamic.h"
 #include "../conf/config_file_userdata.h"
 #include "filters/dspfilter.h"
-#include "../file_path.h"
+#include <file/file_path.h>
 #include "../file_ext.h"
 #include "../dir_list.h"
 #include <compat/posix_string.h>

command.c

@@ -24,7 +24,7 @@
 #include "general.h"
 #include "compat/strl.h"
 #include "compat/posix_string.h"
-#include "file_path.h"
+#include <file/file_path.h>
 #include <stdio.h>
 #include <string.h>
 

conf/config_file.c

@@ -22,7 +22,7 @@
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <compat/msvc.h>
-#include "../file_path.h"
+#include <file/file_path.h>
 #include "../general.h"
 
 #if !defined(_WIN32) && !defined(__CELLOS_LV2__) && !defined(_XBOX)

content.c

@@ -15,7 +15,7 @@
 
 #include "content.h"
 #include "file_ops.h"
-#include "file_path.h"
+#include <file/file_path.h>
 #include "general.h"
 #include <stdlib.h>
 #include <boolean.h>

core_info.c

@@ -15,7 +15,7 @@
 
 #include "core_info.h"
 #include "general.h"
-#include "file_path.h"
+#include <file/file_path.h>
 #include "file_ext.h"
 #include "file_extract.h"
 #include "dir_list.h"

decompress/7zip_support.c

@@ -21,7 +21,7 @@
 
 #include <string.h>
 #include <retro_miscellaneous.h>
-#include "../file_path.h"
+#include <file/file_path.h>
 #include "7zip_support.h"
 
 #include "../deps/7zip/7z.h"

decompress/zip_support.c

@@ -21,7 +21,7 @@
 
 #include <string.h>
 #include <retro_miscellaneous.h>
-#include "../file_path.h"
+#include <file/file_path.h>
 #include "zip_support.h"
 
 #include "../deps/rzlib/unzip.h"

dir_list.c

@@ -15,7 +15,7 @@
  */
 
 #include "dir_list.h"
-#include "file_path.h"
+#include <file/file_path.h>
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 

dynamic.c

@@ -18,7 +18,7 @@
 #include <compat/posix_string.h>
 #include "retroarch_logger.h"
 #include "performance.h"
-#include "file_path.h"
+#include <file/file_path.h>
 #include <string.h>
 #include <ctype.h>
 

file_extract.c

@@ -15,6 +15,7 @@
 
 #include "file_extract.h"
 #include "file_ops.h"
+#include <file/file_path.h>
 #include <compat/strl.h>
 #include <retro_miscellaneous.h>
 #include "retroarch_logger.h"

file_ops.c

@@ -15,6 +15,7 @@
  */
 
 #include "file_ops.h"
+#include <file/file_path.h>
 #include <stdlib.h>
 #include <boolean.h>
 #include <string.h>

file_ops.h

@@ -23,7 +23,6 @@
 #include <stddef.h>
 #include <sys/types.h>
 #include <string/string_list.h>
-#include "file_path.h"
 
 #ifdef __cplusplus
 extern "C" {

frontend/frontend.c

@@ -18,7 +18,7 @@
 #include "../driver.h"
 #include "frontend.h"
 #include "../general.h"
-#include "../file_path.h"
+#include <file/file_path.h>
 
 #if defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)
 #include "../config.def.h"

frontend/frontend_salamander.c

@@ -23,7 +23,7 @@
 #include "../general.h"
 #include "../file.h"
 #include "../file_ext.h"
-#include "../file_path.h"
+#include <file/file_path.h>
 #include "../dir_list.h"
 #include "frontend_context.h"
 

frontend/menu/backend/menu_common_backend.c

@@ -21,7 +21,7 @@
 #include <limits.h>
 #include <ctype.h>
 #include "../menu_common.h"
-#include "../../../file_path.h"
+#include <file/file_path.h>
 #include "../../../settings_data.h"
 #include "menu_backend.h"
 #include "../menu_list.h"

frontend/menu/disp/glui.c

@@ -25,7 +25,7 @@
 #include "../menu_driver.h"
 #include "menu_display.h"
 #include "../../../general.h"
-#include "../../../file_path.h"
+#include <file/file_path.h>
 #include "../../../gfx/gl_common.h"
 #include "../../../gfx/video_thread_wrapper.h"
 #include <compat/posix_string.h>

frontend/menu/disp/lakka.c

@@ -26,7 +26,7 @@
 #include "../menu_common.h"
 #include "menu_display.h"
 #include "../../../general.h"
-#include "../../../file_path.h"
+#include <file/file_path.h>
 #include "../../../dir_list.h"
 #include "../../../gfx/gl_common.h"
 #include "../../../gfx/video_thread_wrapper.h"

frontend/menu/disp/rgui.c

@@ -28,7 +28,7 @@
 #include "../../../config.def.h"
 #include "../../../dynamic.h"
 #include <compat/posix_string.h>
-#include "../../../file_path.h"
+#include <file/file_path.h>
 
 #include "../../../settings_data.h"
 #include "../../../gfx/fonts/bitmap.h"

frontend/menu/disp/xmb.c

@@ -25,7 +25,7 @@
 #include "../menu_driver.h"
 #include "menu_display.h"
 #include "../../../general.h"
-#include "../../../file_path.h"
+#include <file/file_path.h>
 #include "../../../gfx/gl_common.h"
 #include "../../../gfx/video_thread_wrapper.h"
 #include <compat/posix_string.h>

frontend/menu/menu_action.c

@@ -20,7 +20,7 @@
 #include "menu_entries.h"
 #include "menu_list.h"
 #include "menu_shader.h"
-#include "../../file_path.h"
+#include <file/file_path.h>
 
 int setting_handler(
       rarch_setting_t *setting, unsigned action)

frontend/menu/menu_common.c

@@ -20,7 +20,7 @@
 #include "menu_list.h"
 #include "menu_shader.h"
 #include "../frontend.h"
-#include "../../file_path.h"
+#include <file/file_path.h>
 
 static void draw_frame(void)
 {

frontend/menu/menu_entries.c

@@ -17,6 +17,8 @@
 #include "menu_entries.h"
 #include "menu_action.h"
 #include "menu_list.h"
+#include <file/file_list.h>
+#include <file/file_path.h>
 #include "../../file_ops.h"
 #include "../../dir_list.h"
 #include "../../settings_data.h"

frontend/menu/menu_entries_cbs.c

@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <file/file_path.h>
 #include "menu_entries_cbs.h"
 #include "menu_action.h"
 #include "menu_common.h"
@@ -23,7 +24,6 @@
 #include "backend/menu_backend.h"
 
 #include "../../file_ext.h"
-#include "../../file_path.h"
 #include "../../config.def.h"
 #include "../../performance.h"
 

frontend/menu/menu_shader.c

@@ -18,7 +18,7 @@
 #include "menu_action.h"
 #include "menu_common.h"
 #include "menu_entries.h"
-#include "../../file_path.h"
+#include <file/file_path.h>
 #include "../../settings_data.h"
 
 #ifdef HAVE_SHADER_MANAGER

frontend/platform/platform_android.c

@@ -27,7 +27,6 @@
 
 #include "../../conf/config_file.h"
 #include "../../general.h"
-#include "../../file.h"
 
 struct android_app *g_android;
 static pthread_key_t thread_key;

frontend/platform/platform_gx.c

@@ -22,7 +22,7 @@
 #include "../../gfx/gx/sdk_defines.h"
 
 #include "../../file.h"
-#include "../../file_path.h"
+#include <file/file_path.h>
 
 #if defined(HW_RVL) && !defined(IS_SALAMANDER)
 #include "../../wii/mem2_manager.h"

frontend/platform/platform_ps3.c

@@ -22,7 +22,7 @@
 #include "../../conf/config_file.h"
 #include "../../general.h"
 #include "../../file.h"
-#include "../../file_path.h"
+#include <file/file_path.h>
 
 #define EMULATOR_CONTENT_DIR "SSNE10000"
 

frontend/platform/platform_psp.c

@@ -27,7 +27,7 @@
 
 #include "../../gfx/psp/sdk_defines.h"
 #include "../../file.h"
-#include "../../file_path.h"
+#include <file/file_path.h>
 #include "../../general.h"
 
 #if defined(HAVE_KERNEL_PRX) || defined(IS_SALAMANDER)

frontend/platform/platform_wii.c

@@ -22,7 +22,7 @@
 #include <gctypes.h>
 #include <ogc/cache.h>
 #include "../../gfx/gx/ppc_asm.h"
-#include "../../file_path.h"
+#include <file/file_path.h>
 #include <ogc/system.h>
 #include <ogc/usbstorage.h>
 #include <sdcard/wiisd_io.h>

general.c

@@ -16,7 +16,7 @@
  */
 
 #include "general.h"
-#include "file_path.h"
+#include <file/file_path.h>
 
 void rarch_playlist_load_content(content_playlist_t *playlist,
       unsigned idx)

gfx/context/drm_egl_ctx.c

@@ -22,7 +22,6 @@
 #include "../gl_common.h"
 #include "../gfx_common.h"
 #include "../../dir_list.h"
-#include "../../file_path.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"

gfx/filter.c

@@ -18,7 +18,7 @@
 #include "../dynamic.h"
 #include "../conf/config_file_userdata.h"
 #include "../general.h"
-#include "../file_path.h"
+#include <file/file_path.h>
 #include "../file_ext.h"
 #include "../dir_list.h"
 #include "../performance.h"

gfx/fonts/freetype.c

@@ -14,7 +14,7 @@
  */
 
 #include "fonts.h"
-#include "../../file_path.h"
+#include <file/file_path.h>
 #include "../../general.h"
 #include <string.h>
 #include <stddef.h>

gfx/shader/shader_gl_cg.c

@@ -29,13 +29,12 @@
 
 #endif
 
-#include "../../general.h"
 #include <string.h>
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include "../../conf/config_file.h"
 #include "../../dynamic.h"
-#include "../../file_path.h"
+#include <file/file_path.h>
 
 #include "../state_tracker.h"
 

gfx/shader/shader_glsl.c

@@ -14,6 +14,7 @@
  */
 
 #include <string.h>
+#include <file/file_path.h>
 #include "../../general.h"
 #include "shader_glsl.h"
 #include <compat/strl.h>

gfx/shader/shader_parse.c

@@ -19,7 +19,7 @@
 #include <compat/posix_string.h>
 #include <compat/msvc.h>
 #include <compat/strl.h>
-#include "../../file_path.h"
+#include <file/file_path.h>
 #include "../../general.h"
 
 #define print_buf(buf, ...) snprintf(buf, sizeof(buf), __VA_ARGS__)

griffin/griffin.c

@@ -520,7 +520,7 @@ DYNAMIC
 FILE
 ============================================================ */
 #include "../content.c"
-#include "../file_path.c"
+#include "../libretro-sdk/file/file_path.c"
 #include "../dir_list.c"
 #include "../libretro-sdk/string/string_list.c"
 #include "../file_ops.c"

input/overlay.c

@@ -21,7 +21,7 @@
 #include "../conf/config_file.h"
 #include <compat/posix_string.h>
 #include "input_common.h"
-#include "../file_path.h"
+#include <file/file_path.h>
 #include <stddef.h>
 #include <math.h>
 

input/udev_input.c

@@ -17,7 +17,7 @@
 #include "keyboard_line.h"
 #include "../general.h"
 #include "../conf/config_file.h"
-#include "../file_path.h"
+#include <file/file_path.h>
 #include <unistd.h>
 #include <stdint.h>
 #include <string.h>

libretro-sdk/file/file_path.c

@@ -1,20 +1,26 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2014 - Daniel De Matteis
- * 
- *  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.
+/* Copyright  (C) 2010-2014 The RetroArch team
  *
- *  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.
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (file_path.c).
+ * ---------------------------------------------------------------------------------------
  *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "file_path.h"
+#include <file/file_path.h>
 #include <stdlib.h>
 #include <boolean.h>
 #include <string.h>

libretro-sdk/include/file/file_path.h

@@ -1,17 +1,23 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2014 - Daniel De Matteis
- * 
- *  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.
+/* Copyright  (C) 2010-2014 The RetroArch team
  *
- *  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.
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (file_path.h).
+ * ---------------------------------------------------------------------------------------
  *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #ifndef __LIBRETRO_SDK_FILE_PATH_H

rarch_compr_file_path.c

@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "file_path.h"
+#include <file/file_path.h>
 #include <stdlib.h>
 #include <boolean.h>
 #include <string.h>
@@ -24,6 +24,8 @@
 #include <compat/posix_string.h>
 #include <retro_miscellaneous.h>
 
+#include "rarch_compr_file_path.h"
+
 #ifdef __HAIKU__
 #include <kernel/image.h>
 #endif
@@ -60,12 +62,6 @@
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_7ZIP
-#include "decompress/7zip_support.h"
-#endif
-#ifdef HAVE_ZLIB
-#include "decompress/zip_support.h"
-#endif
 
 /* Generic compressed file loader.
  * Extracts to buf, unless optional_filename != 0

rarch_compr_file_path.h

@@ -0,0 +1,27 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2014 - Daniel De Matteis
+ * 
+ *  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/>.
+ */
+
+#ifndef _RARCH_COMPR_FILE_PATH_H
+#define _RARCH_COMPR_FILE_PATH_H
+
+#ifdef HAVE_7ZIP
+#include "decompress/7zip_support.h"
+#endif
+#ifdef HAVE_ZLIB
+#include "decompress/zip_support.h"
+#endif
+
+#endif

retroarch.c

@@ -24,7 +24,7 @@
 #include <errno.h>
 #include "content.h"
 #include "file_ops.h"
-#include "file_path.h"
+#include <file/file_path.h>
 #include "dir_list.h"
 #include "general.h"
 #include <compat/strl.h>

runloop.c

@@ -15,7 +15,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "file_path.h"
+#include "dir_list.h"
+#include <file/file_path.h>
 #include "performance.h"
 #include "retroarch_logger.h"
 #include "input/input_common.h"

screenshot.c

@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "general.h"
-#include "file_path.h"
+#include <file/file_path.h>
 #include "gfx/scaler/scaler.h"
 
 #ifdef HAVE_CONFIG_H

settings.c

@@ -18,7 +18,7 @@
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include "config.def.h"
-#include "file_path.h"
+#include <file/file_path.h>
 #include "input/input_common.h"
 
 #ifdef HAVE_CONFIG_H

settings_data.c

@@ -15,7 +15,7 @@
  */
 
 #include "settings_data.h"
-#include "file_path.h"
+#include <file/file_path.h>
 #include "input/input_common.h"
 #include "config.def.h"
 #include "retroarch_logger.h"