diff --git a/src/gamestatus.cpp b/src/gamestatus.cpp
index a965973c60a..914a9556872 100644
--- a/src/gamestatus.cpp
+++ b/src/gamestatus.cpp
@@ -19,6 +19,8 @@
 
 #include "global.hpp"
 
+#include "gamestatus.hpp"
+
 #include "foreach.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
diff --git a/src/multiplayer_ui.cpp b/src/multiplayer_ui.cpp
index 00b4feb702c..d1299b97a92 100644
--- a/src/multiplayer_ui.cpp
+++ b/src/multiplayer_ui.cpp
@@ -16,6 +16,7 @@
 
 #include "construct_dialog.hpp"
 #include "foreach.hpp"
+#include "gamestatus.hpp"
 #include "gettext.hpp"
 #include "gui/dialogs/mp_cmd_wrapper.hpp"
 #include "log.hpp"
diff --git a/src/replay.cpp b/src/replay.cpp
index 3c89dc48655..1c514afed04 100644
--- a/src/replay.cpp
+++ b/src/replay.cpp
@@ -21,23 +21,17 @@
 
 #include "global.hpp"
 
-#include "actions.hpp"
 #include "dialogs.hpp"
 #include "foreach.hpp"
 #include "game_display.hpp"
 #include "game_end_exceptions.hpp"
-#include "game_preferences.hpp"
-#include "gettext.hpp"
 #include "log.hpp"
-#include "map.hpp"
 #include "map_label.hpp"
 #include "play_controller.hpp"
 #include "replay.hpp"
 #include "resources.hpp"
 #include "statistics.hpp"
-#include "unit_display.hpp"
 #include "wesconfig.h"
-#include "serialization/binary_or_text.hpp"
 
 static lg::log_domain log_replay("replay");
 #define DBG_REPLAY LOG_STREAM(debug, log_replay)
diff --git a/src/replay.hpp b/src/replay.hpp
index 2feade500da..5b996e5e517 100644
--- a/src/replay.hpp
+++ b/src/replay.hpp
@@ -21,17 +21,13 @@
 #define REPLAY_H_INCLUDED
 
 #include "config.hpp"
-#include "gamestatus.hpp"
 #include "map_location.hpp"
-#include "random.hpp"
 #include "rng.hpp"
 
-class config_writer;
 class game_display;
 class terrain_label;
 class unit_map;
 class play_controller;
-class tod_manager;
 
 struct verification_manager
 {