diff --git a/source/graphics/TextureManager.cpp b/source/graphics/TextureManager.cpp
index 4106061474..c04c4f3a05 100644
--- a/source/graphics/TextureManager.cpp
+++ b/source/graphics/TextureManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -33,8 +33,8 @@
 #include "ps/Profile.h"
 
 #include <boost/filesystem.hpp>
-
 #include <iomanip>
+#include <set>
 #include <unordered_map>
 #include <unordered_set>
 
diff --git a/source/network/NetClientTurnManager.cpp b/source/network/NetClientTurnManager.cpp
index 75b13227ac..02f5878b5d 100644
--- a/source/network/NetClientTurnManager.cpp
+++ b/source/network/NetClientTurnManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -27,6 +27,8 @@
 #include "ps/Util.h"
 #include "simulation2/Simulation2.h"
 
+#include <fstream>
+
 #if 0
 #define NETCLIENTTURN_LOG(...) debug_printf(__VA_ARGS__)
 #else
diff --git a/source/ps/Game.cpp b/source/ps/Game.cpp
index c2f7afffa9..0647a24d33 100644
--- a/source/ps/Game.cpp
+++ b/source/ps/Game.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -51,6 +51,8 @@
 
 #include "tools/atlas/GameInterface/GameLoop.h"
 
+#include <fstream>
+
 extern bool g_GameRestarted;
 extern GameLoopState* g_AtlasGameLoop;
 
diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp
index fb800175c0..0997d4f2b9 100644
--- a/source/ps/GameSetup/GameSetup.cpp
+++ b/source/ps/GameSetup/GameSetup.cpp
@@ -98,6 +98,7 @@
 
 extern void RestartEngine();
 
+#include <fstream>
 #include <iostream>
 
 #include <boost/algorithm/string/classification.hpp>
diff --git a/source/ps/ProfileViewer.cpp b/source/ps/ProfileViewer.cpp
index b6805da171..4affbbc1df 100644
--- a/source/ps/ProfileViewer.cpp
+++ b/source/ps/ProfileViewer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -38,6 +38,7 @@
 #include "scriptinterface/ScriptInterface.h"
 
 #include <algorithm>
+#include <fstream>
 #include <ctime>
 
 extern int g_xres, g_yres;
diff --git a/source/ps/Profiler2.cpp b/source/ps/Profiler2.cpp
index 41eb643fc6..0371c7fb55 100644
--- a/source/ps/Profiler2.cpp
+++ b/source/ps/Profiler2.cpp
@@ -33,8 +33,11 @@
 #include "ps/Pyrogenesis.h"
 #include "third_party/mongoose/mongoose.h"
 
+#include <fstream>
 #include <iomanip>
 #include <map>
+#include <set>
+#include <tuple>
 #include <unordered_map>
 
 CProfiler2 g_Profiler2;
diff --git a/source/ps/VisualReplay.cpp b/source/ps/VisualReplay.cpp
index 4c61829015..f81c23b972 100644
--- a/source/ps/VisualReplay.cpp
+++ b/source/ps/VisualReplay.cpp
@@ -36,6 +36,8 @@
 #include "scriptinterface/ScriptInterface.h"
 #include "scriptinterface/ScriptExtraHeaders.h"
 
+#include <fstream>
+
 /**
  * Filter too short replays (value in seconds).
  */
diff --git a/source/simulation2/Simulation2.cpp b/source/simulation2/Simulation2.cpp
index eee776c482..bb250da246 100644
--- a/source/simulation2/Simulation2.cpp
+++ b/source/simulation2/Simulation2.cpp
@@ -44,6 +44,7 @@
 #include "ps/Util.h"
 #include "ps/XML/Xeromyces.h"
 
+#include <fstream>
 #include <iomanip>
 
 class CSimulation2Impl
diff --git a/source/simulation2/components/tests/test_Pathfinder.h b/source/simulation2/components/tests/test_Pathfinder.h
index 98b3756e58..203d0c02ca 100644
--- a/source/simulation2/components/tests/test_Pathfinder.h
+++ b/source/simulation2/components/tests/test_Pathfinder.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -31,6 +31,8 @@
 #include "scriptinterface/ScriptContext.h"
 #include "simulation2/Simulation2.h"
 
+#include <fstream>
+
 class TestCmpPathfinder : public CxxTest::TestSuite
 {
 public:
diff --git a/source/simulation2/helpers/HierarchicalPathfinder.h b/source/simulation2/helpers/HierarchicalPathfinder.h
index 2d1cad3b48..9c9e4b7a7a 100644
--- a/source/simulation2/helpers/HierarchicalPathfinder.h
+++ b/source/simulation2/helpers/HierarchicalPathfinder.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -26,6 +26,7 @@
 #include "graphics/SColor.h"
 
 #include <map>
+#include <set>
 
 /**
  * Hierarchical pathfinder.