diff --git a/Makefile.common b/Makefile.common
index a24b57e634..9c6dd53633 100644
--- a/Makefile.common
+++ b/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
diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander
index f28c134f68..fed7da51ad 100644
--- a/Makefile.ps3.salamander
+++ b/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
diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander
index c6d6a7c389..bb72460e1d 100644
--- a/Makefile.psp1.salamander
+++ b/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
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index 95867eee20..c1fdb34a77 100644
--- a/Makefile.wii.salamander
+++ b/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
diff --git a/android/phoenix/jni/apk-extract/apk-extract.c b/android/phoenix/jni/apk-extract/apk-extract.c
index 9d70e8c3d9..c13494da37 100644
--- a/android/phoenix/jni/apk-extract/apk-extract.c
+++ b/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>
diff --git a/apple/iOS/browser.m b/apple/iOS/browser.m
index bbb366abb2..a986dbfbaf 100644
--- a/apple/iOS/browser.m
+++ b/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;
 
diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m
index 2d90b2e9bc..adceab0638 100644
--- a/apple/iOS/menu.m
+++ b/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"
 
 /*********************************************/
diff --git a/audio/dsp_filter.c b/audio/dsp_filter.c
index 2990cdea2f..d819ede45f 100644
--- a/audio/dsp_filter.c
+++ b/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>
diff --git a/command.c b/command.c
index 3ddf8aff07..f2a05cc0f5 100644
--- a/command.c
+++ b/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>
 
diff --git a/conf/config_file.c b/conf/config_file.c
index ebb6db13bd..9b84205b21 100644
--- a/conf/config_file.c
+++ b/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)
diff --git a/content.c b/content.c
index df2c1fc8ed..c0f7c0a500 100644
--- a/content.c
+++ b/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>
diff --git a/core_info.c b/core_info.c
index 7ebe32fdba..30008a73e6 100644
--- a/core_info.c
+++ b/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"
diff --git a/decompress/7zip_support.c b/decompress/7zip_support.c
index 6b833a938c..ade612b1b9 100644
--- a/decompress/7zip_support.c
+++ b/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"
diff --git a/decompress/zip_support.c b/decompress/zip_support.c
index 27994d6a2d..4bfb9a2099 100644
--- a/decompress/zip_support.c
+++ b/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"
diff --git a/dir_list.c b/dir_list.c
index 16d8f5eb3d..804a01a45a 100644
--- a/dir_list.c
+++ b/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>
 
diff --git a/dynamic.c b/dynamic.c
index 73f570c8fa..6590b3f45b 100644
--- a/dynamic.c
+++ b/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>
 
diff --git a/file_extract.c b/file_extract.c
index 00d7ca32a5..23f664e266 100644
--- a/file_extract.c
+++ b/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"
diff --git a/file_ops.c b/file_ops.c
index 8080ac65d6..79a4cc36a7 100644
--- a/file_ops.c
+++ b/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>
diff --git a/file_ops.h b/file_ops.h
index 1925a6be9a..cd203b6bd5 100644
--- a/file_ops.h
+++ b/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" {
diff --git a/frontend/frontend.c b/frontend/frontend.c
index 2fffd1a01c..c6086f4d22 100644
--- a/frontend/frontend.c
+++ b/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"
diff --git a/frontend/frontend_salamander.c b/frontend/frontend_salamander.c
index 88ae1032a2..b07b69c8ce 100644
--- a/frontend/frontend_salamander.c
+++ b/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"
 
diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index 843bc8f2a2..cc7de413f9 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/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"
diff --git a/frontend/menu/disp/glui.c b/frontend/menu/disp/glui.c
index d5c0ccecfe..d4027c571b 100644
--- a/frontend/menu/disp/glui.c
+++ b/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>
diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c
index f83f41d860..213f0d5317 100644
--- a/frontend/menu/disp/lakka.c
+++ b/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"
diff --git a/frontend/menu/disp/rgui.c b/frontend/menu/disp/rgui.c
index 62f5c25a68..2abc8b8422 100644
--- a/frontend/menu/disp/rgui.c
+++ b/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"
diff --git a/frontend/menu/disp/xmb.c b/frontend/menu/disp/xmb.c
index 2212fbbe76..5266053c70 100644
--- a/frontend/menu/disp/xmb.c
+++ b/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>
diff --git a/frontend/menu/menu_action.c b/frontend/menu/menu_action.c
index e6cb778958..c61903f0e4 100644
--- a/frontend/menu/menu_action.c
+++ b/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)
diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index 9c3e61c167..1da3877344 100644
--- a/frontend/menu/menu_common.c
+++ b/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)
 {
diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c
index 3a4fb344a5..05789cfbba 100644
--- a/frontend/menu/menu_entries.c
+++ b/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"
diff --git a/frontend/menu/menu_entries_cbs.c b/frontend/menu/menu_entries_cbs.c
index 32aac9138b..8863007058 100644
--- a/frontend/menu/menu_entries_cbs.c
+++ b/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"
 
diff --git a/frontend/menu/menu_shader.c b/frontend/menu/menu_shader.c
index 74609c4815..257ba4199e 100644
--- a/frontend/menu/menu_shader.c
+++ b/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
diff --git a/frontend/platform/platform_android.c b/frontend/platform/platform_android.c
index dad8514425..0d2356a4e9 100644
--- a/frontend/platform/platform_android.c
+++ b/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;
diff --git a/frontend/platform/platform_gx.c b/frontend/platform/platform_gx.c
index 8c72d14fab..e7dfa99075 100644
--- a/frontend/platform/platform_gx.c
+++ b/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"
diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c
index beb9884290..a5d940b729 100644
--- a/frontend/platform/platform_ps3.c
+++ b/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"
 
diff --git a/frontend/platform/platform_psp.c b/frontend/platform/platform_psp.c
index 274c91fccc..a3911995ad 100644
--- a/frontend/platform/platform_psp.c
+++ b/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)
diff --git a/frontend/platform/platform_wii.c b/frontend/platform/platform_wii.c
index 5dc4eda54e..d8c47e102a 100644
--- a/frontend/platform/platform_wii.c
+++ b/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>
diff --git a/general.c b/general.c
index f845e5a368..3c4e8cef06 100644
--- a/general.c
+++ b/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)
diff --git a/gfx/context/drm_egl_ctx.c b/gfx/context/drm_egl_ctx.c
index 38bb126864..592ffbe059 100644
--- a/gfx/context/drm_egl_ctx.c
+++ b/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"
diff --git a/gfx/filter.c b/gfx/filter.c
index 9110cbe220..c71e5ccc68 100644
--- a/gfx/filter.c
+++ b/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"
diff --git a/gfx/fonts/freetype.c b/gfx/fonts/freetype.c
index b031220a83..f757af25b2 100644
--- a/gfx/fonts/freetype.c
+++ b/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>
diff --git a/gfx/shader/shader_gl_cg.c b/gfx/shader/shader_gl_cg.c
index 6d0580f683..12d0de5443 100644
--- a/gfx/shader/shader_gl_cg.c
+++ b/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"
 
diff --git a/gfx/shader/shader_glsl.c b/gfx/shader/shader_glsl.c
index ebb6e9815a..56d0fc88b8 100644
--- a/gfx/shader/shader_glsl.c
+++ b/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>
diff --git a/gfx/shader/shader_parse.c b/gfx/shader/shader_parse.c
index 03edafb283..61a1f85c5c 100644
--- a/gfx/shader/shader_parse.c
+++ b/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__)
diff --git a/griffin/griffin.c b/griffin/griffin.c
index e0a46968b5..f91541dcc4 100644
--- a/griffin/griffin.c
+++ b/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"
diff --git a/input/overlay.c b/input/overlay.c
index 982a0dd544..28c3962d44 100644
--- a/input/overlay.c
+++ b/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>
 
diff --git a/input/udev_input.c b/input/udev_input.c
index ccf50eb557..d367784430 100644
--- a/input/udev_input.c
+++ b/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>
diff --git a/file_path.c b/libretro-sdk/file/file_path.c
similarity index 90%
rename from file_path.c
rename to libretro-sdk/file/file_path.c
index d2ee57bc2e..14604a0f17 100644
--- a/file_path.c
+++ b/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>
diff --git a/file_path.h b/libretro-sdk/include/file/file_path.h
similarity index 80%
rename from file_path.h
rename to libretro-sdk/include/file/file_path.h
index e7943ce145..bd194c3333 100644
--- a/file_path.h
+++ b/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
diff --git a/rarch_compr_file_path.c b/rarch_compr_file_path.c
index e221d20b32..e712985192 100644
--- a/rarch_compr_file_path.c
+++ b/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
diff --git a/rarch_compr_file_path.h b/rarch_compr_file_path.h
new file mode 100644
index 0000000000..81ad72589d
--- /dev/null
+++ b/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
diff --git a/retroarch.c b/retroarch.c
index b51e3b5a70..6317360e1a 100644
--- a/retroarch.c
+++ b/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>
diff --git a/runloop.c b/runloop.c
index db3073cb7c..a5742cca7b 100644
--- a/runloop.c
+++ b/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"
diff --git a/screenshot.c b/screenshot.c
index 4ffba75f47..4a9df9effe 100644
--- a/screenshot.c
+++ b/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
diff --git a/settings.c b/settings.c
index a64aea0311..a0ee8331d5 100644
--- a/settings.c
+++ b/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
diff --git a/settings_data.c b/settings_data.c
index b6d0265823..19caa52dae 100644
--- a/settings_data.c
+++ b/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"