Cleaned up more unnecessary includes

src/actions/undo_recall_action.cpp

@@ -23,7 +23,6 @@
 #include "units/unit.hpp"
 #include "statistics.hpp"
 #include "log.hpp"
-#include "game_display.hpp"
 
 static lg::log_domain log_engine("engine");
 #define ERR_NG LOG_STREAM(err, log_engine)

src/actions/undo_recruit_action.cpp

@@ -23,7 +23,6 @@
 #include "units/unit.hpp"
 #include "statistics.hpp"
 #include "log.hpp"
-#include "game_display.hpp"
 
 static lg::log_domain log_engine("engine");
 #define ERR_NG LOG_STREAM(err, log_engine)

src/addon/client.cpp

@@ -27,7 +27,6 @@
 #include "log.hpp"
 #include "random.hpp"
 #include "serialization/parser.hpp"
-#include "serialization/string_utils.hpp"
 #include "serialization/utf8_exception.hpp"
 
 #include <stdexcept>

src/ai/default/aspect_attacks.cpp

@@ -25,7 +25,6 @@
 #include "log.hpp"
 #include "map/map.hpp"
 #include "team.hpp"
-#include "tod_manager.hpp"
 #include "resources.hpp"
 #include "units/unit.hpp"
 #include "pathfind/pathfind.hpp"

src/ai/lua/core.cpp

@@ -29,7 +29,6 @@
 #include "ai/lua/lua_object.hpp" // (Nephro)
 
 #include "attack_prediction.hpp"
-#include "game_display.hpp"
 #include "log.hpp"
 #include "map/map.hpp"
 #include "pathfind/pathfind.hpp"

src/arrow.cpp

@@ -19,7 +19,6 @@
 
 #include "arrow.hpp"
 
-#include "game_display.hpp"
 #include "log.hpp"
 #include "sdl/texture.hpp"
 

src/display.cpp

@@ -30,7 +30,6 @@
 #include "gui/dialogs/loading_screen.hpp"
 #include "halo.hpp"
 #include "hotkey/command_executor.hpp"
-#include "language.hpp"
 #include "log.hpp"
 #include "map/label.hpp"
 #include "map/map.hpp"
@@ -42,7 +41,6 @@
 #include "team.hpp"
 #include "terrain/builder.hpp"
 #include "time_of_day.hpp"
-#include "tod_manager.hpp"
 #include "tooltips.hpp"
 #include "units/animation_component.hpp"
 #include "units/drawer.hpp"

src/formula/formula.cpp

@@ -18,7 +18,6 @@
 #include "formula/function.hpp"
 #include "formula/string_utils.hpp"
 #include "random.hpp"
-#include "serialization/string_utils.hpp"
 #include "log.hpp"
 
 #include <cassert>

src/game_events/manager.cpp

@@ -23,7 +23,6 @@
 #include "game_data.hpp"
 #include "log.hpp"
 #include "resources.hpp"
-#include "serialization/string_utils.hpp"
 
 #include <iostream>
 

src/game_events/manager_impl.cpp

@@ -17,7 +17,6 @@
 #include "game_events/handlers.hpp"
 #include "formula/string_utils.hpp"
 #include "log.hpp"
-#include "serialization/string_utils.hpp"
 
 #include <boost/algorithm/string.hpp>
 

src/game_initialization/connect_engine.cpp

@@ -23,7 +23,6 @@
 #include "log.hpp"
 #include "map/map.hpp"
 #include "mt_rng.hpp"
-#include "tod_manager.hpp"
 #include "wesnothd_connection.hpp"
 
 #include <cstdlib>

src/generators/default_map_generator_job.cpp

@@ -21,7 +21,6 @@
 #include "serialization/string_utils.hpp"
 #include "game_config_manager.hpp"
 #include "gettext.hpp"
-#include "language.hpp"
 #include "log.hpp"
 #include "map/map.hpp"
 #include "generators/map_generator.hpp" // mapgen_exception

src/gui/dialogs/addon/manager.cpp

@@ -46,7 +46,6 @@
 #include "gui/widgets/toggle_button.hpp"
 #include "gui/widgets/text_box.hpp"
 #include "gui/widgets/window.hpp"
-#include "serialization/string_utils.hpp"
 #include "formula/string_utils.hpp"
 #include "image.hpp"
 #include "language.hpp"

src/gui/dialogs/game_load.cpp

@@ -41,7 +41,6 @@
 #include "gui/widgets/window.hpp"
 #include "image.hpp"
 #include "language.hpp"
-#include "serialization/string_utils.hpp"
 #include "utils/general.hpp"
 
 #include <cctype>

src/gui/dialogs/unit_attack.cpp

@@ -31,7 +31,6 @@
 #include "gui/widgets/unit_preview_pane.hpp"
 #include "gui/widgets/window.hpp"
 #include "game_config.hpp"
-#include "game_display.hpp"
 #include "gettext.hpp"
 #include "help/help.hpp"
 #include "language.hpp"

src/map/map.cpp

@@ -20,7 +20,6 @@
 #include "map/map.hpp"
 
 #include "config.hpp"
-#include "formula/string_utils.hpp"
 #include "log.hpp"
 #include "map/exception.hpp"
 #include "serialization/parser.hpp"

