include cleanup: builder, cursor, dialogs, display

src/builder.hpp

@@ -13,9 +13,9 @@
 #ifndef BUILDER_H_INCLUDED
 #define BUILDER_H_INCLUDED
 
-#include "config.hpp"
+class config;
+class image::locator;
 #include "map.hpp"
-#include "image.hpp"
 #include "animated.hpp"
 #include "SDL.h"
 

src/cursor.cpp

@@ -6,6 +6,7 @@
 #include "preferences.hpp"
 #include "scoped_resource.hpp"
 #include "sdl_utils.hpp"
+#include "video.hpp"
 
 #include "SDL.h"
 

src/dialogs.hpp

@@ -13,9 +13,9 @@
 #ifndef DIALOGS_H_INCLUDED
 #define DIALOGS_H_INCLUDED
 
-#include "actions.hpp"
-#include "config.hpp"
-#include "display.hpp"
+class config;
+class display;
+
 #include "map.hpp"
 #include "show_dialog.hpp"
 #include "unit.hpp"

src/display.hpp

@@ -13,7 +13,8 @@
 #ifndef DISPLAY_H_INCLUDED
 #define DISPLAY_H_INCLUDED
 
-#include "config.hpp"
+class config;
+class CVideo;
 #include "gamestatus.hpp"
 #include "image.hpp"
 #include "key.hpp"
@@ -25,7 +26,6 @@
 #include "team.hpp"
 #include "theme.hpp"
 #include "unit.hpp"
-#include "video.hpp"
 #include "widgets/button.hpp"
 
 #include "SDL.h"

src/halo.cpp

@@ -5,6 +5,7 @@
 #include "preferences.hpp"
 #include "sdl_utils.hpp"
 #include "util.hpp"
+#include "video.hpp"
 #include "wassert.hpp"
 #include "serialization/string_utils.hpp"
 

src/multiplayer_ui.cpp

@@ -11,12 +11,13 @@
    See the COPYING file for more details.
 */
 
+#include "gettext.hpp"
+#include "game_config.hpp"
 #include "global.hpp"
 #include "multiplayer_ui.hpp"
 #include "network.hpp"
-#include "game_config.hpp"
 #include "sound.hpp"
-#include "gettext.hpp"
+#include "video.hpp"
 
 #define LOG_NW lg::info(lg::network)
 #define ERR_NW lg::err(lg::network)

src/widgets/widget.cpp

@@ -2,6 +2,7 @@
 
 #include "widget.hpp"
 #include "../display.hpp"
+#include "../video.hpp"
 
 namespace {
 	const SDL_Rect EmptyRect = {-1234,-1234,0,0};