diff --git a/source/graphics/Material.h b/source/graphics/Material.h
index 756d9a2091..f4d687f9b6 100644
--- a/source/graphics/Material.h
+++ b/source/graphics/Material.h
@@ -22,7 +22,7 @@
 #include "graphics/Texture.h"
 #include "ps/CStr.h"
 #include "ps/CStrIntern.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 #include "simulation2/helpers/Player.h"
 
 class CMaterial
diff --git a/source/graphics/Model.h b/source/graphics/Model.h
index 889f99e6a5..aa6c141a29 100644
--- a/source/graphics/Model.h
+++ b/source/graphics/Model.h
@@ -28,7 +28,6 @@
 #include "graphics/Material.h"
 #include "graphics/MeshManager.h"
 #include "graphics/ModelAbstract.h"
-#include "ps/Overlay.h"
 
 struct SPropPoint;
 class CObjectEntry;
diff --git a/source/graphics/ModelAbstract.h b/source/graphics/ModelAbstract.h
index 60baec3a8d..236dab9e4b 100644
--- a/source/graphics/ModelAbstract.h
+++ b/source/graphics/ModelAbstract.h
@@ -20,7 +20,7 @@
 
 #include "maths/BoundingBoxOriented.h"
 #include "graphics/RenderableObject.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 #include "simulation2/helpers/Player.h"
 
 class CModel;
diff --git a/source/graphics/ObjectEntry.h b/source/graphics/ObjectEntry.h
index a7271cae16..cc155392e6 100644
--- a/source/graphics/ObjectEntry.h
+++ b/source/graphics/ObjectEntry.h
@@ -31,7 +31,7 @@ struct SPropPoint;
 
 #include "lib/file/vfs/vfs_path.h"
 #include "ps/CStr.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 
 #include "graphics/ObjectBase.h"
 
diff --git a/source/graphics/Overlay.h b/source/graphics/Overlay.h
index dca6597873..98f1d9615e 100644
--- a/source/graphics/Overlay.h
+++ b/source/graphics/Overlay.h
@@ -22,7 +22,7 @@
 #include "maths/Vector2D.h"
 #include "maths/Vector3D.h"
 #include "maths/FixedVector3D.h"
-#include "ps/Overlay.h" // CColor  (TODO: that file has nothing to do with overlays, it should be renamed)
+#include "ps/Shapes.h"
 
 class CTerrain;
 class CSimContext;
diff --git a/source/graphics/ShaderProgram.cpp b/source/graphics/ShaderProgram.cpp
index b99456092a..5d7a135f20 100644
--- a/source/graphics/ShaderProgram.cpp
+++ b/source/graphics/ShaderProgram.cpp
@@ -26,8 +26,8 @@
 #include "maths/Vector3D.h"
 #include "ps/CLogger.h"
 #include "ps/Filesystem.h"
-#include "ps/Overlay.h"
 #include "ps/PreprocessorWrapper.h"
+#include "ps/Shapes.h"
 
 #if !CONFIG2_GLES
 
diff --git a/source/graphics/ShaderProgramFFP.cpp b/source/graphics/ShaderProgramFFP.cpp
index d66dc5b11d..b972e0eded 100644
--- a/source/graphics/ShaderProgramFFP.cpp
+++ b/source/graphics/ShaderProgramFFP.cpp
@@ -25,7 +25,6 @@
 #include "maths/Matrix3D.h"
 #include "maths/Vector3D.h"
 #include "ps/CLogger.h"
-#include "ps/Overlay.h"
 #include "renderer/Renderer.h"
 
 #if !CONFIG2_GLES
diff --git a/source/graphics/TerrainProperties.cpp b/source/graphics/TerrainProperties.cpp
index 3be85b721a..c1c41600ef 100644
--- a/source/graphics/TerrainProperties.cpp
+++ b/source/graphics/TerrainProperties.cpp
@@ -27,7 +27,7 @@
 #include "maths/MathUtil.h"
 #include "ps/CLogger.h"
 #include "ps/Filesystem.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 #include "ps/XML/XeroXMB.h"
 #include "ps/XML/Xeromyces.h"
 
