Header include cleanups

frontend/frontend.c

@@ -22,6 +22,7 @@
 #include "../ui/ui_companion_driver.h"
 #include "../tasks/tasks_internal.h"
 
+#include "../configuration.h"
 #include "../driver.h"
 #include "../retroarch.h"
 #include "../runloop.h"

gfx/drivers/ctr_gfx.c

@@ -23,6 +23,7 @@
 
 #include "ctr_gu.h"
 
+#include "../../configuration.h"
 #include "../../command.h"
 #include "../../general.h"
 #include "../../driver.h"

gfx/drivers/dispmanx_gfx.c

@@ -21,6 +21,7 @@
 #include "config.h"
 #endif
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../retroarch.h"

gfx/drivers/drm_gfx.c

@@ -27,6 +27,7 @@
 #include "config.h"
 #endif
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../retroarch.h"

gfx/drivers/gl.c

@@ -40,6 +40,7 @@
 #include "gl_capabilities.h"
 #include "gl_renderchains/render_chain_gl.h"
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../record/record_driver.h"
 #include "../../performance_counters.h"

gfx/drivers/gx_gfx.c

@@ -23,6 +23,7 @@
 
 #include <streams/file_stream.h>
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../general.h"
 #include "../drivers_font_renderer/bitmap.h"

gfx/drivers/nullgfx.c

@@ -15,6 +15,7 @@
  */
 
 #include "../../driver.h"
+#include "../../configuration.h"
 #include "../../runloop.h"
 #include "../../verbosity.h"
 

gfx/drivers/omap_gfx.c

@@ -36,6 +36,7 @@
 #include <gfx/scaler/scaler.h>
 #include <string/stdstring.h>
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../retroarch.h"

gfx/drivers/sdl2_gfx.c

@@ -26,6 +26,8 @@
 
 #include "SDL.h"
 #include "SDL_syswm.h"
+
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"

gfx/drivers/sdl_gfx.c

@@ -23,6 +23,7 @@
 
 #include "SDL.h"
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../performance_counters.h"

gfx/drivers/vulkan.c

@@ -33,6 +33,7 @@
 #include "../common/vulkan_common.h"
 
 #include "../../driver.h"
+#include "../../configuration.h"
 #include "../../record/record_driver.h"
 #include "../../performance_counters.h"
 

gfx/drivers/xenon360_gfx.c

@@ -22,13 +22,14 @@
 #include <xenos/edram.h>
 #include <xenos/xenos.h>
 
-#include "../../driver.h"
-#include "../../general.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "../../configuration.h"
+#include "../../driver.h"
+#include "../../general.h"
+
 #define XE_W 512
 #define XE_H 512
 

gfx/drivers_context/android_ctx.c

@@ -20,6 +20,7 @@
 #include <formats/image.h>
 #include <string/stdstring.h>
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../runloop.h"

gfx/drivers_context/bbqnx_ctx.c

@@ -29,6 +29,7 @@
 #include <screen/screen.h>
 #include <sys/platform.h>
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../runloop.h"

gfx/drivers_context/cgl_ctx.c

@@ -29,6 +29,7 @@
 #include <OpenGL/OpenGL.h>
 #include <OpenGL/gl.h>
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../runloop.h"
 #include "../../configuration.h"

gfx/drivers_context/d3d_ctx.cpp

@@ -22,6 +22,7 @@
 #include "../drivers/d3d.h"
 #include "../common/win32_common.h"
 
+#include "../../configuration.h"
 #include "../../runloop.h"
 #include "../../verbosity.h"
 

gfx/drivers_context/drm_ctx.c

@@ -36,6 +36,7 @@
 #include <streams/file_stream.h>
 
 #include "../../verbosity.h"
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../runloop.h"
 #include "../../frontend/frontend_driver.h"

gfx/drivers_context/emscriptenegl_ctx.c

