diff --git a/src/construct_dialog.cpp b/src/construct_dialog.cpp
index 9b8ddd608f1..39971d22493 100644
--- a/src/construct_dialog.cpp
+++ b/src/construct_dialog.cpp
@@ -18,8 +18,8 @@
 #include "construct_dialog.hpp"
 
 #include "config_assign.hpp"
-#include "display.hpp"
 #include "formula_string_utils.hpp"
+#include "game_config.hpp"
 #include "gettext.hpp"
 #include "sound.hpp"
 #include "log.hpp"
@@ -27,6 +27,7 @@
 #include "scripting/plugins/context.hpp"
 #include "scripting/plugins/manager.hpp"
 #include "sdl/utils.hpp"
+#include "sdl/rect.hpp"
 
 #include <boost/bind.hpp>
 
diff --git a/src/events.cpp b/src/events.cpp
index be465fcfc1b..a9d76fa8ead 100644
--- a/src/events.cpp
+++ b/src/events.cpp
@@ -22,7 +22,6 @@
 #include "quit_confirmation.hpp"
 #include "preferences.hpp"
 #include "video.hpp"
-#include "display.hpp"
 #if defined _WIN32
 #include "desktop/windows_tray_notification.hpp"
 #endif
diff --git a/src/gui/dialogs/editor_generate_map.cpp b/src/gui/dialogs/editor_generate_map.cpp
index 2d69ea40734..768957a6120 100644
--- a/src/gui/dialogs/editor_generate_map.cpp
+++ b/src/gui/dialogs/editor_generate_map.cpp
@@ -15,7 +15,6 @@
 
 #include "gui/dialogs/editor_generate_map.hpp"
 
-#include "display.hpp"
 #include "gui/auxiliary/find_widget.tpp"
 #include "gui/dialogs/helper.hpp"
 
diff --git a/src/gui/dialogs/unit_attack.cpp b/src/gui/dialogs/unit_attack.cpp
index 972d22eccf0..2df619c00fc 100644
--- a/src/gui/dialogs/unit_attack.cpp
+++ b/src/gui/dialogs/unit_attack.cpp
@@ -29,7 +29,6 @@
 #endif
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
-#include "display.hpp"
 #include "game_config.hpp"
 #include "gettext.hpp"
 #include "help/help.hpp"
diff --git a/src/gui/dialogs/unit_attack.hpp b/src/gui/dialogs/unit_attack.hpp
index 408fa3a34b2..777c09f633a 100644
--- a/src/gui/dialogs/unit_attack.hpp
+++ b/src/gui/dialogs/unit_attack.hpp
@@ -17,7 +17,6 @@
 
 #include "actions/attack.hpp"
 #include "gui/dialogs/dialog.hpp"
-#include "display.hpp"
 #include "unit_map.hpp"
 
 namespace gui2
diff --git a/src/gui/dialogs/unit_create.cpp b/src/gui/dialogs/unit_create.cpp
index d874d8fe763..fb2f0fdf695 100644
--- a/src/gui/dialogs/unit_create.cpp
+++ b/src/gui/dialogs/unit_create.cpp
@@ -33,7 +33,6 @@
 #include "gui/widgets/toggle_button.hpp"
 #include "gui/widgets/unit_preview_pane.hpp"
 #include "gui/widgets/window.hpp"
-#include "display.hpp"
 #include "marked-up_text.hpp"
 #include "help/help.hpp"
 #include "game_config.hpp"
diff --git a/src/hotkey/hotkey_preferences_display.cpp b/src/hotkey/hotkey_preferences_display.cpp
index 6f54a7f9026..c934f46b6d3 100644
--- a/src/hotkey/hotkey_preferences_display.cpp
+++ b/src/hotkey/hotkey_preferences_display.cpp
@@ -22,9 +22,9 @@
 #include "hotkey/hotkey_item.hpp"
 
 #include "construct_dialog.hpp"
-#include "display.hpp"
 #include "gettext.hpp"
 #include "marked-up_text.hpp"
+#include "sdl/rect.hpp"
 
 namespace hotkey {
 
diff --git a/src/reports.cpp b/src/reports.cpp
index 2dc5b46c2ce..f8f2b4e9585 100644
--- a/src/reports.cpp
+++ b/src/reports.cpp
@@ -18,7 +18,6 @@
 #include "attack_prediction.hpp"
 //#include "editor/editor_controller.hpp"
 //#include "editor/palette/terrain_palettes.hpp"
-#include "display.hpp"
 #include "font.hpp"
 #include "game_preferences.hpp"
 #include "gettext.hpp"
diff --git a/src/show_dialog.cpp b/src/show_dialog.cpp
index b96a69d6409..9d78959131f 100644
--- a/src/show_dialog.cpp
+++ b/src/show_dialog.cpp
@@ -19,15 +19,15 @@
 #include "show_dialog.hpp"
 
 #include "construct_dialog.hpp"
-#include "display.hpp"
 #include "floating_label.hpp"
+#include "image.hpp"
 #include "gettext.hpp"
 #include "gui/auxiliary/event/handler.hpp"
 #include "help/help.hpp"
 #include "hotkey/command_executor.hpp"
 #include "log.hpp"
 #include "marked-up_text.hpp"
-
+#include "sdl/rect.hpp"
 
 static lg::log_domain log_display("display");
 #define ERR_DP LOG_STREAM(err, log_display)
diff --git a/src/storyscreen/controller.cpp b/src/storyscreen/controller.cpp
index 21f398e0870..4a5ccefb4ad 100644
--- a/src/storyscreen/controller.cpp
+++ b/src/storyscreen/controller.cpp
@@ -26,7 +26,6 @@
 #include "asserts.hpp"
 #include "variable.hpp"
 
-#include "display.hpp"
 #include "game_events/action_wml.hpp"
 #include "game_events/conditional_wml.hpp"
 #include "game_data.hpp"
diff --git a/src/storyscreen/render.cpp b/src/storyscreen/render.cpp
index 0e5e374801d..a19f80a987b 100644
--- a/src/storyscreen/render.cpp
+++ b/src/storyscreen/render.cpp
@@ -25,12 +25,13 @@
 #include "storyscreen/part.hpp"
 #include "storyscreen/render.hpp"
 
-#include "display.hpp"
 #include "image.hpp"
 #include "language.hpp"
+#include "sdl/rect.hpp"
 #include "sound.hpp"
 #include "text.hpp"
 #include "video.hpp"
+#include "widgets/button.hpp"
 
 #include <boost/foreach.hpp>
 
diff --git a/src/tests/utils/game_config_manager.cpp b/src/tests/utils/game_config_manager.cpp
index 3db866b1b3c..4289b146820 100644
--- a/src/tests/utils/game_config_manager.cpp
+++ b/src/tests/utils/game_config_manager.cpp
@@ -19,7 +19,6 @@
 
 #include "config.hpp"
 #include "config_cache.hpp"
-#include "display.hpp"
 #include "filesystem.hpp"
 #include "font.hpp"
 #include "game_config.hpp"