include cleanup: map

src/cavegen.hpp

@@ -1,6 +1,7 @@
 #ifndef CAVEGEN_HPP_INCLUDED
 #define CAVEGEN_HPP_INCLUDED
 
+#include "config.hpp"
 #include "mapgen.hpp"
 
 #include <set>

src/dialogs.cpp

@@ -22,6 +22,7 @@
 #include "help.hpp"
 #include "language.hpp"
 #include "log.hpp"
+#include "map.hpp"
 #include "playturn.hpp"
 #include "preferences.hpp"
 #include "replay.hpp"

src/image.hpp

@@ -3,6 +3,7 @@
 
 #include "map.hpp"
 #include "unit.hpp"
+#include "sdl_utils.hpp"
 
 #include "SDL.h"
 #include <string>

src/map.hpp

@@ -14,7 +14,8 @@
 #ifndef MAP_H_INCLUDED
 #define MAP_H_INCLUDED
 
-#include "config.hpp"
+class config;
+
 #include "terrain.hpp"
 
 #include <map>

src/team.hpp

@@ -20,6 +20,8 @@
 #include <string>
 #include <vector>
 
+#include "SDL.h"
+
 //This class stores all the data for a single 'side' (in game nomenclature).
 //e.g. there is only one leader unit per team.
 class team

src/unit_types.hpp

@@ -13,11 +13,12 @@
 #ifndef UNIT_TYPES_H_INCLUDED
 #define UNIT_TYPES_H_INCLUDED
 
+#include "animated.hpp"
 #include "config.hpp"
 #include "map.hpp"
 #include "race.hpp"
 #include "team.hpp"
-#include "animated.hpp"
+#include "util.hpp"
 
 #include <string>
 #include <vector>