diff --git a/source/graphics/TerritoryTexture.cpp b/source/graphics/TerritoryTexture.cpp
index 12d197606a..c4af525c23 100644
--- a/source/graphics/TerritoryTexture.cpp
+++ b/source/graphics/TerritoryTexture.cpp
@@ -21,8 +21,8 @@
 
 #include "graphics/Terrain.h"
 #include "lib/bits.h"
-#include "ps/Overlay.h"
 #include "ps/Profile.h"
+#include "ps/Shapes.h"
 #include "renderer/Renderer.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpPlayer.h"
diff --git a/source/graphics/TextRenderer.h b/source/graphics/TextRenderer.h
index 0c096f99dc..75692fc884 100644
--- a/source/graphics/TextRenderer.h
+++ b/source/graphics/TextRenderer.h
@@ -21,7 +21,7 @@
 #include "graphics/ShaderProgramPtr.h"
 #include "maths/Matrix3D.h"
 #include "ps/CStrIntern.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 
 class CFont;
 
diff --git a/source/gui/CGUI.cpp b/source/gui/CGUI.cpp
index c24877243e..2c676062a8 100644
--- a/source/gui/CGUI.cpp
+++ b/source/gui/CGUI.cpp
@@ -55,7 +55,6 @@ CGUI
 #include "ps/Filesystem.h"
 #include "ps/Hotkey.h"
 #include "ps/Globals.h"
-#include "ps/Overlay.h"
 #include "ps/Profile.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/XML/Xeromyces.h"
diff --git a/source/gui/CGUI.h b/source/gui/CGUI.h
index 5102073dda..d43fddc6cc 100644
--- a/source/gui/CGUI.h
+++ b/source/gui/CGUI.h
@@ -42,7 +42,7 @@ CGUI
 #include "GUIbase.h"
 #include "scriptinterface/ScriptInterface.h"
 
-#include "ps/Overlay.h" // CPos and CRect
+#include "ps/Shapes.h"
 
 #include "lib/input.h"
 
diff --git a/source/gui/CGUISprite.h b/source/gui/CGUISprite.h
index 6eb442b8d6..f70e1c6a0f 100644
--- a/source/gui/CGUISprite.h
+++ b/source/gui/CGUISprite.h
@@ -42,7 +42,6 @@ A GUI Sprite
 //--------------------------------------------------------
 #include "GUIbase.h"
 
-#include "ps/Overlay.h"
 #include "lib/res/graphics/ogl_tex.h"
 
 //--------------------------------------------------------
diff --git a/source/gui/GUIRenderer.h b/source/gui/GUIRenderer.h
index 1ddf1601fd..b919a9f7f8 100644
--- a/source/gui/GUIRenderer.h
+++ b/source/gui/GUIRenderer.h
@@ -21,8 +21,8 @@
 #include "graphics/ShaderTechnique.h"
 #include "graphics/Texture.h"
 #include "lib/res/handle.h"
-#include "ps/Overlay.h"
 #include "ps/CStr.h"
+#include "ps/Shapes.h"
 #include <vector>
 
 struct SGUIImageEffects;
