Drop .hpp for header only things

Half of them acquired a .cpp part anyway

105 files changed, 136 insertions, 136 deletions

diff --git a/application/main.cpp b/application/main.cpp
index 177c795..532c23d 100644
--- a/application/main.cpp
+++ b/application/main.cpp
@@ -1,7 +1,7 @@
 #include <array>
 #include <assetFactory/assetFactory.h>
 #include <chrono>
-#include <collection.hpp>
+#include <collection.h>
 #include <game/activities/go.h>
 #include <game/activities/idle.h>
 #include <game/activity.h>
@@ -22,7 +22,7 @@
 #include <glm/glm.hpp>
 #include <glm/gtx/transform.hpp> // IWYU pragma: keep
 #include <memory>
-#include <special_members.hpp>
+#include <special_members.h>
 #include <ui/applicationBase.h>
 #include <ui/gameMainWindow.h>
 #include <ui/window.h>
diff --git a/assetFactory/asset.h b/assetFactory/asset.h
index dba4974..5bdd2f2 100644
--- a/assetFactory/asset.h
+++ b/assetFactory/asset.h
@@ -2,7 +2,7 @@
 
 #include "factoryMesh.h"
 #include "persistence.h"
-#include <stdTypeDefs.hpp>
+#include <stdTypeDefs.h>
 
 class TextureAtlas;
 
diff --git a/assetFactory/assetFactory.cpp b/assetFactory/assetFactory.cpp
index af0cd54..218c4e7 100644
--- a/assetFactory/assetFactory.cpp
+++ b/assetFactory/assetFactory.cpp
@@ -1,5 +1,5 @@
 #include "assetFactory.h"
-#include "collections.hpp"
+#include "collections.h"
 #include "cuboid.h"
 #include "cylinder.h"
 #include "filesystem.h"
diff --git a/assetFactory/assimp.cpp b/assetFactory/assimp.cpp
index 74b1c54..9dc7842 100644
--- a/assetFactory/assimp.cpp
+++ b/assetFactory/assimp.cpp
@@ -1,7 +1,7 @@
 #include "assimp.h"
 #include "assetFactory.h"
-#include "collections.hpp"
-#include "ptr.hpp"
+#include "collections.h"
+#include "ptr.h"
 #include "resource.h"
 #include <assimp/cimport.h>
 #include <assimp/postprocess.h>
diff --git a/assetFactory/faceController.cpp b/assetFactory/faceController.cpp
index b305f1c..d045b3c 100644
--- a/assetFactory/faceController.cpp
+++ b/assetFactory/faceController.cpp
@@ -1,8 +1,8 @@
 #include "faceController.h"
-#include "collections.hpp"
+#include "collections.h"
 #include "maths.h"
 #include "modelFactoryMesh.h"
