From 6c5e990813bea99c04de0b1f838120b4ab58ba6e Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Wed, 23 Mar 2005 08:52:10 +0000
Subject: [PATCH] Please verify that headers are still self-contained after
 removing a dependency.

---
 src/builder.cpp              | 1 +
 src/builder.hpp              | 8 +++++---
 src/game_errors.hpp          | 2 ++
 src/hotkeys.hpp              | 7 ++++++-
 src/image.hpp                | 1 -
 src/replay.hpp               | 6 +++---
 src/tooltips.hpp             | 6 ++++--
 src/variable.hpp             | 2 ++
 src/widgets/file_chooser.hpp | 2 ++
 9 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/builder.cpp b/src/builder.cpp
index 9a33a90a215..db7a699bbf0 100644
--- a/src/builder.cpp
+++ b/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"
diff --git a/src/builder.hpp b/src/builder.hpp
index e1ef84d30e4..6805e440c44 100644
--- a/src/builder.hpp
+++ b/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
diff --git a/src/game_errors.hpp b/src/game_errors.hpp
index 043c1c91941..6934ed91f72 100644
--- a/src/game_errors.hpp
+++ b/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() {}
diff --git a/src/hotkeys.hpp b/src/hotkeys.hpp
index 7d11af07182..692b29d576d 100644
--- a/src/hotkeys.hpp
+++ b/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
diff --git a/src/image.hpp b/src/image.hpp
index 0b77de0d8ee..a3e5f846bd9 100644
--- a/src/image.hpp
+++ b/src/image.hpp
@@ -2,7 +2,6 @@
 #define IMAGE_HPP_INCLUDED
 
 #include "map.hpp"
-#include "unit.hpp"
 #include "sdl_utils.hpp"
 
 #include "SDL.h"
diff --git a/src/replay.hpp b/src/replay.hpp
index b8fddd6d95c..57f28dcf8c0 100644
--- a/src/replay.hpp
+++ b/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);
diff --git a/src/tooltips.hpp b/src/tooltips.hpp
index 98ee8e1dc0e..d80a840539d 100644
--- a/src/tooltips.hpp
+++ b/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
diff --git a/src/variable.hpp b/src/variable.hpp
index fe1c1fe7791..bc13085da3b 100644
--- a/src/variable.hpp
+++ b/src/variable.hpp
@@ -13,6 +13,8 @@
 #ifndef VARIABLE_H_INCLUDED
 #define VARIABLE_H_INCLUDED
 
+#include <string>
+
 class config;
 
 namespace game_events {
diff --git a/src/widgets/file_chooser.hpp b/src/widgets/file_chooser.hpp
index 10f29385095..66e0d625f38 100644
--- a/src/widgets/file_chooser.hpp
+++ b/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