@@ -19,6 +19,7 @@
 
 #include <emscripten/emscripten.h>
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../runloop.h"
 #include "../video_context_driver.h"

gfx/drivers_context/khr_display_ctx.c

@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../runloop.h"
 #include "../../frontend/frontend_driver.h"

gfx/drivers_context/mali_fbdev_ctx.c

@@ -24,6 +24,7 @@
 #include <streams/file_stream.h>
 
 #include "../../frontend/frontend_driver.h"
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../runloop.h"

gfx/drivers_context/opendingux_fbdev_ctx.c

@@ -17,6 +17,7 @@
 #include <signal.h>
 
 #include "../../frontend/frontend_driver.h"
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../runloop.h"

gfx/drivers_context/sdl_gl_ctx.c

@@ -19,6 +19,7 @@
 #include <X11/Xlib.h>
 #endif
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../runloop.h"
 #include "../common/gl_common.h"

gfx/drivers_context/vc_egl_ctx.c

@@ -26,6 +26,7 @@
 
 #include <retro_inline.h>
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../runloop.h"
 #include "../video_context_driver.h"

gfx/drivers_context/vivante_fbdev_ctx.c

@@ -16,6 +16,7 @@
 
 #include <signal.h>
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../frontend/frontend_driver.h"
 #include "../../general.h"

gfx/drivers_context/wayland_ctx.c

@@ -32,6 +32,7 @@
 
 #include <string/stdstring.h>
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../frontend/frontend_driver.h"
 #include "../../general.h"

gfx/drivers_context/wgl_ctx.cpp

@@ -31,6 +31,7 @@
 
 #include <dynamic/dylib.h>
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../dynamic.h"
 #include "../../runloop.h"

gfx/video_driver.c

@@ -34,6 +34,7 @@
 #include "video_context_driver.h"
 #include "../record/record_driver.h"
 #include "../config.def.h"
+#include "../configuration.h"
 #include "../retroarch.h"
 #include "../runloop.h"
 #include "../performance_counters.h"

gfx/video_thread_wrapper.c

@@ -24,6 +24,8 @@
 #include "video_thread_wrapper.h"
 #include "font_driver.h"
 #include "video_shader_driver.h"
+
+#include "../configuration.h"
 #include "../performance_counters.h"
 #include "../runloop.h"
 #include "../verbosity.h"

input/drivers/android_input.c

@@ -33,6 +33,7 @@
 #include "../../performance_counters.h"
 #include "../../general.h"
 #include "../../driver.h"
+#include ".././.configuration.h"
 
 #ifdef HAVE_MENU
 #include "../../menu/menu_display.h"

input/drivers/cocoa_input.c

@@ -22,6 +22,7 @@
 #include "../input_keymaps.h"
 #include "cocoa_input.h"
 #include "../../general.h"
+#include "../../configuration.h"
 #include "../../driver.h"
 
 #include "../drivers_keyboard/keyboard_event_apple.h"

input/drivers/ctr_input.c

@@ -19,6 +19,7 @@
 #include <boolean.h>
 #include <libretro.h>
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../general.h"
 #include "../input_config.h"

input/drivers/dinput.c

@@ -38,6 +38,7 @@
 
 #include <windowsx.h>
 
+#include "../../configuration.h"
 #include "../../general.h"
 #include "../../verbosity.h"
 #include "../input_autodetect.h"

input/drivers/gx_input.c

@@ -25,6 +25,7 @@
 
 #include <libretro.h>
 
+#include "../../configuration.h"
 #include "../../driver.h"
 
 #ifndef MAX_PADS

input/drivers/ps3_input.c

@@ -24,6 +24,7 @@
 
 #include "../../defines/ps3_defines.h"
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../general.h"
 

input/drivers/psp_input.c

@@ -32,6 +32,7 @@
 
 #include "../../defines/psp_defines.h"
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../general.h"
 #include "../input_config.h"

input/drivers/qnx_input.c

