diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41e7251..30e267b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,45 +48,45 @@ set(SRC_FILES
 )
 
 set(INCLUDE_FILES
-	include/ecs_system.hpp
-	include/gfx_device.hpp
+	include/ecs_system.h
+	include/gfx_device.h
 
-	include/inputs/mouse.hpp
-	include/inputs/keyboard.hpp
-	include/input_manager.hpp
+	include/inputs/mouse.h
+	include/inputs/keyboard.h
+	include/input_manager.h
 
-	include/systems/transform.hpp
-	include/systems/render.hpp
-	include/systems/render2d.hpp
-	include/systems/ui.hpp
-	include/systems/collisions.hpp
+	include/systems/transform.h
+	include/systems/render.h
+	include/systems/render2d.h
+	include/systems/ui.h
+	include/systems/collisions.h
 
-	include/resources/shader.hpp
-	include/resources/material.hpp
-	include/resources/mesh.hpp
-	include/resources/texture.hpp
+	include/resources/shader.h
+	include/resources/material.h
+	include/resources/mesh.h
+	include/resources/texture.h
 
-	include/event_system.hpp
+	include/event_system.h
 
 	include/engine_api.h
 
-	include/util/files.hpp
-	include/util/model_loader.hpp
+	include/util/files.h
+	include/util/model_loader.h
 
-	include/util.hpp
-	include/logger.hpp
-	include/scene_manager.hpp
-	include/gfx.hpp
-	include/scene.hpp
-	include/window.hpp
-	include/log.hpp
-	include/resource_manager.hpp
-	include/application.hpp
+	include/util.h
+	include/logger.h
+	include/scene_manager.h
+	include/gfx.h
+	include/scene.h
+	include/window.h
+	include/log.h
+	include/resource_manager.h
+	include/application.h
 
-	include/components/transform.hpp
-	include/components/renderable.hpp
-	include/components/collider.hpp
-	include/components/ui_element.hpp
+	include/components/transform.h
+	include/components/renderable.h
+	include/components/collider.h
+	include/components/ui_element.h
 )
 
 add_library(${PROJECT_NAME} STATIC
diff --git a/include/application.hpp b/include/application.h
similarity index 95%
rename from include/application.hpp
rename to include/application.h
index bf48251..62aaa29 100644
--- a/include/application.hpp
+++ b/include/application.h
@@ -10,12 +10,12 @@
 
 #include <glm/mat4x4.hpp>
 
-#include "gfx.hpp"
-#include "gfx_device.hpp"
-#include "input_manager.hpp"
-#include "resource_manager.hpp"
-#include "scene_manager.hpp"
-#include "window.hpp"
+#include "gfx.h"
+#include "gfx_device.h"
+#include "input_manager.h"
+#include "resource_manager.h"
+#include "scene_manager.h"
+#include "window.h"
 
 namespace engine {
 
diff --git a/include/components/collider.hpp b/include/components/collider.h
similarity index 100%
rename from include/components/collider.hpp
rename to include/components/collider.h
diff --git a/include/components/renderable.hpp b/include/components/renderable.h
similarity index 82%
rename from include/components/renderable.hpp
rename to include/components/renderable.h
index d907bbd..455a9de 100644
--- a/include/components/renderable.hpp
+++ b/include/components/renderable.h
@@ -3,8 +3,8 @@
 
 #include <memory>
 
-#include "resources/material.hpp"
-#include "resources/mesh.hpp"
+#include "resources/material.h"
+#include "resources/mesh.h"
 
 namespace engine {
 
diff --git a/include/components/transform.hpp b/include/components/transform.h
similarity index 100%
rename from include/components/transform.hpp
rename to include/components/transform.h
diff --git a/include/components/ui_element.hpp b/include/components/ui_element.h
similarity index 100%
rename from include/components/ui_element.hpp
rename to include/components/ui_element.h
diff --git a/include/ecs_system.hpp b/include/ecs_system.h
similarity index 100%
rename from include/ecs_system.hpp
rename to include/ecs_system.h
diff --git a/include/event_system.hpp b/include/event_system.h
similarity index 100%
rename from include/event_system.hpp
rename to include/event_system.h
diff --git a/include/gfx.hpp b/include/gfx.h
similarity index 100%
rename from include/gfx.hpp
rename to include/gfx.h
diff --git a/include/gfx_device.hpp b/include/gfx_device.h
similarity index 99%
rename from include/gfx_device.hpp
rename to include/gfx_device.h
index 80dcb0e..13da9c6 100644
--- a/include/gfx_device.hpp
+++ b/include/gfx_device.h
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "gfx.hpp"
+#include "gfx.h"
 
 struct SDL_Window;  // <SDL_video.h>
 
diff --git a/include/input_manager.hpp b/include/input_manager.h
similarity index 98%
rename from include/input_manager.hpp
rename to include/input_manager.h
index 575b388..d2c3247 100644
--- a/include/input_manager.hpp
+++ b/include/input_manager.h
@@ -5,9 +5,9 @@
 #include <string>
 #include <vector>
 
-#include "inputs/keyboard.hpp"
-#include "inputs/mouse.hpp"
-#include "window.hpp"
+#include "inputs/keyboard.h"
+#include "inputs/mouse.h"
+#include "window.h"
 
 namespace engine {
 
diff --git a/include/inputs/keyboard.hpp b/include/inputs/keyboard.h
similarity index 100%
rename from include/inputs/keyboard.hpp
rename to include/inputs/keyboard.h
diff --git a/include/inputs/mouse.hpp b/include/inputs/mouse.h
similarity index 100%
rename from include/inputs/mouse.hpp
rename to include/inputs/mouse.h
diff --git a/include/log.hpp b/include/log.h
similarity index 100%
rename from include/log.hpp
rename to include/log.h
diff --git a/include/logger.hpp b/include/logger.h
similarity index 98%
rename from include/logger.hpp
rename to include/logger.h
index 250aa8a..af36dc2 100644
--- a/include/logger.hpp
+++ b/include/logger.h
@@ -4,7 +4,7 @@
 #include <filesystem>
 #include <memory>
 
-#include "log.hpp"
+#include "log.h"
 
 #include <spdlog/sinks/basic_file_sink.h>
 #include <spdlog/sinks/stdout_color_sinks.h>
diff --git a/include/resource_manager.hpp b/include/resource_manager.h
similarity index 100%
rename from include/resource_manager.hpp
rename to include/resource_manager.h
diff --git a/include/resources/material.hpp b/include/resources/material.h
similarity index 89%
rename from include/resources/material.hpp
rename to include/resources/material.h
index 13c34ad..723b6c4 100644
--- a/include/resources/material.hpp
+++ b/include/resources/material.h
@@ -3,8 +3,8 @@
 
 #include <memory>
 
-#include "resources/shader.hpp"
-#include "resources/texture.hpp"
+#include "resources/shader.h"
+#include "resources/texture.h"
 
 namespace engine {
 namespace resources {
diff --git a/include/resources/mesh.hpp b/include/resources/mesh.h
similarity index 95%
rename from include/resources/mesh.hpp
rename to include/resources/mesh.h
index 5cfdd91..d05d6ae 100644
--- a/include/resources/mesh.hpp
+++ b/include/resources/mesh.h
@@ -5,8 +5,8 @@
 #include <glm/vec3.hpp>
 #include <vector>
 
-#include "gfx.hpp"
-#include "gfx_device.hpp"
+#include "gfx.h"
+#include "gfx_device.h"
 
 namespace engine {
 
diff --git a/include/resources/shader.hpp b/include/resources/shader.h
similarity index 91%
rename from include/resources/shader.hpp
rename to include/resources/shader.h
index 8efd508..2659204 100644
--- a/include/resources/shader.hpp
+++ b/include/resources/shader.h
@@ -1,9 +1,9 @@
 #ifndef ENGINE_INCLUDE_RESOURCES_SHADER_H_
 #define ENGINE_INCLUDE_RESOURCES_SHADER_H_
 
-#include "application.hpp"
-#include "gfx.hpp"
-#include "gfx_device.hpp"
+#include "application.h"
+#include "gfx.h"
+#include "gfx_device.h"
 
 namespace engine {
 namespace resources {
diff --git a/include/resources/texture.hpp b/include/resources/texture.h
similarity index 93%
rename from include/resources/texture.hpp
rename to include/resources/texture.h
index 51d249c..20c7d2d 100644
--- a/include/resources/texture.hpp
+++ b/include/resources/texture.h
@@ -3,8 +3,8 @@
 
 #include <string>
 
-#include "application.hpp"
-#include "gfx_device.hpp"
+#include "application.h"
+#include "gfx_device.h"
 
 namespace engine {
 namespace resources {
diff --git a/include/scene.hpp b/include/scene.h
similarity index 98%
rename from include/scene.hpp
rename to include/scene.h
index aabd3c0..53a368b 100644
--- a/include/scene.hpp
+++ b/include/scene.h
@@ -6,8 +6,8 @@
 #include <map>
 #include <typeinfo>
 
-#include "ecs_system.hpp"
-#include "event_system.hpp"
+#include "ecs_system.h"
+#include "event_system.h"
 
 namespace engine {
 
diff --git a/include/scene_manager.hpp b/include/scene_manager.h
similarity index 92%
rename from include/scene_manager.hpp
rename to include/scene_manager.h
index 122226c..ace8848 100644
--- a/include/scene_manager.hpp
+++ b/include/scene_manager.h
@@ -4,8 +4,8 @@
 #include <memory>
 #include <vector>
 
-#include "resource_manager.hpp"
-#include "scene.hpp"
+#include "resource_manager.h"
+#include "scene.h"
 
 namespace engine {
 
diff --git a/include/systems/collisions.hpp b/include/systems/collisions.h
similarity index 96%
rename from include/systems/collisions.hpp
rename to include/systems/collisions.h
index c53ade1..657dca0 100644
--- a/include/systems/collisions.hpp
+++ b/include/systems/collisions.h
@@ -5,8 +5,8 @@
 #include <glm/mat4x4.hpp>
 #include <vector>
 
-#include "components/collider.hpp"
-#include "ecs_system.hpp"
+#include "components/collider.h"
+#include "ecs_system.h"
 
 namespace engine {
 
diff --git a/include/systems/render.hpp b/include/systems/render.h
similarity index 77%
rename from include/systems/render.hpp
rename to include/systems/render.h
index b946dd8..e3c6f32 100644
--- a/include/systems/render.hpp
+++ b/include/systems/render.h
@@ -1,13 +1,13 @@
 #ifndef ENGINE_INCLUDE_SYSTEMS_RENDER_H_
 #define ENGINE_INCLUDE_SYSTEMS_RENDER_H_
 
-#include "components/renderable.hpp"
-#include "components/transform.hpp"
-#include "ecs_system.hpp"
-#include "gfx.hpp"
-#include "gfx_device.hpp"
-#include "log.hpp"
-#include "scene.hpp"
+#include "components/renderable.h"
+#include "components/transform.h"
+#include "ecs_system.h"
+#include "gfx.h"
+#include "gfx_device.h"
+#include "log.h"
+#include "scene.h"
 
 namespace engine {
 
diff --git a/include/systems/render2d.hpp b/include/systems/render2d.h
similarity index 91%
rename from include/systems/render2d.hpp
rename to include/systems/render2d.h
index 35a3a95..6279d51 100644
--- a/include/systems/render2d.hpp
+++ b/include/systems/render2d.h
@@ -1,7 +1,7 @@
 #ifndef ENGINE_INCLUDE_SYSTEMS_RENDER2D_H_
 #define ENGINE_INCLUDE_SYSTEMS_RENDER2D_H_
 
-#include "ecs_system.hpp"
+#include "ecs_system.h"
 
 namespace engine {
 
diff --git a/include/systems/transform.hpp b/include/systems/transform.h
similarity index 92%
rename from include/systems/transform.hpp
rename to include/systems/transform.h
index 82fd472..c7baa88 100644
--- a/include/systems/transform.hpp
+++ b/include/systems/transform.h
@@ -1,7 +1,7 @@
 #ifndef ENGINE_INCLUDE_SYSTEMS_TRANSFORM_H_
 #define ENGINE_INCLUDE_SYSTEMS_TRANSFORM_H_
 
-#include "ecs_system.hpp"
+#include "ecs_system.h"
 
 namespace engine {
 
diff --git a/include/systems/ui.hpp b/include/systems/ui.h
similarity index 90%
rename from include/systems/ui.hpp
rename to include/systems/ui.h
index 1512916..e988d96 100644
--- a/include/systems/ui.hpp
+++ b/include/systems/ui.h
@@ -1,7 +1,7 @@
 #ifndef ENGINE_INCLUDE_SYSTEMS_UI_H_
 #define ENGINE_INCLUDE_SYSTEMS_UI_H_
 
-#include "ecs_system.hpp"
+#include "ecs_system.h"
 
 namespace engine {
 
diff --git a/include/util.hpp b/include/util.h
similarity index 100%
rename from include/util.hpp
rename to include/util.h
diff --git a/include/util/files.hpp b/include/util/files.h
similarity index 100%
rename from include/util/files.hpp
rename to include/util/files.h
diff --git a/include/util/model_loader.hpp b/include/util/model_loader.h
similarity index 92%
rename from include/util/model_loader.hpp
rename to include/util/model_loader.h
index ad7898a..0af7223 100644
--- a/include/util/model_loader.hpp
+++ b/include/util/model_loader.h
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "scene.hpp"
+#include "scene.h"
 
 namespace engine {
 namespace util {
diff --git a/include/window.hpp b/include/window.h
similarity index 98%
rename from include/window.hpp
rename to include/window.h
index 4b92eb5..f2ecc42 100644
--- a/include/window.hpp
+++ b/include/window.h
@@ -7,8 +7,8 @@
 #include <SDL.h>
 #include <glm/vec2.hpp>
 
-#include "inputs/keyboard.hpp"
-#include "inputs/mouse.hpp"
+#include "inputs/keyboard.h"
+#include "inputs/mouse.h"
 
 namespace engine {
 
diff --git a/src/application.cpp b/src/application.cpp
index 16a3fbc..05908f7 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -1,4 +1,4 @@
-#include "application.hpp"
+#include "application.h"
 
 #include <filesystem>
 #include <memory>
@@ -8,17 +8,17 @@
 
 #include <glm/mat4x4.hpp>
 
-#include "gfx.hpp"
-#include "gfx_device.hpp"
-#include "input_manager.hpp"
-#include "log.hpp"
-#include "resources/material.hpp"
-#include "resources/mesh.hpp"
-#include "resources/shader.hpp"
-#include "resources/texture.hpp"
-#include "scene.hpp"
-#include "scene_manager.hpp"
-#include "window.hpp"
+#include "gfx.h"
+#include "gfx_device.h"
+#include "input_manager.h"
+#include "log.h"
+#include "resources/material.h"
+#include "resources/mesh.h"
+#include "resources/shader.h"
+#include "resources/texture.h"
+#include "scene.h"
+#include "scene_manager.h"
+#include "window.h"
 
 #ifdef _MSC_VER
 #include <windows.h>
diff --git a/src/ecs_system.cpp b/src/ecs_system.cpp
index 835216f..93504c5 100644
--- a/src/ecs_system.cpp
+++ b/src/ecs_system.cpp
@@ -1,6 +1,6 @@
-#include "ecs_system.hpp"
+#include "ecs_system.h"
 
-#include "scene.hpp"
+#include "scene.h"
 
 namespace engine {
 
diff --git a/src/gfx_device_vulkan.cpp b/src/gfx_device_vulkan.cpp
index e7564b8..1a530c9 100644
--- a/src/gfx_device_vulkan.cpp
+++ b/src/gfx_device_vulkan.cpp
@@ -36,15 +36,15 @@
 
 #include <volk.h>
 
-#include "gfx_device.hpp"
+#include "gfx_device.h"
 #include "vulkan/instance.h"
 #include "vulkan/device.h"
 #include "vulkan/gpu_allocator.h"
 #include "vulkan/swapchain.h"
-#include "util.hpp"
+#include "util.h"
 #include "config.h"
-#include "log.hpp"
-#include "util/files.hpp"
+#include "log.h"
+#include "util/files.h"
 
 inline static void checkVulkanError(VkResult errorCode, int lineNo)
 {
diff --git a/src/input_manager.cpp b/src/input_manager.cpp
index b00161e..84573c4 100644
--- a/src/input_manager.cpp
+++ b/src/input_manager.cpp
@@ -1,6 +1,6 @@
-#include "input_manager.hpp"
+#include "input_manager.h"
 
-#include "window.hpp"
+#include "window.h"
 
 #include <string>
 #include <stdexcept>
diff --git a/src/resources/material.cpp b/src/resources/material.cpp
index 137be9c..a747ff3 100644
--- a/src/resources/material.cpp
+++ b/src/resources/material.cpp
@@ -1,6 +1,6 @@
-#include "resources/material.hpp"
+#include "resources/material.h"
 
-#include "resources/shader.hpp"
+#include "resources/shader.h"
 
 namespace engine::resources {
 
diff --git a/src/resources/mesh.cpp b/src/resources/mesh.cpp
index 143c2bd..1beda72 100644
--- a/src/resources/mesh.cpp
+++ b/src/resources/mesh.cpp
@@ -1,7 +1,7 @@
-#include "resources/mesh.hpp"
+#include "resources/mesh.h"
 
-#include "log.hpp"
-#include "gfx_device.hpp"
+#include "log.h"
+#include "gfx_device.h"
 
 namespace engine::resources {
 
diff --git a/src/resources/shader.cpp b/src/resources/shader.cpp
index 16cd580..13ba7ca 100644
--- a/src/resources/shader.cpp
+++ b/src/resources/shader.cpp
@@ -1,8 +1,8 @@
-#include "resources/shader.hpp"
+#include "resources/shader.h"
 
-#include "application.hpp"
-#include "gfx_device.hpp"
-#include "log.hpp"
+#include "application.h"
+#include "gfx_device.h"
+#include "log.h"
 
 #include <glm/mat4x4.hpp>
 
diff --git a/src/resources/texture.cpp b/src/resources/texture.cpp
index 751ee6e..659d463 100644
--- a/src/resources/texture.cpp
+++ b/src/resources/texture.cpp
@@ -1,8 +1,8 @@
-#include "resources/texture.hpp"
+#include "resources/texture.h"
 
-#include "application.hpp"
-#include "util/files.hpp"
-#include "log.hpp"
+#include "application.h"
+#include "util/files.h"
+#include "log.h"
 
 #include <vector>
 
diff --git a/src/scene.cpp b/src/scene.cpp
index 10b4c62..3c84263 100644
--- a/src/scene.cpp
+++ b/src/scene.cpp
@@ -1,11 +1,11 @@
-#include "scene.hpp"
+#include "scene.h"
 
-#include "components/transform.hpp"
-#include "components/renderable.hpp"
-#include "components/collider.hpp"
-#include "systems/transform.hpp"
-#include "systems/render.hpp"
-#include "systems/collisions.hpp"
+#include "components/transform.h"
+#include "components/renderable.h"
+#include "components/collider.h"
+#include "systems/transform.h"
+#include "systems/render.h"
+#include "systems/collisions.h"
 
 namespace engine {
 
diff --git a/src/scene_manager.cpp b/src/scene_manager.cpp
index 42d6910..5421f26 100644
--- a/src/scene_manager.cpp
+++ b/src/scene_manager.cpp
@@ -1,7 +1,7 @@
-#include "scene_manager.hpp"
+#include "scene_manager.h"
 
-#include "scene.hpp"
-#include "resources/texture.hpp"
+#include "scene.h"
+#include "resources/texture.h"
 
 #include <assert.h>
 
diff --git a/src/systems/collisions.cpp b/src/systems/collisions.cpp
index 3c093eb..b0ca423 100644
--- a/src/systems/collisions.cpp
+++ b/src/systems/collisions.cpp
@@ -1,11 +1,11 @@
-#include "systems/collisions.hpp"
+#include "systems/collisions.h"
 
-#include "components/transform.hpp"
-#include "components/collider.hpp"
-#include "components/renderable.hpp"
-#include "scene.hpp"
+#include "components/transform.h"
+#include "components/collider.h"
+#include "components/renderable.h"
+#include "scene.h"
 
-#include "log.hpp"
+#include "log.h"
 
 #include <array>
 
diff --git a/src/systems/render.cpp b/src/systems/render.cpp
index 7f30f74..8d92fe6 100644
--- a/src/systems/render.cpp
+++ b/src/systems/render.cpp
@@ -1,14 +1,14 @@
-#include "systems/render.hpp"
+#include "systems/render.h"
 
-#include "application.hpp"
-#include "window.hpp"
-#include "gfx_device.hpp"
+#include "application.h"
+#include "window.h"
+#include "gfx_device.h"
 
-#include "resources/material.hpp"
-#include "resources/shader.hpp"
-#include "resources/texture.hpp"
+#include "resources/material.h"
+#include "resources/shader.h"
+#include "resources/texture.h"
 
-#include "resources/mesh.hpp"
+#include "resources/mesh.h"
 
 #include <glm/mat4x4.hpp>
 
diff --git a/src/systems/render2d.cpp b/src/systems/render2d.cpp
index 6218501..8728d55 100644
--- a/src/systems/render2d.cpp
+++ b/src/systems/render2d.cpp
@@ -1,8 +1,8 @@
-#include "systems/render2d.hpp"
+#include "systems/render2d.h"
 
 #include <typeinfo>
 
-#include "components/transform.hpp"
+#include "components/transform.h"
 
 namespace engine {
 
diff --git a/src/systems/transform.cpp b/src/systems/transform.cpp
index 57011be..094b1ca 100644
--- a/src/systems/transform.cpp
+++ b/src/systems/transform.cpp
@@ -1,7 +1,7 @@
-#include "systems/transform.hpp"
+#include "systems/transform.h"
 
-#include "scene.hpp"
-#include "components/transform.hpp"
+#include "scene.h"
+#include "components/transform.h"
 
 #include <typeinfo>
 
diff --git a/src/systems/ui.cpp b/src/systems/ui.cpp
index df17691..a2c43c2 100644
--- a/src/systems/ui.cpp
+++ b/src/systems/ui.cpp
@@ -1,6 +1,6 @@
-#include "systems/ui.hpp"
+#include "systems/ui.h"
 
-#include "components/ui_element.hpp"
+#include "components/ui_element.h"
 
 #include <typeinfo>
 
diff --git a/src/util/files.cpp b/src/util/files.cpp
index 049c349..3a677f3 100644
--- a/src/util/files.cpp
+++ b/src/util/files.cpp
@@ -1,4 +1,4 @@
-#include "util/files.hpp"
+#include "util/files.h"
 
 #include "stb_image.h"
 
diff --git a/src/util/model_loader.cpp b/src/util/model_loader.cpp
index c32382a..ebe66c7 100644
--- a/src/util/model_loader.cpp
+++ b/src/util/model_loader.cpp
@@ -1,16 +1,16 @@
-#include "util/model_loader.hpp"
+#include "util/model_loader.h"
 
-#include "log.hpp"
+#include "log.h"
 
-#include "application.hpp"
+#include "application.h"
 
-#include "components/transform.hpp"
-#include "components/renderable.hpp"
+#include "components/transform.h"
+#include "components/renderable.h"
 
-#include "resources/texture.hpp"
-#include "resources/material.hpp"
-#include "resources/shader.hpp"
-#include "resources/mesh.hpp"
+#include "resources/texture.h"
+#include "resources/material.h"
+#include "resources/shader.h"
+#include "resources/mesh.h"
 
 #include <assimp/Importer.hpp>
 #include <assimp/LogStream.hpp>
diff --git a/src/vulkan/device.cpp b/src/vulkan/device.cpp
index 145f0c1..18680bf 100644
--- a/src/vulkan/device.cpp
+++ b/src/vulkan/device.cpp
@@ -5,7 +5,7 @@
 #include <cstring>
 #include <assert.h>
 
-#include "log.hpp"
+#include "log.h"
 
 #include "device.h"
 
diff --git a/src/vulkan/instance.cpp b/src/vulkan/instance.cpp
index 171e1bf..744acb5 100644
--- a/src/vulkan/instance.cpp
+++ b/src/vulkan/instance.cpp
@@ -5,9 +5,9 @@
 
 #include <SDL2/SDL_vulkan.h>
 
-#include "util.hpp"
+#include "util.h"
 #include "config.h"
-#include "log.hpp"
+#include "log.h"
 
 #include "instance.h"
 
diff --git a/src/vulkan/swapchain.cpp b/src/vulkan/swapchain.cpp
index 9a3050c..d773d13 100644
--- a/src/vulkan/swapchain.cpp
+++ b/src/vulkan/swapchain.cpp
@@ -6,7 +6,7 @@
 
 #include <SDL2/SDL_vulkan.h>
 
-#include "log.hpp"
+#include "log.h"
 
 #include "swapchain.h"
 
diff --git a/src/window.cpp b/src/window.cpp
index 13422b3..74eb7b1 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1,4 +1,4 @@
-#include "window.hpp"
+#include "window.h"
 
 #include <iostream>
 #include <stdexcept>
diff --git a/test/src/camera_controller.cpp b/test/src/camera_controller.cpp
index 8dddb24..7da39c1 100644
--- a/test/src/camera_controller.cpp
+++ b/test/src/camera_controller.cpp
@@ -1,21 +1,20 @@
 #include "camera_controller.hpp"
 
-#include "application.hpp"
-#include "window.hpp"
-#include "input_manager.hpp"
-#include "scene_manager.hpp"
-#include "scene.hpp"
+#include "application.h"
+#include "window.h"
+#include "input_manager.h"
+#include "scene_manager.h"
+#include "scene.h"
 
-#include "components/transform.hpp"
-#include "components/collider.hpp"
+#include "components/transform.h"
+#include "components/collider.h"
+#include "log.h"
 
 #include <glm/trigonometric.hpp>
 #include <glm/gtc/constants.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <glm/gtx/rotate_vector.hpp>
 
-#include <log.hpp>
-
 CameraControllerSystem::CameraControllerSystem(engine::Scene* scene)
 	: System(scene, { typeid(engine::TransformComponent).hash_code(), typeid(CameraControllerComponent).hash_code() })
 {
diff --git a/test/src/camera_controller.hpp b/test/src/camera_controller.hpp
index dc79e0d..5a00c72 100644
--- a/test/src/camera_controller.hpp
+++ b/test/src/camera_controller.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "ecs_system.hpp"
-#include "event_system.hpp"
+#include "ecs_system.h"
+#include "event_system.h"
 
-#include "components/transform.hpp"
-#include "systems/collisions.hpp"
+#include "components/transform.h"
+#include "systems/collisions.h"
 
 struct CameraControllerComponent {
 	float m_cameraSensitivity = 0.007f;
diff --git a/test/src/game.cpp b/test/src/game.cpp
index cead568..5ea8140 100644
--- a/test/src/game.cpp
+++ b/test/src/game.cpp
@@ -1,27 +1,21 @@
+#include "game.hpp"
 #include "config.h"
 
 #include "camera_controller.hpp"
 #include "meshgen.hpp"
-
-#include "application.hpp"
-#include "window.hpp"
-#include "input_manager.hpp"
-#include "scene_manager.hpp"
-#include "scene.hpp"
-
-#include "components/transform.hpp"
-#include "components/collider.hpp"
-#include "components/renderable.hpp"
-
-#include "systems/transform.hpp"
-#include "systems/render.hpp"
-
-#include "resources/material.hpp"
-#include "resources/texture.hpp"
-
-#include "util/model_loader.hpp"
-
-#include "game.hpp"
+#include "application.h"
+#include "window.h"
+#include "input_manager.h"
+#include "scene_manager.h"
+#include "scene.h"
+#include "components/transform.h"
+#include "components/collider.h"
+#include "components/renderable.h"
+#include "systems/transform.h"
+#include "systems/render.h"
+#include "resources/material.h"
+#include "resources/texture.h"
+#include "util/model_loader.h"
 
 static void configureInputs(engine::InputManager* inputManager)
 {
diff --git a/test/src/main.cpp b/test/src/main.cpp
index 1fc8cfe..4e7fee1 100644
--- a/test/src/main.cpp
+++ b/test/src/main.cpp
@@ -2,8 +2,8 @@
 #include "game.hpp"
 
 // engine
-#include "logger.hpp"
-#include "window.hpp"
+#include "logger.h"
+#include "window.h"
 
 // standard library
 #include <exception>
diff --git a/test/src/meshgen.cpp b/test/src/meshgen.cpp
index 05baa08..f7899e6 100644
--- a/test/src/meshgen.cpp
+++ b/test/src/meshgen.cpp
@@ -1,6 +1,6 @@
 #include "meshgen.hpp"
 
-#include "resources/mesh.hpp"
+#include "resources/mesh.h"
 
 #include <glm/gtc/constants.hpp>
 #include <glm/ext.hpp>
diff --git a/test/src/meshgen.hpp b/test/src/meshgen.hpp
index 98e011c..b43a7e1 100644
--- a/test/src/meshgen.hpp
+++ b/test/src/meshgen.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <memory>
-#include "resources/mesh.hpp"
+#include "resources/mesh.h"
 
 // generates a UV sphere
 std::unique_ptr<engine::resources::Mesh> genSphereMesh(engine::GFXDevice* gfx, float r, int detail, bool windInside = false, bool flipNormals = false);