Index: source/graphics/Camera.cpp
===================================================================
--- source/graphics/Camera.cpp
+++ source/graphics/Camera.cpp
@@ -26,12 +26,8 @@
 
 #include "graphics/HFTracer.h"
 #include "graphics/Terrain.h"
-#include "lib/ogl.h"
-#include "maths/MathUtil.h"
 #include "maths/Vector4D.h"
-#include "ps/Game.h"
 #include "ps/World.h"
-#include "renderer/Renderer.h"
 #include "renderer/WaterManager.h"
 
 CCamera::CCamera()
Index: source/graphics/CinemaManager.cpp
===================================================================
--- source/graphics/CinemaManager.cpp
+++ source/graphics/CinemaManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -28,15 +28,11 @@
 #include "gui/GUIutil.h"
 #include "gui/GUIManager.h"
 #include "gui/IGUIObject.h"
-#include "lib/ogl.h"
-#include "maths/MathUtil.h"
 #include "maths/Quaternion.h"
 #include "maths/Vector3D.h"
 #include "maths/Vector4D.h"
-#include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 #include "ps/CStr.h"
-#include "ps/Game.h"
 #include "ps/GameSetup/Config.h"
 #include "ps/Hotkey.h"
 #include "ps/World.h"
@@ -48,8 +44,6 @@
 #include "simulation2/MessageTypes.h"
 #include "simulation2/system/ComponentManager.h"
 #include "simulation2/Simulation2.h"
-#include "renderer/Renderer.h"
-
 
 CCinemaManager::CCinemaManager()
 	: m_DrawPaths(false)
Index: source/graphics/ColladaManager.cpp
===================================================================
--- source/graphics/ColladaManager.cpp
+++ source/graphics/ColladaManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -25,10 +25,8 @@
 #include "lib/fnv_hash.h"
 #include "maths/MD5.h"
 #include "ps/CacheLoader.h"
