include cleanup: statistics, theme, terrain, titlescreen

src/map.cpp

@@ -13,6 +13,7 @@
 
 #include "global.hpp"
 
+#include "config.hpp"
 #include "log.hpp"
 #include "map.hpp"
 #include "pathutils.hpp"

src/mapgen_dialog.hpp

@@ -1,6 +1,7 @@
 #ifndef MAPGEN_DIALOG_HPP_INCLUDED
 #define MAPGEN_DIALOG_HPP_INCLUDED
 
+#include "config.hpp"
 #include "mapgen.hpp"
 
 class default_map_generator : public map_generator

src/statistics.hpp

@@ -1,8 +1,8 @@
 #ifndef STATISTICS_HPP_INCLUDED
 #define STATISTICS_HPP_INCLUDED
 
+class unit;
 #include "actions.hpp"
-#include "unit.hpp"
 
 namespace statistics
 {

src/terrain.cpp

@@ -13,6 +13,7 @@
 
 #include "global.hpp"
 
+#include "config.hpp"
 #include "terrain.hpp"
 
 #include <cstdlib>

src/terrain.hpp

@@ -13,10 +13,12 @@
 #ifndef TERRAIN_H_INCLUDED
 #define TERRAIN_H_INCLUDED
 
-#include "config.hpp"
+class config;
 #include "sdl_utils.hpp"
 
+#include <map>
 #include <string>
+#include <vector>
 
 class terrain_type
 {

src/theme.cpp

@@ -1,5 +1,6 @@
 #include "global.hpp"
 
+#include "config.hpp"
 #include "font.hpp"
 #include "language.hpp"
 #include "log.hpp"

src/theme.hpp

@@ -2,9 +2,10 @@
 #define THEME_HPP_INCLUDED
 
 #include <map>
+#include <string>
 #include <vector>
 
-#include "config.hpp"
+class config;
 
 #include "SDL.h"
 

src/titlescreen.hpp

@@ -1,7 +1,8 @@
 #ifndef TITLE_HPP_INCLUDED
 #define TITLE_HPP_INCLUDED
 
-#include "display.hpp"
+class config;
+class display;
 
 namespace gui {