Please verify that headers are still self-contained after removing a dependency.

src/builder.cpp

@@ -15,6 +15,7 @@
 
 #include "array.hpp"
 #include "builder.hpp"
+#include "config.hpp"
 #include "log.hpp"
 #include "pathutils.hpp"
 #include "terrain.hpp"

src/builder.hpp

@@ -13,14 +13,16 @@
 #ifndef BUILDER_H_INCLUDED
 #define BUILDER_H_INCLUDED
 
-class config;
+#include "animated.hpp"
 #include "image.hpp"
 #include "map.hpp"
-#include "animated.hpp"
 #include "SDL.h"
 
-#include <string>
 #include <map>
+#include <set>
+#include <string>
+
+class config;
 
 /**
  * The class terrain_builder is constructed from a config object, and a gamemap

src/game_errors.hpp

@@ -14,6 +14,8 @@
 #ifndef GAME_ERRORS_HPP_INCLUDED
 #define GAME_ERRORS_HPP_INCLUDED
 
+#include <string>
+
 namespace game {
 struct error {
 	error() {}

src/hotkeys.hpp

@@ -13,9 +13,14 @@
 #ifndef HOTKEYS_HPP_INCLUDED
 #define HOTKEYS_HPP_INCLUDED
 
+#include "events.hpp"
+#include "SDL.h"
+
+#include <string>
+#include <vector>
+
 class config;
 class display;
-#include "SDL.h"
 
 //the hotkey system allows hotkey definitions to be loaded from
 //configuration objects, and then detect if a keyboard event

src/image.hpp

@@ -2,7 +2,6 @@
 #define IMAGE_HPP_INCLUDED
 
 #include "map.hpp"
-#include "unit.hpp"
 #include "sdl_utils.hpp"
 
 #include "SDL.h"

src/replay.hpp

@@ -13,14 +13,14 @@
 #ifndef REPLAY_H_INCLUDED
 #define REPLAY_H_INCLUDED
 
-class display;
-class gamestatus;
-
 #include "config.hpp"
+#include "gamestatus.hpp"
 #include "map.hpp"
 #include "random.hpp"
 #include "unit.hpp"
 
+class display;
+
 struct verification_manager
 {
 	verification_manager(const unit_map& units);

src/tooltips.hpp

@@ -1,10 +1,12 @@
 #ifndef TOOLTIPS_HPP_INCLUDED
 #define TOOLTIPS_HPP_INCLUDED
 
-class CVideo;
-
 #include "SDL.h"
 
+#include <string>
+
+class CVideo;
+
 namespace tooltips {
 
 struct manager

src/variable.hpp

@@ -13,6 +13,8 @@
 #ifndef VARIABLE_H_INCLUDED
 #define VARIABLE_H_INCLUDED
 
+#include <string>
+
 class config;
 
 namespace game_events {

src/widgets/file_chooser.hpp

@@ -18,6 +18,8 @@
 #include "textbox.hpp"
 #include "widget.hpp"
 
+class display;
+
 namespace gui {
 
 /// A widget where the user may navigate through directories and choose