src/map_command_handler.hpp

@@ -15,7 +15,6 @@ See the COPYING file for more details.
 
 #pragma once
 #include "config.hpp"
-#include "serialization/string_utils.hpp"
 #include "formula/string_utils.hpp"
 #include "gettext.hpp"
 

src/pathfind/astarsearch.cpp

@@ -14,7 +14,6 @@
 */
 
 #include "log.hpp"
-#include "map/map.hpp"
 #include "pathfind/pathfind.hpp"
 #include "pathfind/teleport.hpp"
 

src/playturn.cpp

@@ -32,7 +32,6 @@
 #include "preferences/general.hpp"              // for message_bell
 #include "replay.hpp"                   // for replay, recorder, do_replay, etc
 #include "resources.hpp"                // for gameboard, screen, etc
-#include "serialization/string_utils.hpp"  // for string_map
 #include "synced_context.hpp"
 #include "team.hpp"                     // for team, team::CONTROLLER::AI, etc
 #include "wesnothd_connection_error.hpp"

src/preferences/game.cpp

@@ -15,7 +15,6 @@
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
 #include "game_board.hpp"
-#include "game_display.hpp"
 #include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "lexical_cast.hpp"
@@ -26,6 +25,8 @@
 #include "settings.hpp"
 #include "units/unit.hpp"
 #include "units/map.hpp"
+#include "utils/general.hpp"
+#include "video.hpp"
 #include "wml_exception.hpp"
 
 #include <cassert>

src/scripting/lua_kernel_base.cpp

@@ -40,7 +40,6 @@
 #include "image.hpp"
 
 #include "formula/string_utils.hpp"
-#include "serialization/string_utils.hpp"
 #include "utils/functional.hpp"
 #include "utils/name_generator.hpp"
 #include "utils/markov_generator.hpp"

src/sdl/surface.cpp

@@ -15,7 +15,6 @@
 
 #include "sdl/rect.hpp"
 #include "sdl/utils.hpp"
-#include "video.hpp"
 
 void surface::free_surface()
 {

src/side_filter.cpp

@@ -15,7 +15,6 @@
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
 #include "config.hpp"
-#include "display_context.hpp"
 #include "filter_context.hpp"
 #include "log.hpp"
 #include "recall_list_manager.hpp"

src/tod_manager.cpp

@@ -14,7 +14,6 @@
 
 #include "tod_manager.hpp"
 
-#include "display_context.hpp"
 #include "serialization/string_utils.hpp"
 #include "game_data.hpp"
 #include "gettext.hpp"

src/tooltips.cpp

@@ -15,13 +15,16 @@
 #include "tooltips.hpp"
 
 #include "floating_label.hpp"
+#include "font/constants.hpp"
 #include "font/standard_colors.hpp"
-#include "game_display.hpp"
 #include "help/help.hpp"
+#include "sdl/rect.hpp"
 #include "video.hpp"
 
 #include <SDL_rect.h> // Travis doesn't like this, although it works on my machine -> '#include <SDL_sound.h>
 
+#include <map>
+
 namespace {
 
 static const int font_size = font::SIZE_NORMAL;

src/units/abilities.cpp

@@ -29,7 +29,6 @@
 #include "lexical_cast.hpp"
 #include "log.hpp"
 #include "resources.hpp"
-#include "serialization/string_view.hpp"
 #include "team.hpp"
 #include "terrain/filter.hpp"
 #include "units/filter.hpp"

src/units/animation_component.cpp

@@ -16,7 +16,6 @@
 
 #include "config.hpp"
 #include "display.hpp"
-#include "map/map.hpp"
 #include "preferences/display.hpp"
 #include "random.hpp"
 #include "units/unit.hpp"

src/units/filter.cpp

@@ -17,6 +17,7 @@
 #include "log.hpp"
 
 #include "config.hpp"
+#include "display_context.hpp"
 #include "game_data.hpp"
 #include "map/map.hpp"
 #include "map/location.hpp"
@@ -24,7 +25,6 @@
 #include "side_filter.hpp"
 #include "team.hpp"
 #include "terrain/filter.hpp"
-#include "tod_manager.hpp"
 #include "units/unit.hpp"
 #include "units/formula_manager.hpp"
 #include "units/types.hpp"

src/units/filter.hpp

@@ -28,7 +28,6 @@
 #include "units/ptr.hpp"
 #include "utils/make_enum.hpp"
 
-#include "display_context.hpp"
 #include "filter_context.hpp"
 #include "units/map.hpp"
 #include "variable.hpp"

src/utils/name_generator_factory.cpp

@@ -12,7 +12,6 @@
 */
 
 #include "log.hpp"
-#include "serialization/string_utils.hpp"
 #include "utils/name_generator_factory.hpp"
 #include "utils/name_generator.hpp"
 #include "utils/context_free_grammar_generator.hpp"

src/whiteboard/side_actions.cpp

@@ -38,7 +38,6 @@
 #include "display.hpp"
 #include "game_end_exceptions.hpp"
 #include "game_state.hpp"
-#include "map/map.hpp"
 #include "resources.hpp"
 #include "units/unit.hpp"
 #include "utils/iterable_pair.hpp"