diff --git a/src/ai/formula/candidates.cpp b/src/ai/formula/candidates.cpp
index fe787918becf..0b34b4581662 100644
--- a/src/ai/formula/candidates.cpp
+++ b/src/ai/formula/candidates.cpp
@@ -19,8 +19,8 @@
 
 #include "ai/formula/ai.hpp"
 #include "ai/formula/candidates.hpp"
-#include "game_board.hpp"
 #include "log.hpp"
+#include "team.hpp"
 #include "units/unit.hpp"
 
 static lg::log_domain log_formula_ai("ai/engine/fai");
diff --git a/src/editor/controller/editor_controller.cpp b/src/editor/controller/editor_controller.cpp
index b2702c474f0c..2e64f64242f0 100644
--- a/src/editor/controller/editor_controller.cpp
+++ b/src/editor/controller/editor_controller.cpp
@@ -42,7 +42,6 @@
 #include "cursor.hpp"
 #include "desktop/clipboard.hpp"
 #include "floating_label.hpp"
-#include "game_board.hpp"
 #include "help/help.hpp"
 #include "preferences/game.hpp"
 #include "gettext.hpp"
diff --git a/src/editor/map/context_manager.cpp b/src/editor/map/context_manager.cpp
index 2d1a32e43f7b..46c33dc8624e 100644
--- a/src/editor/map/context_manager.cpp
+++ b/src/editor/map/context_manager.cpp
@@ -21,7 +21,6 @@
 #include "editor/map/map_context.hpp"
 #include "filesystem.hpp"
 #include "formula/string_utils.hpp"
-#include "game_board.hpp"
 #include "generators/map_create.hpp"
 #include "generators/map_generator.hpp"
 #include "gettext.hpp"
diff --git a/src/editor/map/map_context.cpp b/src/editor/map/map_context.cpp
index bcf3129c5f96..b3d1971dd2da 100644
--- a/src/editor/map/map_context.cpp
+++ b/src/editor/map/map_context.cpp
@@ -19,7 +19,6 @@
 #include "editor/action/action.hpp"
 #include "filesystem.hpp"
 #include "formula/string_utils.hpp"
-#include "game_board.hpp"
 #include "gettext.hpp"
 #include "map/exception.hpp"
 #include "map/label.hpp"
diff --git a/src/gui/dialogs/game_stats.cpp b/src/gui/dialogs/game_stats.cpp
index f8062c23b1f7..0b8a001d3c6d 100644
--- a/src/gui/dialogs/game_stats.cpp
+++ b/src/gui/dialogs/game_stats.cpp
@@ -30,9 +30,7 @@
 #include "gui/widgets/stacked_widget.hpp"
 #include "gui/widgets/toggle_button.hpp"
 #include "gui/widgets/window.hpp"
-#include "display.hpp"
 #include "formatter.hpp"
-#include "game_board.hpp"
 #include "game_classification.hpp"
 #include "map/map.hpp"
 #include "play_controller.hpp"
diff --git a/src/gui/dialogs/game_stats.hpp b/src/gui/dialogs/game_stats.hpp
index 54ff6bf81339..ecab2a7f54bf 100644
--- a/src/gui/dialogs/game_stats.hpp
+++ b/src/gui/dialogs/game_stats.hpp
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "game_board.hpp"
+#include "display_context.hpp"
 #include "gettext.hpp"
 #include "gui/dialogs/modal_dialog.hpp"
 #include "gui/dialogs/transient_message.hpp"
@@ -23,7 +23,6 @@
 #include <string>
 #include <vector>
 
-class display;
 class team;
 struct team_data;
 
@@ -37,9 +36,9 @@ class game_stats : public modal_dialog
 public:
 	game_stats(const display_context& board, const int viewing_team, int& selected_index);
 
-	static bool execute(game_board& board, const int viewing_team, int& selected_index)
+	static bool execute(const display_context& board, const int viewing_team, int& selected_index)
 	{
-		if(std::all_of(board.teams().begin(), board.teams().end(), [](team& team) { return team.hidden(); })) {
+		if(std::all_of(board.teams().begin(), board.teams().end(), [](const team& team) { return team.hidden(); })) {
 			show_transient_message("", _("No visible sides found."));
 			return false;
 		}
diff --git a/src/gui/dialogs/gamestate_inspector.cpp b/src/gui/dialogs/gamestate_inspector.cpp
index f63db1ffe794..66f9404134fb 100644
--- a/src/gui/dialogs/gamestate_inspector.cpp
+++ b/src/gui/dialogs/gamestate_inspector.cpp
@@ -31,7 +31,6 @@
 #include "game_events/manager.hpp"
 #include "serialization/parser.hpp" // for write()
 
-#include "game_board.hpp"
 #include "game_data.hpp"
 #include "recall_list_manager.hpp"
 #include "team.hpp"
diff --git a/src/mouse_events.cpp b/src/mouse_events.cpp
index df16d8ab94f7..367e29c3507f 100644
--- a/src/mouse_events.cpp
+++ b/src/mouse_events.cpp
@@ -20,7 +20,6 @@
 #include "actions/undo.hpp"                  // for undo_list
 #include "config.hpp"                        // for config
 #include "cursor.hpp"                        // for set, CURSOR_TYPE::NORMAL, etc
-#include "game_board.hpp"                    // for game_board, etc
 #include "game_events/pump.hpp"              // for fire
 #include "gettext.hpp"                       // for _
 #include "gui/dialogs/transient_message.hpp" // for show_transient_message
diff --git a/src/movetype.cpp b/src/movetype.cpp
index 60f427f9c67c..1e5f4114ae88 100644
--- a/src/movetype.cpp
+++ b/src/movetype.cpp
@@ -19,7 +19,6 @@
 
 #include "movetype.hpp"
 
-#include "game_board.hpp"
 #include "game_config_manager.hpp"
 #include "log.hpp"
 #include "map/map.hpp"
diff --git a/src/terrain/filter.cpp b/src/terrain/filter.cpp
index b56a3061da6a..a5d14c91b838 100644
--- a/src/terrain/filter.cpp
+++ b/src/terrain/filter.cpp
@@ -17,7 +17,6 @@
 #include "config.hpp"
 #include "display_context.hpp"
 #include "filter_context.hpp"
-#include "game_board.hpp"
 #include "game_data.hpp"
 #include "log.hpp"
 #include "map/map.hpp"
diff --git a/src/units/abilities.cpp b/src/units/abilities.cpp
index e739ae6f9ada..0c4b1f20edf3 100644
--- a/src/units/abilities.cpp
+++ b/src/units/abilities.cpp
@@ -26,7 +26,6 @@
 #include "formula/callable_objects.hpp"
 #include "formula/formula.hpp"
 #include "formula/function_gamestate.hpp"
-#include "game_board.hpp"
 #include "lexical_cast.hpp"
 #include "log.hpp"
 #include "resources.hpp"