Remove unnecessary header files (#8531)

Co-authored-by: shijie.chen <shijie.chen@goland.cn>

src/actions/undo_action.hpp

@@ -18,7 +18,6 @@
 #include <optional>
 #include "map/location.hpp"
 #include "synced_context.hpp"
-#include "game_events/pump.hpp" // for queued_event
 #include "config.hpp"
 
 namespace actions {

src/actions/undo_dismiss_action.cpp

@@ -14,7 +14,6 @@
 
 #include "actions/undo_dismiss_action.hpp"
 #include "game_board.hpp"
-#include "replay.hpp"
 #include "resources.hpp"
 #include "team.hpp"
 #include "units/unit.hpp"

src/actions/undo_move_action.cpp

@@ -13,10 +13,8 @@
 */
 
 #include "actions/undo_move_action.hpp"
-#include "actions/move.hpp"
 
 #include "resources.hpp"
-#include "replay.hpp"
 #include "units/map.hpp"
 #include "units/animation_component.hpp"
 #include "log.hpp"
@@ -24,7 +22,6 @@
 #include "units/udisplay.hpp"
 #include "units/unit.hpp"
 #include "game_board.hpp"
-#include "map/map.hpp"
 
 static lg::log_domain log_engine("engine");
 #define ERR_NG LOG_STREAM(err, log_engine)

src/actions/undo_recall_action.cpp

@@ -13,14 +13,11 @@
 */
 
 #include "actions/undo_recall_action.hpp"
-#include "actions/create.hpp"
 
-#include "gui/dialogs/transient_message.hpp"
 #include "game_board.hpp"
 #include "play_controller.hpp"
 #include "resources.hpp"
 #include "team.hpp"
-#include "replay.hpp"
 #include "units/animation_component.hpp"
 #include "units/map.hpp"
 #include "units/unit.hpp"

src/actions/undo_recruit_action.cpp

@@ -13,14 +13,11 @@
 */
 
 #include "actions/undo_recruit_action.hpp"
-#include "actions/create.hpp"
 
-#include "gui/dialogs/transient_message.hpp"
 #include "game_board.hpp"
 #include "play_controller.hpp"
 #include "resources.hpp"
 #include "team.hpp"
-#include "replay.hpp"
 #include "units/map.hpp"
 #include "units/unit.hpp"
 #include "units/types.hpp"

src/actions/undo_update_shroud_action.cpp

@@ -13,7 +13,6 @@
 */
 
 #include "actions/undo_update_shroud_action.hpp"
-#include "replay.hpp"
 
 namespace actions
 {

src/actions/undo_update_shroud_action.hpp

@@ -15,7 +15,6 @@
 #pragma once
 
 #include "undo_action.hpp"
-#include "units/ptr.hpp"
 
 namespace actions
 {

src/actions/unit_creator.cpp

@@ -24,13 +24,11 @@
 
 #include "config.hpp"
 #include "display.hpp"
-#include "filter_context.hpp"
 #include "game_board.hpp"
 #include "game_events/pump.hpp"
 #include "preferences/game.hpp"
 #include "game_data.hpp" // for resources::gamedata conversion variable_set
 #include "game_version.hpp"
-#include "gettext.hpp"
 #include "log.hpp"
 #include "map/map.hpp"
 #include "pathfind/pathfind.hpp"
@@ -38,7 +36,6 @@
 #include "team.hpp" //for team
 #include "units/unit.hpp" // for unit
 #include "units/udisplay.hpp" // for unit_display
-#include "variable.hpp" // for vconfig
 #include "deprecation.hpp"
 
 static lg::log_domain log_engine("engine");

src/actions/vision.cpp

@@ -34,9 +34,7 @@
 #include "team.hpp"
 #include "units/unit.hpp"
 
-#include <boost/dynamic_bitset.hpp>
 
-class unit_animation;
 
 static lg::log_domain log_engine("engine");
 #define DBG_NG LOG_STREAM(debug, log_engine)

src/addon/client.cpp

@@ -31,8 +31,6 @@
 #include "log.hpp"
 #include "preferences/credentials.hpp"
 #include "preferences/game.hpp"
-#include "random.hpp"
-#include "serialization/parser.hpp"
 #include "serialization/string_utils.hpp"
 #include "serialization/utf8_exception.hpp"
 #include "utils/parse_network_address.hpp"

src/addon/info.cpp

@@ -15,7 +15,6 @@
 
 #include "addon/info.hpp"
 
-#include "addon/manager.hpp"
 #include "config.hpp"
 #include "font/pango/escape.hpp"
 #include "gettext.hpp"

src/addon/info.hpp

@@ -23,7 +23,6 @@
 #include <set>
 #include <map>
 
-struct addon_info_translation;
 struct addon_info;
 class config;
 typedef std::map<std::string, addon_info> addons_list;

src/addon/manager.hpp

@@ -36,7 +36,6 @@ class version_info;
 #include <functional>
 #include <string>
 #include <vector>
-#include <utility>
 #include <map>
 
 /**

src/ai/actions.cpp

@@ -47,7 +47,6 @@
 #include "mouse_handler_base.hpp"
 #include "pathfind/teleport.hpp"
 #include "play_controller.hpp"
-#include "playsingle_controller.hpp"
 #include "recall_list_manager.hpp"
 #include "replay_helper.hpp"
 #include "resources.hpp"
@@ -56,7 +55,6 @@
 #include "units/unit.hpp"
 #include "units/ptr.hpp"
 #include "units/types.hpp"
-#include "whiteboard/manager.hpp"
 
 namespace ai {
 

src/ai/composite/ai.cpp

@@ -25,7 +25,6 @@
 #include "ai/composite/property_handler.hpp"
 #include "ai/composite/stage.hpp"
 #include "ai/configuration.hpp"
-#include "ai/manager.hpp"
 #include "actions/attack.hpp"
 #include "log.hpp"
 

src/ai/composite/component.cpp

@@ -19,22 +19,13 @@
  */
 
 #include "ai/composite/component.hpp"
-#include "ai/composite/engine.hpp"
 #include "ai/composite/property_handler.hpp"
 #include "config.hpp"
 #include "log.hpp"
-#include "units/unit.hpp"
 
-#include "ai/formula/ai.hpp"
 
 #include <boost/regex.hpp>
 
-namespace pathfind {
-
-struct pathfind;
-
-} //of namespace pathfind
-
 namespace ai {
 
 static lg::log_domain log_ai_component("ai/component");

src/ai/composite/contexts.hpp

@@ -35,7 +35,6 @@ public:
 
 };
 
-class rca_context;
 class rca_context : public virtual ai_context {
 public:
 
@@ -66,7 +65,6 @@ private:
 	static bool strategy_set_;
 };
 
-class candidate_action_context;
 class candidate_action_context : public virtual rca_context {
 public:
 

src/ai/composite/engine.hpp

@@ -23,7 +23,6 @@
 #include "ai/composite/component.hpp"
 #include "ai/contexts.hpp"
 
-#include <algorithm>
 #include <iterator>
 
 //============================================================================
@@ -31,8 +30,6 @@
 namespace ai {
 
 class rca_context;
-class ai_context;
-class component;
 
 class engine : public component {
 public:
@@ -102,7 +99,6 @@ protected:
 	std::string name_;
 };
 
-class engine_factory;
 
 class engine_factory{
 	bool is_duplicate(const std::string &name);

src/ai/composite/goal.cpp

@@ -22,8 +22,6 @@
 #include "ai/default/contexts.hpp"
 #include "ai/lua/core.hpp"
 #include "ai/lua/lua_object.hpp"
-#include "ai/manager.hpp"
-#include "filter_context.hpp"
 #include "game_board.hpp"
 #include "log.hpp"
 #include "map/location.hpp"

src/ai/composite/goal.hpp

@@ -27,7 +27,6 @@
 
 #include <iterator>
 #include <map>
-#include <set>
 #include <string>
 #include <utility>
 #include <vector>

src/ai/composite/rca.cpp

@@ -18,8 +18,6 @@
  * @file
  */
 
-#include "ai/composite/ai.hpp"
-#include "ai/composite/engine.hpp"
 #include "ai/composite/rca.hpp"
 #include "log.hpp"
 

src/ai/composite/rca.hpp

@@ -144,7 +144,6 @@ private:
 
 typedef std::shared_ptr<candidate_action> candidate_action_ptr;
 
-class candidate_action_factory;
 
 class candidate_action_factory{
 	bool is_duplicate(const std::string &name);

src/ai/composite/stage.cpp

@@ -18,8 +18,6 @@
  * @file
  */
 
-#include "ai/composite/ai.hpp"
-#include "ai/composite/engine.hpp"
 #include "ai/composite/stage.hpp"
 #include "ai/contexts.hpp"
 #include "log.hpp"

src/ai/composite/stage.hpp

@@ -25,7 +25,6 @@
 
 namespace ai {
 
-class ai_composite;
 
 class stage : public virtual ai_context_proxy, public component {
 public:

src/ai/contexts.cpp

@@ -27,7 +27,6 @@
 #include "ai/composite/aspect.hpp"         // for typesafe_aspect, aspect, etc
 #include "ai/composite/engine.hpp"         // for engine, engine_factory, etc
 #include "ai/composite/goal.hpp"           // for goal
-#include "ai/composite/stage.hpp"       // for ministage
 #include "ai/game_info.hpp"             // for typesafe_aspect_ptr, etc
 #include "ai/lua/aspect_advancements.hpp"
 #include "ai/manager.hpp"                  // for manager
@@ -51,8 +50,6 @@
 #include "units/unit.hpp"                  // for unit
 #include "units/unit_alignments.hpp"
 #include "units/map.hpp"  // for unit_map::iterator_base, etc
-#include "units/ptr.hpp"                 // for unit_ptr
-#include "units/types.hpp"  // for attack_type, unit_type, etc
 #include "formula/variant.hpp"                  // for variant
 
 #include <algorithm>                    // for find, count, max, fill_n

src/ai/contexts.hpp

@@ -28,7 +28,6 @@
 #include "generic_event.hpp"         // for observer
 #include "units/ptr.hpp"              // for unit_ptr
 #include "map/location.hpp"       // for map_location
-#include "utils/variant.hpp"
 
 #include <map>                          // for map, map<>::value_compare
 #include <set>                          // for set
@@ -44,9 +43,6 @@ class unit_type;  // lines 46-46
 namespace wfl { class variant; }
 namespace ai { class ai_context; }  // lines 51-51
 namespace ai { class unit_advancements_aspect; }
-namespace ai { template <typename T> class typesafe_aspect; }
-namespace boost { template <class T> class shared_ptr; }
-namespace pathfind { struct paths; }
 struct battle_context_unit_stats;  // lines 39-39
 
 namespace ai {
@@ -120,7 +116,6 @@ private:
 
 // side context
 
-class side_context;
 
 class side_context{
 public:
@@ -162,7 +157,6 @@ public:
 
 };
 
-class readonly_context;
 class readonly_context : public virtual side_context {
 public:
 	readonly_context(){}
@@ -350,7 +344,6 @@ public:
 
 };
 
-class readwrite_context;
 class readwrite_context : public virtual readonly_context {
 public:
 	readwrite_context(){}

src/ai/default/aspect_attacks.cpp

@@ -30,7 +30,6 @@
 #include "resources.hpp"
 #include "scripting/lua_unit.hpp"
 #include "team.hpp"
-#include "tod_manager.hpp"
 #include "units/filter.hpp"
 #include "units/unit.hpp"
 

src/ai/default/attack.cpp

@@ -21,7 +21,6 @@
 #include "ai/manager.hpp"
 #include "ai/default/contexts.hpp"
 #include "ai/actions.hpp"
-#include "ai/formula/ai.hpp"
 #include "ai/composite/contexts.hpp"
 
 #include "actions/attack.hpp"

src/ai/default/ca.cpp

@@ -21,9 +21,7 @@
 #include "ai/default/ca.hpp"
 #include "ai/actions.hpp"
 #include "ai/manager.hpp"
-#include "ai/composite/engine.hpp"
 #include "ai/composite/rca.hpp"
-#include "ai/composite/stage.hpp"
 #include "game_board.hpp"
 #include "game_data.hpp"
 #include "log.hpp"
@@ -35,7 +33,6 @@
 #include "pathfind/teleport.hpp"
 
 #include <numeric>
-#include <boost/dynamic_bitset.hpp>
 
 #include <SDL2/SDL_timer.h>
 

src/ai/default/ca_move_to_targets.cpp

@@ -20,7 +20,6 @@
 
 #include "ai/default/ca_move_to_targets.hpp"
 
-#include "ai/composite/ai.hpp"
 #include "ai/actions.hpp"
 #include "game_board.hpp"
 #include "log.hpp"

src/ai/default/contexts.hpp

@@ -122,7 +122,6 @@ public:
 	wfl::variant execute_self(wfl::variant ctxt) override;
 };
 
-class default_ai_context;
 class default_ai_context : public virtual readwrite_context{
 public:
 

src/ai/default/engine_cpp.cpp

@@ -18,7 +18,6 @@
  * @file
  */
 
-#include "ai/composite/ai.hpp"
 #include "ai/composite/aspect.hpp"
 #include "ai/composite/goal.hpp"
 #include "ai/composite/rca.hpp"

src/ai/default/recruitment.cpp

@@ -27,7 +27,6 @@
 #include "actions/attack.hpp"
 #include "attack_prediction.hpp"
 #include "display.hpp"
-#include "filter_context.hpp"
 #include "game_board.hpp"
 #include "log.hpp"
 #include "map/map.hpp"

src/ai/default/stage_rca.cpp

@@ -21,7 +21,6 @@
 #include "ai/default/stage_rca.hpp"
 
 #include "ai/manager.hpp"
-#include "ai/composite/ai.hpp"
 #include "ai/composite/engine.hpp"
 #include "ai/composite/property_handler.hpp"
 #include "ai/composite/rca.hpp"

src/ai/formula/ai.cpp

@@ -39,26 +39,16 @@
 #include "tod_manager.hpp"        // for tod_manager
 #include "tstring.hpp"                  // for t_string, operator+
 #include "units/unit.hpp"               // for unit
-#include "units/formula_manager.hpp"  // for unit_formula_manager
 #include "units/ptr.hpp"                 // for unit_ptr
 #include "units/types.hpp"
 #include "formula/formula.hpp"  // for formula_error, formula, etc
 #include "map/location.hpp"  // for map_location, etc
-#include "ai/actions.hpp"               // for recall_result, etc
-#include "ai/manager.hpp"               // for manager
-#include "ai/composite/contexts.hpp"
-#include "ai/composite/stage.hpp"  // for stage
-#include "ai/default/contexts.hpp"  // for attack_analysis
 #include "ai/formula/function_table.hpp"           // for ai_function_symbol_table
 #include "ai/game_info.hpp"  // for move_result_ptr, move_map, etc
 #include "ai/formula/candidates.hpp"               // for base_candidate_action, etc
 #include "utils/variant.hpp"
 
-#include <cassert>                     // for assert
 #include <ctime>                       // for time
-#include <map>                          // for multimap<>::const_iterator, etc
-#include <sstream>                      // for operator<<, basic_ostream, etc
-#include <stack>                        // for stack
 #include <vector>                       // for vector, allocator, etc
 
 static lg::log_domain log_formula_ai("ai/engine/fai");

src/ai/formula/ai.hpp

@@ -27,7 +27,6 @@
 #include "config.hpp"                   // for config
 #include "formula/callable.hpp"         // for formula_callable, etc
 #include "formula/formula_fwd.hpp"              // for const_formula_ptr, etc
-#include "generic_event.hpp"  // for observer
 #include "pathfind/teleport.hpp"  // for teleport_map
 #include "units/map.hpp"
 #include <set>                          // for multiset
@@ -36,12 +35,10 @@
 #include <vector>                       // for vector
 
 namespace ai { class ai_context; }
-namespace pathfind { struct plain_route; }  // lines 57-57
 struct map_location;
 
 namespace wfl {
 	struct formula_error;
-	class variant;
 }
 
 namespace wfl {

src/ai/formula/callable_objects.cpp

@@ -14,7 +14,6 @@
 */
 
 #include "ai/formula/ai.hpp"
-#include "attack_prediction.hpp"
 #include "game_board.hpp"
 #include "ai/formula/callable_objects.hpp"
 #include "ai/composite/contexts.hpp"

src/ai/formula/callable_objects.hpp

@@ -18,7 +18,6 @@
 #include "ai/game_info.hpp"
 #include "actions/attack.hpp"
 #include "formula/callable_objects.hpp"
-#include "formula/formula.hpp"
 #include "formula/callable.hpp"
 
 namespace ai {

src/ai/formula/candidates.hpp

@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include <set>
 
 class unit_map;
 class config;

src/ai/formula/engine_fai.cpp

@@ -21,12 +21,10 @@
 #include "ai/formula/ai.hpp"
 #include "ai/formula/engine_fai.hpp"
 #include "ai/composite/rca.hpp"
-#include "ai/formula/ai.hpp"
 #include "ai/formula/candidates.hpp"
 #include "ai/formula/stage_side_formulas.hpp"
 #include "ai/formula/stage_unit_formulas.hpp"
 #include "log.hpp"
-#include "units/unit.hpp"
 
 namespace ai {
 

src/ai/formula/engine_fai.hpp

@@ -21,7 +21,6 @@
 #pragma once
 
 #include "ai/composite/engine.hpp"
-#include "ai/default/contexts.hpp"
 
 //============================================================================
 namespace ai {

src/ai/formula/function_table.hpp

@@ -17,7 +17,6 @@
 
 #include "formula/function.hpp"
 
-#include <set>
 
 namespace ai {
 	class formula_ai;

src/ai/formula/stage_side_formulas.cpp

@@ -22,7 +22,6 @@
 #include "ai/formula/ai.hpp"
 
 #include "formula/formula.hpp"
-#include "formula/function.hpp"
 #include "log.hpp"
 
 static lg::log_domain log_ai("ai/stage/side_formulas");

src/ai/formula/stage_unit_formulas.cpp

@@ -23,7 +23,6 @@
 #include "ai/formula/ai.hpp"
 
 #include "formula/formula.hpp"
-#include "formula/function.hpp"
 #include "game_board.hpp"
 #include "log.hpp"
 #include "resources.hpp"

src/ai/lua/aspect_advancements.cpp

@@ -22,11 +22,9 @@
 #include "units/unit.hpp"
 #include "units/map.hpp"    // for unit_map::const_iterator, etc
 
-#include <ostream>                      // for operator<<, basic_ostream, etc
 #include <string>                       // for string, char_traits, etc
 #include <vector>                       // for vector
 
-struct lua_State;
 
 
 static lg::log_domain log_ai_engine_lua("ai/engine/lua");

src/ai/lua/core.cpp

@@ -19,24 +19,18 @@
  *
  */
 
-#include <cassert>
 #include <cstring>
 
 #include "ai/lua/core.hpp"
 #include "ai/composite/aspect.hpp"
-#include "scripting/game_lua_kernel.hpp"
 #include "scripting/lua_unit.hpp"
 #include "scripting/push_check.hpp"
 #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"
 #include "play_controller.hpp"
 #include "resources.hpp"
-#include "terrain/translation.hpp"
 #include "terrain/filter.hpp"
 #include "units/unit.hpp"
 #include "ai/actions.hpp"
@@ -44,7 +38,6 @@
 #include "ai/composite/contexts.hpp"
 #include "ai/default/aspect_attacks.hpp"
 
-#include "lua/wrapper_lauxlib.h"
 
 static lg::log_domain log_ai_engine_lua("ai/engine/lua");
 #define LOG_LUA LOG_STREAM(info, log_ai_engine_lua)

src/ai/lua/engine_lua.cpp

@@ -19,7 +19,6 @@
  */
 
 #include "ai/lua/engine_lua.hpp"
-#include "ai/composite/ai.hpp"
 #include "ai/composite/goal.hpp"
 #include "ai/composite/rca.hpp"
 #include "ai/composite/stage.hpp"

src/ai/lua/lua_object.cpp

@@ -19,10 +19,8 @@
  */
 
 #include "ai/lua/lua_object.hpp"
-#include "ai/lua/engine_lua.hpp"
 #include "ai/default/aspect_attacks.hpp"
 #include "scripting/lua_common.hpp"
-#include "resources.hpp"
 
 #include "lua/wrapper_lauxlib.h"
 

src/ai/lua/lua_object.hpp

@@ -31,7 +31,6 @@
 #include "ai/default/contexts.hpp"
 #include "ai/lua/aspect_advancements.hpp"
 
-#include <iterator>
 #include <string>
 #include <vector>
 

src/ai/manager.cpp

@@ -35,7 +35,6 @@
 #include "ai/configuration.hpp"            // for configuration
 #include "ai/contexts.hpp"                 // for readonly_context, etc
 #include "ai/default/contexts.hpp"  // for default_ai_context, etc
-#include "game_end_exceptions.hpp" // for ai_end_turn_exception
 #include "ai/game_info.hpp"             // for side_number, engine_ptr, etc
 #include "game_config.hpp"              // for debug
 #include "ai/lua/aspect_advancements.hpp"
@@ -46,7 +45,6 @@
 #include <cassert>                     // for assert
 #include <iterator>                     // for reverse_iterator, etc
 #include <map>                          // for _Rb_tree_iterator, etc
-#include <ostream>                      // for operator<<, basic_ostream, etc
 #include <set>                          // for set
 #include <stack>                        // for stack
 #include <utility>                      // for pair, make_pair

src/ai/manager.hpp

@@ -34,14 +34,11 @@
 class game_launcher;
 namespace ai { class unit_advancements_aspect; }  // lines 45-45
 namespace ai { class ai_composite; }  // lines 45-45
-namespace ai { class ai_context; }  // lines 42-42
 namespace ai { class component; }  // lines 43-43
 namespace ai { class default_ai_context; }  // lines 41-41
 namespace ai { class readonly_context; }  // lines 39-39
 namespace ai { class readwrite_context; }  // lines 40-40
 namespace ai { class side_context; }  // lines 38-38
-namespace events { class generic_event; }
-namespace events { class observer; }
 
 namespace ai
 {

src/ai/registry.cpp

@@ -26,7 +26,6 @@
 #include "ai/composite/stage.hpp"       // for ministage, idle_stage, etc
 #include "ai/composite/rca.hpp"
 #include "ai/game_info.hpp"             // for attacks_vector
-#include "ai/composite/ai.hpp"             // for ai_composite
 #include "ai/composite/aspect.hpp"         // for composite_aspect, etc
 #include "ai/default/engine_cpp.hpp"  // for engine_cpp
 #include "ai/formula/engine_fai.hpp"     // for engine_fai

src/ai/simulated_actions.hpp

@@ -22,7 +22,6 @@
 
 #include "ai/game_info.hpp"
 
-#include "lua/aspect_advancements.hpp"
 
 class unit_type;
 

src/ai/testing.cpp

@@ -24,7 +24,6 @@
 #include "replay.hpp"
 #include "resources.hpp"
 #include "team.hpp"
-#include "units/unit.hpp"
 #include "tod_manager.hpp"
 #include "game_version.hpp"
 

src/ai/testing.hpp

@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include <vector>
 
 class ai_testing{
 public:

src/animated.hpp

@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include <map>
-#include <string>
 #include <vector>
 
 void new_animation_frame();

src/arrow.cpp

@@ -21,7 +21,6 @@
 #include "arrow.hpp"
 
 #include "draw.hpp"
-#include "game_display.hpp"
 #include "log.hpp"
 
 static lg::log_domain log_arrows("arrows");

src/attack_prediction.cpp

@@ -32,17 +32,13 @@
 
 #include "actions/attack.hpp"
 #include "game_config.hpp"
-#include "log.hpp"
 #include "preferences/general.hpp"
 #include "random.hpp"
-#include "serialization/string_utils.hpp"
 
 #include <array>
 #include <cfloat>
-#include <cmath>
 #include <memory>
 #include <numeric>
-#include <sstream>
 
 #if defined(BENCHMARK) || defined(CHECK)
 #include <chrono>

src/attack_prediction.hpp

@@ -17,7 +17,6 @@
 
 #include <vector>
 #include <array>
-#include <cstring>
 
 struct battle_context_unit_stats;
 

src/build_info.cpp

@@ -18,7 +18,6 @@
 #include "build_info.hpp"
 
 #include "desktop/version.hpp"
-#include "game_config.hpp"
 #include "filesystem.hpp"
 #include "formatter.hpp"
 #include "gettext.hpp"
@@ -36,12 +35,10 @@
 
 #include "lua/wrapper_lua.h"
 
-#include <SDL2/SDL.h>
 #include <SDL2/SDL_image.h>
 #include <SDL2/SDL_mixer.h>
 
 #include <boost/algorithm/string.hpp>
-#include <boost/predef.h>
 #include <boost/version.hpp>
 
 #ifndef __APPLE__

src/carryover.cpp

@@ -18,7 +18,6 @@
 #include "config.hpp"
 #include "log.hpp"
 #include "serialization/string_utils.hpp"
-#include <cassert>
 
 static lg::log_domain log_engine("engine");
 #define LOG_NG LOG_STREAM(info, log_engine)

src/carryover.hpp

@@ -15,7 +15,6 @@
 #pragma once
 
 class team;
-class config;
 #include <vector>
 #include <string>
 #include <set>

src/carryover_show_gold.cpp

@@ -15,15 +15,11 @@
 
 #include "carryover_show_gold.hpp"
 
-#include "config.hpp"
 #include "log.hpp"
 #include "team.hpp"
 #include "game_state.hpp"
 #include "gettext.hpp"
-#include "gui/dialogs/message.hpp"
-#include "gui/dialogs/outro.hpp"
 #include "gui/dialogs/transient_message.hpp"
-#include "gui/widgets/retval.hpp"
 #include "formula/string_utils.hpp"
 #include "map/map.hpp"
 #include <cassert>

src/chat_command_handler.cpp

@@ -20,7 +20,6 @@
 #include "gui/dialogs/multiplayer/mp_report.hpp"
 #include "gui/dialogs/preferences_dialog.hpp"
 #include "map_command_handler.hpp"
-#include "preferences/display.hpp"
 #include "preferences/game.hpp"
 
 namespace events {

src/chat_events.cpp

@@ -17,11 +17,8 @@
 #include "formula/string_utils.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
-#include "map_command_handler.hpp"
 #include "chat_command_handler.hpp"
 #include "preferences/credentials.hpp"
-#include "preferences/general.hpp"
-#include "preferences/game.hpp"
 
 static lg::log_domain log_engine("engine");
 #define ERR_NG LOG_STREAM(err, log_engine)

src/color_range.cpp

@@ -23,7 +23,6 @@
 
 #include "map/map.hpp"
 
-#include <iomanip>
 #include <sstream>
 #include <unordered_set>
 

src/color_range.hpp

@@ -17,7 +17,6 @@
 
 #include "color.hpp"
 
-#include <cstdint>
 #include <string>
 #include <unordered_map>
 #include <vector>

src/config.cpp

@@ -30,7 +30,6 @@
 
 #include <algorithm>
 #include <cstring>
-#include <istream>
 
 static lg::log_domain log_config("config");
 #define ERR_CF LOG_STREAM(err, log_config)

src/config_attribute_value.cpp

@@ -26,7 +26,6 @@
 #include "serialization/string_utils.hpp"
 
 #include <cstdlib>
-#include <istream>
 
 static lg::log_domain log_config("config");
 #define ERR_CF LOG_STREAM(err, log_config)

src/conftests/sdl2_image.cpp

@@ -13,7 +13,6 @@
 */
 
 #include <SDL2/SDL.h>
-#include <SDL2/SDL_image.h>
 
 int main(int, char**)
 {

src/controller_base.cpp

@@ -21,7 +21,6 @@
 #include "game_config_manager.hpp"
 #include "hotkey/command_executor.hpp"
 #include "log.hpp"
-#include "map/map.hpp"
 #include "mouse_handler_base.hpp"
 #include "preferences/game.hpp"
 #include "scripting/plugins/context.hpp"

src/countdown_clock.cpp

@@ -15,7 +15,6 @@
 #include "countdown_clock.hpp"
 
 #include "team.hpp"
-#include "saved_game.hpp"
 #include "preferences/general.hpp"
 #include "sound.hpp"
 

src/cursor.hpp

@@ -15,7 +15,6 @@
 
 #pragma once
 
-class surface;
 
 namespace cursor
 {

src/deprecation.cpp

@@ -15,7 +15,6 @@
 #include "deprecation.hpp"
 
 #include "formula/string_utils.hpp"
-#include "gettext.hpp"
 #include "log.hpp"
 #include "preferences/general.hpp"
 #include "game_version.hpp"

src/desktop/clipboard.cpp

@@ -14,8 +14,6 @@
 */
 
 #include "desktop/clipboard.hpp"
-#include "serialization/unicode.hpp"
-#include <algorithm>
 
 #include <SDL2/SDL_events.h>
 #include <SDL2/SDL_clipboard.h>

src/desktop/notifications.cpp

@@ -15,7 +15,6 @@
 
 #include "desktop/notifications.hpp"
 
-#include "preferences/game.hpp"
 #include "gettext.hpp"
 
 #include "video.hpp" // window_has_flags()

src/desktop/open.cpp

@@ -22,7 +22,6 @@
 
 #include <thread>
 
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h> // fork(), exec family
 

src/desktop/paths.cpp

@@ -17,7 +17,6 @@
 
 #include "desktop/paths.hpp"
 
-#include "game_config.hpp"
 #include "filesystem.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
@@ -33,7 +32,6 @@
 
 // For username stuff on Unix:
 #include <pwd.h>
-#include <sys/types.h>
 
 #else // _WIN32
 

src/desktop/version.cpp

@@ -48,7 +48,6 @@
 #endif
 
 #ifdef _WIN32
-
 #ifndef UNICODE
 #define UNICODE
 #endif

src/display.cpp

@@ -22,7 +22,6 @@
 
 #include "arrow.hpp"
 #include "color.hpp"
-#include "cursor.hpp"
 #include "draw.hpp"
 #include "draw_manager.hpp"
 #include "fake_unit_manager.hpp"
@@ -30,11 +29,8 @@
 #include "font/sdl_ttf_compat.hpp"
 #include "font/text.hpp"
 #include "preferences/game.hpp"
-#include "gettext.hpp"
-#include "gui/dialogs/loading_screen.hpp"
 #include "halo.hpp"
 #include "hotkey/command_executor.hpp"
-#include "language.hpp"
 #include "log.hpp"
 #include "map/map.hpp"
 #include "map/label.hpp"
@@ -49,7 +45,6 @@
 #include "terrain/builder.hpp"
 #include "time_of_day.hpp"
 #include "tooltips.hpp"
-#include "tod_manager.hpp"
 #include "units/unit.hpp"
 #include "units/animation_component.hpp"
 #include "units/drawer.hpp"
@@ -59,7 +54,6 @@
 
 #include <boost/algorithm/string/trim.hpp>
 
-#include <SDL2/SDL_image.h>
 
 #include <algorithm>
 #include <array>

src/display.hpp

@@ -33,7 +33,6 @@
 
 #pragma once
 
-class config;
 class fake_unit_manager;
 class terrain_builder;
 class map_labels;
@@ -42,9 +41,6 @@ class reports;
 class team;
 struct overlay;
 
-namespace halo {
-	class manager;
-}
 
 namespace wb {
 	class manager;
@@ -71,7 +67,6 @@ namespace wb {
 #include <functional>
 #include <chrono>
 #include <cstdint>
-#include <deque>
 #include <list>
 #include <map>
 #include <memory>

src/display_chat_manager.cpp

@@ -15,7 +15,6 @@
 
 #include "display_chat_manager.hpp"
 
-#include "desktop/notifications.hpp"
 #include "display.hpp"
 #include "floating_label.hpp"
 #include "game_board.hpp" // <-- only needed for is_observer()

src/draw.cpp

@@ -17,7 +17,6 @@
 #include "color.hpp"
 #include "log.hpp"
 #include "sdl/rect.hpp"
-#include "sdl/surface.hpp"
 #include "sdl/texture.hpp"
 #include "sdl/utils.hpp" // sdl::runtime_at_least
 #include "video.hpp"

src/draw.hpp

@@ -35,9 +35,6 @@
 #include <vector>
 
 struct color_t;
-class surface;
-class texture;
-struct SDL_Texture;
 
 namespace draw
 {

src/draw_manager.cpp

@@ -23,12 +23,10 @@
 #include "utils/general.hpp"
 #include "video.hpp"
 
-#include <SDL2/SDL_rect.h>
 #include <SDL2/SDL_timer.h>
 
 #include <algorithm>
 #include <vector>
-#include <map>
 
 static lg::log_domain log_draw_man("draw/manager");
 #define ERR_DM LOG_STREAM(err, log_draw_man)

src/editor/action/action_item.cpp

@@ -23,7 +23,6 @@
 
 #include "editor/action/action_item.hpp"
 
-#include "editor/map/map_context.hpp"
 
 namespace editor
 {

src/editor/action/action_label.hpp

@@ -28,7 +28,6 @@
 
 #include "color.hpp"
 #include "editor/action/action.hpp"
-#include "map/map.hpp"
 
 namespace editor
 {

src/editor/action/mouse/mouse_action.hpp

@@ -16,9 +16,7 @@
 #pragma once
 
 #include "editor/action/action_base.hpp"
-#include "editor/map/editor_map.hpp"
 #include "theme.hpp"
-#include "editor/palette/editor_palettes.hpp"
 #include "editor/palette/terrain_palettes.hpp"
 #include "editor/palette/location_palette.hpp"
 #include "editor/palette/empty_palette.hpp"

src/editor/action/mouse/mouse_action_item.cpp

@@ -19,7 +19,6 @@
 #include "editor/action/action_item.hpp"
 
 #include "editor/editor_display.hpp"
-#include "tooltips.hpp"
 #include "gettext.hpp"
 
 #include "map/location.hpp"

src/editor/action/mouse/mouse_action_map_label.cpp

@@ -20,7 +20,6 @@
 
 #include "editor/editor_display.hpp"
 #include "editor/controller/editor_controller.hpp"
-#include "editor/map/context_manager.hpp"
 
 #include "gui/dialogs/editor/edit_label.hpp"
 

src/editor/action/mouse/mouse_action_select.hpp

@@ -18,7 +18,6 @@
 #include "editor/action/mouse/mouse_action.hpp"
 
 class CKey;
-class empty_palette;
 
 namespace editor {
 

src/editor/action/mouse/mouse_action_unit.cpp

@@ -20,12 +20,10 @@
 
 #include "editor/editor_display.hpp"
 #include "formula/string_utils.hpp"
-#include "gui/dialogs/unit_create.hpp"
 #include "tooltips.hpp"
 #include "gettext.hpp"
 
 #include "map/location.hpp"
-#include "sdl/rect.hpp"
 #include "team.hpp"
 #include "units/unit.hpp"
 #include "units/map.hpp"

src/editor/action/mouse/mouse_action_village.hpp

@@ -18,7 +18,6 @@
 #include "editor/action/mouse/mouse_action.hpp"
 
 class CKey;
-class empty_palette;
 
 namespace editor {
 

src/editor/controller/editor_controller.cpp

@@ -36,7 +36,6 @@
 #include "gui/dialogs/preferences_dialog.hpp"
 #include "gui/dialogs/transient_message.hpp"
 #include "gui/dialogs/unit_list.hpp"
-#include "gui/widgets/retval.hpp"
 #include "wml_exception.hpp"
 
 #include "resources.hpp"
@@ -45,15 +44,11 @@
 #include "cursor.hpp"
 #include "desktop/clipboard.hpp"
 #include "floating_label.hpp"
-#include "game_board.hpp"
-#include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "picture.hpp"
-#include "preferences/display.hpp"
 #include "sound.hpp"
 #include "units/unit.hpp"
 #include "units/animation_component.hpp"
-#include "game_config_manager.hpp"
 #include "quit_confirmation.hpp"
 #include "sdl/input.hpp" // get_mouse_button_mask
 

src/editor/controller/editor_controller.hpp

@@ -18,8 +18,6 @@
 #include "editor/editor_display.hpp"
 #include "editor/editor_main.hpp"
 #include "editor/map/context_manager.hpp"
-#include "editor/map/map_context.hpp"
-#include "editor/map/map_fragment.hpp"
 #include "editor/toolkit/editor_toolkit.hpp"
 
 #include "controller_base.hpp"
@@ -30,19 +28,12 @@
 
 #include "sound_music_track.hpp"
 
-class map_generator;
-
-namespace tooltips {
-class manager;
-}
-
 namespace font {
 struct floating_label_context;
 }
 
 namespace editor {
 
-class editor_map;
 
 enum menu_type {
 	MAP,

src/editor/editor_display.cpp

@@ -22,10 +22,8 @@
 #include "font/sdl_ttf_compat.hpp" // for pango_line_width
 #include "lexical_cast.hpp"
 #include "overlay.hpp"
-#include "reports.hpp"
 #include "team.hpp"
 #include "terrain/builder.hpp"
-#include "units/map.hpp"
 #include "video.hpp"
 
 namespace wb {

src/editor/editor_main.cpp

@@ -20,11 +20,8 @@
 #include "gettext.hpp"
 #include "gui/dialogs/editor/choose_addon.hpp"
 #include "gui/dialogs/prompt.hpp"
-#include "gui/dialogs/message.hpp"
 #include "filesystem.hpp"
 #include "editor/action/action_base.hpp"
-#include "serialization/parser.hpp"
-#include "serialization/preprocessor.hpp"
 
 lg::log_domain log_editor("editor");
 

src/editor/editor_main.hpp

@@ -17,7 +17,6 @@
 
 #include <string>
 
-class config;
 
 namespace editor {
 

src/editor/map/context_manager.cpp

@@ -20,12 +20,10 @@
 
 #include "addon/validation.hpp"
 
-#include "display.hpp"
 #include "editor/map/context_manager.hpp"
 #include "editor/map/map_context.hpp"
 #include "filesystem.hpp"
 #include "formula/string_utils.hpp"
-#include "game_board.hpp"
 #include "generators/map_create.hpp"
 #include "generators/map_generator.hpp"
 #include "gettext.hpp"

src/editor/map/editor_map.hpp

@@ -19,7 +19,6 @@
 
 #include "map/map.hpp"
 
-#include <deque>
 
 namespace editor {