clean some includes

this contains a fix in  playcampaign.cpp where an object was accidently
copied.

src/ai/actions.cpp

@@ -41,6 +41,7 @@
 #include "attack_prediction.hpp"
 #include "game_preferences.hpp"
 #include "log.hpp"
+#include "map/map.hpp"
 #include "mouse_handler_base.hpp"
 #include "pathfind/teleport.hpp"
 #include "play_controller.hpp"

src/controller_base.cpp

@@ -22,6 +22,7 @@
 #include "hotkey/command_executor.hpp"
 #include "hotkey/hotkey_command.hpp"
 #include "log.hpp"
+#include "map/map.hpp"
 #include "mouse_handler_base.hpp"
 #include "scripting/plugins/context.hpp"
 #include "soundsource.hpp"

src/game_initialization/create_engine.cpp

@@ -26,6 +26,7 @@
 #include "log.hpp"
 #include "generators/map_create.hpp"
 #include "map/exception.hpp"
+#include "map/map.hpp"
 #include "marked-up_text.hpp"
 #include "minimap.hpp"
 #include "saved_game.hpp"

src/game_initialization/create_engine.hpp

@@ -16,7 +16,6 @@
 
 #include "config.hpp"
 #include "utils/make_enum.hpp"
-#include "map/map.hpp"
 #include "mp_game_settings.hpp"
 #include "save_index.hpp"
 #include "sdl/utils.hpp"
@@ -27,6 +26,8 @@
 class CVideo;
 class saved_game;
 class map_generator;
+class gamemap;
+
 namespace ng {
 namespace depcheck { class manager; }
 class level

src/game_initialization/multiplayer_lobby.cpp

@@ -24,6 +24,7 @@
 #include "game_preferences.hpp"
 #include "lobby_preferences.hpp"
 #include "map/exception.hpp"
+#include "map/map.hpp"
 #include "marked-up_text.hpp"
 #include "minimap.hpp"
 #include "multiplayer_lobby.hpp"

src/game_initialization/playcampaign.cpp

@@ -34,6 +34,7 @@
 #include "persist_manager.hpp"
 #include "playmp_controller.hpp"
 #include "log.hpp"
+#include "map/map.hpp"
 #include "map/exception.hpp"
 #include "mp_game_utils.hpp"
 #include "multiplayer.hpp"
@@ -156,8 +157,8 @@ void campaign_controller::show_carryover_message(playsingle_controller& playcont
 	if (persistent_teams > 0 && ((has_next_scenario && end_level.proceed_to_next_level)||
 			state_.classification().campaign_type == game_classification::CAMPAIGN_TYPE::TEST))
 	{
-		gamemap map = playcontroller.get_map_const();
-		tod_manager tod = playcontroller.get_tod_manager_const();
+		const gamemap& map = playcontroller.get_map_const();
+		const tod_manager& tod = playcontroller.get_tod_manager_const();
 		int turns_left = std::max<int>(0, tod.number_of_turns() - tod.turn());
 		for (team &t : teams)
 		{

src/hotkey/hotkey_handler.cpp

@@ -24,6 +24,7 @@
 #include "game_state.hpp"
 #include "hotkey/hotkey_command.hpp"
 #include "hotkey/hotkey_item.hpp"
+#include "map/map.hpp"
 #include "play_controller.hpp"
 #include "preferences_display.hpp"
 #include "savegame.hpp"

src/hotkey/hotkey_handler_sp.cpp

@@ -23,6 +23,7 @@
 #include "whiteboard/manager.hpp"
 #include "game_events/menu_item.hpp"
 #include "game_events/wmi_container.hpp"
+#include "map/map.hpp"
 #include "save_index.hpp"
 #include "gui/dialogs/message.hpp"
 #include "resources.hpp"

src/joystick.hpp

@@ -17,7 +17,7 @@
 
 #include <vector>
 #include "sdl/utils.hpp"
-#include "map/map.hpp"
+#include "map/location.hpp"
 
 class joystick_manager {
 

src/minimap.hpp

@@ -15,12 +15,12 @@
 #define MINIMAP_HPP_INCLUDED
 
 #include <cstddef>
-#include "map/map.hpp"
 
 class gamemap;
 struct surface;
 class team;
 struct map_location;
+class gamemap;
 
 #ifdef SDL_GPU
 class CVideo;

src/playsingle_controller.cpp

@@ -35,6 +35,7 @@
 #include "hotkey/hotkey_handler_sp.hpp"
 #include "log.hpp"
 #include "map/label.hpp"
+#include "map/map.hpp"
 #include "marked-up_text.hpp"
 #include "playturn.hpp"
 #include "random_new_deterministic.hpp"

src/synced_commands.cpp

@@ -30,6 +30,7 @@
 #include "game_preferences.hpp"
 #include "game_events/manager.hpp"
 #include "game_events/pump.hpp"
+#include "map/map.hpp"
 #include "units/helper.hpp"
 #include "recall_list_manager.hpp"
 #include "resources.hpp"

src/whiteboard/move.cpp

@@ -29,6 +29,7 @@
 #include "fake_unit_ptr.hpp"
 #include "game_board.hpp"
 #include "game_end_exceptions.hpp"
+#include "map/map.hpp"
 #include "mouse_events.hpp"
 #include "play_controller.hpp"
 #include "replay.hpp"