diff --git a/src/editor/editor_controller.cpp b/src/editor/editor_controller.cpp
index e278a6041db7..aa61ed81bb2b 100644
--- a/src/editor/editor_controller.cpp
+++ b/src/editor/editor_controller.cpp
@@ -37,6 +37,7 @@
 #include "wml_exception.hpp"
 
 #include "dialogs.hpp"
+#include "resources.hpp"
 
 #include "../clipboard.hpp"
 #include "../game_preferences.hpp"
diff --git a/src/editor/map/context_manager.cpp b/src/editor/map/context_manager.cpp
index 2a71748eda21..05d69015de55 100644
--- a/src/editor/map/context_manager.cpp
+++ b/src/editor/map/context_manager.cpp
@@ -13,6 +13,7 @@
 */
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
+#include "resources.hpp"
 #include "team.hpp"
 
 #include "context_manager.hpp"
diff --git a/src/editor/map/map_context.cpp b/src/editor/map/map_context.cpp
index 1563569dbadc..31dfc046b480 100644
--- a/src/editor/map/map_context.cpp
+++ b/src/editor/map/map_context.cpp
@@ -21,6 +21,7 @@
 #include "gettext.hpp"
 #include "map_exception.hpp"
 #include "map_label.hpp"
+#include "resources.hpp"
 #include "serialization/binary_or_text.hpp"
 #include "serialization/parser.hpp"
 #include "team.hpp"
diff --git a/src/game_display.hpp b/src/game_display.hpp
index bc8a5b4d386e..1e5165d88354 100644
--- a/src/game_display.hpp
+++ b/src/game_display.hpp
@@ -22,6 +22,7 @@ class tod_manager;
 class team;
 class unit;
 class unit_map;
+class game_board;
 
 #include "animated.hpp"
 #include "chat_events.hpp"
diff --git a/src/help.cpp b/src/help.cpp
index a3d10c51c5bd..ab3dae811970 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -34,6 +34,7 @@
 #include "log.hpp"
 #include "map.hpp"
 #include "marked-up_text.hpp"
+#include "resources.hpp"
 #include "sound.hpp"
 #include "unit.hpp"
 #include "unit_helper.hpp"
diff --git a/src/leader_scroll_dialog.cpp b/src/leader_scroll_dialog.cpp
index a00cf5865a17..39ce114a537c 100644
--- a/src/leader_scroll_dialog.cpp
+++ b/src/leader_scroll_dialog.cpp
@@ -25,6 +25,7 @@
 //#include "display.hpp"
 //#include "gettext.hpp"
 #include "marked-up_text.hpp"
+#include "resources.hpp"
 //
 //#include <boost/foreach.hpp>
 
diff --git a/src/minimap.cpp b/src/minimap.cpp
index 003aba835779..6c776defd7ed 100644
--- a/src/minimap.cpp
+++ b/src/minimap.cpp
@@ -21,6 +21,7 @@
 #include "image.hpp"
 #include "log.hpp"
 #include "map.hpp"
+#include "resources.hpp"
 #include "sdl/utils.hpp"
 
 #include "team.hpp"
diff --git a/src/mp_game_utils.cpp b/src/mp_game_utils.cpp
index 8747ef783d12..8ff18735ea35 100644
--- a/src/mp_game_utils.cpp
+++ b/src/mp_game_utils.cpp
@@ -23,6 +23,7 @@
 #include "log.hpp"
 #include "mp_options.hpp"
 #include "replay.hpp"
+#include "resources.hpp"
 #include "savegame.hpp"
 #include "tod_manager.hpp"
 #include "unit_id.hpp"
diff --git a/src/multiplayer.cpp b/src/multiplayer.cpp
index 87d74e6d0444..4aae86304788 100644
--- a/src/multiplayer.cpp
+++ b/src/multiplayer.cpp
@@ -37,6 +37,7 @@
 #include "multiplayer_lobby.hpp"
 #include "playcampaign.hpp"
 #include "playmp_controller.hpp"
+#include "resources.hpp"
 #include "settings.hpp"
 #include "sound.hpp"
 #include "unit_id.hpp"
diff --git a/src/multiplayer_connect_engine.cpp b/src/multiplayer_connect_engine.cpp
index 57ea8ae0f28a..12fc0256fad6 100644
--- a/src/multiplayer_connect_engine.cpp
+++ b/src/multiplayer_connect_engine.cpp
@@ -21,6 +21,7 @@
 #include "map.hpp"
 #include "multiplayer_ui.hpp"
 #include "mp_game_utils.hpp"
+#include "resources.hpp"
 #include "tod_manager.hpp"
 
 #include <boost/foreach.hpp>
diff --git a/src/multiplayer_create_engine.cpp b/src/multiplayer_create_engine.cpp
index 6119b07e3650..b89f7c2c55f8 100644
--- a/src/multiplayer_create_engine.cpp
+++ b/src/multiplayer_create_engine.cpp
@@ -22,6 +22,7 @@
 #include "generators/map_create.hpp"
 #include "map_exception.hpp"
 #include "minimap.hpp"
+#include "resources.hpp"
 #include "saved_game.hpp"
 #include "wml_separators.hpp"
 #include "wml_exception.hpp"
diff --git a/src/multiplayer_wait.cpp b/src/multiplayer_wait.cpp
index e7166c2ce6ad..6486ac72a102 100644
--- a/src/multiplayer_wait.cpp
+++ b/src/multiplayer_wait.cpp
@@ -24,6 +24,7 @@
 #include "marked-up_text.hpp"
 #include "mp_game_utils.hpp"
 #include "multiplayer_wait.hpp"
+#include "resources.hpp"
 #include "statistics.hpp"
 #include "saved_game.hpp"
 #include "sound.hpp"
diff --git a/src/unit.cpp b/src/unit.cpp
index 27374715ac42..b02813478958 100644
--- a/src/unit.cpp
+++ b/src/unit.cpp
@@ -34,6 +34,7 @@
 #include "terrain_filter.hpp"
 #include "formula_string_utils.hpp"
 #include "random_new.hpp"
+#include "resources.hpp"
 #include "scripting/lua.hpp"
 #include "side_filter.hpp"
 #include "play_controller.hpp"
diff --git a/src/unit.hpp b/src/unit.hpp
index e4f0381def55..4e29eb5896da 100644
--- a/src/unit.hpp
+++ b/src/unit.hpp
@@ -21,14 +21,14 @@
 #include <boost/scoped_ptr.hpp>
 
 #include "formula_callable.hpp"
-#include "resources.hpp"
 #include "unit_animation.hpp"
 #include "unit_types.hpp"
 #include "unit_map.hpp"
 
 class display;
-class vconfig;
+class gamemap;
 class team;
+class vconfig;
 
 /// The things contained within a unit_ability_list.
 typedef std::pair<const config *, map_location> unit_ability;