include cleanup: unit*, variable

src/game_events.cpp

@@ -14,6 +14,7 @@
 #include "global.hpp"
 
 #include "ai.hpp"
+#include "display.hpp"
 #include "game_events.hpp"
 #include "image.hpp"
 #include "language.hpp"

src/unit.cpp

@@ -21,6 +21,7 @@
 #include "preferences.hpp"
 #include "replay.hpp"
 #include "unit.hpp"
+#include "unit_types.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
 #include "serialization/string_utils.hpp"

src/unit.hpp

@@ -15,6 +15,7 @@
 
 #include "config.hpp"
 #include "map.hpp"
+#include "race.hpp"
 #include "team.hpp"
 #include "unit_types.hpp"
 

src/unit_display.cpp

@@ -1,6 +1,7 @@
 #include "global.hpp"
 
 #include "actions.hpp"
+#include "display.hpp"
 #include "events.hpp"
 #include "game_config.hpp"
 #include "halo.hpp"

src/unit_display.hpp

@@ -1,7 +1,8 @@
 #ifndef UNIT_DISPLAY_HPP_INCLUDED
 #define UNIT_DISPLAY_HPP_INCLUDED
 
-#include "display.hpp"
+class display;
+
 #include "unit.hpp"
 
 ///the unit_display namespace contains a number of free functions

src/variable.hpp

@@ -13,7 +13,7 @@
 #ifndef VARIABLE_H_INCLUDED
 #define VARIABLE_H_INCLUDED
 
-#include "config.hpp"
+class config;
 
 namespace game_events {
 std::string& get_variable(const std::string& varname);