diff --git a/src/gui/dialogs/multiplayer/mp_join_game.hpp b/src/gui/dialogs/multiplayer/mp_join_game.hpp
index e07c5236ad09..d176797d1f74 100644
--- a/src/gui/dialogs/multiplayer/mp_join_game.hpp
+++ b/src/gui/dialogs/multiplayer/mp_join_game.hpp
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "ai/configuration.hpp"
 #include "game_initialization/connect_engine.hpp"
 #include "game_initialization/lobby_info.hpp"
 #include "game_initialization/multiplayer.hpp"
diff --git a/src/gui/dialogs/multiplayer/mp_staging.cpp b/src/gui/dialogs/multiplayer/mp_staging.cpp
index 490cae4d70bb..c763dea4db56 100644
--- a/src/gui/dialogs/multiplayer/mp_staging.cpp
+++ b/src/gui/dialogs/multiplayer/mp_staging.cpp
@@ -15,6 +15,7 @@
 
 #include "gui/dialogs/multiplayer/mp_staging.hpp"
 
+#include "ai/configuration.hpp"
 #include "chat_log.hpp"
 #include "font/text_formatting.hpp"
 #include "formatter.hpp"
diff --git a/src/gui/dialogs/multiplayer/mp_staging.hpp b/src/gui/dialogs/multiplayer/mp_staging.hpp
index 5f236a35e1a7..93c6f29400e8 100644
--- a/src/gui/dialogs/multiplayer/mp_staging.hpp
+++ b/src/gui/dialogs/multiplayer/mp_staging.hpp
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "ai/configuration.hpp"
 #include "game_initialization/connect_engine.hpp"
 #include "game_initialization/lobby_info.hpp"
 #include "game_initialization/multiplayer.hpp"
@@ -24,6 +23,11 @@
 
 class config;
 
+namespace ai
+{
+	struct description;
+}
+
 namespace gui2
 {
 
diff --git a/src/synced_context.cpp b/src/synced_context.cpp
index a0c7a9d8604f..c5c04ff105d1 100644
--- a/src/synced_context.cpp
+++ b/src/synced_context.cpp
@@ -15,7 +15,6 @@
 #include "synced_commands.hpp"
 
 #include "actions/undo.hpp"
-#include "ai/manager.hpp"
 #include "config.hpp"
 #include "game_classification.hpp"
 #include "replay.hpp"