diff --git a/fggl/app.cpp b/fggl/app.cpp
index e60b9983d6a15fd4c748afb8d2acf6780b64486c..12811d4d2ff775e5aaec98c44e35e147659212f6 100644
--- a/fggl/app.cpp
+++ b/fggl/app.cpp
@@ -13,7 +13,6 @@
  */
 
 #include <cstdlib>
-#include <memory>
 
 #include <spdlog/spdlog.h>
 #include <fggl/app.hpp>
diff --git a/fggl/audio/openal/audio.cpp b/fggl/audio/openal/audio.cpp
index 1529a5fba22eae93b6df23d77e393723cfe785f7..f9a3d244c2861d7517a0818ca9040015898ec165 100644
--- a/fggl/audio/openal/audio.cpp
+++ b/fggl/audio/openal/audio.cpp
@@ -30,7 +30,6 @@
 #include "fggl/assets/types.hpp"
 #include "fggl/assets/manager.hpp"
 
-#include "fggl/data/storage.hpp"
 #include "../../stb/stb_vorbis.h"
 
 namespace fggl::audio::openal {
diff --git a/fggl/data/procedural.cpp b/fggl/data/procedural.cpp
index cef758733d2010aacd07bcb0075cecc854047814..6770d0efadc45ed6c29f20f4d166c1c0ecc3a3af 100644
--- a/fggl/data/procedural.cpp
+++ b/fggl/data/procedural.cpp
@@ -17,9 +17,7 @@
 #include <fggl/data/model.hpp>
 
 #include <glm/ext/matrix_transform.hpp>
-#include <glm/gtc/quaternion.hpp>
 
-#include <iostream>
 #include <array>
 
 #include <glm/geometric.hpp>
diff --git a/fggl/gfx/atlas.cpp b/fggl/gfx/atlas.cpp
index a8a7132073d586f45846664bbc7eb4deb6457908..680d1f4fcea3fe06702e40d28269f4ebb9f73ba4 100644
--- a/fggl/gfx/atlas.cpp
+++ b/fggl/gfx/atlas.cpp
@@ -14,10 +14,8 @@
 
 #include <fggl/gfx/atlas.hpp>
 
-#include <fggl/math/types.hpp>
 #include <array>
 #include <vector>
-#include <string>
 
 #define STBRP_STATIC
 #define STB_RECT_PACK_IMPLEMENTATION
diff --git a/fggl/gfx/input.cpp b/fggl/gfx/input.cpp
index ac35a9aef013b492cddf8a1d794e682f75fa12fd..5d104e27a7828734dd0017100423508200550cde 100644
--- a/fggl/gfx/input.cpp
+++ b/fggl/gfx/input.cpp
@@ -13,10 +13,6 @@
  */
 
 #include <fggl/gfx/input.hpp>
-#include <cassert>
-
-#include <bitset>
-#include <iostream>
 
 using fggl::gfx::Input;
 
diff --git a/fggl/gfx/ogl/renderer.cpp b/fggl/gfx/ogl/renderer.cpp
index e77ab8652cdb9c814bc9f6327aa9204e6aa9f3a1..772920c252d823cbfb70f1448ee6bcc3bb139037 100644
--- a/fggl/gfx/ogl/renderer.cpp
+++ b/fggl/gfx/ogl/renderer.cpp
@@ -153,7 +153,7 @@ namespace fggl::gfx {
 
 	static ogl::Image make_solid(uint8_t width, uint8_t height, GLuint colour) {
 
-		GLuint *texData = new GLuint[width * height];
+		auto *texData = new GLuint[width * height];
 		for (int i = 0; i < width * height; ++i) {
 			texData[i] = colour;
 		}
diff --git a/fggl/gfx/ogl/shader.cpp b/fggl/gfx/ogl/shader.cpp
index 78d1fba4141fa3e21fdd4bcfb32fc42d8141200c..6ba49c412cca3cca377870a138b60b2706225c6d 100644
--- a/fggl/gfx/ogl/shader.cpp
+++ b/fggl/gfx/ogl/shader.cpp
@@ -17,6 +17,7 @@
 #include "fggl/gfx/ogl4/fallback.hpp"
 
 #include <iostream>
+#include <fstream>
 #include <vector>
 #include <spdlog/spdlog.h>
 
@@ -306,7 +307,7 @@ namespace fggl::gfx {
 
 	template<>
 	bool fggl::data::fggl_deserialize(std::filesystem::path &data, fggl::gfx::BinaryCache *out) {
-		auto f =
+		auto* f =
 			#ifdef _MSC_VER
 			_wfopen(data.c_str(), L"r");
 			#else
@@ -347,8 +348,6 @@ namespace fggl::gfx {
 		return result;
 	}
 
-#include <iostream>
-#include <fstream>
 
 template<>
 bool fggl::data::fggl_deserialize(std::filesystem::path &data, std::string *out) {
diff --git a/fggl/input/camera_input.cpp b/fggl/input/camera_input.cpp
index 3dd5e6d59b59cb251484364c41626980f8d354ea..831349235abdea2c5ae9d5267a3c4c1661a1975b 100644
--- a/fggl/input/camera_input.cpp
+++ b/fggl/input/camera_input.cpp
@@ -45,7 +45,7 @@ namespace fggl::input {
 		rotationMatrixX = glm::rotate(rotationMatrixX, xAngle, fggl::math::UP);
 		position = (rotationMatrixX * (position - pivot)) + pivot;
 
-		// rotate the camera aroud the pivot on the second axis
+		// rotate the camera around the pivot on the second axis
 		glm::mat4x4 rotationMatrixY(1.0f);
 		rotationMatrixY = glm::rotate(rotationMatrixY, yAngle, rightDir);
 		glm::vec3 finalPos = (rotationMatrixY * (position - pivot)) + pivot;
diff --git a/fggl/math/triangulation.cpp b/fggl/math/triangulation.cpp
index 8f620a561c4be1abaa08099608df8249bff839ef..b72b2a526f553ae0e2c90de61293c681135b5eb8 100644
--- a/fggl/math/triangulation.cpp
+++ b/fggl/math/triangulation.cpp
@@ -13,7 +13,6 @@
  */
 
 #include "fggl/math/triangulation.hpp"
-#include <iostream>
 
 namespace fggl::math {