Take file_path.h include out of file.h

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

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

conf/config_file.c

@@ -23,6 +23,7 @@
 #include "../compat/posix_string.h"
 #include "../msvc/msvc_compat.h"
 #include "../file.h"
+#include "../file_path.h"
 #include "../miscellaneous.h"
 #include "../general.h"
 

core_info.c

@@ -15,9 +15,10 @@
 
 #include "core_info.h"
 #include "general.h"
-#include "file.h"
+#include "file_path.h"
 #include "file_ext.h"
 #include "file_extract.h"
+#include "dir_list.h"
 #include "config.def.h"
 
 #ifdef HAVE_CONFIG_H

core_options.c

@@ -16,6 +16,7 @@
 #include "core_options.h"
 #include "general.h"
 #include "file.h"
+#include "dir_list.h"
 #include "compat/posix_string.h"
 
 struct core_option

dynamic.c

@@ -20,6 +20,7 @@
 #include "retroarch_logger.h"
 #include "performance.h"
 #include "file.h"
+#include "file_path.h"
 #include <string.h>
 #include <ctype.h>
 

file.c

@@ -14,6 +14,7 @@
  */
 
 #include "file.h"
+#include "file_path.h"
 #include "general.h"
 #include <stdlib.h>
 #include "boolean.h"

file.h

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

file_extract.c

@@ -15,6 +15,8 @@
 
 #include "file_extract.h"
 #include "file.h"
+#include "file_path.h"
+#include "string_list.h"
 #include "compat/strl.h"
 #include "general.h"
 #include <stdio.h>

frontend/frontend.c

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

frontend/menu/backend/menu_common_backend.c

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

frontend/menu/disp/glui.c

@@ -24,7 +24,9 @@
 #include "../menu_common.h"
 #include "../menu_driver.h"
 #include "menu_display.h"
+#include "../../../string_list.h"
 #include "../../../general.h"
+#include "../../../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,6 +26,7 @@
 #include "../menu_common.h"
 #include "menu_display.h"
 #include "../../../general.h"
+#include "../../../file_path.h"
 #include "../../../gfx/gl_common.h"
 #include "../../../gfx/video_thread_wrapper.h"
 #include "../../../compat/posix_string.h"

frontend/menu/disp/rgui.c

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

frontend/menu/disp/xmb.c

@@ -25,6 +25,7 @@
 #include "../menu_driver.h"
 #include "menu_display.h"
 #include "../../../general.h"
+#include "../../../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,6 +20,7 @@
 #include "menu_entries.h"
 #include "menu_list.h"
 #include "menu_shader.h"
+#include "../../file_path.h"
 
 int setting_handler(
       rarch_setting_t *setting, unsigned action)

frontend/menu/menu_common.c

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

frontend/menu/menu_entries.c

@@ -17,6 +17,7 @@
 #include "menu_entries.h"
 #include "menu_action.h"
 #include "menu_list.h"
+#include "../../file_path.h"
 #include "../../settings_data.h"
 #include "../../performance.h"
 

frontend/menu/menu_entries_cbs.c

@@ -23,6 +23,7 @@
 #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,6 +18,7 @@
 #include "menu_action.h"
 #include "menu_common.h"
 #include "menu_entries.h"
+#include "../../file_path.h"
 #include "../../settings_data.h"
 
 #ifdef HAVE_SHADER_MANAGER

general.c

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

gfx/fonts/freetype.c

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

gfx/image/image_rpng.c

@@ -19,6 +19,7 @@
 
 #include "image.h"
 #include "../../file.h"
+#include "../../file_path.h"
 
 #include <stdlib.h>
 #include <string.h>

gfx/py_state/py_state.c

@@ -27,6 +27,7 @@
 #include "../../compat/posix_string.h"
 #include "../../input/input_common.h"
 #include "../../file.h"
+#include "../../file_path.h"
 
 static PyObject* py_read_wram(PyObject *self, PyObject *args)
 {

gfx/shader/shader_gl_cg.c

@@ -36,6 +36,7 @@
 #include "../../dynamic.h"
 #include "../../compat/posix_string.h"
 #include "../../file.h"
+#include "../../file_path.h"
 
 #include "../state_tracker.h"
 

gfx/shader/shader_glsl.c

@@ -22,6 +22,7 @@
 #include "../state_tracker.h"
 #include "../../dynamic.h"
 #include "../../file.h"
+#include "../../file_path.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"

gfx/shader/shader_parse.c

@@ -19,6 +19,7 @@
 #include "../../compat/posix_string.h"
 #include "../../msvc/msvc_compat.h"
 #include "../../file.h"
+#include "../../file_path.h"
 #include "../../compat/strl.h"
 #include "../../general.h"
 

input/input_autodetect.c

@@ -16,6 +16,7 @@
 
 #include "input_common.h"
 #include "input_autodetect.h"
+#include "dir_list.h"
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>

input/overlay.c

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

retroarch.c

@@ -25,6 +25,7 @@
 #include <errno.h>
 #include "driver.h"
 #include "file.h"
+#include "file_path.h"
 #include "general.h"
 #include "dynamic.h"
 #include "compat/strl.h"

runloop.c

@@ -16,6 +16,8 @@
  */
 
 #include "general.h"
+#include "file_path.h"
+#include "dir_list.h"
 #include "performance.h"
 #include "input/input_common.h"
 #include "intl/intl.h"

screenshot.c

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

settings.c

@@ -19,6 +19,7 @@
 #include "compat/strl.h"
 #include "config.def.h"
 #include "file.h"
+#include "file_path.h"
 #include "compat/posix_string.h"
 #include "input/input_common.h"
 #include "frontend/frontend.h"