-#include "ray.hpp"
+#include "ray.h"
 
 void
 FaceController::apply(ModelFactoryMesh & mesh, const StyleStack & parents, const std::string & names,
diff --git a/assetFactory/factoryMesh.cpp b/assetFactory/factoryMesh.cpp
index 784179f..46bcf6f 100644
--- a/assetFactory/factoryMesh.cpp
+++ b/assetFactory/factoryMesh.cpp
@@ -1,6 +1,6 @@
 #include "factoryMesh.h"
-#include "collections.hpp"
-#include "gfx/models/vertex.hpp"
+#include "collections.h"
+#include "gfx/models/vertex.h"
 #include "modelFactoryMesh.h"
 
 Mesh::Ptr
diff --git a/assetFactory/factoryMesh.h b/assetFactory/factoryMesh.h
index bbeb870..f71c737 100644
--- a/assetFactory/factoryMesh.h
+++ b/assetFactory/factoryMesh.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "gfx/models/mesh.h"
-#include "stdTypeDefs.hpp"
+#include "stdTypeDefs.h"
 #include "use.h"
 
 class FactoryMesh : public Persistence::Persistable, public StdTypeDefs<FactoryMesh> {
diff --git a/assetFactory/object.h b/assetFactory/object.h
index 3f7b640..f47c512 100644
--- a/assetFactory/object.h
+++ b/assetFactory/object.h
@@ -2,7 +2,7 @@
 
 #include "persistence.h"
 #include "shape.h"
-#include "stdTypeDefs.hpp"
+#include "stdTypeDefs.h"
 #include "use.h"
 
 class Object : public StdTypeDefs<Object>, public Shape, public Persistence::Persistable {
diff --git a/assetFactory/shape.cpp b/assetFactory/shape.cpp
index 3261354..1bfbdbb 100644
--- a/assetFactory/shape.cpp
+++ b/assetFactory/shape.cpp
@@ -1,5 +1,5 @@
 #include "shape.h"
-#include "gfx/models/vertex.hpp"
+#include "gfx/models/vertex.h"
 #include "maths.h"
 #include "modelFactoryMesh.h"
 #include "shape.h"
diff --git a/assetFactory/shape.h b/assetFactory/shape.h
index fe517c1..ea3e4e7 100644
--- a/assetFactory/shape.h
+++ b/assetFactory/shape.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "modelFactoryMesh_fwd.h"
-#include "stdTypeDefs.hpp"
+#include "stdTypeDefs.h"
 #include <OpenMesh/Core/Mesh/Handles.hh>
 #include <glm/vec3.hpp>
 #include <map>
diff --git a/assetFactory/textureFragment.h b/assetFactory/textureFragment.h
index e6f07f3..6c99fee 100644
--- a/assetFactory/textureFragment.h
+++ b/assetFactory/textureFragment.h
@@ -3,7 +3,7 @@
 #include "gfx/image.h"
 #include "gfx/models/texture.h"
 #include "persistence.h"
-#include "stdTypeDefs.hpp"
+#include "stdTypeDefs.h"
 #include "worker.h"
 
 class TextureFragment : public Persistence::Persistable, public StdTypeDefs<TextureFragment> {
diff --git a/assetFactory/texturePacker.cpp b/assetFactory/texturePacker.cpp
index fcc935f..1d533c1 100644
--- a/assetFactory/texturePacker.cpp
+++ b/assetFactory/texturePacker.cpp
@@ -1,5 +1,5 @@
 #include "texturePacker.h"
-#include "collections.hpp"
+#include "collections.h"
 #include <GL/glew.h>
 #include <algorithm>
 #include <cstdio>
diff --git a/assetFactory/use.cpp b/assetFactory/use.cpp
index 9db3495..5314321 100644
--- a/assetFactory/use.cpp
+++ b/assetFactory/use.cpp
@@ -4,7 +4,7 @@
 #include <glm/matrix.hpp>
 #include <maths.h>
 #include <set>
-#include <stream_support.hpp>
+#include <stream_support.h>
 
 Shape::CreatedFaces
 Use::createMesh(ModelFactoryMesh & mesh, float levelOfDetailFactor) const
diff --git a/assetFactory/use.h b/assetFactory/use.h
index 9dbf382..a91685b 100644
--- a/assetFactory/use.h
+++ b/assetFactory/use.h
@@ -4,7 +4,7 @@
 #include "modelFactoryMesh_fwd.h"
 #include "persistence.h"
 #include "shape.h"
-#include "stdTypeDefs.hpp"
+#include "stdTypeDefs.h"
 #include "style.h"
 
 class Use : public StdTypeDefs<Use>, public Mutation, public Style, public Persistence::Persistable {
diff --git a/game/activity.h b/game/activity.h
index 6ba3712..e0585f7 100644
--- a/game/activity.h
+++ b/game/activity.h
@@ -2,7 +2,7 @@
 
 #include <game/worldobject.h>
 #include <memory>
-#include <special_members.hpp>
+#include <special_members.h>
 
 class Vehicle;
 
diff --git a/game/gamestate.h b/game/gamestate.h
index db223c0..6f3f382 100644
--- a/game/gamestate.h
+++ b/game/gamestate.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "assetFactory/assetFactory.h"
-#include <collection.hpp>
+#include <collection.h>
 #include <memory>
-#include <special_members.hpp>
+#include <special_members.h>
 
 class WorldObject;
 class GeoData;
diff --git a/game/geoData.cpp b/game/geoData.cpp
index 4dd0c40..34a1030 100644
--- a/game/geoData.cpp
+++ b/game/geoData.cpp
@@ -9,7 +9,7 @@
 #include <limits>
 #include <maths.h>
 #include <random>
-#include <ray.hpp>
+#include <ray.h>
 #include <stb/stb_image.h>
 #include <stdexcept>
 #include <util.h>
diff --git a/game/network/link.cpp b/game/network/link.cpp
index aecc2fc..bb27a52 100644
--- a/game/network/link.cpp
+++ b/game/network/link.cpp
@@ -1,9 +1,9 @@
 #include "link.h"
 #include <compare>
 #include <glm/gtx/transform.hpp>
-#include <location.hpp>
+#include <location.h>
 #include <maths.h>
-#include <ray.hpp>
+#include <ray.h>
 #include <tuple>
 
 Link::Link(End a, End b, float l) : ends {{std::move(a), std::move(b)}}, length {l} { }
diff --git a/game/network/link.h b/game/network/link.h
index 1f6b780..4a9f83f 100644
--- a/game/network/link.h
+++ b/game/network/link.h
@@ -2,11 +2,11 @@
 
 #include <array>
 #include <glm/glm.hpp>
-#include <location.hpp>
+#include <location.h>
 #include <maths.h>
 #include <memory>
-#include <special_members.hpp>
-#include <stdTypeDefs.hpp>
+#include <special_members.h>
+#include <stdTypeDefs.h>
 #include <utility>
 #include <vector>
 
diff --git a/game/network/network.cpp b/game/network/network.cpp
index 59ef7c8..083b08e 100644
--- a/game/network/network.cpp
+++ b/game/network/network.cpp
@@ -7,7 +7,7 @@
 #include <gfx/models/texture.h>
 #include <glm/gtx/intersect.hpp>
 #include <initializer_list>
-#include <ray.hpp>
+#include <ray.h>
 #include <stdexcept>
 #include <utility>
 
diff --git a/game/network/network.h b/game/network/network.h
index 4b485cc..b9316eb 100644
--- a/game/network/network.h
+++ b/game/network/network.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include "link.h"
-#include <collection.hpp>
+#include <collection.h>
 #include <gfx/renderable.h>
 #include <glm/glm.hpp>
 #include <memory>
 #include <set>
-#include <sorting.hpp>
-#include <special_members.hpp>
+#include <sorting.h>
+#include <special_members.h>
 #include <string>
 #include <utility>
 #include <variant>
diff --git a/game/network/rail.cpp b/game/network/rail.cpp
index e7006cf..4454600 100644
--- a/game/network/rail.cpp
+++ b/game/network/rail.cpp
@@ -3,11 +3,11 @@
 #include <GL/glew.h>
 #include <array>
 #include <cmath>
-#include <collection.hpp>
+#include <collection.h>
 #include <cstddef>
 #include <game/network/link.h>
 #include <game/network/network.impl.h> // IWYU pragma: keep
-#include <gfx/models/vertex.hpp>
+#include <gfx/models/vertex.h>
 #include <glm/gtx/transform.hpp>
 #include <initializer_list>
 #include <maths.h>
diff --git a/game/network/rail.h b/game/network/rail.h
index 8edc363..611eb67 100644
--- a/game/network/rail.h
+++ b/game/network/rail.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "chronology.hpp"
+#include "chronology.h"
 #include "game/worldobject.h"
 #include "gfx/models/mesh.h"
 #include "gfx/renderable.h"
@@ -9,7 +9,7 @@
 #include <glm/glm.hpp>
 #include <memory>
 #include <span>
-#include <special_members.hpp>
+#include <special_members.h>
 
 class SceneShader;
 class Vertex;
diff --git a/game/objective.h b/game/objective.h
index 617b8e9..130015f 100644
--- a/game/objective.h
+++ b/game/objective.h
@@ -3,7 +3,7 @@
 #include "activity.h"
 #include "network/link.h"
 #include <memory>
-#include <special_members.hpp>
+#include <special_members.h>
 
 class Orders;
 
diff --git a/game/orders.h b/game/orders.h
index 5ac0abf..f29e208 100644
--- a/game/orders.h
+++ b/game/orders.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <collection.hpp>
+#include <collection.h>
 #include <memory>
 
 class Objective;
diff --git a/game/scenary/foliage.cpp b/game/scenary/foliage.cpp
index 0913c6e..9304842 100644
--- a/game/scenary/foliage.cpp
+++ b/game/scenary/foliage.cpp
@@ -1,9 +1,9 @@
 #include "foliage.h"
 #include "gfx/gl/sceneShader.h"
 #include "gfx/gl/shadowMapper.h"
-#include "gfx/gl/vertexArrayObject.hpp"
+#include "gfx/gl/vertexArrayObject.h"
 #include "gfx/models/texture.h"
-#include "location.hpp"
+#include "location.h"
 
 bool
 Foliage::persist(Persistence::PersistenceStore & store)
diff --git a/game/scenary/plant.cpp b/game/scenary/plant.cpp
index 2a79807..4fb3cb5 100644
--- a/game/scenary/plant.cpp
+++ b/game/scenary/plant.cpp
@@ -1,5 +1,5 @@
 #include "plant.h"
-#include "location.hpp"
+#include "location.h"
 
 Plant::Plant(std::shared_ptr<const Foliage> type, const Location & position) :
 	type {std::move(type)}, location {this->type->instances.acquire(position.getTransform())}
diff --git a/game/selectable.h b/game/selectable.h
index 3d734f3..31287d8 100644
--- a/game/selectable.h
+++ b/game/selectable.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <glm/glm.hpp>
-#include <special_members.hpp>
+#include <special_members.h>
 
 class Ray;
 
diff --git a/game/terrain.cpp b/game/terrain.cpp
index f798254..1753dfe 100644
--- a/game/terrain.cpp
+++ b/game/terrain.cpp
@@ -10,10 +10,10 @@
 #include <gfx/gl/shadowMapper.h>
 #include <gfx/image.h>
 #include <gfx/models/mesh.h>
-#include <gfx/models/vertex.hpp>
+#include <gfx/models/vertex.h>
 #include <glm/glm.hpp>
 #include <iterator>
-#include <location.hpp>
+#include <location.h>
 #include <maths.h>
 #include <utility>
 #include <vector>
diff --git a/game/terrain.h b/game/terrain.h
index 879d173..d62f138 100644
--- a/game/terrain.h
+++ b/game/terrain.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "chronology.hpp"
-#include "collection.hpp"
+#include "chronology.h"
+#include "collection.h"
 #include "game/worldobject.h"
 #include <gfx/models/mesh.h>
 #include <gfx/renderable.h>
diff --git a/game/vehicles/railVehicle.cpp b/game/vehicles/railVehicle.cpp
index b77b93c..c4a9e96 100644
--- a/game/vehicles/railVehicle.cpp
+++ b/game/vehicles/railVehicle.cpp
@@ -6,10 +6,10 @@
 #include <glm/glm.hpp>
 #include <glm/gtx/intersect.hpp>
 #include <glm/gtx/transform.hpp>
-#include <location.hpp>
+#include <location.h>
 #include <maths.h>
 #include <memory>
-#include <ray.hpp>
+#include <ray.h>
 
 RailVehicle::RailVehicle(RailVehicleClassPtr rvc) :
 	rvClass {std::move(rvc)}, location {rvClass->instancesBody}, bogies {
diff --git a/game/vehicles/railVehicleClass.cpp b/game/vehicles/railVehicleClass.cpp
index 82a442e..64a21be 100644
--- a/game/vehicles/railVehicleClass.cpp
+++ b/game/vehicles/railVehicleClass.cpp
@@ -1,7 +1,7 @@
 #include "railVehicleClass.h"
 #include "gfx/gl/sceneShader.h"
 #include "gfx/gl/shadowMapper.h"
-#include "gfx/gl/vertexArrayObject.hpp"
+#include "gfx/gl/vertexArrayObject.h"
 #include "gfx/models/mesh.h"
 #include "gfx/models/texture.h"
 #include <algorithm>
@@ -13,7 +13,7 @@
 #include <glm/glm.hpp>
 #include <iterator>
 #include <lib/resource.h>
-#include <location.hpp>
+#include <location.h>
 #include <map>
 #include <maths.h>
 #include <memory>
diff --git a/game/vehicles/train.cpp b/game/vehicles/train.cpp
index fdfc3e1..6f3b036 100644
--- a/game/vehicles/train.cpp
+++ b/game/vehicles/train.cpp
@@ -3,7 +3,7 @@
 #include "game/vehicles/railVehicle.h"
 #include "game/vehicles/railVehicleClass.h"
 #include "gfx/renderable.h"
-#include "location.hpp"
+#include "location.h"
 #include <algorithm>
 #include <functional>
 #include <optional>
diff --git a/game/vehicles/train.h b/game/vehicles/train.h
index 15e2f6e..20c3bc4 100644
--- a/game/vehicles/train.h
+++ b/game/vehicles/train.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include "chronology.hpp"
+#include "chronology.h"
 #include "game/activities/go.h" // IWYU pragma: keep
 #include "game/activities/idle.h" // IWYU pragma: keep
 #include "game/activity.h"
 #include "game/network/link.h"
 #include "railVehicle.h"
 #include "vehicle.h"
-#include <collection.hpp>
+#include <collection.h>
 #include <glm/glm.hpp>
-#include <location.hpp>
+#include <location.h>
 #include <memory>
 #include <vector>
 
diff --git a/game/vehicles/vehicle.cpp b/game/vehicles/vehicle.cpp
index 6dc8371..0d46017 100644
--- a/game/vehicles/vehicle.cpp
+++ b/game/vehicles/vehicle.cpp
@@ -10,7 +10,7 @@
 #include <cmath>
 #include <glm/glm.hpp>
 #include <iterator>
-#include <location.hpp>
+#include <location.h>
 #include <maths.h>
 #include <utility>
 #include <vector>
diff --git a/game/vehicles/vehicle.h b/game/vehicles/vehicle.h
index 369bd7a..763ade9 100644
--- a/game/vehicles/vehicle.h
+++ b/game/vehicles/vehicle.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "chronology.hpp"
+#include "chronology.h"
 #include "linkHistory.h"
 #include <game/activity.h>
 #include <game/network/link.h>
diff --git a/game/worldobject.h b/game/worldobject.h
index 994545b..e064bc7 100644
--- a/game/worldobject.h
+++ b/game/worldobject.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "chronology.hpp"
-#include <special_members.hpp>
+#include "chronology.h"
+#include <special_members.h>
 
 class WorldObject {
 public:
diff --git a/gfx/camera_controller.h b/gfx/camera_controller.h
index fd5c885..83c0d38 100644
--- a/gfx/camera_controller.h
+++ b/gfx/camera_controller.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <special_members.hpp>
+#include <special_members.h>
 
 class Camera;
 
diff --git a/gfx/followCameraController.cpp b/gfx/followCameraController.cpp
index d15ecda..5b08483 100644
--- a/gfx/followCameraController.cpp
+++ b/gfx/followCameraController.cpp
@@ -2,7 +2,7 @@
 #include "game/vehicles/vehicle.h"
 #include <gfx/gl/camera.h>
 #include <glm/glm.hpp>
-#include <location.hpp>
+#include <location.h>
 #include <maths.h>
 #include <memory>
 #include <tuple>
diff --git a/gfx/gl/bufferedLocation.cpp b/gfx/gl/bufferedLocation.cpp
index 4484053..7027b4c 100644
--- a/gfx/gl/bufferedLocation.cpp
+++ b/gfx/gl/bufferedLocation.cpp
@@ -1,5 +1,5 @@
 #include "bufferedLocation.h"
-#include "location.hpp"
+#include "location.h"
 #include "maths.h"
 #include <glm/gtx/transform.hpp>
 
diff --git a/gfx/gl/bufferedLocation.h b/gfx/gl/bufferedLocation.h
index cf7afed..6d148cd 100644
--- a/gfx/gl/bufferedLocation.h
+++ b/gfx/gl/bufferedLocation.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "instanceVertices.h"
-#include "location.hpp"
+#include "location.h"
 #include <glm/mat4x4.hpp>
 #include <glm/vec3.hpp>
 
diff --git a/gfx/gl/camera.cpp b/gfx/gl/camera.cpp
index 5b7269e..f642423 100644
--- a/gfx/gl/camera.cpp
+++ b/gfx/gl/camera.cpp
@@ -1,9 +1,9 @@
 #include "camera.h"
-#include <collections.hpp>
+#include <collections.h>
 #include <glm/gtx/intersect.hpp> // IWYU pragma: keep
 #include <glm/gtx/transform.hpp> // IWYU pragma: keep
 #include <maths.h>
-#include <ray.hpp>
+#include <ray.h>
 
 Camera::Camera(glm::vec3 pos, float fov, float aspect, float zNear, float zFar) :
 	position {pos}, forward {::north}, up {::up}, near {zNear}, far {zFar}, projection {glm::perspective(
diff --git a/gfx/gl/camera.h b/gfx/gl/camera.h
index 5c168e7..3f1c3a7 100644
--- a/gfx/gl/camera.h
+++ b/gfx/gl/camera.h
@@ -2,7 +2,7 @@
 
 #include <glm/glm.hpp>
 #include <maths.h>
-#include <ray.hpp>
+#include <ray.h>
 
 class Camera {
 public:
diff --git a/gfx/gl/instanceVertices.h b/gfx/gl/instanceVertices.h
index 8bb2f21..9df6e12 100644
--- a/gfx/gl/instanceVertices.h
+++ b/gfx/gl/instanceVertices.h
@@ -4,7 +4,7 @@
 #include <cassert>
 #include <iterator>
 #include <span>
-#include <special_members.hpp>
+#include <special_members.h>
 #include <utility>
 #include <vector>
 
diff --git a/gfx/gl/program.cpp b/gfx/gl/program.cpp
index 7791e3e..0b60eaa 100644
--- a/gfx/gl/program.cpp
+++ b/gfx/gl/program.cpp
@@ -2,7 +2,7 @@
 #include "shader.h"
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtx/transform.hpp>
-#include <location.hpp>
+#include <location.h>
 #include <maths.h>
 
 void
diff --git a/gfx/gl/program.h b/gfx/gl/program.h
index 787a53c..2708ff0 100644
--- a/gfx/gl/program.h
+++ b/gfx/gl/program.h
@@ -2,9 +2,9 @@
 
 #include "shader.h"
 #include <GL/glew.h>
-#include <glRef.hpp>
+#include <glRef.h>
 #include <glm/mat4x4.hpp>
-#include <special_members.hpp>
+#include <special_members.h>
 
 class Location;
 
diff --git a/gfx/gl/sceneProvider.h b/gfx/gl/sceneProvider.h
index 1d9ba57..f5e8e99 100644
--- a/gfx/gl/sceneProvider.h
+++ b/gfx/gl/sceneProvider.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <special_members.hpp>
+#include <special_members.h>
 
 class SceneRenderer;
 class ShadowMapper;
diff --git a/gfx/gl/sceneRenderer.cpp b/gfx/gl/sceneRenderer.cpp
index 6542bea..aa9453a 100644
--- a/gfx/gl/sceneRenderer.cpp
+++ b/gfx/gl/sceneRenderer.cpp
@@ -1,6 +1,6 @@
 #include "sceneRenderer.h"
 #include "maths.h"
-#include "vertexArrayObject.hpp"
+#include "vertexArrayObject.h"
 #include <gfx/gl/shaders/fs-directionalLight.h>
 #include <gfx/gl/shaders/fs-lighting.h>
 #include <gfx/gl/shaders/vs-lighting.h>
diff --git a/gfx/gl/sceneShader.cpp b/gfx/gl/sceneShader.cpp
index 00d9826..1354611 100644
--- a/gfx/gl/sceneShader.cpp
+++ b/gfx/gl/sceneShader.cpp
@@ -13,10 +13,10 @@
 #include <gfx/gl/shaders/vs-pointLight.h>
 #include <gfx/gl/shaders/vs-spotLight.h>
 #include <gfx/gl/shaders/vs-water.h>
-#include <gfx/gl/vertexArrayObject.hpp>
+#include <gfx/gl/vertexArrayObject.h>
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtx/transform.hpp>
-#include <location.hpp>
+#include <location.h>
 #include <maths.h>
 
 SceneShader::SceneShader() :
diff --git a/gfx/gl/shader.h b/gfx/gl/shader.h
index c1e3981..cb8065b 100644
--- a/gfx/gl/shader.h
+++ b/gfx/gl/shader.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <GL/glew.h>
-#include <glRef.hpp>
+#include <glRef.h>
 #include <optional>
 #include <string_view>
 
diff --git a/gfx/gl/shadowMapper.cpp b/gfx/gl/shadowMapper.cpp
index 9f1e420..55d986c 100644
--- a/gfx/gl/shadowMapper.cpp
+++ b/gfx/gl/shadowMapper.cpp
@@ -1,14 +1,14 @@
 #include "shadowMapper.h"
 #include "camera.h"
-#include "collections.hpp"
+#include "collections.h"
 #include "gfx/gl/shaders/vs-shadowDynamicPoint.h"
 #include "gfx/gl/shaders/vs-shadowDynamicPointInst.h"
 #include "gfx/gl/shaders/vs-shadowFixedPoint.h"
-#include "location.hpp"
+#include "location.h"
 #include "maths.h"
 #include "sceneProvider.h"
 #include "sceneShader.h"
-#include "sorting.hpp"
+#include "sorting.h"
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtx/transform.hpp>
 #include <glm/matrix.hpp>
diff --git a/gfx/gl/vertexArrayObject.hpp b/gfx/gl/vertexArrayObject.h
index 7ded03e..085cba6 100644
--- a/gfx/gl/vertexArrayObject.hpp
+++ b/gfx/gl/vertexArrayObject.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "collections.hpp"
-#include "gl_traits.hpp"
-#include "special_members.hpp"
+#include "collections.h"
+#include "gl_traits.h"
+#include "special_members.h"
 #include <GL/glew.h>
 
 class VertexArrayObject {
diff --git a/gfx/image.h b/gfx/image.h
index 97c2731..8bb4067 100644
--- a/gfx/image.h
+++ b/gfx/image.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <span> // IWYU pragma: export
-#include <special_members.hpp>
+#include <special_members.h>
 #include <string>
 
 class Image {
diff --git a/gfx/models/mesh.cpp b/gfx/models/mesh.cpp
index 7c5ddd4..a1ce991 100644
--- a/gfx/models/mesh.cpp
+++ b/gfx/models/mesh.cpp
@@ -1,7 +1,7 @@
 #include "mesh.h"
-#include "gfx/gl/vertexArrayObject.hpp"
+#include "gfx/gl/vertexArrayObject.h"
 #include "glArrays.h"
-#include "vertex.hpp"
+#include "vertex.h"
 #include <cstddef>
 
 Mesh::Mesh(const std::span<const Vertex> vertices, const std::span<const unsigned int> indices, GLenum m) :
diff --git a/gfx/models/mesh.h b/gfx/models/mesh.h
index 9b22b02..f022c2a 100644
--- a/gfx/models/mesh.h
+++ b/gfx/models/mesh.h
@@ -4,7 +4,7 @@
 #include <glArrays.h>
 #include <memory>
 #include <span>
-#include <stdTypeDefs.hpp>
+#include <stdTypeDefs.h>
 
 class Vertex;
 class VertexArrayObject;
diff --git a/gfx/models/vertex.hpp b/gfx/models/vertex.h
index 181e7e7..181e7e7 100644
--- a/gfx/models/vertex.hpp
+++ b/gfx/models/vertex.h
diff --git a/gfx/renderable.h b/gfx/renderable.h
index 5a9b1cd..e126fff 100644
--- a/gfx/renderable.h
+++ b/gfx/renderable.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <special_members.hpp>
+#include <special_members.h>
 
 class SceneShader;
 class ShadowMapper;
diff --git a/lib/cache.h b/lib/cache.h
index 5ab9469..2c3975b 100644
--- a/lib/cache.h
+++ b/lib/cache.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "special_members.hpp"
+#include "special_members.h"
 #include <functional>
 #include <map>
 #include <memory>
diff --git a/lib/chronology.hpp b/lib/chronology.h
index 1980116..1980116 100644
--- a/lib/chronology.hpp
+++ b/lib/chronology.h
diff --git a/lib/collection.hpp b/lib/collection.h
index 6802bcb..6802bcb 100644
--- a/lib/collection.hpp
+++ b/lib/collection.h
diff --git a/lib/collections.hpp b/lib/collections.h
index 8f5a43d..8f5a43d 100644
--- a/lib/collections.hpp
+++ b/lib/collections.h
diff --git a/lib/embed-glsl.cpp.m4 b/lib/embed-glsl.cpp.m4
index 5b25e0a..3503f75 100644
--- a/lib/embed-glsl.cpp.m4
+++ b/lib/embed-glsl.cpp.m4
@@ -3,7 +3,7 @@ changecom()dnl
 #include "substr(TYPE,1)-NAME.h"
 #include <GL/glew.h>
 #include "gfx/gl/shader.h"
-#include "lib/strings.hpp"
+#include "lib/strings.h"
 
 constexpr const GLchar * src { R"GLSL-EMBED(dnl
 include(SOURCE))GLSL-EMBED" };
diff --git a/lib/enumDetails.hpp b/lib/enumDetails.h
index 5966be2..5966be2 100644
--- a/lib/enumDetails.hpp
+++ b/lib/enumDetails.h
diff --git a/lib/filesystem.h b/lib/filesystem.h
index 5315183..b076f43 100644
--- a/lib/filesystem.h
+++ b/lib/filesystem.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ptr.hpp"
-#include "special_members.hpp"
+#include "ptr.h"
+#include "special_members.h"
 #include <cstddef>
 #include <cstdio>
 #include <sys/types.h>
diff --git a/lib/geometricPlane.cpp b/lib/geometricPlane.cpp
index 71216c1..ea4f02d 100644
--- a/lib/geometricPlane.cpp
+++ b/lib/geometricPlane.cpp
@@ -1,5 +1,5 @@
 #include "geometricPlane.h"
-#include "ray.hpp"
+#include "ray.h"
 #include <glm/geometric.hpp>
 #include <glm/gtx/intersect.hpp>
 
diff --git a/lib/glArrays.h b/lib/glArrays.h
index 42f1d0f..8c8c0bc 100644
--- a/lib/glArrays.h
+++ b/lib/glArrays.h
@@ -4,7 +4,7 @@
 #include <algorithm> // IWYU pragma: keep
 #include <array>
 #include <cstddef>
-#include <special_members.hpp>
+#include <special_members.h>
 
 template<size_t N> class glArraysBase {
 	static_assert(N > 0);
diff --git a/lib/glRef.hpp b/lib/glRef.h
index 1ab239d..3031cf5 100644
--- a/lib/glRef.hpp
+++ b/lib/glRef.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <special_members.hpp>
+#include <special_members.h>
 #include <stdexcept>
 
 template<typename IdType, auto get, auto release, auto... fixed> class glRef {
diff --git a/lib/gl_traits.hpp b/lib/gl_traits.h
index 6ff8905..6ff8905 100644
--- a/lib/gl_traits.hpp
+++ b/lib/gl_traits.h
diff --git a/lib/location.cpp b/lib/location.cpp
index bff27a2..732dd6d 100644
--- a/lib/location.cpp
+++ b/lib/location.cpp
@@ -1,4 +1,4 @@
-#include "location.hpp"
+#include "location.h"
 #include "maths.h"
 #include <glm/gtx/transform.hpp>
 
diff --git a/lib/location.hpp b/lib/location.h
index 078f5d3..078f5d3 100644
--- a/lib/location.hpp
+++ b/lib/location.h
diff --git a/lib/persistence.h b/lib/persistence.h
index cc2e4e5..5d71d4c 100644
--- a/lib/persistence.h
+++ b/lib/persistence.h
@@ -8,7 +8,7 @@
 #include <memory>
 #include <optional>
 #include <span>
-#include <special_members.hpp>
+#include <special_members.h>
 #include <sstream>
 #include <stack>
 #include <stdexcept>
diff --git a/lib/ptr.hpp b/lib/ptr.h
index 931df39..b7d15a1 100644
--- a/lib/ptr.hpp
+++ b/lib/ptr.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <memory>
-#include <special_members.hpp>
+#include <special_members.h>
 
 template<typename Obj, auto Destroy> class wrapped_ptr {
 public:
diff --git a/lib/ray.cpp b/lib/ray.cpp
index f9e3311..c4e0d8c 100644
--- a/lib/ray.cpp
+++ b/lib/ray.cpp
@@ -1,4 +1,4 @@
-#include "ray.hpp"
+#include "ray.h"
 #include <algorithm>
 
 Ray
diff --git a/lib/ray.hpp b/lib/ray.h
index 9bf47af..9bf47af 100644
--- a/lib/ray.hpp
+++ b/lib/ray.h
diff --git a/lib/sorting.hpp b/lib/sorting.h
index 777de00..777de00 100644
--- a/lib/sorting.hpp
+++ b/lib/sorting.h
diff --git a/lib/special_members.hpp b/lib/special_members.h
index 312862b..312862b 100644
--- a/lib/special_members.hpp
+++ b/lib/special_members.h
diff --git a/lib/stdTypeDefs.hpp b/lib/stdTypeDefs.h
index 317cdb3..317cdb3 100644
--- a/lib/stdTypeDefs.hpp
+++ b/lib/stdTypeDefs.h
diff --git a/lib/stream_support.hpp b/lib/stream_support.h
index 52cc9d9..7fb256c 100644
--- a/lib/stream_support.hpp
+++ b/lib/stream_support.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "enumDetails.hpp"
+#include "enumDetails.h"
 #include <glm/glm.hpp>
 #include <iostream>
 #include <maths.h>
diff --git a/lib/strings.hpp b/lib/strings.h
index 9dca9ac..9dca9ac 100644
--- a/lib/strings.hpp
+++ b/lib/strings.h
diff --git a/lib/worker.h b/lib/worker.h
index d9a5a6f..0d15ca2 100644
--- a/lib/worker.h
+++ b/lib/worker.h
@@ -6,7 +6,7 @@
 #include <memory>
 #include <mutex>
 #include <semaphore>
-#include <special_members.hpp>
+#include <special_members.h>
 #include <thread>
 #include <utility>
 #include <vector>
diff --git a/test/enumDetailsData.hpp b/test/enumDetailsData.h
index 0e98af5..713d742 100644
--- a/test/enumDetailsData.hpp
+++ b/test/enumDetailsData.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <enumDetails.hpp>
+#include <enumDetails.h>
 
 enum GlobalUnscoped { aa, b, c };
 enum class GlobalScoped { aa, b, c };
diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index c0edd66..18dc778 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -14,9 +14,9 @@
 #include "game/vehicles/railVehicleClass.h"
 #include "gfx/gl/sceneRenderer.h"
 #include "gfx/renderable.h"
-#include "lib/collection.hpp"
-#include "lib/location.hpp"
-#include "lib/stream_support.hpp"
+#include "lib/collection.h"
+#include "lib/location.h"
+#include "lib/stream_support.h"
 #include "testMainWindow.h"
 #include "ui/applicationBase.h"
 
diff --git a/test/test-collection.cpp b/test/test-collection.cpp
index 9884812..16db792 100644
--- a/test/test-collection.cpp
+++ b/test/test-collection.cpp
@@ -2,10 +2,10 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <collection.hpp>
+#include <collection.h>
 #include <memory>
-#include <ptr.hpp>
-#include <special_members.hpp>
+#include <ptr.h>
+#include <special_members.h>
 #include <vector>
 
 class Base {
diff --git a/test/test-enumDetails.cpp b/test/test-enumDetails.cpp
index db2d6d0..0e759e5 100644
--- a/test/test-enumDetails.cpp
+++ b/test/test-enumDetails.cpp
@@ -1,11 +1,11 @@
 #define BOOST_TEST_MODULE test_enumDetails
 
-#include "enumDetailsData.hpp"
+#include "enumDetailsData.h"
 #include "testHelpers.h"
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
-#include <enumDetails.hpp>
-#include <stream_support.hpp>
+#include <enumDetails.h>
+#include <stream_support.h>
 
 constexpr std::array INVALID_NAMES {"", "missing", "GlobalScoped::aa", "GlobalScoped", "ns::aa", "a", "bb"};
 constexpr std::array VALID_NAMES {"aa", "b", "c"};
diff --git a/test/test-geo.cpp b/test/test-geo.cpp
index bc442e9..e672e54 100644
--- a/test/test-geo.cpp
+++ b/test/test-geo.cpp
@@ -3,10 +3,10 @@
 #include "testHelpers.h"
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
-#include <stream_support.hpp>
+#include <stream_support.h>
 
 #include <game/geoData.h>
-#include <lib/ray.hpp>
+#include <lib/ray.h>
 
 struct TestGeoData : public GeoData {
 	TestGeoData() : GeoData {{{-10, -5}, {30, 40}}, 5.F} { }
diff --git a/test/test-instancing.cpp b/test/test-instancing.cpp
index c743ce0..8745484 100644
--- a/test/test-instancing.cpp
+++ b/test/test-instancing.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE instancing
 
-#include "stream_support.hpp"
+#include "stream_support.h"
 #include "testHelpers.h"
 #include "testMainWindow.h"
 #include "ui/applicationBase.h"
diff --git a/test/test-maths.cpp b/test/test-maths.cpp
index 6ee2113..a4a881d 100644
--- a/test/test-maths.cpp
+++ b/test/test-maths.cpp
@@ -4,7 +4,7 @@
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 #include <glm/gtx/transform.hpp>
-#include <stream_support.hpp>
+#include <stream_support.h>
 #include <string_view>
 #include <type_traits>
 
diff --git a/test/test-network.cpp b/test/test-network.cpp
index 19c0977..e6241e4 100644
--- a/test/test-network.cpp
+++ b/test/test-network.cpp
@@ -5,7 +5,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include <array>
-#include <collection.hpp>
+#include <collection.h>
 #include <game/network/link.h>
 #include <game/network/network.h>
 #include <game/network/network.impl.h> // IWYU pragma: keep
@@ -14,7 +14,7 @@
 #include <maths.h>
 #include <memory>
 #include <stdexcept>
-#include <stream_support.hpp>
+#include <stream_support.h>
 #include <utility>
 #include <vector>
 
diff --git a/test/test-render.cpp b/test/test-render.cpp
index d5e2d87..4bfcad2 100644
--- a/test/test-render.cpp
+++ b/test/test-render.cpp
@@ -14,9 +14,9 @@
 #include <gfx/gl/sceneRenderer.h>
 #include <gfx/models/texture.h>
 #include <lib/glArrays.h>
-#include <location.hpp>
+#include <location.h>
 #include <maths.h>
-#include <stream_support.hpp>
+#include <stream_support.h>
 #include <ui/applicationBase.h>
 #include <ui/window.h>
 
diff --git a/test/test-static-enumDetails.cpp b/test/test-static-enumDetails.cpp
index 03c2203..5f81753 100644
--- a/test/test-static-enumDetails.cpp
+++ b/test/test-static-enumDetails.cpp
@@ -1,6 +1,6 @@
 #define ENUM_PROBE
-#include "enumDetailsData.hpp"
-#include <enumDetails.hpp>
+#include "enumDetailsData.h"
+#include <enumDetails.h>
 
 // Test type name
 static_assert(EnumTypeDetails<GlobalUnscoped>::typeName == "GlobalUnscoped");
diff --git a/test/test-static-stream_support.cpp b/test/test-static-stream_support.cpp
index 367d5a2..3002ccc 100644
--- a/test/test-static-stream_support.cpp
+++ b/test/test-static-stream_support.cpp
@@ -1,4 +1,4 @@
-#include "stream_support.hpp"
+#include "stream_support.h"
 
 #include <array>
 #include <vector>
diff --git a/test/test-text.cpp b/test/test-text.cpp
index 0c73021..3a23818 100644
--- a/test/test-text.cpp
+++ b/test/test-text.cpp
@@ -3,7 +3,7 @@
 #include "testHelpers.h"
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
-#include <stream_support.hpp>
+#include <stream_support.h>
 
 #include <array>
 #include <glm/glm.hpp>
diff --git a/test/test-worker.cpp b/test/test-worker.cpp
index 76b7138..cadc366 100644
--- a/test/test-worker.cpp
+++ b/test/test-worker.cpp
@@ -3,7 +3,7 @@
 #include "testHelpers.h"
 #include <boost/test/unit_test.hpp>
 #include <set>
-#include <stream_support.hpp>
+#include <stream_support.h>
 #include <worker.h>
 
 uint32_t
diff --git a/test/testRenderOutput.h b/test/testRenderOutput.h
index 8a8bdaf..f5cd56b 100644
--- a/test/testRenderOutput.h
+++ b/test/testRenderOutput.h
@@ -2,7 +2,7 @@
 
 #include "glArrays.h"
 #include <glm/vec2.hpp>
-#include <special_members.hpp>
+#include <special_members.h>
 
 class TestRenderOutput {
 public:
diff --git a/ui/applicationBase.h b/ui/applicationBase.h
index 57995ca..9d9b66b 100644
--- a/ui/applicationBase.h
+++ b/ui/applicationBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <special_members.hpp>
+#include <special_members.h>
 
 class ApplicationBase {
 public:
diff --git a/ui/editNetwork.h b/ui/editNetwork.h
index 1ba2e13..eb1677e 100644
--- a/ui/editNetwork.h
+++ b/ui/editNetwork.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "gameMainSelector.h"
-#include "modeHelper.hpp"
+#include "modeHelper.h"
 #include "toolbar.h"
 #include "worldOverlay.h"
 #include <game/gamestate.h>
diff --git a/ui/font.cpp b/ui/font.cpp
index 43991f0..108f905 100644
--- a/ui/font.cpp
+++ b/ui/font.cpp
@@ -5,7 +5,7 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include "glArrays.h"
-#include <glRef.hpp>
+#include <glRef.h>
 #include <maths.h>
 #include <memory>
 #include <optional>
diff --git a/ui/gameMainSelector.cpp b/ui/gameMainSelector.cpp
index 0fbf687..081718d 100644
--- a/ui/gameMainSelector.cpp
+++ b/ui/gameMainSelector.cpp
@@ -1,5 +1,5 @@
 #include "gameMainSelector.h"
-#include "collection.hpp"
+#include "collection.h"
 #include "text.h"
 #include "ui/uiComponent.h"
 #include <SDL2/SDL.h>
@@ -10,7 +10,7 @@
 #include <gfx/gl/camera.h>
 #include <optional>
 #include <span>
-#include <stream_support.hpp>
+#include <stream_support.h>
 #include <typeinfo>
 #include <vector>
 
diff --git a/ui/gameMainSelector.h b/ui/gameMainSelector.h
index aacd67a..98cdf53 100644
--- a/ui/gameMainSelector.h
+++ b/ui/gameMainSelector.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "SDL_events.h"
-#include "special_members.hpp"
+#include "special_members.h"
 #include "uiComponent.h"
 #include "worldOverlay.h"
 #include <glm/glm.hpp>
diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp
index 3f85a4f..30cdada 100644
--- a/ui/gameMainWindow.cpp
+++ b/ui/gameMainWindow.cpp
@@ -3,12 +3,12 @@
 #include "gameMainSelector.h"
 #include "gfx/camera_controller.h"
 #include "manualCameraController.h"
-#include "modeHelper.hpp"
+#include "modeHelper.h"
 #include "toolbar.h"
 #include "window.h"
 #include <GL/glew.h>
 #include <SDL2/SDL.h>
-#include <collection.hpp>
+#include <collection.h>
 #include <game/gamestate.h>
 #include <game/network/rail.h>
 #include <game/worldobject.h> // IWYU pragma: keep
diff --git a/ui/gameMainWindow.h b/ui/gameMainWindow.h
index d5bcf41..a4e822e 100644
--- a/ui/gameMainWindow.h
+++ b/ui/gameMainWindow.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "chronology.hpp"
+#include "chronology.h"
 #include "gfx/gl/sceneRenderer.h"
 #include "window.h"
 #include <cstddef>
diff --git a/ui/modeHelper.hpp b/ui/modeHelper.h
index 77707f2..77707f2 100644
--- a/ui/modeHelper.hpp
+++ b/ui/modeHelper.h
diff --git a/ui/toolbar.h b/ui/toolbar.h
index d141139..ea560f5 100644
--- a/ui/toolbar.h
+++ b/ui/toolbar.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "collection.hpp"
+#include "collection.h"
 #include "iconButton.h"
 #include "uiComponent.h"
 #include <initializer_list>
diff --git a/ui/uiComponent.h b/ui/uiComponent.h
index 8a9613e..75c2284 100644
--- a/ui/uiComponent.h
+++ b/ui/uiComponent.h
@@ -2,7 +2,7 @@
 
 #include <functional>
 #include <glm/glm.hpp>
-#include <special_members.hpp>
+#include <special_members.h>
 
 class UIShader;
 union SDL_Event;
diff --git a/ui/window.h b/ui/window.h
index 8b7d870..be9e114 100644
--- a/ui/window.h
+++ b/ui/window.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "chronology.hpp"
-#include "collection.hpp"
+#include "chronology.h"
+#include "collection.h"
 #include "gfx/gl/uiShader.h"
-#include "ptr.hpp"
+#include "ptr.h"
 #include "uiComponent.h" // IWYU pragma: keep
 #include <SDL2/SDL.h>
 #include <cstddef>
-#include <special_members.hpp>
+#include <special_members.h>
 #include <string>
 
 using SDL_WindowPtr = wrapped_ptrt<SDL_Window, SDL_CreateWindow, SDL_DestroyWindow>;