Index: ps/trunk/source/graphics/ShaderDefines.h
===================================================================
--- ps/trunk/source/graphics/ShaderDefines.h
+++ ps/trunk/source/graphics/ShaderDefines.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2018 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,6 +23,7 @@
 #include "ps/CStrIntern.h"
 
 #include <boost/unordered_map.hpp>
+#include <map>
 
 class CVector4D;
 
Index: ps/trunk/source/lib/sysdep/os/win/wnuma.cpp
===================================================================
--- ps/trunk/source/lib/sysdep/os/win/wnuma.cpp
+++ ps/trunk/source/lib/sysdep/os/win/wnuma.cpp
@@ -34,6 +34,8 @@
 #include "lib/sysdep/os/win/win.h"
 #include "lib/sysdep/os/win/wutil.h"
 #include "lib/sysdep/os/win/wcpu.h"
+
+#include <map>
 #include <Psapi.h>
 
 #if ARCH_X86_X64
Index: ps/trunk/source/lib/sysdep/os/win/wversion.cpp
===================================================================
--- ps/trunk/source/lib/sysdep/os/win/wversion.cpp
+++ ps/trunk/source/lib/sysdep/os/win/wversion.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2018 Wildfire Games.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -26,6 +26,8 @@
 #include "lib/sysdep/os/win/win.h"
 #include "lib/sysdep/os/win/winit.h"
 
+#include <sstream>
+
 WINIT_REGISTER_EARLY_INIT(wversion_Init);
 
 
Index: ps/trunk/source/ps/ConfigDB.h
===================================================================
--- ps/trunk/source/ps/ConfigDB.h
+++ ps/trunk/source/ps/ConfigDB.h
@@ -31,6 +31,8 @@
 #include "ps/CStr.h"
 #include "ps/Singleton.h"
 
+#include <map>
+
 // Namespace priorities: User supersedes mod supersedes system.
 //						 Command-line arguments override everything.
 
Index: ps/trunk/source/ps/Profiler2.cpp
===================================================================
--- ps/trunk/source/ps/Profiler2.cpp
+++ ps/trunk/source/ps/Profiler2.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2018 Wildfire Games.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -31,6 +31,7 @@
 #include "third_party/mongoose/mongoose.h"
 
 #include <iomanip>
+#include <map>
 #include <unordered_map>
 
 CProfiler2 g_Profiler2;
Index: ps/trunk/source/scriptinterface/ScriptInterface.h
===================================================================
--- ps/trunk/source/scriptinterface/ScriptInterface.h
+++ ps/trunk/source/scriptinterface/ScriptInterface.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2018 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,14 +18,14 @@
 #ifndef INCLUDED_SCRIPTINTERFACE
 #define INCLUDED_SCRIPTINTERFACE
 
-#include <boost/random/linear_congruential.hpp>
-
 #include "lib/file/vfs/vfs_path.h"
-
 #include "maths/Fixed.h"
 #include "ScriptTypes.h"
 #include "ps/Errors.h"
 
+#include <boost/random/linear_congruential.hpp>
+#include <map>
+
 ERROR_GROUP(Scripting);
 ERROR_TYPE(Scripting, SetupFailed);
 
Index: ps/trunk/source/scriptinterface/ScriptRuntime.h
===================================================================
--- ps/trunk/source/scriptinterface/ScriptRuntime.h
+++ ps/trunk/source/scriptinterface/ScriptRuntime.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2018 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,11 +18,11 @@
 #ifndef INCLUDED_SCRIPTRUNTIME
 #define INCLUDED_SCRIPTRUNTIME
 
-#include <sstream>
-
 #include "ScriptTypes.h"
 #include "ScriptExtraHeaders.h"
 
+#include <sstream>
+
 #define STACK_CHUNK_SIZE 8192
 
 /**
Index: ps/trunk/source/simulation2/system/ComponentManager.h
===================================================================
--- ps/trunk/source/simulation2/system/ComponentManager.h
+++ ps/trunk/source/simulation2/system/ComponentManager.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2018 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -27,8 +27,8 @@
 
 #include <boost/random/linear_congruential.hpp>
 #include <boost/unordered_map.hpp>
-
 #include <map>
+#include <set>
 #include <unordered_map>
 
 class IComponent;