diff --git a/command.c b/command.c index 6442d0bb32..7f846937ef 100644 --- a/command.c +++ b/command.c @@ -74,7 +74,6 @@ #include "defaults.h" #include "driver.h" -#include "input/input_driver.h" #include "frontend/frontend_driver.h" #include "file_path_special.h" #include "autosave.h" diff --git a/configuration.c b/configuration.c index bf65fcffe7..b2e1ffa34c 100644 --- a/configuration.c +++ b/configuration.c @@ -33,7 +33,6 @@ #endif #include "file_path_special.h" -#include "input/input_driver.h" #include "configuration.h" #include "content.h" #include "config.def.h" diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c index 021d4d0609..615694172e 100644 --- a/gfx/common/win32_common.c +++ b/gfx/common/win32_common.c @@ -57,7 +57,6 @@ #include #include -#include "../../input/input_driver.h" #include "../../input/input_keymaps.h" #include "../video_thread_wrapper.h" #include "../video_display_server.h" diff --git a/gfx/drivers_context/gdi_ctx.c b/gfx/drivers_context/gdi_ctx.c index 2d79bb33c6..04782b1165 100644 --- a/gfx/drivers_context/gdi_ctx.c +++ b/gfx/drivers_context/gdi_ctx.c @@ -36,7 +36,6 @@ #include "../../dynamic.h" #include "../../configuration.h" -#include "../../input/input_driver.h" #include "../../retroarch.h" #include "../../verbosity.h" #include "../../frontend/frontend_driver.h" diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c index 7a91178f7c..0b7fae942d 100644 --- a/gfx/drivers_context/wgl_ctx.c +++ b/gfx/drivers_context/wgl_ctx.c @@ -41,7 +41,6 @@ #include "../../configuration.h" #include "../../dynamic.h" -#include "../../input/input_driver.h" #include "../../retroarch.h" #include "../../verbosity.h" #include "../../frontend/frontend_driver.h" diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 1c792e8b94..ffcc7793ea 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -35,7 +35,6 @@ #include "../../menu/menu_driver.h" #endif -#include "../input_driver.h" #include "../../command.h" #include "../../frontend/drivers/platform_unix.h" diff --git a/input/drivers/cocoa_input.c b/input/drivers/cocoa_input.c index f2ed788911..70a977b617 100644 --- a/input/drivers/cocoa_input.c +++ b/input/drivers/cocoa_input.c @@ -23,7 +23,6 @@ #include "../../config.h" #endif -#include "../input_driver.h" #include "../input_keymaps.h" #include "cocoa_input.h" diff --git a/input/drivers/cocoa_input.h b/input/drivers/cocoa_input.h index 62f21b4904..bbbf42778c 100644 --- a/input/drivers/cocoa_input.h +++ b/input/drivers/cocoa_input.h @@ -20,6 +20,8 @@ #include #include +#include "../input_driver.h" + /* Input responder */ #define MAX_TOUCHES 16 diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c index baed5a6e2c..16df9745e1 100644 --- a/input/drivers/dinput.c +++ b/input/drivers/dinput.c @@ -45,7 +45,6 @@ #include -#include "../input_driver.h" #include "../input_keymaps.h" #include "../../configuration.h" diff --git a/input/drivers/qnx_input.c b/input/drivers/qnx_input.c index dd849e79e7..a798a805ba 100644 --- a/input/drivers/qnx_input.c +++ b/input/drivers/qnx_input.c @@ -29,7 +29,6 @@ #include "../../config.def.h" -#include "../input_driver.h" #include "../../retroarch.h" #include "../../tasks/tasks_internal.h" diff --git a/input/drivers/rwebinput_input.c b/input/drivers/rwebinput_input.c index 86037abdea..d91d4ad606 100644 --- a/input/drivers/rwebinput_input.c +++ b/input/drivers/rwebinput_input.c @@ -26,7 +26,6 @@ #include -#include "../input_driver.h" #include "../input_keymaps.h" #include "../../tasks/tasks_internal.h" diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c index 547ba89551..fbce3c1bd5 100644 --- a/input/drivers/sdl_input.c +++ b/input/drivers/sdl_input.c @@ -24,7 +24,6 @@ #include "SDL.h" -#include "../input_driver.h" #include "../input_keymaps.h" #include "../../retroarch.h" diff --git a/input/drivers/switch_input.c b/input/drivers/switch_input.c index b0c021b980..91205c8614 100644 --- a/input/drivers/switch_input.c +++ b/input/drivers/switch_input.c @@ -80,7 +80,6 @@ typedef struct /* end of touch mouse defines and types */ #endif -#include "../input_driver.h" #include "../input_keymaps.h" /* TODO/FIXME - diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c index 0b53e84840..23acce1c0e 100644 --- a/input/drivers/udev_input.c +++ b/input/drivers/udev_input.c @@ -66,7 +66,6 @@ #include #include -#include "../input_driver.h" #include "../input_keymaps.h" #include "../common/linux_common.h" diff --git a/input/drivers/wayland_input.c b/input/drivers/wayland_input.c index c946cb4ebf..55f63616cf 100644 --- a/input/drivers/wayland_input.c +++ b/input/drivers/wayland_input.c @@ -37,7 +37,6 @@ #include #include -#include "../input_driver.h" #include "../input_keymaps.h" #include "../common/linux_common.h" diff --git a/input/drivers/winraw_input.c b/input/drivers/winraw_input.c index 30b306e5a2..f6e569e840 100644 --- a/input/drivers/winraw_input.c +++ b/input/drivers/winraw_input.c @@ -15,7 +15,6 @@ #include -#include "../input_driver.h" #include "../input_keymaps.h" #include "../../configuration.h" diff --git a/input/drivers/x11_input.c b/input/drivers/x11_input.c index 7ddd3c4a14..0af90b5cdd 100644 --- a/input/drivers/x11_input.c +++ b/input/drivers/x11_input.c @@ -24,7 +24,6 @@ #include #include -#include "../input_driver.h" #include "../input_keymaps.h" #include "../common/input_x11_common.h" diff --git a/input/drivers_joypad/ctr_joypad.c b/input/drivers_joypad/ctr_joypad.c index 4ea5dd9667..a66ea7be07 100644 --- a/input/drivers_joypad/ctr_joypad.c +++ b/input/drivers_joypad/ctr_joypad.c @@ -20,7 +20,6 @@ #include "../../config.def.h" -#include "../input_driver.h" #include "../../tasks/tasks_internal.h" diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c index c22fdcb791..5ef57561fe 100644 --- a/input/drivers_joypad/dinput_joypad.c +++ b/input/drivers_joypad/dinput_joypad.c @@ -30,7 +30,6 @@ #endif #include "../../tasks/tasks_internal.h" -#include "../input_driver.h" #include "../input_keymaps.h" #include "../../retroarch.h" #include "../../verbosity.h" diff --git a/input/drivers_joypad/switch_joypad.c b/input/drivers_joypad/switch_joypad.c index cb8dcfbcda..ce2152e17e 100644 --- a/input/drivers_joypad/switch_joypad.c +++ b/input/drivers_joypad/switch_joypad.c @@ -11,7 +11,6 @@ #endif #include "../configuration.h" -#include "../input_driver.h" #include "../../tasks/tasks_internal.h" diff --git a/input/drivers_keyboard/keyboard_event_apple.c b/input/drivers_keyboard/keyboard_event_apple.c index b7b3115d61..0c698c3a94 100644 --- a/input/drivers_keyboard/keyboard_event_apple.c +++ b/input/drivers_keyboard/keyboard_event_apple.c @@ -22,7 +22,6 @@ #endif #include "../input_keymaps.h" -#include "../input_driver.h" #include "../../driver.h" #include "../../retroarch.h" diff --git a/input/include/wiiu/input.h b/input/include/wiiu/input.h index ac8064c470..a2f450abd2 100644 --- a/input/include/wiiu/input.h +++ b/input/include/wiiu/input.h @@ -31,7 +31,6 @@ #include #include "hid.h" -#include "../../input_driver.h" #include "../../common/hid/hid_device_driver.h" #include "../../connect/joypad_connection.h" #include "../../../retroarch.h" diff --git a/input/input_remapping.c b/input/input_remapping.c index 78ecc1daee..7c93890b10 100644 --- a/input/input_remapping.c +++ b/input/input_remapping.c @@ -20,7 +20,6 @@ #include #include -#include "input_driver.h" #include "input_remapping.h" #include "../configuration.h" #include "../retroarch.h" diff --git a/list_special.c b/list_special.c index 0a887ad2e0..bf52522d59 100644 --- a/list_special.c +++ b/list_special.c @@ -38,7 +38,6 @@ #include "list_special.h" #include "frontend/frontend_driver.h" #include "core_info.h" -#include "input/input_driver.h" #include "midi/midi_driver.h" #include "configuration.h" #include "retroarch.h" diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c index 1985e71310..13a97c521c 100644 --- a/managers/cheat_manager.c +++ b/managers/cheat_manager.c @@ -49,7 +49,6 @@ #include "../dynamic.h" #include "../core.h" #include "../verbosity.h" -#include "../input/input_driver.h" #include "../configuration.h" cheat_manager_t cheat_manager_state; diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 0333e69122..110b21a6f2 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -30,13 +30,11 @@ #endif #include "../../tasks/tasks_internal.h" -#include "../../input/input_driver.h" #include "../../core.h" #include "../../core_info.h" #include "../../configuration.h" #include "../../file_path_special.h" -#include "../../input/input_driver.h" #include "../../managers/core_option_manager.h" #include "../../managers/cheat_manager.h" #include "../../performance_counters.h" diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c index 9d347d5ef2..a9bd4c57fa 100644 --- a/menu/cbs/menu_cbs_start.c +++ b/menu/cbs/menu_cbs_start.c @@ -39,7 +39,6 @@ #include "../../performance_counters.h" #include "../../playlist.h" -#include "../../input/input_driver.h" #include "../../input/input_remapping.h" #include "../../config.def.h" diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 99b3771e42..f733c67ed2 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -47,7 +47,6 @@ #include "../../dynamic.h" #include "../../configuration.h" #include "../../managers/cheat_manager.h" -#include "../input/input_driver.h" #include "../tasks/tasks_internal.h" #include "../../playlist.h" diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index abf1a9b651..9d2e76116e 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -90,7 +90,6 @@ #include "../gfx/video_display_server.h" #include "../config.features.h" #include "../version_git.h" -#include "../input/input_driver.h" #include "../list_special.h" #include "../performance_counters.h" #include "../core_info.h" diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 93e3427208..72659bc3ff 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -80,7 +80,6 @@ #include "../dynamic.h" #include "../list_special.h" #include "../wifi/wifi_driver.h" -#include "../input/input_driver.h" #include "../midi/midi_driver.h" #include "../tasks/tasks_internal.h" #include "../config.def.h" diff --git a/menu/widgets/menu_dialog.c b/menu/widgets/menu_dialog.c index a35efe8fa5..9fa2d3a60c 100644 --- a/menu/widgets/menu_dialog.c +++ b/menu/widgets/menu_dialog.c @@ -33,7 +33,6 @@ #include "../../configuration.h" #include "../../tasks/tasks_internal.h" -#include "../../input/input_driver.h" #include "../../performance_counters.h" static bool menu_dialog_pending_push = false; diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c index 4ac2da23c0..46e8172023 100644 --- a/network/netplay/netplay_frontend.c +++ b/network/netplay/netplay_frontend.c @@ -37,7 +37,6 @@ #include "../../configuration.h" #include "../../frontend/frontend_driver.h" -#include "../../input/input_driver.h" #include "../../tasks/task_content.h" #include "../../tasks/tasks_internal.h" #include "../../file_path_special.h" diff --git a/network/netplay/netplay_init.c b/network/netplay/netplay_init.c index 434fe781f2..ab4619221a 100644 --- a/network/netplay/netplay_init.c +++ b/network/netplay/netplay_init.c @@ -32,7 +32,6 @@ #include "../../autosave.h" #include "../../retroarch.h" -#include "../../input/input_driver.h" #if defined(AF_INET6) && !defined(HAVE_SOCKET_LEGACY) #define HAVE_INET6 1 diff --git a/retroarch.c b/retroarch.c index 75aeaff35f..b0e7528bc7 100644 --- a/retroarch.c +++ b/retroarch.c @@ -119,7 +119,6 @@ #include "menu/widgets/menu_osk.h" #endif -#include "input/input_driver.h" #include "input/input_mapper.h" #include "input/input_keymaps.h" #include "input/input_remapping.h" @@ -155,7 +154,6 @@ #include "core_info.h" #include "dynamic.h" #include "driver.h" -#include "input/input_driver.h" #include "msg_hash.h" #include "paths.h" #include "file_path_special.h" diff --git a/retroarch.h b/retroarch.h index d46f76b93f..ac5a50ed1b 100644 --- a/retroarch.h +++ b/retroarch.h @@ -822,6 +822,7 @@ void recording_driver_update_streaming_url(void); #include "gfx/video_filter.h" #include "gfx/video_shader_parse.h" +#include "input/input_driver.h" #include "input/input_types.h" #define RARCH_SCALE_BASE 256 diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c index 947ca1c318..2b348e01cc 100644 --- a/tasks/task_autodetect.c +++ b/tasks/task_autodetect.c @@ -69,7 +69,6 @@ const GUID GUID_NULL = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}}; #endif #endif -#include "../input/input_driver.h" #include "../input/include/blissbox.h" #include "../configuration.h" diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m index 025f6331ab..8ae6d9e86b 100644 --- a/ui/drivers/cocoa/cocoa_common.m +++ b/ui/drivers/cocoa/cocoa_common.m @@ -23,7 +23,6 @@ #include "../../../verbosity.h" -#include "../../../input/input_driver.h" #include "../../../input/drivers/cocoa_input.h" #include "../../../retroarch.h" diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m index 7379860005..1c59fd7ca5 100644 --- a/ui/drivers/cocoa/cocoatouch_menu.m +++ b/ui/drivers/cocoa/cocoatouch_menu.m @@ -25,7 +25,6 @@ #include #include "cocoa_common.h" -#include "../../../input/input_driver.h" #include "../../../input/input_keymaps.h" #include "../../../input/drivers/cocoa_input.h" diff --git a/uwp/uwp_main.cpp b/uwp/uwp_main.cpp index 939f310fe8..8a17931be9 100644 --- a/uwp/uwp_main.cpp +++ b/uwp/uwp_main.cpp @@ -19,7 +19,6 @@ #include "../retroarch.h" #include "../frontend/frontend.h" #include "../input/input_keymaps.h" -#include "../input/input_driver.h" #include "../verbosity.h" #include "../libretro-common/include/encodings/utf.h" #include "../libretro-common/include/lists/string_list.h"