diff --git a/source/gui/GUITooltip.h b/source/gui/GUITooltip.h
index 67de55ed0f..23f23fc02b 100644
--- a/source/gui/GUITooltip.h
+++ b/source/gui/GUITooltip.h
@@ -22,7 +22,7 @@ class IGUIObject;
 class CGUI;
 
 #include "ps/CStr.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 
 class GUITooltip
 {
diff --git a/source/gui/GUIbase.h b/source/gui/GUIbase.h
index 6e5699a77e..73e4465635 100644
--- a/source/gui/GUIbase.h
+++ b/source/gui/GUIbase.h
@@ -41,7 +41,7 @@ GUI Core, stuff that the whole GUI uses
 
 // I would like to just forward declare CSize, but it doesn't
 //  seem to be defined anywhere in the predefined header.
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 
 #include "ps/CStr.h"
 
diff --git a/source/gui/GUIutil.h b/source/gui/GUIutil.h
index 417c139317..755056ca8e 100644
--- a/source/gui/GUIutil.h
+++ b/source/gui/GUIutil.h
@@ -38,7 +38,6 @@ GUI util
 //--------------------------------------------------------
 #include "GUIbase.h"
 // TODO Gee: New
-#include "ps/Overlay.h"
 #include "CGUI.h"
 #include "CGUISprite.h"
 #include "IGUIObject.h"
diff --git a/source/gui/scripting/ScriptFunctions.cpp b/source/gui/scripting/ScriptFunctions.cpp
index e68ce8f107..e837bfa2c8 100644
--- a/source/gui/scripting/ScriptFunctions.cpp
+++ b/source/gui/scripting/ScriptFunctions.cpp
@@ -47,7 +47,6 @@
 #include "ps/GameSetup/Config.h"
 #include "ps/Globals.h"	// g_frequencyFilter
 #include "ps/Hotkey.h"
-#include "ps/Overlay.h"
 #include "ps/ProfileViewer.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/SavedGame.h"
diff --git a/source/ps/Game.cpp b/source/ps/Game.cpp
index 26400b05b2..64e8fcf8db 100644
--- a/source/ps/Game.cpp
+++ b/source/ps/Game.cpp
@@ -35,9 +35,9 @@
 #include "ps/CStr.h"
 #include "ps/Loader.h"
 #include "ps/LoaderThunks.h"
-#include "ps/Overlay.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"
diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp
index 132e0f5302..d4d3fdd43a 100644
--- a/source/ps/GameSetup/GameSetup.cpp
+++ b/source/ps/GameSetup/GameSetup.cpp
@@ -66,7 +66,6 @@
 #include "ps/Joystick.h"
 #include "ps/Loader.h"
 #include "ps/Mod.h"
-#include "ps/Overlay.h"
 #include "ps/Profile.h"
 #include "ps/ProfileViewer.h"
 #include "ps/Profiler2.h"
diff --git a/source/ps/Overlay.cpp b/source/ps/Shapes.cpp
similarity index 99%
rename from source/ps/Overlay.cpp
rename to source/ps/Shapes.cpp
index 2bf190cc60..5ee79487ab 100644
--- a/source/ps/Overlay.cpp
+++ b/source/ps/Shapes.cpp
@@ -16,14 +16,14 @@
  */
 
 /*
-Overlay.cpp
+Shapes.cpp
 */
 
 #include "precompiled.h"
 
 #include <string>
 
-#include "Overlay.h"
+#include "Shapes.h"
 #include "CLogger.h"
 #include "CStr.h"
 
diff --git a/source/ps/Overlay.h b/source/ps/Shapes.h
similarity index 94%
rename from source/ps/Overlay.h
rename to source/ps/Shapes.h
index e9eb8f9c1a..3f3bf9ce75 100644
--- a/source/ps/Overlay.h
+++ b/source/ps/Shapes.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -16,16 +16,18 @@
  */
 
 /*
-Overlay.h
+Shapes.h
 
 --Overview--
 
-	Class representing 2D screen overlays; includes functionality for overlay
-	position, color, texture and borders.
+	Classes mostly useful for representing 2D screen overlays;
+	includes functionality for overlay position, color, texture and borders.
+
+	CColor is used more widely for various game systems.
 */
 
-#ifndef INCLUDED_OVERLAY
-#define INCLUDED_OVERLAY
+#ifndef INCLUDED_SHAPES
+#define INCLUDED_SHAPES
 
 #include "graphics/SColor.h"
 
@@ -235,4 +237,4 @@ public:
 };
 
 
