remove unit.hpp include from team.hpp

src/about.cpp

@@ -21,9 +21,11 @@
 
 #include "construct_dialog.hpp"
 #include "display.hpp"
+#include "formula_string_utils.hpp"
 #include "gettext.hpp"
 #include "marked-up_text.hpp"
 #include "sdl/alpha.hpp"
+#include "util.hpp"
 
 #include <boost/foreach.hpp>
 

src/ai/composite/component.cpp

@@ -22,6 +22,7 @@
 #include "property_handler.hpp"
 #include "../../config.hpp"
 #include "../../log.hpp"
+#include "../../unit.hpp"
 
 #include "../formula/ai.hpp"
 

src/ai/composite/engine_fai.cpp

@@ -25,6 +25,7 @@
 #include "../formula/stage_side_formulas.hpp"
 #include "../formula/stage_unit_formulas.hpp"
 #include "../../log.hpp"
+#include "../../unit.hpp"
 
 namespace ai {
 

src/ai/contexts.cpp

@@ -39,6 +39,7 @@
 #include "../mouse_handler_base.hpp"
 #include "../resources.hpp"
 #include "../tod_manager.hpp"
+#include "../unit.hpp"
 
 #include <boost/foreach.hpp>
 

src/ai/default/ai.cpp

@@ -32,6 +32,7 @@
 #include "../../mouse_handler_base.hpp"
 #include "../../resources.hpp"
 #include "../../terrain_filter.hpp"
+#include "../../unit.hpp"
 #include "../../unit_display.hpp"
 #include "../../wml_exception.hpp"
 

src/ai/default/attack.cpp

@@ -28,6 +28,7 @@
 #include "../../log.hpp"
 #include "../../map.hpp"
 #include "../../team.hpp"
+#include "../../unit.hpp"
 
 static lg::log_domain log_ai("ai/attack");
 #define LOG_AI LOG_STREAM(info, log_ai)

src/ai/default/contexts.cpp

@@ -25,6 +25,7 @@
 #include "../../map.hpp"
 #include "../../resources.hpp"
 #include "../../team.hpp"
+#include "../../unit.hpp"
 #include "../composite/goal.hpp"
 #include "../../pathfind/pathfind.hpp"
 

src/ai/testing.cpp

@@ -23,6 +23,7 @@
 #include "../util.hpp"
 #include "../resources.hpp"
 #include "../team.hpp"
+#include "../unit.hpp"
 #include "../tod_manager.hpp"
 
 static lg::log_domain log_ai_testing("ai/testing");

src/ai/testing/ca.cpp

@@ -29,6 +29,7 @@
 #include "../../map.hpp"
 #include "../../resources.hpp"
 #include "../../team.hpp"
+#include "../../unit.hpp"
 #include "../../pathfind/pathfind.hpp"
 #include "../../pathfind/teleport.hpp"
 

src/ai/testing/ca_testing_move_to_targets.cpp

@@ -26,6 +26,7 @@
 #include "../../map.hpp"
 #include "../../resources.hpp"
 #include "../../team.hpp"
+#include "../../unit.hpp"
 #include "../../terrain_filter.hpp"
 #include "../../pathfind/pathfind.hpp"
 

src/ai/testing/ca_testing_recruitment.cpp

@@ -29,6 +29,8 @@
 #include "../../map.hpp"
 #include "../../resources.hpp"
 #include "../../team.hpp"
+#include "../../unit.hpp"
+#include "../../unit_types.hpp"
 #include "../../wml_exception.hpp"
 #include "../../pathfind/pathfind.hpp"
 

src/callable_objects.hpp

@@ -18,6 +18,7 @@
 #include "formula_callable.hpp"
 #include "map.hpp"
 #include "team.hpp"
+#include "unit.hpp"
 
 #define CALLABLE_WRAPPER_START(klass) \
 class klass##_callable : public game_logic::formula_callable { \

src/carryover.cpp

@@ -18,6 +18,7 @@
 
 #include "config.hpp"
 #include "team.hpp"
+#include "unit.hpp"
 #include "gamestatus.hpp"
 #include <boost/foreach.hpp>
 #include <cassert>

src/construct_dialog.cpp

@@ -18,6 +18,7 @@
 #include "construct_dialog.hpp"
 
 #include "display.hpp"
+#include "formula_string_utils.hpp"
 #include "gettext.hpp"
 #include "sound.hpp"
 #include "log.hpp"

src/display.hpp

@@ -43,8 +43,10 @@ namespace wb {
 	class manager;
 }
 
+#include "animated.hpp"
 #include "display_context.hpp"
 #include "font.hpp"
+#include "image.hpp" //only needed for enums (!)
 #include "key.hpp"
 #include "team.hpp"
 #include "time_of_day.hpp"

src/editor/editor_display.cpp

@@ -16,6 +16,7 @@
 #include "editor_display.hpp"
 #include "reports.hpp"
 #include "terrain_builder.hpp"
+#include "unit_map.hpp"
 
 #include <boost/shared_ptr.hpp>
 

src/editor/map/map_context.cpp

@@ -25,6 +25,7 @@
 #include "serialization/binary_or_text.hpp"
 #include "serialization/parser.hpp"
 #include "team.hpp"
+#include "unit.hpp"
 #include "wml_exception.hpp"
 
 

src/editor/palette/editor_palettes.cpp

@@ -21,6 +21,7 @@
 #include "tooltips.hpp"
 #include "overlay.hpp"
 #include "filesystem.hpp"
+#include "unit_types.hpp"
 
 #include "editor/action/mouse/mouse_action.hpp"
 

src/editor/palette/terrain_palettes.cpp

@@ -21,6 +21,7 @@
 #include "terrain_palettes.hpp"
 
 #include "../../gettext.hpp"
+#include "../../formula_string_utils.hpp"
 
 #include <boost/foreach.hpp>
 

src/editor/palette/unit_palette.hpp

@@ -21,6 +21,8 @@
 
 #include "editor_palettes.hpp"
 
+#include "../../unit_types.hpp"
+
 namespace editor {
 
 //std::string get_selected_terrain();

src/game_display.hpp

@@ -28,6 +28,7 @@ class game_board;
 #include "chat_events.hpp"
 #include "display.hpp"
 #include "pathfind/pathfind.hpp"
+#include "unit.hpp" // TODO: Refactor so that this is not necessary
 
 #include <deque>
 

src/gui/dialogs/gamestate_inspector.cpp

@@ -34,6 +34,8 @@
 #include "../../gamestatus.hpp"
 #include "../../resources.hpp"
 #include "../../team.hpp"
+#include "../../unit.hpp"
+#include "../../unit_map.hpp"
 #include "../../ai/manager.hpp"
 
 #include <vector>

src/leader_scroll_dialog.cpp

@@ -26,6 +26,8 @@
 //#include "gettext.hpp"
 #include "marked-up_text.hpp"
 #include "resources.hpp"
+#include "unit.hpp"
+
 //
 //#include <boost/foreach.hpp>
 

src/side_filter.cpp

@@ -24,6 +24,7 @@
 #include "team.hpp"
 #include "serialization/string_utils.hpp"
 #include "network.hpp"
+#include "unit.hpp"
 
 #include <boost/foreach.hpp>
 

src/team.hpp

@@ -17,8 +17,13 @@
 #include "color_range.hpp"
 #include "game_config.hpp"
 #include "make_enum.hpp"
+#include "map_location.hpp"
 #include "savegame_config.hpp"
-#include "unit.hpp"
+#include "SDL.h" //Apparently needed b/c of SDL_Color
+#include "unit_ptr.hpp"
+#include "util.hpp"
+
+#include <boost/shared_ptr.hpp>
 
 class gamemap;
 

src/terrain_filter.cpp

@@ -25,6 +25,7 @@
 #include "team.hpp"
 #include "terrain_filter.hpp"
 #include "tod_manager.hpp"
+#include "unit.hpp"
 #include "variable.hpp"
 
 #include <boost/foreach.hpp>