-#include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "ps/DllLoader.h"
-#include "ps/Filesystem.h"
 
 namespace Collada
 {
Index: source/graphics/Color.cpp
===================================================================
--- source/graphics/Color.cpp
+++ source/graphics/Color.cpp
@@ -18,10 +18,7 @@
 #include "precompiled.h"
 
 #include "graphics/Color.h"
-
 #include "graphics/SColor.h"
-#include "maths/MathUtil.h"
-#include "ps/CLogger.h"
 #include "ps/CStr.h"
 
 #if HAVE_SSE
Index: source/graphics/Decal.cpp
===================================================================
--- source/graphics/Decal.cpp
+++ source/graphics/Decal.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #include "Decal.h"
 
 #include "graphics/Terrain.h"
-#include "maths/MathUtil.h"
 
 CModelAbstract* CModelDecal::Clone() const
 {
Index: source/graphics/Font.cpp
===================================================================
--- source/graphics/Font.cpp
+++ source/graphics/Font.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,9 +19,6 @@
 #include "Font.h"
 
 #include "graphics/FontManager.h"
-#include "ps/Filesystem.h"
-#include "ps/CLogger.h"
-#include "renderer/Renderer.h"
 
 #include <map>
 #include <string>
Index: source/graphics/FontManager.cpp
===================================================================
--- source/graphics/FontManager.cpp
+++ source/graphics/FontManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,10 +21,7 @@
 
 #include "graphics/Font.h"
 #include "graphics/TextureManager.h"
-#include "ps/CLogger.h"
 #include "ps/CStr.h"
-#include "ps/Filesystem.h"
-#include "renderer/Renderer.h"
 
 #include <cfloat>
 
Index: source/graphics/FontMetrics.cpp
===================================================================
--- source/graphics/FontMetrics.cpp
+++ source/graphics/FontMetrics.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,9 +20,6 @@
 
 #include "graphics/Font.h"
 #include "graphics/FontManager.h"
-#include "ps/Filesystem.h"
-#include "ps/CLogger.h"
-#include "renderer/Renderer.h"
 
 CFontMetrics::CFontMetrics(CStrIntern font)
 {
Index: source/graphics/Frustum.cpp
===================================================================
--- source/graphics/Frustum.cpp
+++ source/graphics/Frustum.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -29,7 +29,6 @@
 
 #include "Frustum.h"
 #include "maths/BoundingBoxAligned.h"
-#include "maths/MathUtil.h"
 #include "maths/Matrix3D.h"
 
 CFrustum::CFrustum ()
Index: source/graphics/GameView.cpp
===================================================================
--- source/graphics/GameView.cpp
+++ source/graphics/GameView.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -25,7 +25,6 @@
 #include "graphics/HFTracer.h"
 #include "graphics/LOSTexture.h"
 #include "graphics/LightEnv.h"
-#include "graphics/Model.h"
 #include "graphics/ObjectManager.h"
 #include "graphics/Patch.h"
 #include "graphics/SkeletonAnimManager.h"
@@ -39,22 +38,17 @@
 #include "lib/timer.h"
 #include "lobby/IXmppClient.h"
 #include "maths/BoundingBoxAligned.h"
-#include "maths/MathUtil.h"
 #include "maths/Matrix3D.h"
 #include "maths/Quaternion.h"
 #include "ps/ConfigDB.h"
-#include "ps/Filesystem.h"
-#include "ps/Game.h"
 #include "ps/Globals.h"
 #include "ps/Hotkey.h"
 #include "ps/Joystick.h"
 #include "ps/Loader.h"
 #include "ps/LoaderThunks.h"
-#include "ps/Profile.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/TouchInput.h"
 #include "ps/World.h"
-#include "renderer/Renderer.h"
 #include "renderer/WaterManager.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpPosition.h"
Index: source/graphics/HFTracer.cpp
===================================================================
--- source/graphics/HFTracer.cpp
+++ source/graphics/HFTracer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -26,7 +26,6 @@
 #include "graphics/Patch.h"
 #include "graphics/Terrain.h"
 #include "maths/BoundingBoxAligned.h"
-#include "maths/MathUtil.h"
 #include "maths/Vector3D.h"
 
 #include <cfloat>
Index: source/graphics/HeightMipmap.cpp
===================================================================
--- source/graphics/HeightMipmap.cpp
+++ source/graphics/HeightMipmap.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,8 +23,6 @@
 #include "lib/timer.h"
 #include "lib/allocators/shared_ptr.h"
 #include "lib/tex/tex.h"
-#include "maths/MathUtil.h"
-#include "ps/Filesystem.h"
 
 #include <cmath>
 
Index: source/graphics/LOSTexture.cpp
===================================================================
--- source/graphics/LOSTexture.cpp
+++ source/graphics/LOSTexture.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,14 +19,9 @@
 
 #include "LOSTexture.h"
 
-#include "graphics/ShaderManager.h"
 #include "graphics/Terrain.h"
 #include "lib/bits.h"
 #include "lib/config2.h"
-#include "ps/CLogger.h"
-#include "ps/Game.h"
-#include "ps/Profile.h"
-#include "renderer/Renderer.h"
 #include "renderer/TimeManager.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpRangeManager.h"
Index: source/graphics/LightEnv.cpp
===================================================================
--- source/graphics/LightEnv.cpp
+++ source/graphics/LightEnv.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,11 +21,8 @@
 
 #include "precompiled.h"
 
-#include "maths/MathUtil.h"
-
 #include "graphics/LightEnv.h"
 
-
 CLightEnv::CLightEnv()
 	: m_Elevation(DEGTORAD(45)),
 	m_Rotation(DEGTORAD(315)),
Index: source/graphics/MapGenerator.cpp
===================================================================
--- source/graphics/MapGenerator.cpp
+++ source/graphics/MapGenerator.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -26,10 +26,7 @@
 #include "lib/status.h"
 #include "lib/timer.h"
 #include "lib/file/vfs/vfs_path.h"
-#include "maths/MathUtil.h"
-#include "ps/CLogger.h"
 #include "ps/FileIo.h"
-#include "ps/Profile.h"
 #include "ps/scripting/JSInterface_VFS.h"
 #include "scriptinterface/ScriptRuntime.h"
 #include "scriptinterface/ScriptConversions.h"
Index: source/graphics/MapIO.cpp
===================================================================
--- source/graphics/MapIO.cpp
+++ source/graphics/MapIO.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -25,7 +25,6 @@
 #include "lib/os_path.h"
 #include "lib/status.h"
 #include "lib/tex/tex.h"
-#include "maths/MathUtil.h"
 #include "ps/Filesystem.h"
 
 #include <algorithm>
Index: source/graphics/MapReader.cpp
===================================================================
--- source/graphics/MapReader.cpp
+++ source/graphics/MapReader.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -30,8 +30,6 @@
 #include "graphics/TerrainTextureManager.h"
 #include "lib/timer.h"
 #include "lib/external_libraries/libsdl.h"
-#include "maths/MathUtil.h"
-#include "ps/CLogger.h"
 #include "ps/Loader.h"
 #include "ps/LoaderThunks.h"
 #include "ps/World.h"
Index: source/graphics/MapWriter.cpp
===================================================================
--- source/graphics/MapWriter.cpp
+++ source/graphics/MapWriter.cpp
@@ -28,11 +28,8 @@
 #include "TerrainTextureEntry.h"
 #include "TerrainTextureManager.h"
 
-#include "maths/MathUtil.h"
 #include "maths/NUSpline.h"
-#include "ps/CLogger.h"
 #include "ps/Loader.h"
-#include "ps/Filesystem.h"
 #include "ps/XML/XMLWriter.h"
 #include "renderer/PostprocManager.h"
 #include "renderer/SkyManager.h"
Index: source/graphics/MaterialManager.cpp
===================================================================
--- source/graphics/MaterialManager.cpp
+++ source/graphics/MaterialManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,15 +19,10 @@
 
 #include "MaterialManager.h"
 
-#include "lib/ogl.h"
-#include "maths/MathUtil.h"
 #include "maths/Vector4D.h"
-#include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
-#include "ps/Filesystem.h"
 #include "ps/PreprocessorWrapper.h"
 #include "ps/XML/Xeromyces.h"
-#include "renderer/Renderer.h"
 
 #include <sstream>
 
Index: source/graphics/MeshManager.cpp
===================================================================
--- source/graphics/MeshManager.cpp
+++ source/graphics/MeshManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,9 +21,7 @@
 
 #include "graphics/ColladaManager.h"
 #include "graphics/ModelDef.h"
-#include "ps/CLogger.h"
 #include "ps/FileIo.h" // to get access to its CError
-#include "ps/Profile.h"
 
 // TODO: should this cache models while they're not actively in the game?
 // (Currently they'll probably be deleted when the reference count drops to 0,
Index: source/graphics/Model.cpp
===================================================================
--- source/graphics/Model.cpp
+++ source/graphics/Model.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -35,9 +35,6 @@
 #include "lib/res/graphics/ogl_tex.h"
 #include "lib/res/h_mgr.h"
 #include "lib/sysdep/rtl.h"
-#include "ps/Profile.h"
-#include "ps/CLogger.h"
-#include "renderer/Renderer.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpTerrain.h"
 
Index: source/graphics/ModelAbstract.cpp
===================================================================
--- source/graphics/ModelAbstract.cpp
+++ source/graphics/ModelAbstract.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,8 +19,6 @@
 
 #include "ModelAbstract.h"
 
-#include "ps/CLogger.h"
-
 const CBoundingBoxOriented& CModelAbstract::GetSelectionBox()
 {
 	if (!m_SelectionBoxValid)
Index: source/graphics/ObjectBase.cpp
===================================================================
--- source/graphics/ObjectBase.cpp
+++ source/graphics/ObjectBase.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,10 +24,7 @@
 
 #include "ObjectManager.h"
 #include "ps/XML/Xeromyces.h"
-#include "ps/Filesystem.h"
-#include "ps/CLogger.h"
 #include "lib/timer.h"
-#include "maths/MathUtil.h"
 
 #include <boost/random/uniform_int.hpp>
 
Index: source/graphics/ObjectEntry.cpp
===================================================================
--- source/graphics/ObjectEntry.cpp
+++ source/graphics/ObjectEntry.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,7 +23,6 @@
 #include "graphics/Material.h"
 #include "graphics/MaterialManager.h"
 #include "graphics/MeshManager.h"
-#include "graphics/Model.h"
 #include "graphics/ModelDef.h"
 #include "graphics/ObjectBase.h"
 #include "graphics/ObjectManager.h"
@@ -31,10 +30,7 @@
 #include "graphics/SkeletonAnim.h"
 #include "graphics/TextureManager.h"
 #include "lib/rand.h"
-#include "ps/CLogger.h"
-#include "ps/Game.h"
 #include "ps/World.h"
-#include "renderer/Renderer.h"
 #include "simulation2/Simulation2.h"
 
 #include <sstream>
Index: source/graphics/ObjectManager.cpp
===================================================================
--- source/graphics/ObjectManager.cpp
+++ source/graphics/ObjectManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,16 +21,11 @@
 
 #include "graphics/ObjectBase.h"
 #include "graphics/ObjectEntry.h"
-#include "ps/CLogger.h"
-#include "ps/Game.h"
-#include "ps/Profile.h"
-#include "ps/Filesystem.h"
 #include "ps/XML/Xeromyces.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpTerrain.h"
 #include "simulation2/components/ICmpVisual.h"
 
-
 bool CObjectManager::ObjectKey::operator< (const CObjectManager::ObjectKey& a) const
 {
 	if (ActorName < a.ActorName)
Index: source/graphics/Overlay.cpp
===================================================================
--- source/graphics/Overlay.cpp
+++ source/graphics/Overlay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,7 +21,6 @@
 
 #include "graphics/TextureManager.h"
 #include "ps/CStr.h"
-#include "renderer/Renderer.h"
 
 SOverlayTexturedLine::LineCapType SOverlayTexturedLine::StrToLineCapType(const std::wstring& str)
 {
Index: source/graphics/ParticleEmitter.cpp
===================================================================
--- source/graphics/ParticleEmitter.cpp
+++ source/graphics/ParticleEmitter.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -26,8 +26,6 @@
 #include "graphics/ShaderProgram.h"
 #include "graphics/TextureManager.h"
 
-#include "renderer/Renderer.h"
-
 CParticleEmitter::CParticleEmitter(const CParticleEmitterTypePtr& type) :
 	m_Type(type), m_Active(true), m_NextParticleIdx(0), m_EmissionRoundingError(0.f),
 	m_LastUpdateTime(type->m_Manager.GetCurrentTime()),
Index: source/graphics/ParticleEmitterType.cpp
===================================================================
--- source/graphics/ParticleEmitterType.cpp
+++ source/graphics/ParticleEmitterType.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,15 +24,10 @@
 #include "graphics/ParticleManager.h"
 #include "graphics/TextureManager.h"
 #include "lib/rand.h"
-#include "maths/MathUtil.h"
-#include "ps/CLogger.h"
-#include "ps/Filesystem.h"
 #include "ps/XML/Xeromyces.h"
-#include "renderer/Renderer.h"
 
 #include <boost/random/uniform_real.hpp>
 
-
 /**
  * Interface for particle state variables, which get evaluated for each newly
  * constructed particle.
Index: source/graphics/ParticleManager.cpp
===================================================================
--- source/graphics/ParticleManager.cpp
+++ source/graphics/ParticleManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,8 +19,6 @@
 
 #include "ParticleManager.h"
 
-#include "ps/Filesystem.h"
-#include "ps/Profile.h"
 #include "renderer/Scene.h"
 
 static Status ReloadChangedFileCB(void* param, const VfsPath& path)
Index: source/graphics/ShaderManager.cpp
===================================================================
--- source/graphics/ShaderManager.cpp
+++ source/graphics/ShaderManager.cpp
@@ -17,23 +17,17 @@
 
 #include "precompiled.h"
 
-#include "ShaderManager.h"
-
 #include "graphics/ShaderTechnique.h"
 #include "lib/config2.h"
 #include "lib/timer.h"
 #include "lib/utf8.h"
-#include "ps/CLogger.h"
 #include "ps/CStrIntern.h"
-#include "ps/Filesystem.h"
 #include "ps/PreprocessorWrapper.h"
-#include "ps/Profile.h"
 #if USE_SHADER_XML_VALIDATION
 # include "ps/XML/RelaxNG.h"
 #endif
 #include "ps/XML/Xeromyces.h"
 #include "ps/XML/XMLWriter.h"
-#include "renderer/Renderer.h"
 
 TIMER_ADD_CLIENT(tc_ShaderValidation);
 
Index: source/graphics/ShaderProgram.cpp
===================================================================
--- source/graphics/ShaderProgram.cpp
+++ source/graphics/ShaderProgram.cpp
@@ -25,8 +25,6 @@
 #include "lib/res/graphics/ogl_tex.h"
 #include "maths/Matrix3D.h"
 #include "maths/Vector3D.h"
-#include "ps/CLogger.h"
-#include "ps/Filesystem.h"
 #include "ps/PreprocessorWrapper.h"
 
 #if !CONFIG2_GLES
Index: source/graphics/ShaderProgramFFP.cpp
===================================================================
--- source/graphics/ShaderProgramFFP.cpp
+++ source/graphics/ShaderProgramFFP.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,8 +24,6 @@
 #include "lib/res/graphics/ogl_tex.h"
 #include "maths/Matrix3D.h"
 #include "maths/Vector3D.h"
-#include "ps/CLogger.h"
-#include "renderer/Renderer.h"
 
 #if !CONFIG2_GLES
 
Index: source/graphics/SkeletonAnimDef.cpp
===================================================================
--- source/graphics/SkeletonAnimDef.cpp
+++ source/graphics/SkeletonAnimDef.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,10 +22,8 @@
 #include "precompiled.h"
 
 #include "SkeletonAnimDef.h"
-#include "maths/MathUtil.h"
 #include "ps/FileIo.h"
 
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 // CSkeletonAnimDef constructor
 CSkeletonAnimDef::CSkeletonAnimDef() : m_FrameTime(0), m_NumKeys(0), m_NumFrames(0), m_Keys(0)
Index: source/graphics/SkeletonAnimManager.cpp
===================================================================
--- source/graphics/SkeletonAnimManager.cpp
+++ source/graphics/SkeletonAnimManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,12 +24,9 @@
 #include "SkeletonAnimManager.h"
 
 #include "graphics/ColladaManager.h"
-#include "graphics/Model.h"
 #include "graphics/SkeletonAnimDef.h"
-#include "ps/CLogger.h"
 #include "ps/FileIo.h"
 
-
 ///////////////////////////////////////////////////////////////////////////////
 // CSkeletonAnimManager constructor
 CSkeletonAnimManager::CSkeletonAnimManager(CColladaManager& colladaManager)
Index: source/graphics/Terrain.cpp
===================================================================
--- source/graphics/Terrain.cpp
+++ source/graphics/Terrain.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,8 +24,6 @@
 #include "lib/res/graphics/ogl_tex.h"
 #include "lib/sysdep/cpu.h"
 
-#include "renderer/Renderer.h"
-
 #include "TerrainProperties.h"
 #include "TerrainTextureEntry.h"
 #include "TerrainTextureManager.h"
@@ -34,8 +32,6 @@
 #include "Terrain.h"
 #include "Patch.h"
 #include "maths/FixedVector3D.h"
-#include "maths/MathUtil.h"
-#include "ps/CLogger.h"
 #include "simulation2/helpers/Pathfinding.h"
 
 ///////////////////////////////////////////////////////////////////////////////
Index: source/graphics/TerrainProperties.cpp
===================================================================
--- source/graphics/TerrainProperties.cpp
+++ source/graphics/TerrainProperties.cpp
@@ -25,9 +25,6 @@
 
 #include "graphics/Color.h"
 #include "graphics/TerrainTextureManager.h"
-#include "maths/MathUtil.h"
-#include "ps/CLogger.h"
-#include "ps/Filesystem.h"
 #include "ps/XML/XeroXMB.h"
 #include "ps/XML/Xeromyces.h"
 
Index: source/graphics/TerrainTextureEntry.cpp
===================================================================
--- source/graphics/TerrainTextureEntry.cpp
+++ source/graphics/TerrainTextureEntry.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #include "TerrainTextureEntry.h"
 
 #include "lib/utf8.h"
-#include "lib/ogl.h"
 #include "lib/allocators/shared_ptr.h"
 #include "lib/res/graphics/ogl_tex.h"
 
@@ -33,7 +32,6 @@
 #include "graphics/TerrainTextureManager.h"
 #include "graphics/TerrainProperties.h"
 #include "graphics/Texture.h"
-#include "renderer/Renderer.h"
 
 #include <map>
 
Index: source/graphics/TerrainTextureManager.cpp
===================================================================
--- source/graphics/TerrainTextureManager.cpp
+++ source/graphics/TerrainTextureManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -25,11 +25,8 @@
 #include "TerrainProperties.h"
 
 #include "lib/res/graphics/ogl_tex.h"
-#include "lib/ogl.h"
 #include "lib/timer.h"
 
-#include "ps/CLogger.h"
-#include "ps/Filesystem.h"
 #include "ps/XML/Xeromyces.h"
 
 #include <boost/algorithm/string.hpp>
Index: source/graphics/TerritoryTexture.cpp
===================================================================
--- source/graphics/TerritoryTexture.cpp
+++ source/graphics/TerritoryTexture.cpp
@@ -22,8 +22,6 @@
 #include "graphics/Color.h"
 #include "graphics/Terrain.h"
 #include "lib/bits.h"
-#include "ps/Profile.h"
-#include "renderer/Renderer.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/helpers/Pathfinding.h"
 #include "simulation2/components/ICmpPlayer.h"
Index: source/graphics/TextRenderer.cpp
===================================================================
--- source/graphics/TextRenderer.cpp
+++ source/graphics/TextRenderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,10 +22,8 @@
 #include "graphics/Font.h"
 #include "graphics/FontManager.h"
 #include "graphics/ShaderProgram.h"
-#include "lib/ogl.h"
 #include "ps/CStrIntern.h"
 #include "ps/GameSetup/Config.h"
-#include "renderer/Renderer.h"
 
 CTextRenderer::CTextRenderer(const CShaderProgramPtr& shader) :
 	m_Shader(shader)
Index: source/graphics/TextureConverter.cpp
===================================================================
--- source/graphics/TextureConverter.cpp
+++ source/graphics/TextureConverter.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,7 +24,6 @@
 #include "lib/allocators/shared_ptr.h"
 #include "lib/tex/tex.h"
 #include "maths/MD5.h"
-#include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "ps/Profiler2.h"
 #include "ps/XML/Xeromyces.h"
Index: source/graphics/TextureManager.cpp
===================================================================
--- source/graphics/TextureManager.cpp
+++ source/graphics/TextureManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -32,9 +32,6 @@
 #include "lib/timer.h"
 #include "maths/MD5.h"
 #include "ps/CacheLoader.h"
-#include "ps/CLogger.h"
-#include "ps/Filesystem.h"
-#include "ps/Profile.h"
 
 struct TPhash
 	 : std::unary_function<CTextureProperties, std::size_t>,
Index: source/graphics/UnitAnimation.cpp
===================================================================
--- source/graphics/UnitAnimation.cpp
+++ source/graphics/UnitAnimation.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,14 +19,12 @@
 
 #include "UnitAnimation.h"
 
-#include "graphics/Model.h"
 #include "graphics/ObjectEntry.h"
 #include "graphics/SkeletonAnim.h"
 #include "graphics/SkeletonAnimDef.h"
 #include "graphics/Unit.h"
 #include "lib/rand.h"
 #include "ps/CStr.h"
-#include "ps/Game.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpSoundManager.h"
 
Index: source/graphics/UnitManager.cpp
===================================================================
--- source/graphics/UnitManager.cpp
+++ source/graphics/UnitManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -28,7 +28,6 @@
 #include "Unit.h"
 #include "ObjectManager.h"
 #include "ObjectEntry.h"
-#include "ps/Game.h"
 #include "ps/World.h"
 
 #include <algorithm>
Index: source/gui/CChart.cpp
===================================================================
--- source/gui/CChart.cpp
+++ source/gui/CChart.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,7 +21,6 @@
 #include "graphics/ShaderManager.h"
 #include "i18n/L10n.h"
 #include "lib/ogl.h"
-#include "ps/CLogger.h"
 #include "renderer/Renderer.h"
 #include "third_party/cppformat/format.h"
 
Index: source/gui/CCheckBox.cpp
===================================================================
--- source/gui/CCheckBox.cpp
+++ source/gui/CCheckBox.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #include "CCheckBox.h"
 
 #include "graphics/FontMetrics.h"
-#include "ps/CLogger.h"
 #include "ps/CStrIntern.h"
 
 /**
Index: source/gui/CDropDown.cpp
===================================================================
--- source/gui/CDropDown.cpp
+++ source/gui/CDropDown.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 #include "lib/external_libraries/libsdl.h"
 #include "lib/ogl.h"
 #include "lib/timer.h"
-#include "ps/CLogger.h"
 #include "soundmanager/ISoundManager.h"
 
 CDropDown::CDropDown()
Index: source/gui/CGUI.cpp
===================================================================
--- source/gui/CGUI.cpp
+++ source/gui/CGUI.cpp
@@ -20,8 +20,6 @@
 #include <stdarg.h>
 #include <string>
 
-#include "GUI.h"
-
 // Types - when including them into the engine.
 #include "CButton.h"
 #include "CChart.h"
@@ -47,7 +45,6 @@
 #include "lib/sysdep/sysdep.h"
 #include "lib/timer.h"
 #include "lib/utf8.h"
-#include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 #include "ps/GameSetup/Config.h"
 #include "ps/Globals.h"
Index: source/gui/CGUIScrollBarVertical.cpp
===================================================================
--- source/gui/CGUIScrollBarVertical.cpp
+++ source/gui/CGUIScrollBarVertical.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -16,14 +16,8 @@
  */
 
 #include "precompiled.h"
-
 #include "CGUIScrollBarVertical.h"
 
-#include "GUI.h"
-
-#include "ps/CLogger.h"
-
-
 CGUIScrollBarVertical::CGUIScrollBarVertical()
 {
 }
Index: source/gui/CImage.cpp
===================================================================
--- source/gui/CImage.cpp
+++ source/gui/CImage.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,9 +18,6 @@
 #include "precompiled.h"
 
 #include "CImage.h"
-
-#include "GUI.h"
-
 #include "lib/ogl.h"
 
 CImage::CImage()
Index: source/gui/CInput.cpp
===================================================================
--- source/gui/CInput.cpp
+++ source/gui/CInput.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,8 +20,6 @@
 #include "CInput.h"
 
 #include "CGUIScrollBarVertical.h"
-#include "GUI.h"
-
 #include "graphics/FontMetrics.h"
 #include "graphics/ShaderManager.h"
 #include "graphics/TextRenderer.h"
@@ -29,7 +27,6 @@
 #include "lib/sysdep/clipboard.h"
 #include "lib/timer.h"
 #include "lib/utf8.h"
-#include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 #include "ps/GameSetup/Config.h"
 #include "ps/Globals.h"
Index: source/gui/CList.cpp
===================================================================
--- source/gui/CList.cpp
+++ source/gui/CList.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 #include "CGUIScrollBarVertical.h"
 
 #include "lib/external_libraries/libsdl.h"
-#include "ps/CLogger.h"
 #include "ps/Profile.h"
 #include "soundmanager/ISoundManager.h"
 
Index: source/gui/COList.cpp
===================================================================
--- source/gui/COList.cpp
+++ source/gui/COList.cpp
@@ -20,7 +20,6 @@
 #include "COList.h"
 
 #include "i18n/L10n.h"
-#include "ps/CLogger.h"
 #include "soundmanager/ISoundManager.h"
 
 const float SORT_SPRITE_DIM = 16.0f;
Index: source/gui/CProgressBar.cpp
===================================================================
--- source/gui/CProgressBar.cpp
+++ source/gui/CProgressBar.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -16,8 +16,6 @@
  */
 
 #include "precompiled.h"
-
-#include "GUI.h"
 #include "CProgressBar.h"
 
 #include "lib/ogl.h"
Index: source/gui/CRadioButton.cpp
===================================================================
--- source/gui/CRadioButton.cpp
+++ source/gui/CRadioButton.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,8 +19,6 @@
 
 #include "CRadioButton.h"
 
-#include "GUI.h"
-
 void CRadioButton::HandleMessage(SGUIMessage& Message)
 {
 	// Important
Index: source/gui/CSlider.cpp
===================================================================
--- source/gui/CSlider.cpp
+++ source/gui/CSlider.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,10 +17,7 @@
 
 #include "precompiled.h"
 #include "CSlider.h"
-#include "GUI.h"
 #include "lib/ogl.h"
-#include "ps/CLogger.h"
-
 
 CSlider::CSlider()
 	: m_IsPressed(false), m_ButtonSide(0)
Index: source/gui/CText.cpp
===================================================================
--- source/gui/CText.cpp
+++ source/gui/CText.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,10 +18,7 @@
 #include "precompiled.h"
 
 #include "CText.h"
-
 #include "CGUIScrollBarVertical.h"
-#include "GUI.h"
-
 #include "lib/ogl.h"
 
 CText::CText()
Index: source/gui/GUIManager.cpp
===================================================================
--- source/gui/GUIManager.cpp
+++ source/gui/GUIManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,7 +23,6 @@
 
 #include "lib/timer.h"
 #include "ps/Filesystem.h"
-#include "ps/CLogger.h"
 #include "ps/Profile.h"
 #include "ps/XML/Xeromyces.h"
 #include "ps/GameSetup/Config.h"
Index: source/gui/GUIRenderer.cpp
===================================================================
--- source/gui/GUIRenderer.cpp
+++ source/gui/GUIRenderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -27,14 +27,11 @@
 #include "lib/utf8.h"
 #include "lib/res/h_mgr.h"
 #include "lib/tex/tex.h"
-#include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 #include "renderer/Renderer.h"
 
-
 using namespace GUIRenderer;
 
-
 DrawCalls::DrawCalls()
 {
 }
Index: source/gui/GUITooltip.cpp
===================================================================
--- source/gui/GUITooltip.cpp
+++ source/gui/GUITooltip.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,7 +24,6 @@
 #include "IGUIObject.h"
 
 #include "lib/timer.h"
-#include "ps/CLogger.h"
 
 /*
 	Tooltips:
Index: source/gui/GUIbase.cpp
===================================================================
--- source/gui/GUIbase.cpp
+++ source/gui/GUIbase.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,10 +17,6 @@
 
 #include "precompiled.h"
 
-#include "GUI.h"
-
-#include "ps/CLogger.h"
-
 CClientArea::CClientArea() : pixel(0.f,0.f,0.f,0.f), percent(0.f,0.f,0.f,0.f)
 {
 }
Index: source/gui/GUItext.cpp
===================================================================
--- source/gui/GUItext.cpp
+++ source/gui/GUItext.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,12 +18,8 @@
 #include "precompiled.h"
 
 #include <algorithm>
-
-#include "GUI.h"
 #include "lib/utf8.h"
 #include "graphics/FontMetrics.h"
-#include "ps/CLogger.h"
-
 
 // List of word delimiter bounds
 // The list contains ranges of word delimiters. The odd indexed chars are the start
Index: source/gui/GUIutil.cpp
===================================================================
--- source/gui/GUIutil.cpp
+++ source/gui/GUIutil.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,11 +17,8 @@
 
 #include "precompiled.h"
 
-#include "GUI.h"
 #include "GUIManager.h"
-
 #include "maths/Matrix3D.h"
-#include "ps/CLogger.h"
 #include "ps/GameSetup/Config.h"
 
 extern int g_xres, g_yres;
Index: source/gui/IGUIButtonBehavior.cpp
===================================================================
--- source/gui/IGUIButtonBehavior.cpp
+++ source/gui/IGUIButtonBehavior.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -16,10 +16,6 @@
  */
 
 #include "precompiled.h"
-
-#include "GUI.h"
-
-#include "ps/CLogger.h"
 #include "soundmanager/ISoundManager.h"
 
 IGUIButtonBehavior::IGUIButtonBehavior() : m_Pressed(false)
Index: source/gui/IGUIObject.cpp
===================================================================
--- source/gui/IGUIObject.cpp
+++ source/gui/IGUIObject.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,17 +17,13 @@
 
 #include "precompiled.h"
 
-#include "GUI.h"
-
 #include "gui/scripting/JSInterface_GUITypes.h"
 #include "gui/scripting/JSInterface_IGUIObject.h"
 
 #include "ps/GameSetup/Config.h"
-#include "ps/CLogger.h"
 #include "ps/Profile.h"
 #include "scriptinterface/ScriptInterface.h"
 
-
 IGUIObject::IGUIObject()
 	: m_pGUI(NULL), m_pParent(NULL), m_MouseHovering(false), m_LastClickTime()
 {
Index: source/gui/IGUIScrollBar.cpp
===================================================================
--- source/gui/IGUIScrollBar.cpp
+++ source/gui/IGUIScrollBar.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -16,8 +16,6 @@
  */
 
 #include "precompiled.h"
-
-#include "GUI.h"
 #include "maths/MathUtil.h"
 
 IGUIScrollBar::IGUIScrollBar() : m_pStyle(NULL), m_pGUI(NULL),
Index: source/gui/IGUIScrollBarOwner.cpp
===================================================================
--- source/gui/IGUIScrollBarOwner.cpp
+++ source/gui/IGUIScrollBarOwner.cpp
@@ -17,8 +17,6 @@
 
 #include "precompiled.h"
 
-#include "GUI.h"
-
 IGUIScrollBarOwner::IGUIScrollBarOwner()
 {
 }
Index: source/gui/IGUITextOwner.cpp
===================================================================
--- source/gui/IGUITextOwner.cpp
+++ source/gui/IGUITextOwner.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,8 +17,6 @@
 
 #include "precompiled.h"
 
-#include "GUI.h"
-
 IGUITextOwner::IGUITextOwner() : m_GeneratedTextsValid(false)
 {
 }
Index: source/gui/MiniMap.cpp
===================================================================
--- source/gui/MiniMap.cpp
+++ source/gui/MiniMap.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -28,7 +28,6 @@
 #include "graphics/TerrainTextureEntry.h"
 #include "graphics/TerrainTextureManager.h"
 #include "graphics/TerritoryTexture.h"
-#include "gui/GUI.h"
 #include "gui/GUIManager.h"
 #include "lib/bits.h"
 #include "lib/external_libraries/libsdl.h"
Index: source/i18n/L10n.cpp
===================================================================
--- source/i18n/L10n.cpp
+++ source/i18n/L10n.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -31,8 +31,6 @@
 
 #include "gui/GUIManager.h"
 #include "lib/file/file_system.h"
-#include "lib/utf8.h"
-#include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 #include "ps/Filesystem.h"
 #include "ps/GameSetup/GameSetup.h"
Index: source/i18n/scripting/JSInterface_L10n.cpp
===================================================================
--- source/i18n/scripting/JSInterface_L10n.cpp
+++ source/i18n/scripting/JSInterface_L10n.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,8 +20,6 @@
 #include "JSInterface_L10n.h"
 
 #include "i18n/L10n.h"
-#include "lib/utf8.h"
-#include "ps/Profile.h"
 #include "scriptinterface/ScriptInterface.h"
 
 // Returns a translation of the specified English string into the current language.
Index: source/network/NetClient.cpp
===================================================================
--- source/network/NetClient.cpp
+++ source/network/NetClient.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -28,13 +28,11 @@
 #include "lib/sysdep/sysdep.h"
 #include "lobby/IXmppClient.h"
 #include "ps/CConsole.h"
-#include "ps/CLogger.h"
 #include "ps/Compress.h"
 #include "ps/CStr.h"
 #include "ps/Game.h"
 #include "ps/Loader.h"
 #include "scriptinterface/ScriptInterface.h"
-#include "simulation2/Simulation2.h"
 
 CNetClient *g_NetClient = NULL;
 
Index: source/network/NetClientTurnManager.cpp
===================================================================
--- source/network/NetClientTurnManager.cpp
+++ source/network/NetClientTurnManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,11 +21,9 @@
 #include "NetClient.h"
 
 #include "gui/GUIManager.h"
-#include "ps/CLogger.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/Replay.h"
 #include "ps/Util.h"
-#include "simulation2/Simulation2.h"
 
 #if 0
 #define NETCLIENTTURN_LOG(...) debug_printf(__VA_ARGS__)
Index: source/network/NetFileTransfer.cpp
===================================================================
--- source/network/NetFileTransfer.cpp
+++ source/network/NetFileTransfer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 #include "lib/timer.h"
 #include "network/NetMessage.h"
 #include "network/NetSession.h"
-#include "ps/CLogger.h"
 
 Status CNetFileTransferer::HandleMessageReceive(const CNetMessage* message)
 {
Index: source/network/NetHost.cpp
===================================================================
--- source/network/NetHost.cpp
+++ source/network/NetHost.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,7 +21,6 @@
 
 #include "lib/external_libraries/enet.h"
 #include "network/NetMessage.h"
-#include "ps/CLogger.h"
 
 bool CNetHost::SendMessage(const CNetMessage* message, ENetPeer* peer, const char* peerName)
 {
Index: source/network/NetMessage.cpp
===================================================================
--- source/network/NetMessage.cpp
+++ source/network/NetMessage.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,10 +18,7 @@
 #include "precompiled.h"
 #include "NetMessage.h"
 
-#include "ps/CLogger.h"
-
 #include "ps/Game.h"
-#include "simulation2/Simulation2.h"
 
 #undef ALLNETMSGS_DONT_CREATE_NMTS
 #define ALLNETMSGS_IMPLEMENT
Index: source/network/NetServer.cpp
===================================================================
--- source/network/NetServer.cpp
+++ source/network/NetServer.cpp
@@ -28,14 +28,12 @@
 #include "lib/external_libraries/enet.h"
 #include "lib/types.h"
 #include "network/StunClient.h"
-#include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 #include "ps/GUID.h"
 #include "ps/Profile.h"
 #include "ps/ThreadUtil.h"
 #include "scriptinterface/ScriptInterface.h"
 #include "scriptinterface/ScriptRuntime.h"
-#include "simulation2/Simulation2.h"
 #include "simulation2/system/TurnManager.h"
 
 #if CONFIG2_MINIUPNPC
Index: source/network/NetServerTurnManager.cpp
===================================================================
--- source/network/NetServerTurnManager.cpp
+++ source/network/NetServerTurnManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 #include "NetServer.h"
 #include "NetSession.h"
 
-#include "ps/CLogger.h"
 #include "simulation2/system/TurnManager.h"
 
 #if 0
Index: source/network/NetSession.cpp
===================================================================
--- source/network/NetSession.cpp
+++ source/network/NetSession.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 #include "NetMessage.h"
 #include "NetStats.h"
 #include "lib/external_libraries/enet.h"
-#include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 #include "ps/Profile.h"
 #include "scriptinterface/ScriptInterface.h"
Index: source/network/StunClient.cpp
===================================================================
--- source/network/StunClient.cpp
+++ source/network/StunClient.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * Copyright (C) 2013-2016 SuperTuxKart-Team.
  * This file is part of 0 A.D.
  *
@@ -44,7 +44,6 @@
 #endif
 
 #include "scriptinterface/ScriptInterface.h"
-#include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 
 unsigned int m_StunServerIP;
Index: source/network/scripting/JSInterface_Network.cpp
===================================================================
--- source/network/scripting/JSInterface_Network.cpp
+++ source/network/scripting/JSInterface_Network.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,7 +23,6 @@
 #include "lib/external_libraries/libsdl.h"
 #include "lib/types.h"
 #include "lobby/IXmppClient.h"
-#include "network/NetClient.h"
 #include "network/NetMessage.h"
 #include "network/NetServer.h"
 #include "network/StunClient.h"
Index: source/pch/atlas/precompiled.h
===================================================================
--- source/pch/atlas/precompiled.h
+++ source/pch/atlas/precompiled.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,10 +18,10 @@
 #include "lib/precompiled.h"	// common precompiled header
 
 // Atlas-specific PCH:
-
+#include "ps/Game.h"
+#include "ps/World.h"
+#include "simulation2/Simulation2.h"
 #if HAVE_PCH
-
 #include "tools/atlas/GameInterface/Messages.h"
 #include "ps/CStr.h"
-
 #endif // HAVE_PCH
Index: source/pch/engine/precompiled.h
===================================================================
--- source/pch/engine/precompiled.h
+++ source/pch/engine/precompiled.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,13 +19,15 @@
 
 // "engine"-specific PCH:
 
+#include "lib/utf8.h"
+#include "network/NetClient.h"
+#include "ps/CLogger.h"
+#include "ps/Profile.h"
 #include "ps/Pyrogenesis.h"	// old error system
-
+#include "renderer/Renderer.h"
 #if HAVE_PCH
-
 // some other external libraries that are used in several places:
 // .. CStr is included very frequently, so a reasonable amount of time is
 //    saved by including it here. (~10% in a full rebuild, as of r2365)
 #include "ps/CStr.h"
-
 #endif // HAVE_PCH
Index: source/pch/graphics/precompiled.h
===================================================================
--- source/pch/graphics/precompiled.h
+++ source/pch/graphics/precompiled.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -16,5 +16,13 @@
  */
 
 #include "lib/precompiled.h"	// common precompiled header
-
 // "graphics"-specific PCH:
+#include "graphics/Model.h"
+#include "graphics/ShaderManager.h"
+#include "lib/ogl.h"
+#include "maths/MathUtil.h"
+#include "ps/CLogger.h"
+#include "ps/Filesystem.h"
+#include "ps/Game.h"
+#include "ps/Profile.h"
+#include "renderer/Renderer.h"
Index: source/pch/gui/precompiled.h
===================================================================
--- source/pch/gui/precompiled.h
+++ source/pch/gui/precompiled.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,6 +17,8 @@
 
 #include "lib/precompiled.h"	// common precompiled header
 
+#include "gui/GUI.h"
+#include "ps/CLogger.h"
 #if MSC_VERSION
 # pragma warning(disable:4250)	// "inherits 'IGUITextOwner::IGUITextOwner::UpdateCachedSize' via dominance"
 #endif
Index: source/pch/network/precompiled.h
===================================================================
--- source/pch/network/precompiled.h
+++ source/pch/network/precompiled.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,3 +17,6 @@
 
 #define MINIMAL_PCH 0
 #include "lib/precompiled.h"	// common precompiled header
+
+#include "ps/CLogger.h"
+#include "simulation2/Simulation2.h"
Index: source/pch/simulation2/precompiled.h
===================================================================
--- source/pch/simulation2/precompiled.h
+++ source/pch/simulation2/precompiled.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,3 +20,6 @@
 
 // Minimal is a bit *too* minimal to let things compile, so include a few more headers
 #include "lib/debug.h"
+#include "simulation2/MessageTypes.h"
+#include "simulation2/system/Component.h"
+#include "simulation2/system/InterfaceScripted.h"
Index: source/pch/test/precompiled.h
===================================================================
--- source/pch/test/precompiled.h
+++ source/pch/test/precompiled.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,13 +18,11 @@
 #include "lib/precompiled.h"	// common precompiled header
 
 // "test"-specific PCH:
-
+#include "simulation2/system/ComponentTest.h"
 #if HAVE_PCH
-
 #include "lib/self_test.h"
 #include <cxxtest/TestListener.h>
 #include <cxxtest/TestTracker.h>
 #include <cxxtest/TestRunner.h>
 #include <cxxtest/RealDescriptions.h>
-
 #endif // HAVE_PCH
Index: source/ps/CConsole.cpp
===================================================================
--- source/ps/CConsole.cpp
+++ source/ps/CConsole.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -32,18 +32,13 @@
 #include "lib/ogl.h"
 #include "lib/sysdep/clipboard.h"
 #include "lib/timer.h"
-#include "lib/utf8.h"
 #include "maths/MathUtil.h"
-#include "network/NetClient.h"
 #include "network/NetServer.h"
-#include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 #include "ps/GameSetup/Config.h"
 #include "ps/Globals.h"
 #include "ps/Hotkey.h"
-#include "ps/Profile.h"
 #include "ps/Pyrogenesis.h"
-#include "renderer/Renderer.h"
 #include "scriptinterface/ScriptInterface.h"
 
 CConsole* g_Console = 0;
Index: source/ps/CLogger.cpp
===================================================================
--- source/ps/CLogger.cpp
+++ source/ps/CLogger.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,10 +24,7 @@
 #include "graphics/TextRenderer.h"
 #include "lib/ogl.h"
 #include "lib/timer.h"
-#include "lib/utf8.h"
 #include "ps/CConsole.h"
-#include "ps/Profile.h"
-#include "renderer/Renderer.h"
 
 #include <ctime>
 #include <iostream>
Index: source/ps/CStr.cpp
===================================================================
--- source/ps/CStr.cpp
+++ source/ps/CStr.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -27,7 +27,6 @@
 #define CStr_CPP_FIRST
 
 #include "lib/fnv_hash.h"
-#include "lib/utf8.h"
 #include "lib/byte_order.h"
 #include "network/Serialization.h"
 
@@ -37,7 +36,6 @@
 #define UNIDOUBLER_HEADER "CStr.cpp"
 #include "UniDoubler.h"
 
-
 // Only include these function definitions in the first instance of CStr.cpp:
 
 /**
Index: source/ps/CStrIntern.cpp
===================================================================
--- source/ps/CStrIntern.cpp
+++ source/ps/CStrIntern.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #include "CStrIntern.h"
 
 #include "lib/fnv_hash.h"
-#include "ps/CLogger.h"
 
 #include <boost/unordered_map.hpp>
 
Index: source/ps/CacheLoader.cpp
===================================================================
--- source/ps/CacheLoader.cpp
+++ source/ps/CacheLoader.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,6 +19,7 @@
 
 #include "CacheLoader.h"
 
+#include "ps/CLogger.h"
 #include "maths/MD5.h"
 #include "ps/CLogger.h"
 #include "ps/Util.h"
Index: source/ps/ConfigDB.cpp
===================================================================
--- source/ps/ConfigDB.cpp
+++ source/ps/ConfigDB.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,7 +23,6 @@
 
 #include "lib/allocators/shared_ptr.h"
 #include "lib/file/vfs/vfs_path.h"
-#include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "ps/Filesystem.h"
 #include "ps/ThreadUtil.h"
Index: source/ps/FileIo.cpp
===================================================================
--- source/ps/FileIo.cpp
+++ source/ps/FileIo.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 #include "precompiled.h"
 
 #include "FileIo.h"
-#include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 #include "lib/byte_order.h"
 
Index: source/ps/Filesystem.cpp
===================================================================
--- source/ps/Filesystem.cpp
+++ source/ps/Filesystem.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,13 +18,8 @@
 #include "precompiled.h"
 #include "Filesystem.h"
 
-#include "ps/CLogger.h"
-#include "ps/Profile.h"
-
 #include "lib/res/h_mgr.h"	// h_reload
 #include "lib/sysdep/dir_watch.h"
-#include "lib/utf8.h"
-
 
 PIVFS g_VFS;
 
Index: source/ps/Game.cpp
===================================================================
--- source/ps/Game.cpp
+++ source/ps/Game.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -27,19 +27,15 @@
 #include "gui/CGUI.h"
 #include "lib/config2.h"
 #include "lib/timer.h"
-#include "network/NetClient.h"
 #include "network/NetServer.h"
 #include "ps/CConsole.h"
-#include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "ps/Loader.h"
 #include "ps/LoaderThunks.h"
-#include "ps/Profile.h"
 #include "ps/Replay.h"
 #include "ps/Shapes.h"
 #include "ps/World.h"
 #include "ps/GameSetup/GameSetup.h"
-#include "renderer/Renderer.h"
 #include "renderer/TimeManager.h"
 #include "renderer/WaterManager.h"
 #include "scriptinterface/ScriptInterface.h"
Index: source/ps/GameSetup/Config.cpp
===================================================================
--- source/ps/GameSetup/Config.cpp
+++ source/ps/GameSetup/Config.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,7 +21,6 @@
 
 #include "lib/timer.h"
 #include "ps/CConsole.h"
-#include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 #include "ps/GameSetup/CmdLineArgs.h"
 
Index: source/ps/GameSetup/GameSetup.cpp
===================================================================
--- source/ps/GameSetup/GameSetup.cpp
+++ source/ps/GameSetup/GameSetup.cpp
@@ -41,12 +41,10 @@
 #include "i18n/L10n.h"
 #include "maths/MathUtil.h"
 #include "network/NetServer.h"
-#include "network/NetClient.h"
 #include "network/NetMessage.h"
 #include "network/NetMessages.h"
 
 #include "ps/CConsole.h"
-#include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 #include "ps/Filesystem.h"
 #include "ps/Game.h"
@@ -62,7 +60,6 @@
 #include "ps/Loader.h"
 #include "ps/Mod.h"
 #include "ps/ModIo.h"
-#include "ps/Profile.h"
 #include "ps/ProfileViewer.h"
 #include "ps/Profiler2.h"
 #include "ps/Pyrogenesis.h"	// psSetLogDir
@@ -74,7 +71,6 @@
 #include "ps/VisualReplay.h"
 #include "ps/World.h"
 
-#include "renderer/Renderer.h"
 #include "renderer/VertexBufferManager.h"
 #include "renderer/ModelRenderer.h"
 #include "scriptinterface/ScriptInterface.h"
Index: source/ps/GameSetup/HWDetect.cpp
===================================================================
--- source/ps/GameSetup/HWDetect.cpp
+++ source/ps/GameSetup/HWDetect.cpp
@@ -23,7 +23,6 @@
 #include "lib/snd.h"
 #include "lib/svn_revision.h"
 #include "lib/timer.h"
-#include "lib/utf8.h"
 #include "lib/external_libraries/libsdl.h"
 #include "lib/res/graphics/ogl_tex.h"
 #include "lib/posix/posix_utsname.h"
@@ -35,10 +34,8 @@
 # include "lib/sysdep/arch/x86_x64/cache.h"
 # include "lib/sysdep/arch/x86_x64/topology.h"
 #endif
-#include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 #include "ps/Filesystem.h"
-#include "ps/Profile.h"
 #include "ps/UserReport.h"
 #include "ps/VideoMode.h"
 #include "ps/GameSetup/Config.h"
Index: source/ps/GameSetup/Paths.cpp
===================================================================
--- source/ps/GameSetup/Paths.cpp
+++ source/ps/GameSetup/Paths.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2019 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,6 @@
 # include "lib/sysdep/os/osx/osx_paths.h"
 # include "lib/sysdep/os/osx/osx_bundle.h"
 #endif
-#include "ps/CLogger.h"
-
 
 Paths::Paths(const CmdLineArgs& args)
 {
Index: source/ps/Globals.cpp
===================================================================
--- source/ps/Globals.cpp
+++ source/ps/Globals.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,7 +18,6 @@
 #include "precompiled.h"
 #include "Globals.h"
 
-#include "network/NetClient.h"
 #include "ps/GameSetup/Config.h"
 #include "soundmanager/ISoundManager.h"
 
Index: source/ps/Hotkey.cpp
===================================================================
--- source/ps/Hotkey.cpp
+++ source/ps/Hotkey.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,7 +21,6 @@
 #include <boost/tokenizer.hpp>
 
 #include "ps/CConsole.h"
-#include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "ps/ConfigDB.h"
 #include "ps/Globals.h"
Index: source/ps/Joystick.cpp
===================================================================
--- source/ps/Joystick.cpp
+++ source/ps/Joystick.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #include "Joystick.h"
 
 #include "lib/external_libraries/libsdl.h"
-#include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 
 CJoystick g_Joystick;
Index: source/ps/Mod.cpp
===================================================================
--- source/ps/Mod.cpp
+++ source/ps/Mod.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,7 +23,6 @@
 
 #include "lib/file/file_system.h"
 #include "lib/file/vfs/vfs.h"
-#include "lib/utf8.h"
 #include "ps/Filesystem.h"
 #include "ps/GameSetup/GameSetup.h"
 #include "ps/GameSetup/Paths.h"
Index: source/ps/PreprocessorWrapper.cpp
===================================================================
--- source/ps/PreprocessorWrapper.cpp
+++ source/ps/PreprocessorWrapper.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #include "PreprocessorWrapper.h"
 
 #include "graphics/ShaderDefines.h"
-#include "ps/CLogger.h"
 
 void CPreprocessorWrapper::AddDefine(const char* name, const char* value)
 {
Index: source/ps/ProfileViewer.cpp
===================================================================
--- source/ps/ProfileViewer.cpp
+++ source/ps/ProfileViewer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -31,11 +31,8 @@
 #include "gui/GUIutil.h"
 #include "graphics/ShaderManager.h"
 #include "graphics/TextRenderer.h"
-#include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 #include "ps/Hotkey.h"
-#include "ps/Profile.h"
-#include "lib/external_libraries/libsdl.h"
 #include "renderer/Renderer.h"
 #include "scriptinterface/ScriptInterface.h"
 
Index: source/ps/Profiler2.cpp
===================================================================
--- source/ps/Profiler2.cpp
+++ source/ps/Profiler2.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -25,7 +25,6 @@
 #include "Profiler2.h"
 
 #include "lib/allocators/shared_ptr.h"
-#include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "ps/Profiler2GPU.h"
 #include "third_party/mongoose/mongoose.h"
Index: source/ps/Replay.cpp
===================================================================
--- source/ps/Replay.cpp
+++ source/ps/Replay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,11 +24,10 @@
 #include "lib/file/file_system.h"
 #include "lib/res/h_mgr.h"
 #include "lib/tex/tex.h"
+
 #include "ps/Game.h"
-#include "ps/CLogger.h"
 #include "ps/Loader.h"
 #include "ps/Mod.h"
-#include "ps/Profile.h"
 #include "ps/ProfileViewer.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/Mod.h"
Index: source/ps/SavedGame.cpp
===================================================================
--- source/ps/SavedGame.cpp
+++ source/ps/SavedGame.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,8 +24,8 @@
 #include "lib/allocators/shared_ptr.h"
 #include "lib/file/archive/archive_zip.h"
 #include "i18n/L10n.h"
-#include "lib/utf8.h"
-#include "ps/CLogger.h"
+//
+
 #include "ps/Filesystem.h"
 #include "ps/Game.h"
 #include "ps/Mod.h"
Index: source/ps/TemplateLoader.cpp
===================================================================
--- source/ps/TemplateLoader.cpp
+++ source/ps/TemplateLoader.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,8 +19,6 @@
 
 #include "TemplateLoader.h"
 
-#include "lib/utf8.h"
-#include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 #include "ps/XML/Xeromyces.h"
 
Index: source/ps/UserReport.cpp
===================================================================
--- source/ps/UserReport.cpp
+++ source/ps/UserReport.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #include "UserReport.h"
 
 #include "lib/timer.h"
-#include "lib/utf8.h"
 #include "lib/external_libraries/curl.h"
 #include "lib/external_libraries/libsdl.h"
 #include "lib/external_libraries/zlib.h"
Index: source/ps/Util.cpp
===================================================================
--- source/ps/Util.cpp
+++ source/ps/Util.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -36,15 +36,12 @@
 #include "lib/tex/tex.h"
 
 #include "i18n/L10n.h"
-#include "lib/utf8.h"
 
 #include "ps/GameSetup/Config.h"
 #include "ps/GameSetup/GameSetup.h"
 #include "ps/Game.h"
-#include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 #include "ps/VideoMode.h"
-#include "renderer/Renderer.h"
 #include "maths/MathUtil.h"
 #include "graphics/GameView.h"
 
Index: source/ps/VideoMode.cpp
===================================================================
--- source/ps/VideoMode.cpp
+++ source/ps/VideoMode.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
Index: source/ps/VisualReplay.cpp
===================================================================
--- source/ps/VisualReplay.cpp
+++ source/ps/VisualReplay.cpp
@@ -22,10 +22,7 @@
 #include "gui/GUIManager.h"
 #include "lib/allocators/shared_ptr.h"
 #include "lib/external_libraries/libsdl.h"
-#include "lib/utf8.h"
-#include "network/NetClient.h"
 #include "network/NetServer.h"
-#include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 #include "ps/Game.h"
 #include "ps/GameSetup/Paths.h"
Index: source/ps/World.cpp
===================================================================
--- source/ps/World.cpp
+++ source/ps/World.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -31,14 +31,12 @@
 #include "graphics/Terrain.h"
 #include "graphics/UnitManager.h"
 #include "lib/timer.h"
-#include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "ps/Errors.h"
 #include "ps/Game.h"
 #include "ps/Loader.h"
 #include "ps/LoaderThunks.h"
 #include "ps/World.h"
-#include "renderer/Renderer.h"
 #include "simulation2/Simulation2.h"
 
 /**
Index: source/ps/XML/RelaxNG.cpp
===================================================================
--- source/ps/XML/RelaxNG.cpp
+++ source/ps/XML/RelaxNG.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,8 +20,6 @@
 #include "RelaxNG.h"
 
 #include "lib/timer.h"
-#include "lib/utf8.h"
-#include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 
 #include <libxml/relaxng.h>
Index: source/ps/XML/XMLWriter.cpp
===================================================================
--- source/ps/XML/XMLWriter.cpp
+++ source/ps/XML/XMLWriter.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,10 +19,8 @@
 
 #include "XMLWriter.h"
 
-#include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 #include "ps/XML/Xeromyces.h"
-#include "lib/utf8.h"
 #include "lib/allocators/shared_ptr.h"
 #include "lib/sysdep/cpu.h"
 #include "maths/Fixed.h"
Index: source/ps/XML/Xeromyces.cpp
===================================================================
--- source/ps/XML/Xeromyces.cpp
+++ source/ps/XML/Xeromyces.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -25,7 +25,6 @@
 
 #include "maths/MD5.h"
 #include "ps/CacheLoader.h"
-#include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 #include "RelaxNG.h"
 #include "Xeromyces.h"
Index: source/ps/scripting/JSInterface_ConfigDB.cpp
===================================================================
--- source/ps/scripting/JSInterface_ConfigDB.cpp
+++ source/ps/scripting/JSInterface_ConfigDB.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
Index: source/ps/scripting/JSInterface_Console.cpp
===================================================================
--- source/ps/scripting/JSInterface_Console.cpp
+++ source/ps/scripting/JSInterface_Console.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
Index: source/ps/scripting/JSInterface_Game.cpp
===================================================================
--- source/ps/scripting/JSInterface_Game.cpp
+++ source/ps/scripting/JSInterface_Game.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,9 +20,7 @@
 #include "JSInterface_Game.h"
 
 #include "graphics/Terrain.h"
-#include "network/NetClient.h"
 #include "network/NetServer.h"
-#include "ps/CLogger.h"
 #include "ps/Game.h"
 #include "ps/Replay.h"
 #include "ps/World.h"
Index: source/ps/scripting/JSInterface_Main.cpp
===================================================================
--- source/ps/scripting/JSInterface_Main.cpp
+++ source/ps/scripting/JSInterface_Main.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 #include "graphics/FontMetrics.h"
 #include "graphics/MapReader.h"
 #include "lib/sysdep/sysdep.h"
-#include "lib/utf8.h"
 #include "maths/MD5.h"
 #include "ps/CStrIntern.h"
 #include "ps/GUID.h"
Index: source/ps/scripting/JSInterface_SavedGame.cpp
===================================================================
--- source/ps/scripting/JSInterface_SavedGame.cpp
+++ source/ps/scripting/JSInterface_SavedGame.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,9 +19,7 @@
 
 #include "JSInterface_SavedGame.h"
 
-#include "network/NetClient.h"
 #include "network/NetServer.h"
-#include "ps/CLogger.h"
 #include "ps/Game.h"
 #include "ps/SavedGame.h"
 #include "scriptinterface/ScriptInterface.h"
Index: source/ps/scripting/JSInterface_VisualReplay.cpp
===================================================================
--- source/ps/scripting/JSInterface_VisualReplay.cpp
+++ source/ps/scripting/JSInterface_VisualReplay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #include "JSInterface_VisualReplay.h"
 
 #include "ps/CStr.h"
-#include "ps/Profile.h"
 #include "ps/VisualReplay.h"
 #include "scriptinterface/ScriptInterface.h"
 
Index: source/renderer/DecalRData.cpp
===================================================================
--- source/renderer/DecalRData.cpp
+++ source/renderer/DecalRData.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,14 +21,8 @@
 
 #include "graphics/Decal.h"
 #include "graphics/LightEnv.h"
-#include "graphics/Model.h"
-#include "graphics/ShaderManager.h"
 #include "graphics/Terrain.h"
 #include "graphics/TextureManager.h"
-#include "ps/CLogger.h"
-#include "ps/Game.h"
-#include "ps/Profile.h"
-#include "renderer/Renderer.h"
 #include "renderer/TerrainRenderer.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpWaterManager.h"
Index: source/renderer/HWLightingModelRenderer.cpp
===================================================================
--- source/renderer/HWLightingModelRenderer.cpp
+++ source/renderer/HWLightingModelRenderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,18 +18,15 @@
 #include "precompiled.h"
 
 #include "lib/bits.h"
-#include "lib/ogl.h"
 #include "lib/sysdep/rtl.h"
 #include "maths/Vector3D.h"
 
 #include "graphics/Color.h"
 #include "graphics/LightEnv.h"
-#include "graphics/Model.h"
 #include "graphics/ModelDef.h"
 #include "graphics/ShaderProgram.h"
 
 #include "renderer/HWLightingModelRenderer.h"
-#include "renderer/Renderer.h"
 #include "renderer/RenderModifiers.h"
 #include "renderer/VertexArray.h"
 
Index: source/renderer/InstancingModelRenderer.cpp
===================================================================
--- source/renderer/InstancingModelRenderer.cpp
+++ source/renderer/InstancingModelRenderer.cpp
@@ -22,11 +22,8 @@
 #include "graphics/LightEnv.h"
 #include "graphics/Model.h"
 #include "graphics/ModelDef.h"
-#include "lib/ogl.h"
 #include "maths/Vector3D.h"
 #include "maths/Vector4D.h"
-#include "ps/CLogger.h"
-#include "renderer/Renderer.h"
 #include "renderer/RenderModifiers.h"
 #include "renderer/VertexArray.h"
 #include "third_party/mikktspace/weldmesh.h"
Index: source/renderer/MikktspaceWrap.cpp
===================================================================
--- source/renderer/MikktspaceWrap.cpp
+++ source/renderer/MikktspaceWrap.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,9 +21,7 @@
 
 #include "graphics/Color.h"
 #include "graphics/LightEnv.h"
-#include "graphics/Model.h"
 #include "graphics/ModelDef.h"
-#include "graphics/ShaderManager.h"
 #include "graphics/TextureManager.h"
 
 #include "renderer/MikktspaceWrap.h"
Index: source/renderer/ModelRenderer.cpp
===================================================================
--- source/renderer/ModelRenderer.cpp
+++ source/renderer/ModelRenderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,25 +19,18 @@
 
 #include "lib/allocators/allocator_adapters.h"
 #include "lib/allocators/arena.h"
-#include "lib/ogl.h"
 #include "maths/Vector3D.h"
 #include "maths/Vector4D.h"
 
-#include "ps/CLogger.h"
-#include "ps/Profile.h"
-
 #include "graphics/Color.h"
 #include "graphics/LightEnv.h"
 #include "graphics/Material.h"
-#include "graphics/Model.h"
 #include "graphics/ModelDef.h"
-#include "graphics/ShaderManager.h"
 #include "graphics/TextureManager.h"
 
 #include "renderer/MikktspaceWrap.h"
 #include "renderer/ModelRenderer.h"
 #include "renderer/ModelVertexRenderer.h"
-#include "renderer/Renderer.h"
 #include "renderer/RenderModifiers.h"
 #include "renderer/SkyManager.h"
 #include "renderer/TimeManager.h"
Index: source/renderer/OverlayRenderer.cpp
===================================================================
--- source/renderer/OverlayRenderer.cpp
+++ source/renderer/OverlayRenderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,12 +24,7 @@
 #include "graphics/Overlay.h"
 #include "graphics/Terrain.h"
 #include "graphics/TextureManager.h"
-#include "lib/ogl.h"
-#include "maths/MathUtil.h"
 #include "maths/Quaternion.h"
-#include "ps/Game.h"
-#include "ps/Profile.h"
-#include "renderer/Renderer.h"
 #include "renderer/TexturedLineRData.h"
 #include "renderer/VertexArray.h"
 #include "renderer/VertexBuffer.h"
Index: source/renderer/ParticleRenderer.cpp
===================================================================
--- source/renderer/ParticleRenderer.cpp
+++ source/renderer/ParticleRenderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,10 +21,7 @@
 
 #include "graphics/ParticleEmitter.h"
 #include "graphics/ShaderDefines.h"
-#include "graphics/ShaderManager.h"
 #include "graphics/TextureManager.h"
-#include "ps/Profile.h"
-#include "renderer/Renderer.h"
 
 struct ParticleRendererInternals
 {
Index: source/renderer/PatchRData.cpp
===================================================================
--- source/renderer/PatchRData.cpp
+++ source/renderer/PatchRData.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -25,22 +25,16 @@
 #include "graphics/LightEnv.h"
 #include "graphics/LOSTexture.h"
 #include "graphics/Patch.h"
-#include "graphics/ShaderManager.h"
 #include "graphics/Terrain.h"
 #include "graphics/TextRenderer.h"
 #include "lib/alignment.h"
 #include "lib/allocators/arena.h"
-#include "maths/MathUtil.h"
-#include "ps/CLogger.h"
-#include "ps/Game.h"
-#include "ps/Profile.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/World.h"
 #include "ps/GameSetup/Config.h"
 #include "renderer/AlphaMapCalculator.h"
 #include "renderer/PatchRData.h"
 #include "renderer/TerrainRenderer.h"
-#include "renderer/Renderer.h"
 #include "renderer/WaterManager.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpWaterManager.h"
Index: source/renderer/PostprocManager.cpp
===================================================================
--- source/renderer/PostprocManager.cpp
+++ source/renderer/PostprocManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,22 +17,14 @@
 
 #include "precompiled.h"
 
-#include "lib/ogl.h"
-#include "maths/MathUtil.h"
-
 #include "gui/GUIutil.h"
 #include "lib/bits.h"
-#include "ps/CLogger.h"
-#include "ps/Filesystem.h"
-#include "ps/Game.h"
 #include "ps/World.h"
 
 #include "graphics/GameView.h"
 #include "graphics/LightEnv.h"
-#include "graphics/ShaderManager.h"
 
 #include "renderer/PostprocManager.h"
-#include "renderer/Renderer.h"
 
 #if !CONFIG2_GLES
 
Index: source/renderer/RenderModifiers.cpp
===================================================================
--- source/renderer/RenderModifiers.cpp
+++ source/renderer/RenderModifiers.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,21 +21,16 @@
 
 #include "precompiled.h"
 
-#include "lib/ogl.h"
 #include "maths/Vector3D.h"
 #include "maths/Vector4D.h"
 #include "maths/Matrix3D.h"
 
-#include "ps/Game.h"
-
 #include "graphics/GameView.h"
 #include "graphics/LightEnv.h"
 #include "graphics/LOSTexture.h"
-#include "graphics/Model.h"
 #include "graphics/TextureManager.h"
 
 #include "renderer/RenderModifiers.h"
-#include "renderer/Renderer.h"
 #include "renderer/ShadowMap.h"
 
 #include <boost/algorithm/string.hpp>
Index: source/renderer/Renderer.cpp
===================================================================
--- source/renderer/Renderer.cpp
+++ source/renderer/Renderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -28,18 +28,11 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include "Renderer.h"
-
 #include "lib/bits.h"	// is_pow2
 #include "lib/res/graphics/ogl_tex.h"
 #include "lib/allocators/shared_ptr.h"
 #include "maths/Matrix3D.h"
-#include "maths/MathUtil.h"
-#include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
-#include "ps/Game.h"
-#include "ps/Profile.h"
-#include "ps/Filesystem.h"
 #include "ps/World.h"
 #include "ps/Loader.h"
 #include "ps/ProfileViewer.h"
@@ -50,11 +43,9 @@
 #include "graphics/LightEnv.h"
 #include "graphics/LOSTexture.h"
 #include "graphics/MaterialManager.h"
-#include "graphics/Model.h"
 #include "graphics/ModelDef.h"
 #include "graphics/ParticleManager.h"
 #include "graphics/Patch.h"
-#include "graphics/ShaderManager.h"
 #include "graphics/Terrain.h"
 #include "graphics/Texture.h"
 #include "graphics/TextureManager.h"
Index: source/renderer/Scene.cpp
===================================================================
--- source/renderer/Scene.cpp
+++ source/renderer/Scene.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -27,7 +27,6 @@
 
 #include "precompiled.h"
 
-#include "graphics/Model.h"
 #include "graphics/ParticleEmitter.h"
 #include "renderer/Scene.h"
 
Index: source/renderer/ShadowMap.cpp
===================================================================
--- source/renderer/ShadowMap.cpp
+++ source/renderer/ShadowMap.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,23 +23,16 @@
 
 #include "gui/GUIutil.h"
 #include "lib/bits.h"
-#include "lib/ogl.h"
-#include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
-#include "ps/Profile.h"
 
 #include "graphics/LightEnv.h"
-#include "graphics/ShaderManager.h"
 
 #include "maths/BoundingBoxAligned.h"
 #include "maths/Brush.h"
-#include "maths/MathUtil.h"
 #include "maths/Matrix3D.h"
 
-#include "renderer/Renderer.h"
 #include "renderer/ShadowMap.h"
 
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // ShadowMap implementation
 
Index: source/renderer/SilhouetteRenderer.cpp
===================================================================
--- source/renderer/SilhouetteRenderer.cpp
+++ source/renderer/SilhouetteRenderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,12 +21,7 @@
 
 #include "graphics/Camera.h"
 #include "graphics/HFTracer.h"
-#include "graphics/Model.h"
 #include "graphics/Patch.h"
-#include "graphics/ShaderManager.h"
-#include "maths/MathUtil.h"
-#include "ps/Profile.h"
-#include "renderer/Renderer.h"
 #include "renderer/Scene.h"
 
 #include <cfloat>
Index: source/renderer/SkyManager.cpp
===================================================================
--- source/renderer/SkyManager.cpp
+++ source/renderer/SkyManager.cpp
@@ -30,12 +30,8 @@
 #include "lib/timer.h"
 #include "lib/tex/tex.h"
 #include "lib/res/graphics/ogl_tex.h"
-#include "maths/MathUtil.h"
 #include "ps/CStr.h"
-#include "ps/CLogger.h"
-#include "ps/Game.h"
 #include "ps/Loader.h"
-#include "ps/Filesystem.h"
 #include "ps/World.h"
 #include "renderer/SkyManager.h"
 #include "renderer/Renderer.h"
Index: source/renderer/TerrainOverlay.cpp
===================================================================
--- source/renderer/TerrainOverlay.cpp
+++ source/renderer/TerrainOverlay.cpp
@@ -22,12 +22,8 @@
 #include "graphics/Color.h"
 #include "graphics/Terrain.h"
 #include "lib/bits.h"
-#include "lib/ogl.h"
-#include "maths/MathUtil.h"
-#include "ps/Game.h"
 #include "ps/Profile.h"
 #include "ps/World.h"
-#include "renderer/Renderer.h"
 #include "renderer/TerrainRenderer.h"
 #include "simulation2/system/SimContext.h"
 
Index: source/renderer/TerrainRenderer.cpp
===================================================================
--- source/renderer/TerrainRenderer.cpp
+++ source/renderer/TerrainRenderer.cpp
@@ -28,25 +28,15 @@
 #include "graphics/LOSTexture.h"
 #include "graphics/Patch.h"
 #include "graphics/GameView.h"
-#include "graphics/Model.h"
-#include "graphics/ShaderManager.h"
 #include "renderer/ShadowMap.h"
 #include "renderer/SkyManager.h"
 #include "graphics/TerritoryTexture.h"
 #include "graphics/TextRenderer.h"
 
-#include "maths/MathUtil.h"
-
-#include "ps/Filesystem.h"
-#include "ps/CLogger.h"
-#include "ps/Game.h"
-#include "ps/Profile.h"
 #include "ps/World.h"
 
 #include "renderer/DecalRData.h"
 #include "renderer/PatchRData.h"
-#include "renderer/Renderer.h"
-#include "renderer/ShadowMap.h"
 #include "renderer/TerrainRenderer.h"
 #include "renderer/VertexArray.h"
 #include "renderer/WaterManager.h"
Index: source/renderer/TexturedLineRData.cpp
===================================================================
--- source/renderer/TexturedLineRData.cpp
+++ source/renderer/TexturedLineRData.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,10 +20,8 @@
 #include "TexturedLineRData.h"
 
 #include "graphics/Terrain.h"
-#include "maths/MathUtil.h"
 #include "maths/Quaternion.h"
 #include "renderer/OverlayRenderer.h"
-#include "renderer/Renderer.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/system/SimContext.h"
 #include "simulation2/components/ICmpWaterManager.h"
Index: source/renderer/TimeManager.cpp
===================================================================
--- source/renderer/TimeManager.cpp
+++ source/renderer/TimeManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,10 +18,8 @@
 #include "precompiled.h"
 
 #include "lib/timer.h"
-#include "maths/MathUtil.h"
 #include "renderer/TimeManager.h"
 
-
 CTimeManager::CTimeManager()
 {
 	m_frameDelta = 0.0;
Index: source/renderer/VertexArray.cpp
===================================================================
--- source/renderer/VertexArray.cpp
+++ source/renderer/VertexArray.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,18 +18,15 @@
 #include "precompiled.h"
 
 #include "lib/alignment.h"
-#include "lib/ogl.h"
 #include "lib/sysdep/rtl.h"
 #include "maths/Vector3D.h"
 #include "maths/Vector4D.h"
-#include "ps/CLogger.h"
 #include "graphics/Color.h"
 #include "graphics/SColor.h"
 #include "renderer/VertexArray.h"
 #include "renderer/VertexBuffer.h"
 #include "renderer/VertexBufferManager.h"
 
-
 VertexArray::VertexArray(GLenum usage, GLenum target)
 {
 	m_Usage = usage;
Index: source/renderer/VertexBuffer.cpp
===================================================================
--- source/renderer/VertexBuffer.cpp
+++ source/renderer/VertexBuffer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,12 +21,9 @@
 
 #include "precompiled.h"
 #include "ps/Errors.h"
-#include "lib/ogl.h"
 #include "lib/sysdep/cpu.h"
-#include "Renderer.h"
 #include "VertexBuffer.h"
 #include "VertexBufferManager.h"
-#include "ps/CLogger.h"
 
 // Absolute maximum (bytewise) size of each GL vertex buffer object.
 // Make it large enough for the maximum feasible mesh size (64K vertexes,
Index: source/renderer/VertexBufferManager.cpp
===================================================================
--- source/renderer/VertexBufferManager.cpp
+++ source/renderer/VertexBufferManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,9 +23,6 @@
 
 #include "VertexBufferManager.h"
 
-#include "lib/ogl.h"
-#include "ps/CLogger.h"
-
 #define DUMP_VB_STATS 0 // for debugging
 
 CVertexBufferManager g_VBMan;
Index: source/renderer/WaterManager.cpp
===================================================================
--- source/renderer/WaterManager.cpp
+++ source/renderer/WaterManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,7 +23,6 @@
 
 #include "graphics/Terrain.h"
 #include "graphics/TextureManager.h"
-#include "graphics/ShaderManager.h"
 #include "graphics/ShaderProgram.h"
 
 #include "lib/bits.h"
@@ -31,21 +30,16 @@
 #include "lib/tex/tex.h"
 #include "lib/res/graphics/ogl_tex.h"
 
-#include "maths/MathUtil.h"
 #include "maths/Vector2D.h"
 
-#include "ps/CLogger.h"
-#include "ps/Game.h"
 #include "ps/World.h"
 
 #include "renderer/WaterManager.h"
-#include "renderer/Renderer.h"
 
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpWaterManager.h"
 #include "simulation2/components/ICmpRangeManager.h"
 
-
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // WaterManager implementation
 
Index: source/simulation2/components/CCmpAIManager.cpp
===================================================================
--- source/simulation2/components/CCmpAIManager.cpp
+++ source/simulation2/components/CCmpAIManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,11 +17,7 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpAIManager.h"
-
-#include "simulation2/MessageTypes.h"
-
 #include "graphics/Terrain.h"
 #include "lib/timer.h"
 #include "lib/tex/tex.h"
Index: source/simulation2/components/CCmpCinemaManager.cpp
===================================================================
--- source/simulation2/components/CCmpCinemaManager.cpp
+++ source/simulation2/components/CCmpCinemaManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,7 +17,6 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpCinemaManager.h"
 
 #include "ps/CLogger.h"
@@ -25,10 +24,8 @@
 #include "simulation2/components/ICmpRangeManager.h"
 #include "simulation2/components/ICmpSelectable.h"
 #include "simulation2/components/ICmpTerritoryManager.h"
-#include "simulation2/MessageTypes.h"
 #include "simulation2/Simulation2.h"
 
-
 class CCmpCinemaManager : public ICmpCinemaManager
 {
 public:
Index: source/simulation2/components/CCmpCommandQueue.cpp
===================================================================
--- source/simulation2/components/CCmpCommandQueue.cpp
+++ source/simulation2/components/CCmpCommandQueue.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,7 +17,6 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpCommandQueue.h"
 
 #include "ps/CLogger.h"
Index: source/simulation2/components/CCmpDecay.cpp
===================================================================
--- source/simulation2/components/CCmpDecay.cpp
+++ source/simulation2/components/CCmpDecay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,11 +17,8 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpDecay.h"
 
-#include "simulation2/MessageTypes.h"
-
 #include "ICmpPosition.h"
 #include "ICmpTerrain.h"
 #include "ICmpVisual.h"
Index: source/simulation2/components/CCmpFootprint.cpp
===================================================================
--- source/simulation2/components/CCmpFootprint.cpp
+++ source/simulation2/components/CCmpFootprint.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,7 +17,6 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpFootprint.h"
 
 #include "ps/Profile.h"
@@ -28,7 +27,6 @@
 #include "simulation2/components/ICmpRallyPoint.h"
 #include "simulation2/components/ICmpUnitMotion.h"
 #include "simulation2/helpers/Geometry.h"
-#include "simulation2/MessageTypes.h"
 #include "maths/FixedVector2D.h"
 
 class CCmpFootprint : public ICmpFootprint
Index: source/simulation2/components/CCmpMinimap.cpp
===================================================================
--- source/simulation2/components/CCmpMinimap.cpp
+++ source/simulation2/components/CCmpMinimap.cpp
@@ -17,13 +17,11 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpMinimap.h"
 
 #include "simulation2/components/ICmpPlayerManager.h"
 #include "simulation2/components/ICmpPlayer.h"
 #include "simulation2/components/ICmpOwnership.h"
-#include "simulation2/MessageTypes.h"
 
 #include "graphics/Color.h"
 
Index: source/simulation2/components/CCmpMotionBall.cpp
===================================================================
--- source/simulation2/components/CCmpMotionBall.cpp
+++ source/simulation2/components/CCmpMotionBall.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpMotion.h"
-
 #include "ICmpPosition.h"
-#include "simulation2/MessageTypes.h"
-
 #include "graphics/Terrain.h"
 
 class CCmpMotionBall : public ICmpMotion
Index: source/simulation2/components/CCmpObstruction.cpp
===================================================================
--- source/simulation2/components/CCmpObstruction.cpp
+++ source/simulation2/components/CCmpObstruction.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,11 +17,8 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpObstruction.h"
-
 #include "ps/CLogger.h"
-#include "simulation2/MessageTypes.h"
 #include "simulation2/components/ICmpObstructionManager.h"
 #include "simulation2/components/ICmpTerrain.h"
 #include "simulation2/components/ICmpUnitMotion.h"
Index: source/simulation2/components/CCmpObstructionManager.cpp
===================================================================
--- source/simulation2/components/CCmpObstructionManager.cpp
+++ source/simulation2/components/CCmpObstructionManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,13 +17,11 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpObstructionManager.h"
 
 #include "ICmpTerrain.h"
 #include "ICmpPosition.h"
 
-#include "simulation2/MessageTypes.h"
 #include "simulation2/helpers/Geometry.h"
 #include "simulation2/helpers/Rasterize.h"
 #include "simulation2/helpers/Render.h"
Index: source/simulation2/components/CCmpOverlayRenderer.cpp
===================================================================
--- source/simulation2/components/CCmpOverlayRenderer.cpp
+++ source/simulation2/components/CCmpOverlayRenderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,13 +17,9 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpOverlayRenderer.h"
-
 #include "ICmpPosition.h"
 
-#include "simulation2/MessageTypes.h"
-
 #include "graphics/Overlay.h"
 #include "graphics/TextureManager.h"
 #include "renderer/Renderer.h"
Index: source/simulation2/components/CCmpOwnership.cpp
===================================================================
--- source/simulation2/components/CCmpOwnership.cpp
+++ source/simulation2/components/CCmpOwnership.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,11 +17,8 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpOwnership.h"
 
-#include "simulation2/MessageTypes.h"
-
 /**
  * Basic ICmpOwnership implementation.
  */
Index: source/simulation2/components/CCmpParticleManager.cpp
===================================================================
--- source/simulation2/components/CCmpParticleManager.cpp
+++ source/simulation2/components/CCmpParticleManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,11 +17,7 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpParticleManager.h"
-
-#include "simulation2/MessageTypes.h"
-
 #include "graphics/ParticleManager.h"
 #include "renderer/Renderer.h"
 
Index: source/simulation2/components/CCmpPathfinder.cpp
===================================================================
--- source/simulation2/components/CCmpPathfinder.cpp
+++ source/simulation2/components/CCmpPathfinder.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -29,7 +29,6 @@
 #include "ps/Profile.h"
 #include "ps/XML/Xeromyces.h"
 #include "renderer/Scene.h"
-#include "simulation2/MessageTypes.h"
 #include "simulation2/components/ICmpObstruction.h"
 #include "simulation2/components/ICmpObstructionManager.h"
 #include "simulation2/components/ICmpTerrain.h"
Index: source/simulation2/components/CCmpPosition.cpp
===================================================================
--- source/simulation2/components/CCmpPosition.cpp
+++ source/simulation2/components/CCmpPosition.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,11 +17,7 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpPosition.h"
-
-#include "simulation2/MessageTypes.h"
-
 #include "ICmpTerrain.h"
 #include "ICmpTerritoryManager.h"
 #include "ICmpVisual.h"
Index: source/simulation2/components/CCmpProjectileManager.cpp
===================================================================
--- source/simulation2/components/CCmpProjectileManager.cpp
+++ source/simulation2/components/CCmpProjectileManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,15 +17,12 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpProjectileManager.h"
-
 #include "ICmpObstruction.h"
 #include "ICmpObstructionManager.h"
 #include "ICmpPosition.h"
 #include "ICmpRangeManager.h"
 #include "ICmpTerrain.h"
-#include "simulation2/MessageTypes.h"
 
 #include "graphics/Frustum.h"
 #include "graphics/Model.h"
Index: source/simulation2/components/CCmpRallyPointRenderer.cpp
===================================================================
--- source/simulation2/components/CCmpRallyPointRenderer.cpp
+++ source/simulation2/components/CCmpRallyPointRenderer.cpp
@@ -18,7 +18,6 @@
 #include "precompiled.h"
 #include "ICmpRallyPointRenderer.h"
 
-#include "simulation2/MessageTypes.h"
 #include "simulation2/components/ICmpFootprint.h"
 #include "simulation2/components/ICmpObstructionManager.h"
 #include "simulation2/components/ICmpOwnership.h"
@@ -32,7 +31,6 @@
 #include "simulation2/components/ICmpWaterManager.h"
 #include "simulation2/helpers/Render.h"
 #include "simulation2/helpers/Geometry.h"
-#include "simulation2/system/Component.h"
 
 #include "graphics/Overlay.h"
 #include "graphics/TextureManager.h"
Index: source/simulation2/components/CCmpRangeManager.cpp
===================================================================
--- source/simulation2/components/CCmpRangeManager.cpp
+++ source/simulation2/components/CCmpRangeManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,12 +17,9 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpRangeManager.h"
-
 #include "ICmpTerrain.h"
 #include "simulation2/system/EntityMap.h"
-#include "simulation2/MessageTypes.h"
 #include "simulation2/components/ICmpFogging.h"
 #include "simulation2/components/ICmpMirage.h"
 #include "simulation2/components/ICmpOwnership.h"
Index: source/simulation2/components/CCmpRangeOverlayRenderer.cpp
===================================================================
--- source/simulation2/components/CCmpRangeOverlayRenderer.cpp
+++ source/simulation2/components/CCmpRangeOverlayRenderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,13 +22,11 @@
 #include "graphics/Overlay.h"
 #include "graphics/TextureManager.h"
 #include "renderer/Renderer.h"
-#include "simulation2/MessageTypes.h"
 #include "simulation2/components/ICmpOwnership.h"
 #include "simulation2/components/ICmpPlayer.h"
 #include "simulation2/components/ICmpPlayerManager.h"
 #include "simulation2/components/ICmpPosition.h"
 #include "simulation2/helpers/Render.h"
-#include "simulation2/system/Component.h"
 
 class CCmpRangeOverlayRenderer : public ICmpRangeOverlayRenderer
 {
Index: source/simulation2/components/CCmpSelectable.cpp
===================================================================
--- source/simulation2/components/CCmpSelectable.cpp
+++ source/simulation2/components/CCmpSelectable.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -30,7 +30,6 @@
 #include "ps/Profile.h"
 #include "renderer/Scene.h"
 #include "renderer/Renderer.h"
-#include "simulation2/MessageTypes.h"
 #include "simulation2/components/ICmpPosition.h"
 #include "simulation2/components/ICmpFootprint.h"
 #include "simulation2/components/ICmpVisual.h"
@@ -40,7 +39,6 @@
 #include "simulation2/components/ICmpPlayerManager.h"
 #include "simulation2/components/ICmpWaterManager.h"
 #include "simulation2/helpers/Render.h"
-#include "simulation2/system/Component.h"
 
 // Minimum alpha value for always visible overlays [0 fully transparent, 1 fully opaque]
 static const float MIN_ALPHA_ALWAYS_VISIBLE = 0.65f;
Index: source/simulation2/components/CCmpSoundManager.cpp
===================================================================
--- source/simulation2/components/CCmpSoundManager.cpp
+++ source/simulation2/components/CCmpSoundManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,10 +17,7 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpSoundManager.h"
-
-#include "simulation2/MessageTypes.h"
 #include "simulation2/components/ICmpPosition.h"
 #include "simulation2/components/ICmpRangeManager.h"
 #include "simulation2/components/ICmpOwnership.h"
Index: source/simulation2/components/CCmpTemplateManager.cpp
===================================================================
--- source/simulation2/components/CCmpTemplateManager.cpp
+++ source/simulation2/components/CCmpTemplateManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,10 +17,7 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpTemplateManager.h"
-
-#include "simulation2/MessageTypes.h"
 #include "simulation2/serialization/SerializeTemplates.h"
 
 #include "ps/TemplateLoader.h"
Index: source/simulation2/components/CCmpTerrain.cpp
===================================================================
--- source/simulation2/components/CCmpTerrain.cpp
+++ source/simulation2/components/CCmpTerrain.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,12 +17,10 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpTerrain.h"
 
 #include "ICmpObstructionManager.h"
 #include "ICmpRangeManager.h"
-#include "simulation2/MessageTypes.h"
 
 #include "graphics/Terrain.h"
 #include "renderer/Renderer.h"
Index: source/simulation2/components/CCmpTerritoryInfluence.cpp
===================================================================
--- source/simulation2/components/CCmpTerritoryInfluence.cpp
+++ source/simulation2/components/CCmpTerritoryInfluence.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,7 +17,6 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpTerritoryInfluence.h"
 
 #include "simulation2/components/ICmpOwnership.h"
Index: source/simulation2/components/CCmpTerritoryManager.cpp
===================================================================
--- source/simulation2/components/CCmpTerritoryManager.cpp
+++ source/simulation2/components/CCmpTerritoryManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,7 +17,6 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpTerritoryManager.h"
 
 #include "graphics/Overlay.h"
@@ -30,7 +29,6 @@
 #include "renderer/Renderer.h"
 #include "renderer/Scene.h"
 #include "renderer/TerrainOverlay.h"
-#include "simulation2/MessageTypes.h"
 #include "simulation2/components/ICmpOwnership.h"
 #include "simulation2/components/ICmpPathfinder.h"
 #include "simulation2/components/ICmpPlayer.h"
Index: source/simulation2/components/CCmpTest.cpp
===================================================================
--- source/simulation2/components/CCmpTest.cpp
+++ source/simulation2/components/CCmpTest.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,11 +17,9 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpTest.h"
 
 #include "simulation2/scripting/ScriptComponent.h"
-#include "simulation2/MessageTypes.h"
 
 #include "ps/Profile.h"
 
Index: source/simulation2/components/CCmpUnitMotion.cpp
===================================================================
--- source/simulation2/components/CCmpUnitMotion.cpp
+++ source/simulation2/components/CCmpUnitMotion.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,7 +17,6 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpUnitMotion.h"
 
 #include "simulation2/components/ICmpObstruction.h"
@@ -29,7 +28,6 @@
 #include "simulation2/components/ICmpValueModificationManager.h"
 #include "simulation2/helpers/Geometry.h"
 #include "simulation2/helpers/Render.h"
-#include "simulation2/MessageTypes.h"
 #include "simulation2/serialization/SerializeTemplates.h"
 
 #include "graphics/Overlay.h"
Index: source/simulation2/components/CCmpUnitRenderer.cpp
===================================================================
--- source/simulation2/components/CCmpUnitRenderer.cpp
+++ source/simulation2/components/CCmpUnitRenderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,11 +17,8 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpUnitRenderer.h"
 
-#include "simulation2/MessageTypes.h"
-
 #include "ICmpPosition.h"
 #include "ICmpRangeManager.h"
 #include "ICmpSelectable.h"
Index: source/simulation2/components/CCmpVision.cpp
===================================================================
--- source/simulation2/components/CCmpVision.cpp
+++ source/simulation2/components/CCmpVision.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,10 +17,8 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpVision.h"
 
-#include "simulation2/MessageTypes.h"
 #include "simulation2/components/ICmpPlayerManager.h"
 #include "simulation2/components/ICmpRangeManager.h"
 #include "simulation2/components/ICmpValueModificationManager.h"
Index: source/simulation2/components/CCmpVisualActor.cpp
===================================================================
--- source/simulation2/components/CCmpVisualActor.cpp
+++ source/simulation2/components/CCmpVisualActor.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,11 +17,8 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpVisual.h"
 
-#include "simulation2/MessageTypes.h"
-
 #include "ICmpFootprint.h"
 #include "ICmpUnitRenderer.h"
 #include "ICmpOwnership.h"
Index: source/simulation2/components/CCmpWaterManager.cpp
===================================================================
--- source/simulation2/components/CCmpWaterManager.cpp
+++ source/simulation2/components/CCmpWaterManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,14 +17,12 @@
 
 #include "precompiled.h"
 
-#include "simulation2/system/Component.h"
 #include "ICmpWaterManager.h"
 
 #include "graphics/RenderableObject.h"
 #include "graphics/Terrain.h"
 #include "renderer/Renderer.h"
 #include "renderer/WaterManager.h"
-#include "simulation2/MessageTypes.h"
 
 #include "tools/atlas/GameInterface/GameLoop.h"
 
Index: source/simulation2/components/ICmpAIInterface.cpp
===================================================================
--- source/simulation2/components/ICmpAIInterface.cpp
+++ source/simulation2/components/ICmpAIInterface.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpAIInterface.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 #include "simulation2/scripting/ScriptComponent.h"
 
 BEGIN_INTERFACE_WRAPPER(AIInterface)
Index: source/simulation2/components/ICmpAIManager.cpp
===================================================================
--- source/simulation2/components/ICmpAIManager.cpp
+++ source/simulation2/components/ICmpAIManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpAIManager.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 #include "lib/file/vfs/vfs_util.h"
 #include "ps/Filesystem.h"
Index: source/simulation2/components/ICmpCinemaManager.cpp
===================================================================
--- source/simulation2/components/ICmpCinemaManager.cpp
+++ source/simulation2/components/ICmpCinemaManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpCinemaManager.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(CinemaManager)
 DEFINE_INTERFACE_METHOD_1("AddPath", void, ICmpCinemaManager, AddPath, CCinemaPath)
Index: source/simulation2/components/ICmpCommandQueue.cpp
===================================================================
--- source/simulation2/components/ICmpCommandQueue.cpp
+++ source/simulation2/components/ICmpCommandQueue.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpCommandQueue.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(CommandQueue)
 DEFINE_INTERFACE_METHOD_2("PushLocalCommand", void, ICmpCommandQueue, PushLocalCommand, player_id_t, JS::HandleValue)
Index: source/simulation2/components/ICmpDecay.cpp
===================================================================
--- source/simulation2/components/ICmpDecay.cpp
+++ source/simulation2/components/ICmpDecay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpDecay.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(Decay)
 END_INTERFACE_WRAPPER(Decay)
Index: source/simulation2/components/ICmpFogging.cpp
===================================================================
--- source/simulation2/components/ICmpFogging.cpp
+++ source/simulation2/components/ICmpFogging.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #include "ICmpFogging.h"
 
 #include "simulation2/scripting/ScriptComponent.h"
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(Fogging)
 END_INTERFACE_WRAPPER(Fogging)
Index: source/simulation2/components/ICmpFootprint.cpp
===================================================================
--- source/simulation2/components/ICmpFootprint.cpp
+++ source/simulation2/components/ICmpFootprint.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpFootprint.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 #include "simulation2/system/SimContext.h"
 #include "maths/FixedVector3D.h"
Index: source/simulation2/components/ICmpGuiInterface.cpp
===================================================================
--- source/simulation2/components/ICmpGuiInterface.cpp
+++ source/simulation2/components/ICmpGuiInterface.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpGuiInterface.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 #include "simulation2/scripting/ScriptComponent.h"
 
 BEGIN_INTERFACE_WRAPPER(GuiInterface)
Index: source/simulation2/components/ICmpIdentity.cpp
===================================================================
--- source/simulation2/components/ICmpIdentity.cpp
+++ source/simulation2/components/ICmpIdentity.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpIdentity.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 #include "simulation2/scripting/ScriptComponent.h"
 
 
Index: source/simulation2/components/ICmpMinimap.cpp
===================================================================
--- source/simulation2/components/ICmpMinimap.cpp
+++ source/simulation2/components/ICmpMinimap.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpMinimap.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(Minimap)
 DEFINE_INTERFACE_METHOD_0("UpdateColor", void, ICmpMinimap, UpdateColor)
Index: source/simulation2/components/ICmpMirage.cpp
===================================================================
--- source/simulation2/components/ICmpMirage.cpp
+++ source/simulation2/components/ICmpMirage.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #include "ICmpMirage.h"
 
 #include "simulation2/scripting/ScriptComponent.h"
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(Mirage)
 END_INTERFACE_WRAPPER(Mirage)
Index: source/simulation2/components/ICmpMotion.cpp
===================================================================
--- source/simulation2/components/ICmpMotion.cpp
+++ source/simulation2/components/ICmpMotion.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpMotion.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 #include "simulation2/scripting/ScriptComponent.h"
 
 BEGIN_INTERFACE_WRAPPER(Motion)
Index: source/simulation2/components/ICmpObstruction.cpp
===================================================================
--- source/simulation2/components/ICmpObstruction.cpp
+++ source/simulation2/components/ICmpObstruction.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpObstruction.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 #include "simulation2/system/SimContext.h"
 
Index: source/simulation2/components/ICmpObstructionManager.cpp
===================================================================
--- source/simulation2/components/ICmpObstructionManager.cpp
+++ source/simulation2/components/ICmpObstructionManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpObstructionManager.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(ObstructionManager)
 DEFINE_INTERFACE_METHOD_1("SetPassabilityCircular", void, ICmpObstructionManager, SetPassabilityCircular, bool)
Index: source/simulation2/components/ICmpOverlayRenderer.cpp
===================================================================
--- source/simulation2/components/ICmpOverlayRenderer.cpp
+++ source/simulation2/components/ICmpOverlayRenderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpOverlayRenderer.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(OverlayRenderer)
 DEFINE_INTERFACE_METHOD_0("Reset", void, ICmpOverlayRenderer, Reset)
Index: source/simulation2/components/ICmpOwnership.cpp
===================================================================
--- source/simulation2/components/ICmpOwnership.cpp
+++ source/simulation2/components/ICmpOwnership.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpOwnership.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(Ownership)
 DEFINE_INTERFACE_METHOD_CONST_0("GetOwner", player_id_t, ICmpOwnership, GetOwner)
Index: source/simulation2/components/ICmpParticleManager.cpp
===================================================================
--- source/simulation2/components/ICmpParticleManager.cpp
+++ source/simulation2/components/ICmpParticleManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpParticleManager.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(ParticleManager)
 END_INTERFACE_WRAPPER(ParticleManager)
Index: source/simulation2/components/ICmpPathfinder.cpp
===================================================================
--- source/simulation2/components/ICmpPathfinder.cpp
+++ source/simulation2/components/ICmpPathfinder.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpPathfinder.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(Pathfinder)
 DEFINE_INTERFACE_METHOD_1("SetDebugOverlay", void, ICmpPathfinder, SetDebugOverlay, bool)
Index: source/simulation2/components/ICmpPlayer.cpp
===================================================================
--- source/simulation2/components/ICmpPlayer.cpp
+++ source/simulation2/components/ICmpPlayer.cpp
@@ -21,7 +21,6 @@
 
 #include "graphics/Color.h"
 #include "maths/FixedVector3D.h"
-#include "simulation2/system/InterfaceScripted.h"
 #include "simulation2/scripting/ScriptComponent.h"
 
 BEGIN_INTERFACE_WRAPPER(Player)
Index: source/simulation2/components/ICmpPlayerManager.cpp
===================================================================
--- source/simulation2/components/ICmpPlayerManager.cpp
+++ source/simulation2/components/ICmpPlayerManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpPlayerManager.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 #include "simulation2/scripting/ScriptComponent.h"
 
 BEGIN_INTERFACE_WRAPPER(PlayerManager)
Index: source/simulation2/components/ICmpPosition.cpp
===================================================================
--- source/simulation2/components/ICmpPosition.cpp
+++ source/simulation2/components/ICmpPosition.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpPosition.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(Position)
 DEFINE_INTERFACE_METHOD_2("SetTurretParent", void, ICmpPosition, SetTurretParent, entity_id_t, CFixedVector3D)
Index: source/simulation2/components/ICmpProjectileManager.cpp
===================================================================
--- source/simulation2/components/ICmpProjectileManager.cpp
+++ source/simulation2/components/ICmpProjectileManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpProjectileManager.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(ProjectileManager)
 DEFINE_INTERFACE_METHOD_7("LaunchProjectileAtPoint", uint32_t, ICmpProjectileManager, LaunchProjectileAtPoint, CFixedVector3D, CFixedVector3D, fixed, fixed, std::wstring, std::wstring, fixed)
Index: source/simulation2/components/ICmpRallyPoint.cpp
===================================================================
--- source/simulation2/components/ICmpRallyPoint.cpp
+++ source/simulation2/components/ICmpRallyPoint.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #include "ICmpRallyPoint.h"
 
 #include "maths/FixedVector2D.h"
-#include "simulation2/system/InterfaceScripted.h"
 #include "simulation2/scripting/ScriptComponent.h"
 
 BEGIN_INTERFACE_WRAPPER(RallyPoint)
Index: source/simulation2/components/ICmpRallyPointRenderer.cpp
===================================================================
--- source/simulation2/components/ICmpRallyPointRenderer.cpp
+++ source/simulation2/components/ICmpRallyPointRenderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,7 +18,6 @@
 #include "precompiled.h"
 
 #include "ICmpRallyPointRenderer.h"
-#include "simulation2/system/InterfaceScripted.h"
 
 class CFixedVector2D;
 
Index: source/simulation2/components/ICmpRangeManager.cpp
===================================================================
--- source/simulation2/components/ICmpRangeManager.cpp
+++ source/simulation2/components/ICmpRangeManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpRangeManager.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 std::string ICmpRangeManager::GetLosVisibility_wrapper(entity_id_t ent, int player) const
 {
Index: source/simulation2/components/ICmpRangeOverlayRenderer.cpp
===================================================================
--- source/simulation2/components/ICmpRangeOverlayRenderer.cpp
+++ source/simulation2/components/ICmpRangeOverlayRenderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,7 +18,6 @@
 #include "precompiled.h"
 
 #include "ICmpRangeOverlayRenderer.h"
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(RangeOverlayRenderer)
 DEFINE_INTERFACE_METHOD_4("AddRangeOverlay", void, ICmpRangeOverlayRenderer, AddRangeOverlay, float, std::string, std::string, float)
Index: source/simulation2/components/ICmpSelectable.cpp
===================================================================
--- source/simulation2/components/ICmpSelectable.cpp
+++ source/simulation2/components/ICmpSelectable.cpp
@@ -19,7 +19,6 @@
 
 #include "ICmpSelectable.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 #include "graphics/Color.h"
 
Index: source/simulation2/components/ICmpSettlement.cpp
===================================================================
--- source/simulation2/components/ICmpSettlement.cpp
+++ source/simulation2/components/ICmpSettlement.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpSettlement.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 #include "simulation2/scripting/ScriptComponent.h"
 
 
Index: source/simulation2/components/ICmpSound.cpp
===================================================================
--- source/simulation2/components/ICmpSound.cpp
+++ source/simulation2/components/ICmpSound.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #include "ICmpSound.h"
 
 #include "simulation2/scripting/ScriptComponent.h"
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(Sound)
 END_INTERFACE_WRAPPER(Sound)
Index: source/simulation2/components/ICmpSoundManager.cpp
===================================================================
--- source/simulation2/components/ICmpSoundManager.cpp
+++ source/simulation2/components/ICmpSoundManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,8 +19,6 @@
 
 #include "ICmpSoundManager.h"
 
-#include "simulation2/system/InterfaceScripted.h"
-
 BEGIN_INTERFACE_WRAPPER(SoundManager)
 DEFINE_INTERFACE_METHOD_2("PlaySoundGroup", void, ICmpSoundManager, PlaySoundGroup, std::wstring, entity_id_t)
 DEFINE_INTERFACE_METHOD_2("PlaySoundGroupAtPosition", void, ICmpSoundManager, PlaySoundGroupAtPosition, std::wstring, CFixedVector3D)
Index: source/simulation2/components/ICmpTemplateManager.cpp
===================================================================
--- source/simulation2/components/ICmpTemplateManager.cpp
+++ source/simulation2/components/ICmpTemplateManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,8 +19,6 @@
 
 #include "ICmpTemplateManager.h"
 
-#include "simulation2/system/InterfaceScripted.h"
-
 BEGIN_INTERFACE_WRAPPER(TemplateManager)
 DEFINE_INTERFACE_METHOD_1("GetTemplate", const CParamNode*, ICmpTemplateManager, GetTemplate, std::string)
 DEFINE_INTERFACE_METHOD_1("GetTemplateWithoutValidation", const CParamNode*, ICmpTemplateManager, GetTemplateWithoutValidation, std::string)
Index: source/simulation2/components/ICmpTerrain.cpp
===================================================================
--- source/simulation2/components/ICmpTerrain.cpp
+++ source/simulation2/components/ICmpTerrain.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,8 +19,6 @@
 
 #include "ICmpTerrain.h"
 
-#include "simulation2/system/InterfaceScripted.h"
-
 BEGIN_INTERFACE_WRAPPER(Terrain)
 DEFINE_INTERFACE_METHOD_CONST_2("GetGroundLevel", entity_pos_t, ICmpTerrain, GetGroundLevel, entity_pos_t, entity_pos_t)
 DEFINE_INTERFACE_METHOD_CONST_2("CalcNormal", CFixedVector3D, ICmpTerrain, CalcNormal, entity_pos_t, entity_pos_t)
Index: source/simulation2/components/ICmpTerritoryDecayManager.cpp
===================================================================
--- source/simulation2/components/ICmpTerritoryDecayManager.cpp
+++ source/simulation2/components/ICmpTerritoryDecayManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpTerritoryDecayManager.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 #include "simulation2/scripting/ScriptComponent.h"
 
 BEGIN_INTERFACE_WRAPPER(TerritoryDecayManager)
Index: source/simulation2/components/ICmpTerritoryInfluence.cpp
===================================================================
--- source/simulation2/components/ICmpTerritoryInfluence.cpp
+++ source/simulation2/components/ICmpTerritoryInfluence.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,5 @@
 
 #include "ICmpTerritoryInfluence.h"
 
-#include "simulation2/system/InterfaceScripted.h"
-
 BEGIN_INTERFACE_WRAPPER(TerritoryInfluence)
 END_INTERFACE_WRAPPER(TerritoryInfluence)
Index: source/simulation2/components/ICmpTerritoryManager.cpp
===================================================================
--- source/simulation2/components/ICmpTerritoryManager.cpp
+++ source/simulation2/components/ICmpTerritoryManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,8 +19,6 @@
 
 #include "ICmpTerritoryManager.h"
 
-#include "simulation2/system/InterfaceScripted.h"
-
 BEGIN_INTERFACE_WRAPPER(TerritoryManager)
 DEFINE_INTERFACE_METHOD_2("GetOwner", player_id_t, ICmpTerritoryManager, GetOwner, entity_pos_t, entity_pos_t)
 DEFINE_INTERFACE_METHOD_3("GetNeighbours", std::vector<u32>, ICmpTerritoryManager, GetNeighbours, entity_pos_t, entity_pos_t, bool)
Index: source/simulation2/components/ICmpTest.cpp
===================================================================
--- source/simulation2/components/ICmpTest.cpp
+++ source/simulation2/components/ICmpTest.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,8 +19,6 @@
 
 #include "ICmpTest.h"
 
-#include "simulation2/system/InterfaceScripted.h"
-
 BEGIN_INTERFACE_WRAPPER(Test1)
 END_INTERFACE_WRAPPER(Test1)
 
Index: source/simulation2/components/ICmpUnitMotion.cpp
===================================================================
--- source/simulation2/components/ICmpUnitMotion.cpp
+++ source/simulation2/components/ICmpUnitMotion.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpUnitMotion.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 #include "simulation2/scripting/ScriptComponent.h"
 
 BEGIN_INTERFACE_WRAPPER(UnitMotion)
Index: source/simulation2/components/ICmpUnitRenderer.cpp
===================================================================
--- source/simulation2/components/ICmpUnitRenderer.cpp
+++ source/simulation2/components/ICmpUnitRenderer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,8 +19,6 @@
 
 #include "ICmpUnitRenderer.h"
 
-#include "simulation2/system/InterfaceScripted.h"
-
 BEGIN_INTERFACE_WRAPPER(UnitRenderer)
 DEFINE_INTERFACE_METHOD_1("SetDebugOverlay", void, ICmpUnitRenderer, SetDebugOverlay, bool)
 END_INTERFACE_WRAPPER(UnitRenderer)
Index: source/simulation2/components/ICmpUnknownScript.cpp
===================================================================
--- source/simulation2/components/ICmpUnknownScript.cpp
+++ source/simulation2/components/ICmpUnknownScript.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpUnknownScript.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 #include "simulation2/scripting/ScriptComponent.h"
 
 BEGIN_INTERFACE_WRAPPER(UnknownScript)
Index: source/simulation2/components/ICmpValueModificationManager.cpp
===================================================================
--- source/simulation2/components/ICmpValueModificationManager.cpp
+++ source/simulation2/components/ICmpValueModificationManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpValueModificationManager.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 #include "simulation2/scripting/ScriptComponent.h"
 
 BEGIN_INTERFACE_WRAPPER(ValueModificationManager)
Index: source/simulation2/components/ICmpVisibility.cpp
===================================================================
--- source/simulation2/components/ICmpVisibility.cpp
+++ source/simulation2/components/ICmpVisibility.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #include "ICmpVisibility.h"
 
 #include "simulation2/scripting/ScriptComponent.h"
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(Visibility)
 END_INTERFACE_WRAPPER(Visibility)
Index: source/simulation2/components/ICmpVision.cpp
===================================================================
--- source/simulation2/components/ICmpVision.cpp
+++ source/simulation2/components/ICmpVision.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpVision.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(Vision)
 DEFINE_INTERFACE_METHOD_CONST_0("GetRange", entity_pos_t, ICmpVision, GetRange)
Index: source/simulation2/components/ICmpVisual.cpp
===================================================================
--- source/simulation2/components/ICmpVisual.cpp
+++ source/simulation2/components/ICmpVisual.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpVisual.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(Visual)
 DEFINE_INTERFACE_METHOD_2("SetVariant", void, ICmpVisual, SetVariant, CStr, CStr)
Index: source/simulation2/components/ICmpWaterManager.cpp
===================================================================
--- source/simulation2/components/ICmpWaterManager.cpp
+++ source/simulation2/components/ICmpWaterManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "ICmpWaterManager.h"
 
-#include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(WaterManager)
 DEFINE_INTERFACE_METHOD_0("RecomputeWaterData", void, ICmpWaterManager, RecomputeWaterData)
Index: source/simulation2/system/ComponentTest.h
===================================================================
--- source/simulation2/system/ComponentTest.h
+++ source/simulation2/system/ComponentTest.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -14,7 +14,8 @@
  * You should have received a copy of the GNU General Public License
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+#ifndef INCLUDED_COMPONENT_TEST
+#define INCLUDED_COMPONENT_TEST
 #include "lib/self_test.h"
 
 #include "maths/Matrix3D.h"
@@ -244,3 +245,4 @@
 	{
 	}
 };
+#endif
Index: source/soundmanager/SoundManager.cpp
===================================================================
--- source/soundmanager/SoundManager.cpp
+++ source/soundmanager/SoundManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -25,7 +25,6 @@
 #include "items/CStreamItem.h"
 
 #include "lib/external_libraries/libsdl.h"
-#include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "ps/ConfigDB.h"
 #include "ps/Filesystem.h"
Index: source/soundmanager/data/OggData.cpp
===================================================================
--- source/soundmanager/data/OggData.cpp
+++ source/soundmanager/data/OggData.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,8 +21,6 @@
 
 #if CONFIG2_AUDIO
 
-#include "ps/CLogger.h"
-#include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 #include "soundmanager/SoundManager.h"
 
Index: source/soundmanager/data/SoundData.cpp
===================================================================
--- source/soundmanager/data/SoundData.cpp
+++ source/soundmanager/data/SoundData.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,7 +23,6 @@
 #if CONFIG2_AUDIO
 
 #include "OggData.h"
-#include "ps/CLogger.h"
 
 DataMap CSoundData::sSoundData;
 
Index: source/soundmanager/data/ogg.cpp
===================================================================
--- source/soundmanager/data/ogg.cpp
+++ source/soundmanager/data/ogg.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -28,10 +28,8 @@
 #include "lib/file/file_system.h"
 
 #include "lib/file/vfs/vfs_util.h"
-#include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 
-
 static Status LibErrorFromVorbis(int err)
 {
 	switch(err)
Index: source/soundmanager/items/CSoundBase.cpp
===================================================================
--- source/soundmanager/items/CSoundBase.cpp
+++ source/soundmanager/items/CSoundBase.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,7 +24,6 @@
 #include "lib/timer.h"
 #include "soundmanager/SoundManager.h"
 #include "soundmanager/data/SoundData.h"
-#include "ps/CLogger.h"
 
 CSoundBase::CSoundBase()
 {
Index: source/soundmanager/scripting/JSInterface_Sound.cpp
===================================================================
--- source/soundmanager/scripting/JSInterface_Sound.cpp
+++ source/soundmanager/scripting/JSInterface_Sound.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,10 +19,8 @@
 #include "JSInterface_Sound.h"
 
 #include "lib/config2.h"
-#include "lib/utf8.h"
 #include "maths/Vector3D.h"
 #include "ps/Filesystem.h"
-#include "ps/Profile.h"
 #include "scriptinterface/ScriptInterface.h"
 #include "soundmanager/SoundManager.h"
 
Index: source/soundmanager/scripting/SoundGroup.cpp
===================================================================
--- source/soundmanager/scripting/SoundGroup.cpp
+++ source/soundmanager/scripting/SoundGroup.cpp
@@ -22,7 +22,6 @@
 #include "graphics/GameView.h"
 #include "lib/rand.h"
 #include "ps/Game.h"
-#include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "ps/Filesystem.h"
 #include "ps/Util.h"
Index: source/tools/atlas/GameInterface/ActorViewer.cpp
===================================================================
--- source/tools/atlas/GameInterface/ActorViewer.cpp
+++ source/tools/atlas/GameInterface/ActorViewer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -46,7 +46,6 @@
 #include "renderer/SkyManager.h"
 #include "renderer/WaterManager.h"
 #include "scriptinterface/ScriptInterface.h"
-#include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpOwnership.h"
 #include "simulation2/components/ICmpPosition.h"
 #include "simulation2/components/ICmpRangeManager.h"
Index: source/tools/atlas/GameInterface/Brushes.cpp
===================================================================
--- source/tools/atlas/GameInterface/Brushes.cpp
+++ source/tools/atlas/GameInterface/Brushes.cpp
@@ -23,10 +23,7 @@
 #include "graphics/Terrain.h"
 #include "lib/ogl.h"
 #include "maths/MathUtil.h"
-#include "ps/Game.h"
-#include "ps/World.h"
 #include "renderer/TerrainOverlay.h"
-#include "simulation2/Simulation2.h"
 #include "simulation2/system/SimContext.h"
 
 using namespace AtlasMessage;
Index: source/tools/atlas/GameInterface/InputProcessor.cpp
===================================================================
--- source/tools/atlas/GameInterface/InputProcessor.cpp
+++ source/tools/atlas/GameInterface/InputProcessor.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "InputProcessor.h"
 
-#include "ps/Game.h"
 #include "graphics/Camera.h"
 #include "graphics/GameView.h"
 #include "maths/Quaternion.h"
Index: source/tools/atlas/GameInterface/Misc.cpp
===================================================================
--- source/tools/atlas/GameInterface/Misc.cpp
+++ source/tools/atlas/GameInterface/Misc.cpp
@@ -22,7 +22,6 @@
 #include "Messages.h"
 
 #include "maths/Vector3D.h"
-#include "ps/Game.h"
 #include "graphics/GameView.h"
 #include "graphics/Camera.h"
 
Index: source/tools/atlas/GameInterface/SimState.cpp
===================================================================
--- source/tools/atlas/GameInterface/SimState.cpp
+++ source/tools/atlas/GameInterface/SimState.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,9 +19,6 @@
 
 #include "SimState.h"
 
-#include "ps/Game.h"
-#include "simulation2/Simulation2.h"
-
 SimState* SimState::Freeze()
 {
 	SimState* simState = new SimState();
Index: source/tools/atlas/GameInterface/View.cpp
===================================================================
--- source/tools/atlas/GameInterface/View.cpp
+++ source/tools/atlas/GameInterface/View.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -32,11 +32,8 @@
 #include "lib/timer.h"
 #include "lib/utf8.h"
 #include "maths/MathUtil.h"
-#include "ps/Game.h"
 #include "ps/GameSetup/GameSetup.h"
-#include "ps/World.h"
 #include "renderer/Renderer.h"
-#include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpObstructionManager.h"
 #include "simulation2/components/ICmpParticleManager.h"
 #include "simulation2/components/ICmpPathfinder.h"