diff --git a/src/actions/undo.cpp b/src/actions/undo.cpp
index 0bc3ec52afd8..3b9be31752c0 100644
--- a/src/actions/undo.cpp
+++ b/src/actions/undo.cpp
@@ -20,7 +20,6 @@
 #include "undo.hpp"
 #include "global.hpp"
 
-#include "../construct_dialog.hpp"
 #include "../game_board.hpp"               // for game_board
 #include "../game_display.hpp"          // for game_display
 #include "../log.hpp"                   // for LOG_STREAM, logger, etc
diff --git a/src/actions/undo_move_action.cpp b/src/actions/undo_move_action.cpp
index 73633320a939..0215adbc41ec 100644
--- a/src/actions/undo_move_action.cpp
+++ b/src/actions/undo_move_action.cpp
@@ -1,7 +1,6 @@
 #include "undo_move_action.hpp"
 #include "move.hpp"
 
-#include "../construct_dialog.hpp"
 #include "../resources.hpp"
 #include "../team.hpp"
 #include "../replay.hpp"
diff --git a/src/ai/default/ai.cpp b/src/ai/default/ai.cpp
index dabeaf386e85..aa4a7da3075c 100644
--- a/src/ai/default/ai.cpp
+++ b/src/ai/default/ai.cpp
@@ -24,7 +24,6 @@
 #include "../formula/ai.hpp"
 
 #include "../../array.hpp"
-#include "../../dialogs.hpp"
 #include "../../game_board.hpp"
 #include "game_events/manager.hpp"
 #include "../../game_events/pump.hpp"
diff --git a/src/config_cache.cpp b/src/config_cache.cpp
index fee04b340972..25f07aec8fe2 100644
--- a/src/config_cache.cpp
+++ b/src/config_cache.cpp
@@ -20,7 +20,6 @@
 #include "game_config.hpp"
 #include "log.hpp"
 #include "marked-up_text.hpp"
-#include "show_dialog.hpp"
 #include "utils/sha1.hpp"
 #include "serialization/binary_or_text.hpp"
 #include "serialization/parser.hpp"
diff --git a/src/editor/action/mouse/mouse_action.cpp b/src/editor/action/mouse/mouse_action.cpp
index b152eaa3cdc4..33992b1a3987 100644
--- a/src/editor/action/mouse/mouse_action.cpp
+++ b/src/editor/action/mouse/mouse_action.cpp
@@ -18,7 +18,6 @@
 #include "../../editor_display.hpp"
 #include "mouse_action.hpp"
 
-#include "construct_dialog.hpp"
 #include "gettext.hpp"
 #include "gui/dialogs/editor_set_starting_position.hpp"
 #include "editor/palette/terrain_palettes.hpp"
diff --git a/src/editor/editor_main.cpp b/src/editor/editor_main.cpp
index 1420f077a0dc..b859567a8601 100644
--- a/src/editor/editor_main.cpp
+++ b/src/editor/editor_main.cpp
@@ -15,7 +15,6 @@
 
 #include "controller/editor_controller.hpp"
 
-#include "../construct_dialog.hpp"
 #include "../gettext.hpp"
 #include "../filesystem.hpp"
 #include "editor/action/action_base.hpp"
diff --git a/src/game_initialization/multiplayer_wait.hpp b/src/game_initialization/multiplayer_wait.hpp
index ff7eecee94d1..6b7387ce4ff6 100644
--- a/src/game_initialization/multiplayer_wait.hpp
+++ b/src/game_initialization/multiplayer_wait.hpp
@@ -17,7 +17,6 @@
 
 #include "flg_manager.hpp"
 #include "multiplayer_ui.hpp"
-#include "show_dialog.hpp"
 #include "widgets/combo.hpp"
 
 namespace mp {
diff --git a/src/gui/dialogs/editor/custom_tod.cpp b/src/gui/dialogs/editor/custom_tod.cpp
index 75a60f22fd69..7a60137097a2 100644
--- a/src/gui/dialogs/editor/custom_tod.cpp
+++ b/src/gui/dialogs/editor/custom_tod.cpp
@@ -16,7 +16,6 @@
 
 #include "gui/dialogs/editor/custom_tod.hpp"
 
-#include "dialogs.hpp"
 #include "filesystem.hpp"
 #include "filechooser.hpp"
 #include "editor/editor_preferences.hpp"
diff --git a/src/gui/dialogs/lobby_main.cpp b/src/gui/dialogs/lobby_main.cpp
index 8f15412b5b21..c712ab881fc7 100644
--- a/src/gui/dialogs/lobby_main.cpp
+++ b/src/gui/dialogs/lobby_main.cpp
@@ -38,7 +38,6 @@
 #include "gui/widgets/toggle_panel.hpp"
 #include "gui/widgets/tree_view_node.hpp"
 
-#include "construct_dialog.hpp"
 #include "formula_string_utils.hpp"
 #include "game_preferences.hpp"
 #include "gettext.hpp"
diff --git a/src/help/help_button.cpp b/src/help/help_button.cpp
index 2590e081aab3..f6681414bffe 100644
--- a/src/help/help_button.cpp
+++ b/src/help/help_button.cpp
@@ -19,7 +19,6 @@
 #include "config.hpp"
 
 #include "hotkey/command_executor.hpp"
-#include "construct_dialog.hpp"
 
 #include <string>
 
diff --git a/src/mouse_events.cpp b/src/mouse_events.cpp
index af4fb6e3c83c..cb93185f1b9d 100644
--- a/src/mouse_events.cpp
+++ b/src/mouse_events.cpp
@@ -41,7 +41,6 @@
 #include "replay_helper.hpp"
 #include "sdl/utils.hpp"                // for int_to_color
 #include "serialization/string_utils.hpp"  // for unicode_em_dash
-#include "show_dialog.hpp"              // for dialog_button_info, etc
 #include "sound.hpp"
 #include "synced_context.hpp"
 #include "team.hpp"                     // for team
diff --git a/src/savegame.cpp b/src/savegame.cpp
index ea418f262b36..f74f7670c61b 100644
--- a/src/savegame.cpp
+++ b/src/savegame.cpp
@@ -21,7 +21,6 @@
 #include "save_index.hpp"
 #include "carryover.hpp"
 #include "config_assign.hpp"
-#include "dialogs.hpp" //FIXME: get rid of this as soon as the two remaining dialogs are moved to gui2
 #include "format_time_summary.hpp"
 #include "formula_string_utils.hpp"
 #include "game_display.hpp"
diff --git a/src/synced_commands.cpp b/src/synced_commands.cpp
index f5c10586b76f..cd05580f8231 100644
--- a/src/synced_commands.cpp
+++ b/src/synced_commands.cpp
@@ -29,7 +29,6 @@
 #include "game_preferences.hpp"
 #include "game_events/manager.hpp"
 #include "game_events/pump.hpp"
-#include "dialogs.hpp"
 #include "unit_helper.hpp"
 #include "recall_list_manager.hpp"
 #include "resources.hpp"