include cleanup: replay, show_dialog

src/about.cpp

@@ -21,6 +21,7 @@
 #include "display.hpp"
 #include "show_dialog.hpp"
 #include "sdl_utils.hpp"
+#include "video.hpp"
 #include "widgets/button.hpp"
 
 #include <sstream>

src/actions.cpp

@@ -31,6 +31,7 @@
 #include "statistics.hpp"
 #include "unit_display.hpp"
 #include "util.hpp"
+#include "video.hpp"
 #include "wassert.hpp"
 #include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"

src/dialogs.cpp

@@ -28,6 +28,7 @@
 #include "replay.hpp"
 #include "show_dialog.hpp"
 #include "util.hpp"
+#include "video.hpp"
 #include "wassert.hpp"
 #include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"

src/display.cpp

@@ -32,6 +32,7 @@
 #include "tooltips.hpp"
 #include "unit_display.hpp"
 #include "util.hpp"
+#include "video.hpp"
 #include "wassert.hpp"
 
 #include "SDL_image.h"

src/editor/editor_dialogs.cpp

@@ -28,6 +28,7 @@
 #include "../language.hpp"
 #include "../map.hpp"
 #include "../preferences.hpp"
+#include "../video.hpp"
 
 #include "editor_dialogs.hpp"
 

src/editor/editor_palettes.cpp

@@ -21,6 +21,7 @@
 #include "../reports.hpp"
 #include "../gettext.hpp"
 #include "../util.hpp"
+#include "../video.hpp"
 #include "../wassert.hpp"
 
 

src/filechooser.cpp

@@ -1,10 +1,11 @@
 #include "global.hpp"
 
-#include "show_dialog.hpp"
-#include "widgets/file_chooser.hpp"
 #include "gettext.hpp"
-#include <vector>
+#include "show_dialog.hpp"
+#include "video.hpp"
+#include "widgets/file_chooser.hpp"
 
+#include <vector>
 #include <string>
 
 namespace dialogs

src/help.cpp

@@ -25,6 +25,7 @@
 #include "show_dialog.hpp"
 #include "unit.hpp"
 #include "util.hpp"
+#include "video.hpp"
 #include "wassert.hpp"
 #include "wml_separators.hpp"
 #include "serialization/parser.hpp"

src/mapgen_dialog.cpp

@@ -8,6 +8,7 @@
 #include "mapgen.hpp"
 #include "show_dialog.hpp"
 #include "util.hpp"
+#include "video.hpp"
 
 #include "widgets/button.hpp"
 #include "widgets/slider.hpp"

src/multiplayer.cpp

@@ -26,6 +26,7 @@
 #include "playlevel.hpp"
 #include "preferences.hpp"
 #include "replay.hpp"
+#include "video.hpp"
 
 #define LOG_NW lg::info(lg::network)
 

src/multiplayer_create.cpp

@@ -11,13 +11,14 @@
    See the COPYING file for more details.
 */
 
+#include "gettext.hpp"
 #include "global.hpp"
 #include "show_dialog.hpp"
 #include "map_create.hpp"
 #include "multiplayer_create.hpp"
 #include "filesystem.hpp"
 #include "preferences.hpp"
-#include "gettext.hpp"
+#include "video.hpp"
 
 namespace {
 const SDL_Rect null_rect = {0, 0, 0, 0};

src/multiplayer_wait.cpp

@@ -19,6 +19,7 @@
 #include "preferences.hpp"
 #include "replay.hpp"
 #include "util.hpp"
+#include "video.hpp"
 #include "wassert.hpp"
 #include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"

src/playlevel.cpp

@@ -39,6 +39,7 @@
 #include "unit_display.hpp"
 #include "util.hpp"
 #include "variable.hpp"
+#include "video.hpp"
 
 #include <iostream>
 #include <iterator>

src/preferences.cpp

@@ -26,6 +26,7 @@
 #include "show_dialog.hpp"
 #include "sound.hpp"
 #include "util.hpp"
+#include "video.hpp"
 #include "wesconfig.h"
 #include "wml_separators.hpp"
 #include "serialization/parser.hpp"

src/replay.hpp

@@ -13,8 +13,10 @@
 #ifndef REPLAY_H_INCLUDED
 #define REPLAY_H_INCLUDED
 
+class display;
+
 #include "config.hpp"
-#include "display.hpp"
+#include "gamestatus.hpp"
 #include "map.hpp"
 #include "unit.hpp"
 

src/show_dialog.cpp

@@ -30,6 +30,7 @@
 #include "sdl_utils.hpp"
 #include "tooltips.hpp"
 #include "util.hpp"
+#include "video.hpp"
 #include "widgets/button.hpp"
 #include "widgets/menu.hpp"
 #include "widgets/textbox.hpp"

src/show_dialog.hpp

@@ -14,15 +14,14 @@
 #ifndef SHOW_DIALOG_HPP_INCLUDED
 #define SHOW_DIALOG_HPP_INCLUDED
 
-#include "config.hpp"
+class config;
+class display;
+
 #include "cursor.hpp"
-#include "display.hpp"
 #include "font.hpp"
 #include "halo.hpp"
 #include "network.hpp"
 #include "tooltips.hpp"
-#include "unit.hpp"
-#include "video.hpp"
 
 #include "widgets/button.hpp"