include cleanup: about, actions, cavegen, mapgen

src/about.hpp

@@ -14,7 +14,8 @@
 #ifndef ABOUT_H_INCLUDED
 #define ABOUT_H_INCLUDED
 
-#include "display.hpp"
+class display;
+
 #include <vector>
 #include <string>
 

src/actions.hpp

@@ -14,16 +14,18 @@
 #ifndef ACTIONS_H_INCLUDED
 #define ACTIONS_H_INCLUDED
 
-#include "display.hpp"
-#include "gamestatus.hpp"
+class display;
+class gamestatus;
+class replay;
+
 #include "map.hpp"
-#include "replay.hpp"
 #include "unit.hpp"
 #include "unit_types.hpp"
 
 #include <deque>
 #include <map>
 #include <string>
+#include <vector>
 
 //this file defines various functions which implement different in-game
 //events and commands.

src/cavegen.hpp

@@ -3,6 +3,8 @@
 
 #include "mapgen.hpp"
 
+#include <set>
+
 class cave_map_generator : public map_generator
 {
 public:

src/map_create.cpp

@@ -4,6 +4,7 @@
 #include "log.hpp"
 #include "map_create.hpp"
 #include "mapgen_dialog.hpp"
+#include "serialization/string_utils.hpp"
 
 #define ERR_CF lg::err(lg::config)
 

src/mapgen.hpp

@@ -1,10 +1,14 @@
 #ifndef MAP_GEN_HPP_INCLUDED
 #define MAP_GEN_HPP_INCLUDED
 
-#include "config.hpp"
-#include "display.hpp"
+class config;
+class display;
 
+#include "map.hpp"
+
+#include <map>
 #include <string>
+#include <vector>
 
 class map_generator
 {

src/multiplayer.cpp

@@ -25,6 +25,7 @@
 #include "network.hpp"
 #include "playlevel.hpp"
 #include "preferences.hpp"
+#include "replay.hpp"
 
 #define LOG_NW lg::info(lg::network)
 

src/multiplayer_connect.cpp

@@ -15,11 +15,12 @@
 #include "dialogs.hpp"
 #include "font.hpp"
 #include "game_config.hpp"
+#include "gettext.hpp"
 #include "multiplayer_connect.hpp"
 #include "preferences.hpp"
+#include "replay.hpp"
 #include "show_dialog.hpp"
 #include "wassert.hpp"
-#include "gettext.hpp"
 #include "serialization/string_utils.hpp"
 
 #define LOG_NW lg::info(lg::network)

src/playturn.hpp

@@ -13,6 +13,8 @@
 #ifndef PLAYTURN_HPP_INCLUDED
 #define PLAYTURN_HPP_INCLUDED
 
+class replay_network_sender;
+
 #include "actions.hpp"
 #include "ai_interface.hpp"
 #include "config.hpp"