Rework some header dependencies.

By moving #include's from headers to source files, there are fewer
dependencies overall, reducing how many files need to be compiled
when headers are touched.

src/actions/attack.cpp

@@ -26,6 +26,7 @@
 #include "../game_display.hpp"
 #include "../game_events.hpp"
 #include "../game_preferences.hpp"
+#include "../gamestatus.hpp"
 #include "../gettext.hpp"
 #include "../log.hpp"
 #include "../map.hpp"

src/actions/create.cpp

@@ -27,6 +27,7 @@
 #include "../game_display.hpp"
 #include "../game_events.hpp"
 #include "../game_preferences.hpp"
+#include "../gamestatus.hpp"
 #include "../gettext.hpp"
 #include "../log.hpp"
 #include "../map.hpp"

src/ai/default/ai.cpp

@@ -26,6 +26,7 @@
 #include "../../array.hpp"
 #include "../../dialogs.hpp"
 #include "../../game_events.hpp"
+#include "../../gamestatus.hpp"
 #include "../../log.hpp"
 #include "../../mouse_handler_base.hpp"
 #include "../../resources.hpp"

src/game.cpp

@@ -30,9 +30,10 @@
 #include "playcampaign.hpp"
 #include "preferences_display.hpp"
 #include "replay.hpp"
-#include "statistics.hpp"
+#include "serialization/binary_or_text.hpp"
 #include "serialization/parser.hpp"
 #include "serialization/validator.hpp"
+#include "statistics.hpp"
 #include "version.hpp"
 #include "wml_exception.hpp"
 

src/gamestatus.cpp

@@ -29,10 +29,12 @@
 #include "game_preferences.hpp"
 #include "replay.hpp"
 #include "resources.hpp"
+#include "serialization/binary_or_text.hpp"
 #include "statistics.hpp"
 #include "team.hpp"
 #include "unit.hpp"
 #include "unit_id.hpp"
+#include "variable.hpp"
 #include "wesconfig.h"
 #include "wml_exception.hpp"
 #include "formula_string_utils.hpp"

src/gamestatus.hpp

@@ -17,20 +17,24 @@
 #ifndef GAME_STATUS_HPP_INCLUDED
 #define GAME_STATUS_HPP_INCLUDED
 
+#include "config.hpp"
+#include "game_end_exceptions.hpp"
+#include "map_location.hpp"
 #include "mp_game_settings.hpp"
 #include "random.hpp"
 #include "simple_rng.hpp"
-#include "map_location.hpp"
-#include "variable.hpp"
-#include "serialization/binary_or_text.hpp"
+#include "tstring.hpp"
 #include "boost/shared_ptr.hpp"
-#include "game_end_exceptions.hpp"
-#include "unit.hpp"
 
-class config;
+class config_writer;
+class game_display;
+class gamemap;
 class scoped_wml_variable;
 class team;
-class gamemap;
+class unit_map;
+
+// Defined later in this header:
+class game_data;
 
 void convert_old_saves(config& cfg);
 

src/persist_var.cpp

@@ -26,6 +26,8 @@
 #include "resources.hpp"
 #include "team.hpp"
 #include "util.hpp"
+#include "variable.hpp"
+
 
 struct persist_choice: mp_sync::user_choice {
 	const persist_context &ctx;

src/unit_display.cpp

@@ -23,6 +23,7 @@
 #include "mouse_events.hpp"
 #include "resources.hpp"
 #include "terrain_filter.hpp"
+#include "unit_map.hpp"
 
 #include <boost/foreach.hpp>
 

src/unit_display.hpp

@@ -20,14 +20,13 @@
 #ifndef UNIT_DISPLAY_HPP_INCLUDED
 #define UNIT_DISPLAY_HPP_INCLUDED
 
-#include "unit_animation.hpp"
-#include "unit_map.hpp"
-#include "gamestatus.hpp"
 #include "game_display.hpp"
+#include "map_location.hpp"
+#include "unit_animation.hpp"
 
 class attack_type;
-class team;
 class unit;
+class vconfig;
 
 /**
  *  Contains a number of free functions which display units