removed a couple of header dependencies

src/astarnode.hpp

@@ -15,10 +15,8 @@ See the COPYING file for more details.
 #ifndef ASTARNODE_H_INCLUDED
 #define ASTARNODE_H_INCLUDED
 
-#include "map.hpp"
 #include "pathutils.hpp"
 #include <set>
-#include <vector>
 
 struct a_star_node
 {

src/builder.hpp

@@ -16,11 +16,9 @@
 #include "animated.hpp"
 #include "image.hpp"
 #include "map.hpp"
-#include "SDL.h"
 
 #include <map>
 #include <set>
-#include <string>
 
 class config;
 

src/config_adapter.cpp

@@ -18,6 +18,7 @@
 #include "game_errors.hpp"
 #include "log.hpp"
 #include "preferences.hpp"
+#include "gamestatus.hpp"
 
 #define LOG_NG LOG_STREAM(info, engine)
 #define ERR_NG LOG_STREAM(err, engine)

src/config_adapter.hpp

@@ -15,13 +15,17 @@
 #ifndef CONFIG_ADAPTER_HPP_INCLUDED
 #define CONFIG_ADAPTER_HPP_INCLUDED
 
-#include "global.hpp"
 
 #include <string>
 #include <vector>
-
+#include "team.hpp"
 #include "config.hpp"
-#include "gamestatus.hpp"
+
+class gamestatus;
+class game_state;
+class game_data;
+class gamemap;
+class unit_map;
 
 //This module is responsible for constructing objects like 'team'
 //or 'unit' out of config-information, that is based on WML.

src/halo.hpp

@@ -15,8 +15,6 @@
 #define HALO_HPP_INCLUDED
 
 class display;
-#include "animated.hpp"
-#include "image.hpp"
 
 #include <string>
 

src/sdl_utils.hpp

@@ -15,7 +15,6 @@
 
 #include "scoped_resource.hpp"
 #include "util.hpp"
-#include "color_range.hpp"
 
 #include "SDL.h"
 

src/show_dialog.hpp

@@ -23,7 +23,6 @@ class CVideo;
 #include "network.hpp"
 #include "tooltips.hpp"
 
-#include "widgets/button.hpp"
 #include "widgets/menu.hpp"
 
 #include "SDL.h"

src/unit_frame.hpp

@@ -13,13 +13,13 @@
 #ifndef UNIT_FRAME_H_INCLUDED
 #define UNIT_FRAME_H_INCLUDED
 
-#include "animated.hpp"
 #include "map.hpp"
-#include "config.hpp"
 #include "util.hpp"
 #include "image.hpp"
 #include "serialization/string_utils.hpp"
 
+class config;
+
 #include <string>
 #include <vector>
 

src/unit_types.hpp

@@ -15,7 +15,6 @@
 
 #include "unit_animation.hpp"
 #include "config.hpp"
-#include "color_range.hpp"
 #include "map.hpp"
 #include "race.hpp"
 #include "util.hpp"