@@ -23,6 +23,7 @@
 #include <bps/navigator.h>
 #include <sys/keycodes.h>
 
+#include "../../configuration.h"
 #include "../../general.h"
 #include "../../driver.h"
 #include "../input_autodetect.h"

input/drivers/rwebinput_input.c

@@ -23,6 +23,7 @@
 #include "../input_config.h"
 #include "../input_keymaps.h"
 
+#include "../../configuration.h"
 #include "../../driver.h"
 
 #include "../../general.h"

input/drivers/sdl_input.c

@@ -21,6 +21,7 @@
 #include <string/stdstring.h>
 #include <libretro.h>
 
+#include "../../configuration.h"
 #include "../../driver.h"
 
 #include "SDL.h"

input/drivers/udev_input.c

@@ -45,6 +45,7 @@
 #include "../input_config.h"
 #include "../input_joypad_driver.h"
 #include "../input_keymaps.h"
+#include "../../configuration.h"
 #include "../../runloop.h"
 #include "../../verbosity.h"
 

input/drivers/xdk_xinput_input.c

@@ -24,6 +24,7 @@
 #include <boolean.h>
 #include <libretro.h>
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../general.h"
 

input/drivers_joypad/android_joypad.c

@@ -15,6 +15,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../../configuration.h"
 #include "../drivers_keyboard/keyboard_event_android.h"
 
 static const char *android_joypad_name(unsigned pad)

input/drivers_joypad/ctr_joypad.c

@@ -17,6 +17,7 @@
 #include "../input_joypad_driver.h"
 #include "../input_driver.h"
 #include "../input_autodetect.h"
+#include "../../configuration.h"
 #include "../../general.h"
 #include "../../configuration.h"
 #include "../../retroarch.h"

input/drivers_joypad/dinput_joypad.c

@@ -23,6 +23,7 @@
 
 #include <boolean.h>
 
+#include "../../configuration.h"
 #include "../../general.h"
 #include "../../verbosity.h"
 #include "../input_autodetect.h"

input/drivers_joypad/gx_joypad.c

@@ -15,6 +15,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../../configuration.h"
 #include "../input_autodetect.h"
 
 #include <gccore.h>

input/drivers_joypad/ps3_joypad.c

@@ -14,9 +14,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
+#include <retro_inline.h>
+
 #include "../input_autodetect.h"
 
-#include <retro_inline.h>
+#include "../../configuration.h"
 
 static uint64_t pad_state[MAX_PADS];
 static int16_t analog_state[MAX_PADS][2][2];

input/drivers_joypad/psp_joypad.c

@@ -14,8 +14,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
+
 #include "../input_autodetect.h"
 
+#include "../../configuration.h"
+
 #if defined(SN_TARGET_PSP2) || defined(VITA)
 #define PSP_MAX_PADS 2
 #else

input/drivers_joypad/qnx_joypad.c

@@ -17,6 +17,8 @@
 
 #include "../input_autodetect.h"
 
