diff --git a/audio/drivers/alsa.c b/audio/drivers/alsa.c index 6ee8336386..ca55e8d4e7 100644 --- a/audio/drivers/alsa.c +++ b/audio/drivers/alsa.c @@ -20,7 +20,6 @@ #include - #include "../audio_driver.h" #include "../../configuration.h" #include "../../verbosity.h" diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c index d56d6dbeff..e05988699c 100644 --- a/gfx/drivers/ctr_gfx.c +++ b/gfx/drivers/ctr_gfx.c @@ -29,7 +29,6 @@ #include "../../configuration.h" #include "../../command.h" -#include "../../driver.h" #include "../../retroarch.h" #include "../../performance_counters.h" diff --git a/gfx/drivers/drm_gfx.c b/gfx/drivers/drm_gfx.c index f87ae08271..0cf9aeaeae 100644 --- a/gfx/drivers/drm_gfx.c +++ b/gfx/drivers/drm_gfx.c @@ -30,7 +30,6 @@ #include "../font_driver.h" #include "../video_context_driver.h" #include "../../configuration.h" -#include "../../driver.h" #include "../../retroarch.h" #include "../../runloop.h" diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index f642010461..e2d0c05d4f 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -41,7 +41,6 @@ #include "gl_renderchains/render_chain_gl.h" #include "../../configuration.h" -#include "../../driver.h" #include "../../record/record_driver.h" #include "../../performance_counters.h" diff --git a/gfx/drivers/gx_gfx.c b/gfx/drivers/gx_gfx.c index b5981aaaa4..6720d1655a 100644 --- a/gfx/drivers/gx_gfx.c +++ b/gfx/drivers/gx_gfx.c @@ -34,7 +34,6 @@ #include "../drivers_font_renderer/bitmap.h" #include "../../defines/gx_defines.h" #include "../../configuration.h" -#include "../../driver.h" #include "../../runloop.h" #include "../../menu/menu_driver.h" #include "../../menu/menu_display.h" diff --git a/gfx/drivers/psp1_gfx.c b/gfx/drivers/psp1_gfx.c index 13978c555e..3dfac31f55 100644 --- a/gfx/drivers/psp1_gfx.c +++ b/gfx/drivers/psp1_gfx.c @@ -29,7 +29,6 @@ #endif #include "../../defines/psp_defines.h" -#include "../../driver.h" #include "../../runloop.h" #ifndef SCEGU_SCR_WIDTH diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c index 3653bd31b6..f1899e51c1 100644 --- a/gfx/drivers/sdl2_gfx.c +++ b/gfx/drivers/sdl2_gfx.c @@ -36,7 +36,6 @@ #include "SDL_syswm.h" #include "../../configuration.h" -#include "../../driver.h" #include "../../retroarch.h" #include "../../runloop.h" #include "../../performance_counters.h" diff --git a/gfx/drivers/sdl_gfx.c b/gfx/drivers/sdl_gfx.c index 84eb4c14bc..ce8cb270cc 100644 --- a/gfx/drivers/sdl_gfx.c +++ b/gfx/drivers/sdl_gfx.c @@ -33,7 +33,6 @@ #include "SDL_syswm.h" #include "../../configuration.h" -#include "../../driver.h" #include "../../runloop.h" #include "../../performance_counters.h" diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c index 411cfaabfa..08bf119b6e 100644 --- a/gfx/drivers/xvideo.c +++ b/gfx/drivers/xvideo.c @@ -31,7 +31,6 @@ #include #include "../../configuration.h" -#include "../../driver.h" #include "../../frontend/frontend_driver.h" #include "../../verbosity.h" #include "../font_driver.h" diff --git a/gfx/drivers_context/android_ctx.c b/gfx/drivers_context/android_ctx.c index 3ff2f613a5..b77aa99f28 100644 --- a/gfx/drivers_context/android_ctx.c +++ b/gfx/drivers_context/android_ctx.c @@ -38,7 +38,6 @@ #include "../../frontend/drivers/platform_linux.h" #include "../../configuration.h" -#include "../../driver.h" #include "../../runloop.h" static enum gfx_ctx_api android_api; diff --git a/gfx/drivers_context/bbqnx_ctx.c b/gfx/drivers_context/bbqnx_ctx.c index 58ac5498de..b744483343 100644 --- a/gfx/drivers_context/bbqnx_ctx.c +++ b/gfx/drivers_context/bbqnx_ctx.c @@ -43,7 +43,6 @@ #endif #include "../../configuration.h" -#include "../../driver.h" #include "../../runloop.h" #define WINDOW_BUFFERS 2 diff --git a/gfx/drivers_context/cgl_ctx.c b/gfx/drivers_context/cgl_ctx.c index a82b834bf8..b743e9ca37 100644 --- a/gfx/drivers_context/cgl_ctx.c +++ b/gfx/drivers_context/cgl_ctx.c @@ -30,7 +30,6 @@ #include #include "../../configuration.h" -#include "../../driver.h" #include "../../runloop.h" #include "../../configuration.h" #include "../video_context_driver.h" diff --git a/gfx/drivers_context/drm_ctx.c b/gfx/drivers_context/drm_ctx.c index 8986dd14ff..db9039b003 100644 --- a/gfx/drivers_context/drm_ctx.c +++ b/gfx/drivers_context/drm_ctx.c @@ -37,7 +37,6 @@ #include "../../verbosity.h" #include "../../configuration.h" -#include "../../driver.h" #include "../../runloop.h" #include "../../frontend/frontend_driver.h" #include "../common/drm_common.h" diff --git a/gfx/drivers_context/emscriptenegl_ctx.c b/gfx/drivers_context/emscriptenegl_ctx.c index 7a32154207..cc5782a52c 100644 --- a/gfx/drivers_context/emscriptenegl_ctx.c +++ b/gfx/drivers_context/emscriptenegl_ctx.c @@ -24,7 +24,6 @@ #endif #include "../../configuration.h" -#include "../../driver.h" #include "../../runloop.h" #include "../video_context_driver.h" diff --git a/gfx/drivers_context/gfx_null_ctx.c b/gfx/drivers_context/gfx_null_ctx.c index 1804b99ffc..d60b297521 100644 --- a/gfx/drivers_context/gfx_null_ctx.c +++ b/gfx/drivers_context/gfx_null_ctx.c @@ -16,7 +16,6 @@ /* Null context. */ -#include "../../driver.h" #include "../video_context_driver.h" static void gfx_ctx_null_swap_interval(void *data, unsigned interval) diff --git a/gfx/drivers_context/khr_display_ctx.c b/gfx/drivers_context/khr_display_ctx.c index 22ded48b38..6907b82d3b 100644 --- a/gfx/drivers_context/khr_display_ctx.c +++ b/gfx/drivers_context/khr_display_ctx.c @@ -18,7 +18,6 @@ #endif #include "../../configuration.h" -#include "../../driver.h" #include "../../runloop.h" #include "../../frontend/frontend_driver.h" #include "../common/vulkan_common.h" diff --git a/gfx/drivers_context/mali_fbdev_ctx.c b/gfx/drivers_context/mali_fbdev_ctx.c index 8f9cc8b9bf..d63f1df4f0 100644 --- a/gfx/drivers_context/mali_fbdev_ctx.c +++ b/gfx/drivers_context/mali_fbdev_ctx.c @@ -37,7 +37,6 @@ #include "../../frontend/frontend_driver.h" #include "../../configuration.h" -#include "../../driver.h" #include "../../runloop.h" typedef struct diff --git a/gfx/drivers_context/opendingux_fbdev_ctx.c b/gfx/drivers_context/opendingux_fbdev_ctx.c index f4e161eec4..90ede9ffd7 100644 --- a/gfx/drivers_context/opendingux_fbdev_ctx.c +++ b/gfx/drivers_context/opendingux_fbdev_ctx.c @@ -30,7 +30,6 @@ #include "../../frontend/frontend_driver.h" #include "../../configuration.h" -#include "../../driver.h" #include "../../runloop.h" typedef struct diff --git a/gfx/drivers_context/osmesa_ctx.c b/gfx/drivers_context/osmesa_ctx.c index 0df8c9b5ef..fdeacc8ba8 100644 --- a/gfx/drivers_context/osmesa_ctx.c +++ b/gfx/drivers_context/osmesa_ctx.c @@ -14,11 +14,7 @@ * If not, see . */ -#include "../../driver.h" -#include "../../runloop.h" -#include "../common/gl_common.h" -#include #include #include @@ -29,6 +25,11 @@ #include #include +#include + +#include "../../runloop.h" +#include "../common/gl_common.h" + #if (OSMESA_MAJOR_VERSION * 1000 + OSMESA_MINOR_VERSION) >= 11002 #define HAVE_OSMESA_CREATE_CONTEXT_ATTRIBS 1 #endif diff --git a/gfx/drivers_context/ps3_ctx.c b/gfx/drivers_context/ps3_ctx.c index 1a58731bf9..dca7efa380 100644 --- a/gfx/drivers_context/ps3_ctx.c +++ b/gfx/drivers_context/ps3_ctx.c @@ -26,7 +26,6 @@ #endif #endif -#include "../../driver.h" #include "../../runloop.h" #include "../../defines/ps3_defines.h" #include "../common/gl_common.h" diff --git a/gfx/drivers_context/sdl_gl_ctx.c b/gfx/drivers_context/sdl_gl_ctx.c index 4987019059..98bf267543 100644 --- a/gfx/drivers_context/sdl_gl_ctx.c +++ b/gfx/drivers_context/sdl_gl_ctx.c @@ -25,7 +25,6 @@ #endif #include "../../configuration.h" -#include "../../driver.h" #include "../../runloop.h" #include "../common/gl_common.h" diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c index ff33e84274..0e48383b02 100644 --- a/gfx/drivers_context/vc_egl_ctx.c +++ b/gfx/drivers_context/vc_egl_ctx.c @@ -31,7 +31,6 @@ #include #include "../../configuration.h" -#include "../../driver.h" #include "../../runloop.h" #include "../video_context_driver.h" diff --git a/gfx/drivers_context/vivante_fbdev_ctx.c b/gfx/drivers_context/vivante_fbdev_ctx.c index 8592bca738..cac00f389b 100644 --- a/gfx/drivers_context/vivante_fbdev_ctx.c +++ b/gfx/drivers_context/vivante_fbdev_ctx.c @@ -29,7 +29,6 @@ #endif #include "../../configuration.h" -#include "../../driver.h" #include "../../frontend/frontend_driver.h" #include "../../runloop.h" diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c index cfce0dd9fb..67071e33d1 100644 --- a/gfx/drivers_context/wayland_ctx.c +++ b/gfx/drivers_context/wayland_ctx.c @@ -42,7 +42,6 @@ #endif #include "../../configuration.h" -#include "../../driver.h" #include "../../frontend/frontend_driver.h" #include "../../runloop.h" diff --git a/gfx/drivers_context/wgl_ctx.cpp b/gfx/drivers_context/wgl_ctx.cpp index d147edf38a..f782c92ff9 100644 --- a/gfx/drivers_context/wgl_ctx.cpp +++ b/gfx/drivers_context/wgl_ctx.cpp @@ -36,7 +36,6 @@ #endif #include "../../configuration.h" -#include "../../driver.h" #include "../../dynamic.h" #include "../../runloop.h" #include "../video_context_driver.h" diff --git a/gfx/drivers_context/x_ctx.c b/gfx/drivers_context/x_ctx.c index 9f43a7346c..656301cf33 100644 --- a/gfx/drivers_context/x_ctx.c +++ b/gfx/drivers_context/x_ctx.c @@ -26,7 +26,6 @@ #endif #include "../../configuration.h" -#include "../../driver.h" #include "../../frontend/frontend_driver.h" #include "../common/gl_common.h" diff --git a/gfx/drivers_context/xegl_ctx.c b/gfx/drivers_context/xegl_ctx.c index e385a24ada..c7d465c946 100644 --- a/gfx/drivers_context/xegl_ctx.c +++ b/gfx/drivers_context/xegl_ctx.c @@ -17,12 +17,12 @@ /* X/EGL context. Mostly used for testing GLES code paths. */ #include +#include #ifdef HAVE_CONFIG_H #include "../../config.h" #endif -#include "../../driver.h" #include "../../configuration.h" #include "../../frontend/frontend_driver.h" diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 449c9bf541..d3f8e33c63 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -39,7 +39,6 @@ #include "../input_joypad_driver.h" #include "../drivers_keyboard/keyboard_event_android.h" #include "../../performance_counters.h" -#include "../../driver.h" #include "../../configuration.h" #define MAX_TOUCH 16 diff --git a/input/drivers/ctr_input.c b/input/drivers/ctr_input.c index 5bfc906eec..aebfd91805 100644 --- a/input/drivers/ctr_input.c +++ b/input/drivers/ctr_input.c @@ -24,7 +24,6 @@ #endif #include "../../configuration.h" -#include "../../driver.h" #include "../input_config.h" #include "../input_joypad_driver.h" diff --git a/input/drivers/gx_input.c b/input/drivers/gx_input.c index 1eb8163824..2f25210978 100644 --- a/input/drivers/gx_input.c +++ b/input/drivers/gx_input.c @@ -26,7 +26,7 @@ #include #include "../../configuration.h" -#include "../../driver.h" +#include "../input_joypad_driver.h" #ifndef MAX_PADS #define MAX_PADS 4 diff --git a/input/drivers/nullinput.c b/input/drivers/nullinput.c index 05b7789a63..ff5d2074d4 100644 --- a/input/drivers/nullinput.c +++ b/input/drivers/nullinput.c @@ -15,7 +15,6 @@ */ #include "../input_driver.h" -#include "../../driver.h" #include "../../verbosity.h" static void *nullinput_input_init(void) diff --git a/input/drivers/ps3_input.c b/input/drivers/ps3_input.c index 9c4d6a68e5..c9236538bc 100644 --- a/input/drivers/ps3_input.c +++ b/input/drivers/ps3_input.c @@ -29,7 +29,7 @@ #include "../../defines/ps3_defines.h" #include "../../configuration.h" -#include "../../driver.h" +#include "../input_joypad_driver.h" #ifdef HAVE_MOUSE #ifndef __PSL1GHT__ diff --git a/input/drivers/psp_input.c b/input/drivers/psp_input.c index 408071da38..49ff9cf46a 100644 --- a/input/drivers/psp_input.c +++ b/input/drivers/psp_input.c @@ -41,7 +41,7 @@ #include "../../defines/psp_defines.h" #include "../../configuration.h" -#include "../../driver.h" +#include "../input_joypad_driver.h" #include "../input_config.h" typedef struct psp_input diff --git a/input/drivers/qnx_input.c b/input/drivers/qnx_input.c index e1abc42eb0..a8b7d33f61 100644 --- a/input/drivers/qnx_input.c +++ b/input/drivers/qnx_input.c @@ -28,7 +28,7 @@ #endif #include "../../configuration.h" -#include "../../driver.h" +#include "../input_joypad_driver.h" #include "../input_autodetect.h" #define MAX_PADS 8 diff --git a/input/drivers/rwebinput_input.c b/input/drivers/rwebinput_input.c index f350375346..2a41bd35d0 100644 --- a/input/drivers/rwebinput_input.c +++ b/input/drivers/rwebinput_input.c @@ -26,7 +26,6 @@ #include "../input_keymaps.h" #include "../../configuration.h" -#include "../../driver.h" typedef struct rwebinput_state { diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c index 0493cd01b6..446a998797 100644 --- a/input/drivers/sdl_input.c +++ b/input/drivers/sdl_input.c @@ -22,7 +22,6 @@ #include #include "../../configuration.h" -#include "../../driver.h" #include "SDL.h" #include "../../gfx/video_context_driver.h" diff --git a/input/drivers/x11_input.c b/input/drivers/x11_input.c index 020bbc5290..78b185ceb2 100644 --- a/input/drivers/x11_input.c +++ b/input/drivers/x11_input.c @@ -30,7 +30,6 @@ #include "../common/input_x11_common.h" #include "../../configuration.h" -#include "../../driver.h" #include "../../verbosity.h" typedef struct x11_input diff --git a/input/drivers/xdk_xinput_input.c b/input/drivers/xdk_xinput_input.c index 577061def2..5ca8627d6f 100644 --- a/input/drivers/xdk_xinput_input.c +++ b/input/drivers/xdk_xinput_input.c @@ -28,8 +28,8 @@ #include #include +#include "../input_joypad_driver.h" #include "../../configuration.h" -#include "../../driver.h" #define MAX_PADS 4 diff --git a/input/drivers/xenon360_input.c b/input/drivers/xenon360_input.c index 0b8a942180..2260e55dcd 100644 --- a/input/drivers/xenon360_input.c +++ b/input/drivers/xenon360_input.c @@ -23,7 +23,7 @@ #include -#include "../../driver.h" +#include "../input_joypad_driver.h" #define MAX_PADS 4 diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 93db3286a1..33f277156c 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -30,8 +30,6 @@ #include "../gfx/video_shader_driver.h" -#include "../driver.h" - RETRO_BEGIN_DECLS #ifndef MAX_COUNTERS diff --git a/tasks/task_content.c b/tasks/task_content.c index 970561e722..c858a12f44 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -94,10 +94,6 @@ #include "../deps/7zip/7zFile.h" #endif -#ifdef HAVE_MENU -#include "../menu/menu_driver.h" -#endif - #ifdef HAVE_CHEEVOS #include "../cheevos.h" #endif diff --git a/tasks/task_database_cue.c b/tasks/task_database_cue.c index 75bec0ad68..846cf67f04 100644 --- a/tasks/task_database_cue.c +++ b/tasks/task_database_cue.c @@ -24,12 +24,16 @@ #include #include -#include "tasks_internal.h" +#ifdef HAVE_CONFIG_H +#include "../config.h" +#endif #ifdef HAVE_LIBRETRODB #include "../database_info.h" #endif +#include "tasks_internal.h" + #include "../list_special.h" #include "../msg_hash.h" #include "../verbosity.h" diff --git a/tasks/task_decompress.c b/tasks/task_decompress.c index 89bd79b693..d230397c20 100644 --- a/tasks/task_decompress.c +++ b/tasks/task_decompress.c @@ -13,9 +13,6 @@ * If not, see . */ -#ifdef HAVE_CONFIG_H -#include "../config.h" -#endif #include #include diff --git a/tasks/task_image.c b/tasks/task_image.c index 53810c776b..240f9b6f30 100644 --- a/tasks/task_image.c +++ b/tasks/task_image.c @@ -25,6 +25,10 @@ #include #include +#ifdef HAVE_CONFIG_H +#include "../config.h" +#endif + #ifdef HAVE_MENU #include "../menu/menu_driver.h" #endif