-#endif
+#endif // INCLUDED_SHAPES
diff --git a/source/ps/tests/test_CColor.h b/source/ps/tests/test_CColor.h
index 32d1d0f775..a4c932e057 100644
--- a/source/ps/tests/test_CColor.h
+++ b/source/ps/tests/test_CColor.h
@@ -17,8 +17,8 @@
 
 #include "lib/self_test.h"
 
-#include "ps/Overlay.h"
 #include "ps/CLogger.h"
+#include "ps/Shapes.h"
 
 class TestCColor : public CxxTest::TestSuite 
 {
diff --git a/source/renderer/SilhouetteRenderer.h b/source/renderer/SilhouetteRenderer.h
index c421412934..485e4d4a1d 100644
--- a/source/renderer/SilhouetteRenderer.h
+++ b/source/renderer/SilhouetteRenderer.h
@@ -18,7 +18,6 @@
 #ifndef INCLUDED_SILHOUETTERENDERER
 #define INCLUDED_SILHOUETTERENDERER
 
-#include "ps/Overlay.h"
 #include "graphics/Overlay.h"
 #include "maths/BoundingBoxAligned.h"
 
diff --git a/source/renderer/TerrainOverlay.cpp b/source/renderer/TerrainOverlay.cpp
index 2c44c9ad1d..3a33ee6253 100644
--- a/source/renderer/TerrainOverlay.cpp
+++ b/source/renderer/TerrainOverlay.cpp
@@ -24,8 +24,8 @@
 #include "lib/ogl.h"
 #include "maths/MathUtil.h"
 #include "ps/Game.h"
-#include "ps/Overlay.h"
 #include "ps/Profile.h"
+#include "ps/Shapes.h"
 #include "ps/World.h"
 #include "renderer/Renderer.h"
 #include "renderer/TerrainRenderer.h"
diff --git a/source/renderer/TimeManager.h b/source/renderer/TimeManager.h
index 971e220fcf..2a1128f950 100644
--- a/source/renderer/TimeManager.h
+++ b/source/renderer/TimeManager.h
@@ -19,7 +19,6 @@
 #define INCLUDED_TIMEMANAGER
 
 #include "graphics/Texture.h"
-#include "ps/Overlay.h"
 #include "maths/Matrix3D.h"
 #include "lib/ogl.h"
 
diff --git a/source/renderer/WaterManager.h b/source/renderer/WaterManager.h
index 0a9b358119..7bb6aad2df 100644
--- a/source/renderer/WaterManager.h
+++ b/source/renderer/WaterManager.h
@@ -26,7 +26,7 @@
 #include "lib/ogl.h"
 #include "maths/Matrix3D.h"
 #include "maths/Vector2D.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 #include "renderer/VertexBufferManager.h"
 
 class CSimulation2;
diff --git a/source/simulation2/components/CCmpMinimap.cpp b/source/simulation2/components/CCmpMinimap.cpp
index 71e63a6e50..eef7a5898d 100644
--- a/source/simulation2/components/CCmpMinimap.cpp
+++ b/source/simulation2/components/CCmpMinimap.cpp
@@ -25,7 +25,7 @@
 #include "simulation2/components/ICmpOwnership.h"
 #include "simulation2/MessageTypes.h"
 
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 
 class CCmpMinimap : public ICmpMinimap
 {
diff --git a/source/simulation2/components/CCmpObstructionManager.cpp b/source/simulation2/components/CCmpObstructionManager.cpp
index 4fa06a8e2f..21e21fc3c3 100644
--- a/source/simulation2/components/CCmpObstructionManager.cpp
+++ b/source/simulation2/components/CCmpObstructionManager.cpp
@@ -29,7 +29,6 @@
 #include "graphics/Overlay.h"
 #include "graphics/Terrain.h"
 #include "maths/MathUtil.h"
-#include "ps/Overlay.h"
 #include "ps/Profile.h"
 #include "renderer/Scene.h"
 #include "ps/CLogger.h"
diff --git a/source/simulation2/components/CCmpRangeManager.cpp b/source/simulation2/components/CCmpRangeManager.cpp
index 1461fb431b..7e036145f0 100644
--- a/source/simulation2/components/CCmpRangeManager.cpp
+++ b/source/simulation2/components/CCmpRangeManager.cpp
@@ -38,7 +38,6 @@
 #include "graphics/Terrain.h"
 #include "lib/timer.h"
 #include "ps/CLogger.h"
-#include "ps/Overlay.h"
 #include "ps/Profile.h"
 #include "renderer/Scene.h"
 
diff --git a/source/simulation2/components/CCmpTerritoryManager.cpp b/source/simulation2/components/CCmpTerritoryManager.cpp
index 897c324d10..27acd1ecb9 100644
--- a/source/simulation2/components/CCmpTerritoryManager.cpp
+++ b/source/simulation2/components/CCmpTerritoryManager.cpp
@@ -26,7 +26,6 @@
 #include "graphics/TerritoryBoundary.h"
 #include "maths/MathUtil.h"
 #include "maths/Vector2D.h"
-#include "ps/Overlay.h"
 #include "renderer/Renderer.h"
 #include "renderer/Scene.h"
 #include "renderer/TerrainOverlay.h"
diff --git a/source/simulation2/components/ICmpPlayer.cpp b/source/simulation2/components/ICmpPlayer.cpp
index 14b308d08c..7bdc5873aa 100644
--- a/source/simulation2/components/ICmpPlayer.cpp
+++ b/source/simulation2/components/ICmpPlayer.cpp
@@ -23,7 +23,7 @@
 #include "simulation2/system/InterfaceScripted.h"
 #include "simulation2/scripting/ScriptComponent.h"
 
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 
 BEGIN_INTERFACE_WRAPPER(Player)
 END_INTERFACE_WRAPPER(Player)
diff --git a/source/simulation2/components/ICmpSelectable.cpp b/source/simulation2/components/ICmpSelectable.cpp
index acc3cc0e97..a947855d04 100644
--- a/source/simulation2/components/ICmpSelectable.cpp
+++ b/source/simulation2/components/ICmpSelectable.cpp
@@ -21,7 +21,7 @@
 
 #include "simulation2/system/InterfaceScripted.h"
 
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 
 BEGIN_INTERFACE_WRAPPER(Selectable)
 DEFINE_INTERFACE_METHOD_2("SetSelectionHighlight", void, ICmpSelectable, SetSelectionHighlight, CColor, bool)
diff --git a/source/simulation2/scripting/EngineScriptConversions.cpp b/source/simulation2/scripting/EngineScriptConversions.cpp
index 542fa88cca..63f7da7249 100644
--- a/source/simulation2/scripting/EngineScriptConversions.cpp
+++ b/source/simulation2/scripting/EngineScriptConversions.cpp
@@ -24,7 +24,7 @@
 #include "maths/FixedVector2D.h"
 #include "maths/FixedVector3D.h"
 #include "ps/CLogger.h"
-#include "ps/Overlay.h"
+#include "ps/Shapes.h"
 #include "ps/utf16string.h"
 #include "simulation2/helpers/Grid.h"
 #include "simulation2/system/IComponent.h"
diff --git a/source/tools/atlas/GameInterface/Brushes.cpp b/source/tools/atlas/GameInterface/Brushes.cpp
index d13806ca88..50062bf8fc 100644
--- a/source/tools/atlas/GameInterface/Brushes.cpp
+++ b/source/tools/atlas/GameInterface/Brushes.cpp
@@ -19,8 +19,8 @@
 
 #include "Brushes.h"
 
-#include "ps/Overlay.h"
 #include "ps/Game.h"
+#include "ps/Shapes.h"
 #include "ps/World.h"
 #include "graphics/Terrain.h"
 #include "lib/ogl.h"