remove unit.hpp include from game_display.hpp

src/actions/vision.cpp

@@ -36,6 +36,8 @@
 
 #include <boost/foreach.hpp>
 
+class unit_animation;
+
 static lg::log_domain log_engine("engine");
 #define DBG_NG LOG_STREAM(debug, log_engine)
 #define ERR_NG LOG_STREAM(err, log_engine)

src/ai/actions.cpp

@@ -52,6 +52,7 @@
 #include "../resources.hpp"
 #include "../statistics.hpp"
 #include "../team.hpp"
+#include "../unit.hpp"
 #include "../synced_context.hpp"
 
 namespace ai {

src/ai/testing/ca_global_fallback.cpp

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

src/attack_prediction_display.cpp

@@ -24,6 +24,7 @@
 #include "marked-up_text.hpp"
 #include "resources.hpp"
 #include "sdl/alpha.hpp"
+#include "unit.hpp"
 #include "unit_abilities.hpp"
 
 // Conversion routine for both unscathed and damage change percentage.

src/display.hpp

@@ -36,7 +36,6 @@
 class config;
 class fake_unit_manager;
 class terrain_builder;
-struct time_of_day;
 class map_labels;
 class arrow;
 

src/game_config_manager.cpp

@@ -30,6 +30,7 @@
 #include "resources.hpp"
 #include "scripting/lua.hpp"
 #include "terrain_builder.hpp"
+#include "unit_types.hpp"
 
 #include <boost/foreach.hpp>
 

src/game_display.hpp

@@ -20,7 +20,6 @@
 class config;
 class tod_manager;
 class team;
-class unit;
 class unit_map;
 class game_board;
 
@@ -28,7 +27,6 @@ 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/menu_events.cpp

@@ -28,8 +28,9 @@
 #include "actions/vision.hpp"
 #include "ai/manager.hpp"
 #include "dialogs.hpp"
-#include "formatter.hpp"
 #include "filechooser.hpp"
+#include "formatter.hpp"
+#include "formula_string_utils.hpp"
 #include "game_board.hpp"
 #include "game_end_exceptions.hpp"
 #include "game_events/pump.hpp"
@@ -62,14 +63,14 @@
 #include "resources.hpp"
 #include "savegame.hpp"
 #include "save_index.hpp"
+#include "scripting/lua.hpp"
 #include "sound.hpp"
 #include "statistics_dialog.hpp"
 #include "synced_context.hpp"
 #include "terrain_builder.hpp"
+#include "unit.hpp"
 #include "unit_display.hpp"
 #include "wml_separators.hpp"
-#include "formula_string_utils.hpp"
-#include "scripting/lua.hpp"
 #include "whiteboard/manager.hpp"
 #include "widgets/combo.hpp"
 

src/mouse_events.hpp

@@ -18,6 +18,7 @@
 
 #include "game_display.hpp"
 #include "mouse_handler_base.hpp"
+#include "unit_map.hpp"
 
 class battle_context;
 

src/multiplayer_wait.cpp

@@ -28,6 +28,7 @@
 #include "statistics.hpp"
 #include "saved_game.hpp"
 #include "sound.hpp"
+#include "unit_types.hpp"
 #include "wml_exception.hpp"
 #include "wml_separators.hpp"
 #include "formula_string_utils.hpp"

src/play_controller.cpp

@@ -51,6 +51,7 @@
 #include "soundsource.hpp"
 #include "synced_context.hpp"
 #include "tooltips.hpp"
+#include "unit.hpp"
 #include "unit_animation.hpp"
 #include "unit_id.hpp"
 #include "whiteboard/manager.hpp"

src/play_controller.hpp

@@ -19,13 +19,14 @@
 #include "controller_base.hpp"
 #include "game_end_exceptions.hpp"
 #include "game_board.hpp"
+#include "gamestatus.hpp"
 #include "help.hpp"
 #include "menu_events.hpp"
 #include "mouse_events.hpp"
 #include "persist_manager.hpp"
 #include "statistics.hpp"
 #include "tod_manager.hpp"
-#include "gamestatus.hpp"
+#include "unit_types.hpp"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
@@ -34,6 +35,8 @@ class game_display;
 class saved_game;
 class game_data;
 class team;
+class unit;
+class unit_animation;
 
 namespace actions {
 	class undo_list;

src/playsingle_controller.cpp

@@ -45,6 +45,7 @@
 #include "save_blocker.hpp"
 #include "soundsource.hpp"
 #include "storyscreen/interface.hpp"
+#include "unit.hpp"
 #include "unit_animation.hpp"
 #include "util.hpp"
 #include "whiteboard/manager.hpp"

src/replay.cpp

@@ -35,6 +35,7 @@
 #include "synced_context.hpp"
 #include "resources.hpp"
 #include "statistics.hpp"
+#include "unit.hpp"
 #include "whiteboard/manager.hpp"
 
 #include <boost/foreach.hpp>

src/scripting/lua_api.cpp

@@ -18,12 +18,13 @@
 #include "lua/lualib.h"
 #include "lua/lauxlib.h"
 
-#include "variable.hpp"
-#include "tstring.hpp"
-#include "resources.hpp"
+#include "config.hpp"
 #include "game_display.hpp"
 #include "log.hpp"
-#include "config.hpp"
+#include "resources.hpp"
+#include "tstring.hpp"
+#include "unit.hpp"
+#include "variable.hpp"
 
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>

src/whiteboard/side_actions.cpp

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