diff --git a/src/ai/manager.cpp b/src/ai/manager.cpp index d97328705b0a..efa7a0a6c6c1 100644 --- a/src/ai/manager.cpp +++ b/src/ai/manager.cpp @@ -56,7 +56,7 @@ #include // for pair, make_pair #include // for vector, allocator, etc -#include "SDL_timer.h" +#include namespace ai { diff --git a/src/ai/testing/ca.cpp b/src/ai/testing/ca.cpp index 3bdb428a92f8..80d0e375fc3f 100644 --- a/src/ai/testing/ca.cpp +++ b/src/ai/testing/ca.cpp @@ -38,7 +38,7 @@ #include -#include "SDL.h" +#include static lg::log_domain log_ai_testing_ai_default("ai/ca/testing_ai_default"); #define DBG_AI_TESTING_AI_DEFAULT LOG_STREAM(debug, log_ai_testing_ai_default) diff --git a/src/ai/testing/stage_sf_with_rca.cpp b/src/ai/testing/stage_sf_with_rca.cpp index aa35bf1be020..6c931a12475e 100644 --- a/src/ai/testing/stage_sf_with_rca.cpp +++ b/src/ai/testing/stage_sf_with_rca.cpp @@ -37,7 +37,7 @@ #include "unit.hpp" #include -#include "SDL.h" +#include namespace ai { diff --git a/src/animated.tpp b/src/animated.tpp index 61c5ec0c60f6..6893320539f9 100644 --- a/src/animated.tpp +++ b/src/animated.tpp @@ -21,7 +21,7 @@ #include -#include "SDL.h" +#include #include "animated.hpp" namespace { diff --git a/src/color_range.hpp b/src/color_range.hpp index 3f460048b889..e0de491d37ac 100644 --- a/src/color_range.hpp +++ b/src/color_range.hpp @@ -28,7 +28,7 @@ #include #include -#include "SDL_types.h" +#include /* Convert comma separated string into rgb values. * Return false and empty result on error. diff --git a/src/display.cpp b/src/display.cpp index 79feb39f7c61..c566d3551bf3 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -47,7 +47,7 @@ #include "whiteboard/manager.hpp" #include "show_dialog.hpp" -#include "SDL_image.h" +#include #include diff --git a/src/display_chat_manager.cpp b/src/display_chat_manager.cpp index 9b1f3c8b948d..be0e5a54ced9 100644 --- a/src/display_chat_manager.cpp +++ b/src/display_chat_manager.cpp @@ -27,8 +27,8 @@ #include #include -#include "SDL_timer.h" -#include "SDL_video.h" +#include +#include static lg::log_domain log_engine("engine"); #define ERR_NG LOG_STREAM(err, log_engine) diff --git a/src/events.cpp b/src/events.cpp index a9d76fa8ead8..3e3c1d1c0b5f 100644 --- a/src/events.cpp +++ b/src/events.cpp @@ -26,7 +26,7 @@ #include "desktop/windows_tray_notification.hpp" #endif -#include "SDL.h" +#include #include #include diff --git a/src/events.hpp b/src/events.hpp index a7f5267b64b4..e9abaa0f6ce3 100644 --- a/src/events.hpp +++ b/src/events.hpp @@ -15,8 +15,8 @@ #ifndef EVENTS_HPP_INCLUDED #define EVENTS_HPP_INCLUDED -#include "SDL_events.h" -#include "SDL_version.h" +#include +#include #include //our user-defined double-click event type diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp index c5db09bb26dc..10726b255762 100644 --- a/src/game_launcher.cpp +++ b/src/game_launcher.cpp @@ -66,12 +66,12 @@ #include // for NULL, system #include // for operator<<, basic_ostream, etc #include // for pair -#include "SDL.h" // for SDL_INIT_JOYSTICK, etc -#include "SDL_events.h" // for SDL_ENABLE -#include "SDL_joystick.h" // for SDL_JoystickEventState, etc -#include "SDL_timer.h" // for SDL_Delay -#include "SDL_version.h" // for SDL_VERSION_ATLEAST -#include "SDL_video.h" // for SDL_WM_SetCaption, etc +#include // for SDL_INIT_JOYSTICK, etc +#include // for SDL_ENABLE +#include // for SDL_JoystickEventState, etc +#include // for SDL_Delay +#include // for SDL_VERSION_ATLEAST +#include // for SDL_WM_SetCaption, etc #ifdef DEBUG_WINDOW_LAYOUT_GRAPHS #include "gui/widgets/debug.hpp" diff --git a/src/generators/default_map_generator_job.cpp b/src/generators/default_map_generator_job.cpp index 102023d8f29e..87e1379bea64 100644 --- a/src/generators/default_map_generator_job.cpp +++ b/src/generators/default_map_generator_job.cpp @@ -31,7 +31,7 @@ #include "util.hpp" #include "wml_exception.hpp" #include "formula_string_utils.hpp" -#include "SDL.h" +#include #include #include "seed_rng.hpp" diff --git a/src/gui/auxiliary/event/dispatcher.hpp b/src/gui/auxiliary/event/dispatcher.hpp index 0a827fe3291f..71a34dd82f0a 100644 --- a/src/gui/auxiliary/event/dispatcher.hpp +++ b/src/gui/auxiliary/event/dispatcher.hpp @@ -20,7 +20,7 @@ #include "sdl/compat.hpp" #include "serialization/unicode_types.hpp" -#include "SDL_events.h" +#include #include "utils/boost_function_guarded.hpp" #include diff --git a/src/gui/auxiliary/event/dispatcher_private.hpp b/src/gui/auxiliary/event/dispatcher_private.hpp index e242c8f61328..8c1c67078f0c 100644 --- a/src/gui/auxiliary/event/dispatcher_private.hpp +++ b/src/gui/auxiliary/event/dispatcher_private.hpp @@ -19,7 +19,7 @@ #include "gui/widgets/widget.hpp" -#include "SDL_events.h" +#include #include diff --git a/src/gui/widgets/helper.cpp b/src/gui/widgets/helper.cpp index fe8c15236df7..17d71e259d1f 100644 --- a/src/gui/widgets/helper.cpp +++ b/src/gui/widgets/helper.cpp @@ -22,7 +22,7 @@ #include "formula_string_utils.hpp" -#include "SDL_ttf.h" +#include namespace gui2 { diff --git a/src/help/help_browser.cpp b/src/help/help_browser.cpp index 4cc3b7c92d00..34e2454fa747 100644 --- a/src/help/help_browser.cpp +++ b/src/help/help_browser.cpp @@ -15,7 +15,7 @@ #include "help_browser.hpp" #include // for NULL #include // for operator<<, basic_ostream, etc -#include "SDL_mouse.h" // for SDL_GetMouseState, etc +#include // for SDL_GetMouseState, etc #include "cursor.hpp" // for set, CURSOR_TYPE::HYPERLINK, etc #include "font.hpp" // for relative_size #include "gettext.hpp" // for _ diff --git a/src/help/help_browser.hpp b/src/help/help_browser.hpp index 24a7bc028000..945705374443 100644 --- a/src/help/help_browser.hpp +++ b/src/help/help_browser.hpp @@ -17,7 +17,7 @@ #include // for deque #include // for string -#include "SDL_events.h" // for SDL_Event +#include // for SDL_Event #include "help_menu.hpp" // for help_menu #include "help_text_area.hpp" // for help_text_area #include "widgets/button.hpp" // for button diff --git a/src/help/help_text_area.hpp b/src/help/help_text_area.hpp index 5dbdab949416..be29b71a3e82 100644 --- a/src/help/help_text_area.hpp +++ b/src/help/help_text_area.hpp @@ -18,7 +18,7 @@ #include // for list #include // for string #include // for pair -#include "SDL_video.h" // for SDL_Color (ptr only), etc +#include // for SDL_Color (ptr only), etc #include "font.hpp" // for NORMAL_COLOR #include "sdl/utils.hpp" // for surface #include "widgets/scrollarea.hpp" // for scrollarea diff --git a/src/hotkey/hotkey_item.cpp b/src/hotkey/hotkey_item.cpp index eef95460e895..4bdee7598062 100644 --- a/src/hotkey/hotkey_item.cpp +++ b/src/hotkey/hotkey_item.cpp @@ -32,7 +32,7 @@ #include "key.hpp" -#include "SDL.h" +#include static lg::log_domain log_config("config"); diff --git a/src/hotkey/hotkey_item.hpp b/src/hotkey/hotkey_item.hpp index 300ec9ea1474..154eaf9ea3e4 100644 --- a/src/hotkey/hotkey_item.hpp +++ b/src/hotkey/hotkey_item.hpp @@ -16,8 +16,8 @@ #ifndef HOTKEY_ITEM_HPP_INCLUDED #define HOTKEY_ITEM_HPP_INCLUDED -#include "SDL_events.h" -#include "SDL.h" +#include +#include #include #include diff --git a/src/image.cpp b/src/image.cpp index 84751e86a516..b8fae01b1b99 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -40,7 +40,7 @@ #include "serialization/string_utils.hpp" #include "video.hpp" -#include "SDL_image.h" +#include #include #include diff --git a/src/log.cpp b/src/log.cpp index a461672563a7..d5521883fec3 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -22,7 +22,7 @@ #include "game_errors.hpp" #include "global.hpp" -#include "SDL_timer.h" +#include #include "log.hpp" diff --git a/src/mouse_events.cpp b/src/mouse_events.cpp index c51ab9098011..69c8449a9b0f 100644 --- a/src/mouse_events.cpp +++ b/src/mouse_events.cpp @@ -62,8 +62,8 @@ #include // for bad_alloc #include // for operator<<, basic_ostream, etc #include // for string, operator<<, etc -#include "SDL_mouse.h" // for SDL_GetMouseState -#include "SDL_video.h" // for SDL_Color +#include // for SDL_GetMouseState +#include // for SDL_Color namespace gui { class slider; } diff --git a/src/mouse_events.hpp b/src/mouse_events.hpp index 69934c519b87..4f62b31c4305 100644 --- a/src/mouse_events.hpp +++ b/src/mouse_events.hpp @@ -24,7 +24,7 @@ #include // for set #include // for vector -#include "SDL_events.h" // for SDL_MouseButtonEvent +#include // for SDL_MouseButtonEvent class game_display; class battle_context; // lines 23-23 diff --git a/src/mouse_handler_base.hpp b/src/mouse_handler_base.hpp index 6b779982d1af..c532e5a559ed 100644 --- a/src/mouse_handler_base.hpp +++ b/src/mouse_handler_base.hpp @@ -17,8 +17,8 @@ #define MOUSE_HANDLER_BASE_H_INCLUDED #include "map_location.hpp" -#include "SDL_events.h" -#include "SDL_version.h" +#include +#include class display; diff --git a/src/network.hpp b/src/network.hpp index 997ce70e933a..7281d1cca3ef 100644 --- a/src/network.hpp +++ b/src/network.hpp @@ -23,7 +23,7 @@ class config; #include "exceptions.hpp" -#include "SDL_net.h" +#include #include #include diff --git a/src/preferences.hpp b/src/preferences.hpp index 92a6e952ea46..84554e19f183 100644 --- a/src/preferences.hpp +++ b/src/preferences.hpp @@ -22,7 +22,7 @@ class display; #include "terrain_translation.hpp" -#include "SDL.h" +#include #include diff --git a/src/save_blocker.hpp b/src/save_blocker.hpp index 291dc5fa1005..b7774ddda68e 100644 --- a/src/save_blocker.hpp +++ b/src/save_blocker.hpp @@ -15,7 +15,7 @@ #ifndef SAVE_BLOCKER_H_INCLUDED #define SAVE_BLOCKER_H_INCLUDED -#include "SDL_mutex.h" +#include #include diff --git a/src/scripting/game_lua_kernel.cpp b/src/scripting/game_lua_kernel.cpp index 0ee5e114d381..f402e7d98bed 100644 --- a/src/scripting/game_lua_kernel.cpp +++ b/src/scripting/game_lua_kernel.cpp @@ -124,8 +124,8 @@ #include // for operator<<, basic_ostream, etc #include // for pair #include // for vector, etc -#include "SDL_timer.h" // for SDL_GetTicks -#include "SDL_video.h" // for SDL_Color, SDL_Surface +#include // for SDL_GetTicks +#include // for SDL_Color, SDL_Surface #include "lua/lauxlib.h" // for luaL_checkinteger, etc #include "lua/lua.h" // for lua_setfield, etc diff --git a/src/sdl/image.cpp b/src/sdl/image.cpp index 42e8df446d8a..b7a1e6df89df 100644 --- a/src/sdl/image.cpp +++ b/src/sdl/image.cpp @@ -15,7 +15,7 @@ #include "sdl/image.hpp" -#include "SDL_image.h" +#include #include "sdl/exception.hpp" #include "sdl/rect.hpp" #include "sdl/utils.hpp" diff --git a/src/sdl/utils.hpp b/src/sdl/utils.hpp index 3ce4e461dd1c..e77f01a5a851 100644 --- a/src/sdl/utils.hpp +++ b/src/sdl/utils.hpp @@ -21,7 +21,7 @@ #include "util.hpp" #include "sdl/compat.hpp" -#include "SDL.h" +#include #include #include diff --git a/src/sound.cpp b/src/sound.cpp index 730153ee77ac..297ceea01408 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -23,8 +23,8 @@ #include "sound_music_track.hpp" #include "util.hpp" -#include "SDL_mixer.h" -#include "SDL.h" // Travis doesn't like this, although it works on my machine -> '#include "SDL_sound.h" +#include +#include // Travis doesn't like this, although it works on my machine -> '#include #include diff --git a/src/soundsource.cpp b/src/soundsource.cpp index 62bd7e99ae67..d3d3e08ac44f 100644 --- a/src/soundsource.cpp +++ b/src/soundsource.cpp @@ -21,7 +21,7 @@ #include "sound.hpp" #include "soundsource.hpp" -#include "SDL.h" // Travis doesn't like this, although it works on my machine -> '#include "SDL_sound.h" +#include // Travis doesn't like this, although it works on my machine -> '#include namespace soundsource { diff --git a/src/tests/gui/test_save_dialog.cpp b/src/tests/gui/test_save_dialog.cpp index 10573ff6b40e..4d0b6181f195 100644 --- a/src/tests/gui/test_save_dialog.cpp +++ b/src/tests/gui/test_save_dialog.cpp @@ -26,7 +26,7 @@ #include "unit_types.hpp" // -#include "SDL.h" +#include #include "tests/utils/fake_event_source.hpp" #include "tests/utils/fake_display.hpp" diff --git a/src/tests/main.cpp b/src/tests/main.cpp index 100132c40a84..8c7ca80c3fa3 100644 --- a/src/tests/main.cpp +++ b/src/tests/main.cpp @@ -31,7 +31,7 @@ #include -#include "SDL.h" +#include #include "filesystem.hpp" #include "game_config.hpp" diff --git a/src/tests/utils/fake_event_source.hpp b/src/tests/utils/fake_event_source.hpp index 84e12b1c2059..8ed00979fff7 100644 --- a/src/tests/utils/fake_event_source.hpp +++ b/src/tests/utils/fake_event_source.hpp @@ -18,7 +18,7 @@ #include #include #include -#include "SDL.h" +#include #include "events.hpp" #include "sdl/compat.hpp" diff --git a/src/thread.cpp b/src/thread.cpp index c00a9d4e993f..1ec6647cfcb8 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -19,9 +19,9 @@ #include "log.hpp" #include "thread.hpp" -#include "SDL_mutex.h" -#include "SDL_thread.h" -#include "SDL_version.h" +#include +#include +#include #define ERR_G LOG_STREAM(err, lg::general()) diff --git a/src/tools/cutter.cpp b/src/tools/cutter.cpp index 084c86de38ae..7171f8a97f7b 100644 --- a/src/tools/cutter.cpp +++ b/src/tools/cutter.cpp @@ -20,7 +20,7 @@ #include "game_config.hpp" #include "exploder_composer.hpp" -#include "SDL_image.h" +#include #include diff --git a/src/tools/exploder_composer.cpp b/src/tools/exploder_composer.cpp index 3bf82742d572..44da1a4369f4 100644 --- a/src/tools/exploder_composer.cpp +++ b/src/tools/exploder_composer.cpp @@ -13,7 +13,7 @@ */ #include "exploder_composer.hpp" -#include "SDL_image.h" +#include #include diff --git a/src/tools/exploder_cutter.cpp b/src/tools/exploder_cutter.cpp index 354396eae467..581bf1b8b048 100644 --- a/src/tools/exploder_cutter.cpp +++ b/src/tools/exploder_cutter.cpp @@ -18,7 +18,7 @@ #include "serialization/parser.hpp" #include "serialization/preprocessor.hpp" #include "serialization/string_utils.hpp" -#include "SDL_image.h" +#include #include diff --git a/src/tooltips.cpp b/src/tooltips.cpp index d90a72fe47ad..3767971c242f 100644 --- a/src/tooltips.cpp +++ b/src/tooltips.cpp @@ -23,7 +23,7 @@ #include "resources.hpp" #include "video.hpp" -#include "SDL.h" // Travis doesn't like this, although it works on my machine -> '#include "SDL_sound.h" +#include // Travis doesn't like this, although it works on my machine -> '#include #include diff --git a/src/unit.cpp b/src/unit.cpp index 1d268415539b..7ddeb6fd4fac 100644 --- a/src/unit.cpp +++ b/src/unit.cpp @@ -69,7 +69,7 @@ #include // for back_insert_iterator, etc #include // for operator new #include // for operator<<, basic_ostream, etc -#include "SDL_video.h" // for SDL_Color +#include // for SDL_Color namespace t_translation { struct t_terrain; } diff --git a/src/widgets/drop_target.hpp b/src/widgets/drop_target.hpp index f00703048291..4f857978cd8b 100644 --- a/src/widgets/drop_target.hpp +++ b/src/widgets/drop_target.hpp @@ -14,7 +14,7 @@ #ifndef DROP_TARGET_H_INCLUDED #define DROP_TARGET_H_INCLUDED -#include "SDL.h" +#include #include diff --git a/src/widgets/scrollpane.hpp b/src/widgets/scrollpane.hpp index 7d7111a2e165..85509dcbe953 100644 --- a/src/widgets/scrollpane.hpp +++ b/src/widgets/scrollpane.hpp @@ -20,7 +20,7 @@ #include #include -#include "SDL.h" +#include #include "sdl/utils.hpp" #include "scrollarea.hpp" diff --git a/src/widgets/slider.hpp b/src/widgets/slider.hpp index 94c1137fb88a..c1f7175bd6cb 100644 --- a/src/widgets/slider.hpp +++ b/src/widgets/slider.hpp @@ -14,7 +14,7 @@ #ifndef SLIDER_HPP_INCLUDED #define SLIDER_HPP_INCLUDED -#include "SDL.h" +#include #include "sdl/utils.hpp"