+#include "../../configuration.h"
+
 static const char *qnx_joypad_name(unsigned pad)
 {
    settings_t *settings = config_get_ptr();

input/drivers_joypad/sdl_joypad.c

@@ -14,10 +14,13 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
+
+#include "SDL.h"
+
+#include "../../configuration.h"
 #include "../input_driver.h"
 #include "../input_autodetect.h"
-#include "SDL.h"
-#include "../../configuration.h"
 #include "../../verbosity.h"
 
 typedef struct _sdl_joypad

input/drivers_joypad/xdk_joypad.c

@@ -14,6 +14,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
+
+#include "../../configuration.h"
 #include "../input_autodetect.h"
 
 static uint64_t pad_state[MAX_PADS];

input/drivers_joypad/xinput_joypad.c

@@ -33,6 +33,7 @@
 #include "../input_autodetect.h"
 #include "../input_config.h"
 
+#include "../../configuration.h"
 #include "../../general.h"
 #include "../../verbosity.h"
 

input/input_driver.c

@@ -20,6 +20,7 @@
 #include "input_keyboard.h"
 #include "input_remapping.h"
 
+#include "../configuration.h"
 #include "../driver.h"
 #include "../retroarch.h"
 #include "../runloop.h"

input/input_joypad_driver.c

@@ -21,6 +21,7 @@
 #include <string/stdstring.h>
 
 #include "input_keymaps.h"
+#include "../configuration.h"
 #include "../general.h"
 #include "../list_special.h"
 #include "../verbosity.h"

input/input_keyboard.c

@@ -21,6 +21,7 @@
 
 #include "input_keyboard.h"
 
+#include "../configuration.h"
 #include "../runloop.h"
 
 struct input_keyboard_line

input/input_remapping.c

@@ -19,6 +19,7 @@
 #include <string/stdstring.h>
 
 #include "input_remapping.h"
+#include "../configuration.h"
 #include "../runloop.h"
 
 /**

input/input_remote.c

@@ -31,6 +31,7 @@
 
 #include "input_remote.h"
 
+#include "../configuration.h"
 #include "../msg_hash.h"
 #include "../runloop.h"
 #include "../verbosity.h"

managers/cheat_manager.c

@@ -24,6 +24,7 @@
 #include <compat/posix_string.h>
 
 #include "cheat_manager.h"
+#include "../configuration.h"
 #include "../runloop.h"
 #include "../dynamic.h"
 #include "../core.h"

menu/cbs/menu_cbs_deferred_push.c

@@ -27,6 +27,7 @@
 
 #include "../../cores/internal_cores.h"
 
+#include "../../configuration.h"
 #include "../../core_info.h"
 #include "../../runloop.h"
 #include "../../system.h"

menu/cbs/menu_cbs_left.c

@@ -26,6 +26,7 @@
 #include "../menu_shader.h"
 #include "../menu_navigation.h"
 
+#include "../../configuration.h"
 #include "../../core_info.h"
 #include "../../managers/cheat_manager.h"
 #include "../../file_path_special.h"

menu/cbs/menu_cbs_scan.c

@@ -21,6 +21,7 @@
 #include "../menu_entry.h"
 #include "../menu_setting.h"
 
+#include "../../configuration.h"
 #include "../../runloop.h"
 #include "../../tasks/tasks_internal.h"
 

menu/cbs/menu_cbs_start.c

@@ -24,6 +24,7 @@
 #include "../menu_setting.h"
 #include "../menu_shader.h"
 
+#include "../../configuration.h"
 #include "../../core_info.h"
 #include "../../managers/core_option_manager.h"
 #include "../../managers/cheat_manager.h"

menu/menu_displaylist.c

@@ -35,6 +35,7 @@
 #include "../database_info.h"
 #endif
 
+#include "../configuration.h"
 #include "../file_path_special.h"
 #include "../defaults.h"
 #include "../managers/cheat_manager.h"

network/netplay/netplay.c

@@ -28,6 +28,7 @@
 
 #include "netplay_private.h"
 
+#include "../../configuration.h"
 #include "../../command.h"
 #include "../../movie.h"
 #include "../../runloop.h"

runloop.h

@@ -16,10 +16,11 @@
 #ifndef __RETROARCH_RUNLOOP_H
 #define __RETROARCH_RUNLOOP_H
 
+#include <boolean.h>
 #include <retro_miscellaneous.h>
 #include <retro_common_api.h>
 
-#include "configuration.h"
+#include "input/input_defines.h"
 
 RETRO_BEGIN_DECLS
 

tasks/task_database.c

@@ -28,6 +28,7 @@
 #include "../database_info.h"
 #endif
 
+#include "../configuration.h"
 #include "../file_path_special.h"
 #include "../list_special.h"
 #include "../msg_hash.h"