6 files changed, 9 insertions, 13 deletions
diff --git a/gfx/followCameraController.cpp b/gfx/followCameraController.cpp
index 25a64e4..1a5a5d3 100644
--- a/gfx/followCameraController.cpp
+++ b/gfx/followCameraController.cpp
@@ -2,7 +2,6 @@
 #include "game/vehicles/vehicle.h"
 #include "gfx/gl/transform.h"
 #include <gfx/gl/camera.h>
-#include <gfx/gl/shader.h>
 #include <glm/glm.hpp>
 #include <maths.h>
 #include <memory>
diff --git a/gfx/gl/shader.cpp b/gfx/gl/shader.cpp
index d4cb747..f30af5c 100644
--- a/gfx/gl/shader.cpp
+++ b/gfx/gl/shader.cpp
@@ -1,4 +1,5 @@
 #include "shader.h"
+#include "gfx/gl/shader-source.h"
 #include <array>
 #include <gfx/gl/shaders/fs-basicShader.h>
 #include <gfx/gl/shaders/fs-landmassShader.h>
diff --git a/gfx/manualCameraController.cpp b/gfx/manualCameraController.cpp
index f8cdbf8..01787c6 100644
--- a/gfx/manualCameraController.cpp
+++ b/gfx/manualCameraController.cpp
@@ -1,6 +1,5 @@
 #include "manualCameraController.h"
 #include <gfx/gl/camera.h>
-#include <gfx/gl/shader.h>
 
 bool
 ManualCameraController::handleInput(SDL_Event & e)
diff --git a/gfx/models/mesh.cpp b/gfx/models/mesh.cpp
index c829f4e..3487083 100644
--- a/gfx/models/mesh.cpp
+++ b/gfx/models/mesh.cpp
@@ -1,11 +1,5 @@
 #include "mesh.h"
-#include "obj.h"
 #include "vertex.hpp"
-#include <algorithm>
-#include <glm/glm.hpp>
-#include <iterator>
-#include <resource.h>
-#include <vector>
 
 Mesh::Mesh(std::span<Vertex> vertices, std::span<unsigned int> indices, GLenum m) :
 	m_vertexArrayObject {}, m_vertexArrayBuffers {}, m_numIndices {indices.size()}, mode {m}
diff --git a/gfx/models/mesh.h b/gfx/models/mesh.h
index ea3a26b..1e53407 100644
--- a/gfx/models/mesh.h
+++ b/gfx/models/mesh.h
@@ -4,14 +4,11 @@
 #include <GL/glew.h>
 #include <array>
 #include <cstddef>
-#include <filesystem>
-#include <gfx/models/vertex.hpp>
+#include <memory>
 #include <span>
 #include <special_members.hpp>
-#include <utility>
-#include <vector>
 
-class ObjParser;
+class Vertex;
 
 enum MeshBufferPositions { POSITION_VB, TEXCOORD_VB, NORMAL_VB, INDEX_VB };
 
diff --git a/gfx/models/obj.impl.cpp b/gfx/models/obj.impl.cpp
index e410058..0c1303a 100644
--- a/gfx/models/obj.impl.cpp
+++ b/gfx/models/obj.impl.cpp
@@ -1,6 +1,12 @@
 #include "obj.h"
+#include <algorithm>
 #include <gfx/models/mesh.h>
 #include <gfx/models/vertex.hpp>
+#include <glm/glm.hpp>
+#include <iterator>
+#include <memory>
+#include <utility>
+#include <vector>
 
 std::vector<ObjParser::NamedMesh>
 ObjParser::createMeshes() const