diff --git a/YoggieEngine/src/Application.h b/YoggieEngine/src/Application.h
index 1d405c6..20cf44e 100644
--- a/YoggieEngine/src/Application.h
+++ b/YoggieEngine/src/Application.h
@@ -1,11 +1,6 @@
 #pragma once
 #include "YoggieEngine.h"
 
-#include "Input/InputManager.h"
-#include "Graphics/Renderer.h"
-#include <string>
-#include <iostream>
-#include <memory>
 namespace YoggieEngine {
 	// forward declaration
 	class InputManager;
diff --git a/YoggieEngine/src/AssetManager/ModelImporter.cpp b/YoggieEngine/src/AssetManager/ModelImporter.cpp
index 90efc71..88d2755 100644
--- a/YoggieEngine/src/AssetManager/ModelImporter.cpp
+++ b/YoggieEngine/src/AssetManager/ModelImporter.cpp
@@ -1,6 +1,6 @@
 #include <YoggieEngine.h>
 #include "ModelImporter.h"
-#include "spdlog/spdlog.h"
+
 namespace YoggieEngine {
 
     SceneObject* ModelImporter::Import(const std::string path)
diff --git a/YoggieEngine/src/EventSystem/Event.h b/YoggieEngine/src/EventSystem/Event.h
index 978c948..778b597 100644
--- a/YoggieEngine/src/EventSystem/Event.h
+++ b/YoggieEngine/src/EventSystem/Event.h
@@ -1,7 +1,4 @@
 #pragma once 
-
-#include <string>
-
 namespace YoggieEngine {
 
     struct Event
diff --git a/YoggieEngine/src/EventSystem/EventEmitter.h b/YoggieEngine/src/EventSystem/EventEmitter.h
index 0946966..2a9530d 100644
--- a/YoggieEngine/src/EventSystem/EventEmitter.h
+++ b/YoggieEngine/src/EventSystem/EventEmitter.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Event.h"
-#include "EventListener.h"
 namespace YoggieEngine{
 	class EventEmitter {
 	public:
diff --git a/YoggieEngine/src/EventSystem/EventListener.h b/YoggieEngine/src/EventSystem/EventListener.h
index 5f0153e..faa6745 100644
--- a/YoggieEngine/src/EventSystem/EventListener.h
+++ b/YoggieEngine/src/EventSystem/EventListener.h
@@ -1,8 +1,4 @@
 #pragma once 
-#include <list>
-#include <iostream>
-
-#include "spdlog/spdlog.h"
 #include "Event.h"
 namespace YoggieEngine {
     class EventListener {
diff --git a/YoggieEngine/src/Graphics/Memory/Buffer.h b/YoggieEngine/src/Graphics/Memory/Buffer.h
index 1a7f489..edf2412 100644
--- a/YoggieEngine/src/Graphics/Memory/Buffer.h
+++ b/YoggieEngine/src/Graphics/Memory/Buffer.h
@@ -1,6 +1,4 @@
 #pragma once
-#include <glad/glad.h>
-
 namespace YoggieEngine {
 	class Buffer {
 
diff --git a/YoggieEngine/src/Graphics/Memory/FrameBuffer.cpp b/YoggieEngine/src/Graphics/Memory/FrameBuffer.cpp
index 8eec733..c72cf63 100644
--- a/YoggieEngine/src/Graphics/Memory/FrameBuffer.cpp
+++ b/YoggieEngine/src/Graphics/Memory/FrameBuffer.cpp
@@ -1,6 +1,6 @@
 #include <YoggieEngine.h>
 #include "Framebuffer.h"
-#include <iostream>
+
 namespace YoggieEngine {
 	Framebuffer::Framebuffer()
 	{
diff --git a/YoggieEngine/src/Graphics/Memory/Framebuffer.h b/YoggieEngine/src/Graphics/Memory/Framebuffer.h
index 99a7d73..fd58381 100644
--- a/YoggieEngine/src/Graphics/Memory/Framebuffer.h
+++ b/YoggieEngine/src/Graphics/Memory/Framebuffer.h
@@ -1,7 +1,4 @@
 #pragma once
-#include <glad/glad.h>
-#include <glm/glm.hpp>
-
 namespace YoggieEngine {
 	class Framebuffer {
 
diff --git a/YoggieEngine/src/Graphics/Memory/UniformBuffer.cpp b/YoggieEngine/src/Graphics/Memory/UniformBuffer.cpp
index 98158be..eb66da9 100644
--- a/YoggieEngine/src/Graphics/Memory/UniformBuffer.cpp
+++ b/YoggieEngine/src/Graphics/Memory/UniformBuffer.cpp
@@ -1,6 +1,5 @@
 #include <YoggieEngine.h>
 #include "UniformBuffer.h"
-#include <glad/glad.h>
 
 namespace YoggieEngine {
 	UniformBuffer::UniformBuffer(unsigned int size)
diff --git a/YoggieEngine/src/Graphics/Memory/VertexArray.cpp b/YoggieEngine/src/Graphics/Memory/VertexArray.cpp
index ac73d1b..9ec9990 100644
--- a/YoggieEngine/src/Graphics/Memory/VertexArray.cpp
+++ b/YoggieEngine/src/Graphics/Memory/VertexArray.cpp
@@ -1,6 +1,5 @@
 #include <YoggieEngine.h>
 #include "VertexArray.h"
-#include <glad/glad.h>
 namespace YoggieEngine {
     void VertexArray::Create() {
         glGenVertexArrays(1, &id);
diff --git a/YoggieEngine/src/Graphics/Primitives/Camera.h b/YoggieEngine/src/Graphics/Primitives/Camera.h
index 217cb8c..f663be2 100644
--- a/YoggieEngine/src/Graphics/Primitives/Camera.h
+++ b/YoggieEngine/src/Graphics/Primitives/Camera.h
@@ -1,8 +1,4 @@
 #pragma once
-
-#include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-
 namespace YoggieEngine {
 	class Camera {
 	public:
diff --git a/YoggieEngine/src/Graphics/Primitives/Material.h b/YoggieEngine/src/Graphics/Primitives/Material.h
index d689408..4665d01 100644
--- a/YoggieEngine/src/Graphics/Primitives/Material.h
+++ b/YoggieEngine/src/Graphics/Primitives/Material.h
@@ -1,6 +1,5 @@
 #pragma once
 #include <glm/glm.hpp>
-#include <string>
 #include "Shader.h"
 
 namespace YoggieEngine {
diff --git a/YoggieEngine/src/Graphics/Primitives/Mesh.h b/YoggieEngine/src/Graphics/Primitives/Mesh.h
index e3420ea..19eedf0 100644
--- a/YoggieEngine/src/Graphics/Primitives/Mesh.h
+++ b/YoggieEngine/src/Graphics/Primitives/Mesh.h
@@ -1,6 +1,5 @@
 #pragma once
 #include <vector>
-#include <glm/glm.hpp>
 #include "Vertex.h"
 
 namespace YoggieEngine {
diff --git a/YoggieEngine/src/Graphics/Primitives/Shader.cpp b/YoggieEngine/src/Graphics/Primitives/Shader.cpp
index 8dc7023..7fb7505 100644
--- a/YoggieEngine/src/Graphics/Primitives/Shader.cpp
+++ b/YoggieEngine/src/Graphics/Primitives/Shader.cpp
@@ -1,6 +1,5 @@
 #include <YoggieEngine.h>
 #include "Shader.h"
-#include "spdlog/spdlog.h"
 namespace YoggieEngine {
     Shader::Shader(const std::string vertexShaderPath, const std::string fragmentShaderPath)
     {
diff --git a/YoggieEngine/src/Graphics/Primitives/Shader.h b/YoggieEngine/src/Graphics/Primitives/Shader.h
index 07487e6..c7a0f82 100644
--- a/YoggieEngine/src/Graphics/Primitives/Shader.h
+++ b/YoggieEngine/src/Graphics/Primitives/Shader.h
@@ -1,10 +1,4 @@
 #pragma once
-#include <glad/glad.h>
-#include <string>
-#include <iostream>
-#include <fstream>
-#include <glm/glm.hpp>
-#include <glm/gtc/type_ptr.hpp>
 
 namespace YoggieEngine {
     class Shader {
diff --git a/YoggieEngine/src/Graphics/Primitives/Texture.cpp b/YoggieEngine/src/Graphics/Primitives/Texture.cpp
index a5d288f..623feb0 100644
--- a/YoggieEngine/src/Graphics/Primitives/Texture.cpp
+++ b/YoggieEngine/src/Graphics/Primitives/Texture.cpp
@@ -1,10 +1,8 @@
 #include <YoggieEngine.h>
 #include "Texture.h"
-#include <glad/glad.h>
 #include <GLFW/glfw3.h>
 #define STB_IMAGE_IMPLEMENTATION
 #include "../stb_image.h"
-#include <iostream>
 
 namespace YoggieEngine {
 	Texture::Texture(const std::string texturePath) {
diff --git a/YoggieEngine/src/Graphics/Primitives/Texture.h b/YoggieEngine/src/Graphics/Primitives/Texture.h
index d1e6cec..ab77f06 100644
--- a/YoggieEngine/src/Graphics/Primitives/Texture.h
+++ b/YoggieEngine/src/Graphics/Primitives/Texture.h
@@ -1,7 +1,4 @@
 #pragma once
-#include <spdlog/spdlog.h>
-#include <string>
-
 namespace YoggieEngine {
 	class Texture {
 	public:
diff --git a/YoggieEngine/src/Graphics/Primitives/Vertex.h b/YoggieEngine/src/Graphics/Primitives/Vertex.h
index 9cb2ae4..7f453cf 100644
--- a/YoggieEngine/src/Graphics/Primitives/Vertex.h
+++ b/YoggieEngine/src/Graphics/Primitives/Vertex.h
@@ -1,6 +1,4 @@
 #pragma once
-#include <glm/glm.hpp>
-
 namespace YoggieEngine {
 	struct Vertex {
 		glm::vec3 vertices;
diff --git a/YoggieEngine/src/Graphics/RenderSurface.cpp b/YoggieEngine/src/Graphics/RenderSurface.cpp
index e7eaedd..f1bb3d5 100644
--- a/YoggieEngine/src/Graphics/RenderSurface.cpp
+++ b/YoggieEngine/src/Graphics/RenderSurface.cpp
@@ -4,8 +4,6 @@ namespace YoggieEngine {
 	RenderSurface::RenderSurface() {
 		shader = new Shader("build/SandboxAppliction/Debug/renderSuface.vs", "build/SandboxApplication/Debug/renderSurface.fs");
 
-
-
 		verts = std::vector<glm::vec3>{
 			{-0.5f, 0.5f, 0.0f}, // 0
 			{-0.5f, -0.5f, 0.0f}, // 1
diff --git a/YoggieEngine/src/Graphics/RenderSurface.h b/YoggieEngine/src/Graphics/RenderSurface.h
index eee2f8c..de27a76 100644
--- a/YoggieEngine/src/Graphics/RenderSurface.h
+++ b/YoggieEngine/src/Graphics/RenderSurface.h
@@ -1,7 +1,6 @@
 #pragma once
 #include "../Graphics/Memory/Buffer.h"
 #include "../Graphics/Memory/VertexArray.h"
-#include <vector>
 
 namespace YoggieEngine {
 
diff --git a/YoggieEngine/src/Graphics/Renderable.h b/YoggieEngine/src/Graphics/Renderable.h
index 609e1f3..9a1fd78 100644
--- a/YoggieEngine/src/Graphics/Renderable.h
+++ b/YoggieEngine/src/Graphics/Renderable.h
@@ -1,9 +1,4 @@
 #pragma once
-#include "Primitives/Mesh.h"
-#include "Primitives/Material.h"
-#include "Primitives/Texture.h"
-#include "../Scene/Scene.h"
-
 namespace YoggieEngine {
 
 	struct  Renderable {
diff --git a/YoggieEngine/src/Graphics/Renderer.cpp b/YoggieEngine/src/Graphics/Renderer.cpp
index 2e69355..cc3fdd3 100644
--- a/YoggieEngine/src/Graphics/Renderer.cpp
+++ b/YoggieEngine/src/Graphics/Renderer.cpp
@@ -3,8 +3,6 @@
 #include "../Scene/Components.h"
 #include "../Graphics/Memory/VertexArray.h"
 #include "../Graphics/Memory/Buffer.h"
-#include <glad/glad.h>
-#include <glm/gtc/type_precision.hpp>
 
 namespace YoggieEngine {
 float Angle = 0.0;
diff --git a/YoggieEngine/src/Graphics/Renderer.h b/YoggieEngine/src/Graphics/Renderer.h
index dfed554..a491fb8 100644
--- a/YoggieEngine/src/Graphics/Renderer.h
+++ b/YoggieEngine/src/Graphics/Renderer.h
@@ -1,16 +1,12 @@
 #pragma once
-#include <vector>
-#include <iostream>
-#include <glm/gtc/matrix_transform.hpp>
-#include "glad/glad.h"
 #include "GLFW/glfw3.h"
 
 #include "../PerfCounter.h"
 
-#include "Primitives/Camera.h"
 #include "Renderable.h"
 #include "Memory/Framebuffer.h"
 #include "../Scene/Components.h"
+#include"../Scene/Scene.h"
 
 namespace YoggieEngine {
 
diff --git a/YoggieEngine/src/PerfCounter.cpp b/YoggieEngine/src/PerfCounter.cpp
index 6f9fb67..230b38e 100644
--- a/YoggieEngine/src/PerfCounter.cpp
+++ b/YoggieEngine/src/PerfCounter.cpp
@@ -1,7 +1,6 @@
 #include <YoggieEngine.h>
 #include "PerfCounter.h"
-#include <imgui.h>
-#include <iostream>
+
 namespace YoggieEngine {
 	uint64_t EngineInstrumentation::GetPrecisionTime() {
 		using namespace std::chrono; // REMINDER: This is kinda ugly but safes line width
diff --git a/YoggieEngine/src/PerfCounter.h b/YoggieEngine/src/PerfCounter.h
index d5bcd3d..120f0bd 100644
--- a/YoggieEngine/src/PerfCounter.h
+++ b/YoggieEngine/src/PerfCounter.h
@@ -1,10 +1,5 @@
 #pragma once
 #include "YoggieEngine.h"
-
-#include <string>
-#include <vector>
-#include <chrono>
-
 namespace YoggieEngine {
 	struct EngineStatistics {
 		float frameTime;
diff --git a/YoggieEngine/src/Platform/Window.cpp b/YoggieEngine/src/Platform/Window.cpp
index 62e94bb..c35469e 100644
--- a/YoggieEngine/src/Platform/Window.cpp
+++ b/YoggieEngine/src/Platform/Window.cpp
@@ -38,7 +38,7 @@ namespace YoggieEngine {
 
 		glfwMakeContextCurrent(window);
 		if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress)) {
-			printf("Failed to initialize GLAD!\n");
+			spdlog::error("Failed to initialize GLAD!\n");
 			exit(-1);
 		}
 
diff --git a/YoggieEngine/src/Platform/Window.h b/YoggieEngine/src/Platform/Window.h
index 11a27c6..6ef2438 100644
--- a/YoggieEngine/src/Platform/Window.h
+++ b/YoggieEngine/src/Platform/Window.h
@@ -1,14 +1,8 @@
 #pragma once 
-
 #define GLFW_STATIC
 
-#include <glad/glad.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <iostream>
-
 #include <GLFW/glfw3.h>
-#include <spdlog/spdlog.h>
 
 #include "../EventSystem/Event.h"
 #include "../EventSystem/EventListener.h"
diff --git a/YoggieEngine/src/Scene/Components.h b/YoggieEngine/src/Scene/Components.h
index 29ed83a..37bbca5 100644
--- a/YoggieEngine/src/Scene/Components.h
+++ b/YoggieEngine/src/Scene/Components.h
@@ -1,8 +1,4 @@
 #pragma once
-
-#include <glm/glm.hpp>
-#include "../Graphics/Primitives/Shader.h"
-#include "../Graphics/Primitives/Mesh.h"
 namespace YoggieEngine {
 	struct IdentifierComponent {
 		std::string name;
diff --git a/YoggieEngine/src/Scene/Entity.h b/YoggieEngine/src/Scene/Entity.h
index 1165ace..ca9b785 100644
--- a/YoggieEngine/src/Scene/Entity.h
+++ b/YoggieEngine/src/Scene/Entity.h
@@ -1,6 +1,4 @@
 #pragma once
-
-#include <entt/entt.hpp>
 namespace YoggieEngine {
 	class Scene;
 	class Entity {
diff --git a/YoggieEngine/src/Scene/Scene.h b/YoggieEngine/src/Scene/Scene.h
index 2a9c740..a6b8b29 100644
--- a/YoggieEngine/src/Scene/Scene.h
+++ b/YoggieEngine/src/Scene/Scene.h
@@ -1,7 +1,4 @@
 #pragma once
-
-#include <string>
-#include <entt/entt.hpp>
 namespace YoggieEngine {
 	class Entity;
 	class Scene
diff --git a/YoggieEngine/src/Scene/TransformTree/Node.h b/YoggieEngine/src/Scene/TransformTree/Node.h
index 82322c6..cd55fb0 100644
--- a/YoggieEngine/src/Scene/TransformTree/Node.h
+++ b/YoggieEngine/src/Scene/TransformTree/Node.h
@@ -1,7 +1,4 @@
 #pragma once
-
-#include <string>
-#include <vector>
 namespace YoggieEngine {
 	class Node {
 	public:
diff --git a/YoggieEngine/src/Scene/TransformTree/SceneNodeTypes.h b/YoggieEngine/src/Scene/TransformTree/SceneNodeTypes.h
index acb770c..e8a4718 100644
--- a/YoggieEngine/src/Scene/TransformTree/SceneNodeTypes.h
+++ b/YoggieEngine/src/Scene/TransformTree/SceneNodeTypes.h
@@ -1,6 +1,4 @@
 #pragma once
-
-#include "../../Graphics/Primitives/Camera.h"
 #include "../../Graphics/Renderable.h"
 #include "Node.h"
 
diff --git a/YoggieEngine/src/Scripting/LuaScript.h b/YoggieEngine/src/Scripting/LuaScript.h
index ea6ac49..608e9c1 100644
--- a/YoggieEngine/src/Scripting/LuaScript.h
+++ b/YoggieEngine/src/Scripting/LuaScript.h
@@ -1,15 +1,4 @@
 #pragma once
-
-#include <string>
-
-extern "C"
-{
-	#include "lauxlib.h"
-	#include "lua.h"
-	#include "lualib.h"
-}
-
-
 #include "LuaScriptingManager.h"
 
 
diff --git a/YoggieEngine/src/Scripting/LuaScriptingManager.h b/YoggieEngine/src/Scripting/LuaScriptingManager.h
index 4842aa6..b3f2a7f 100644
--- a/YoggieEngine/src/Scripting/LuaScriptingManager.h
+++ b/YoggieEngine/src/Scripting/LuaScriptingManager.h
@@ -1,15 +1,4 @@
 #pragma once
-
-#include <vector>
-
-extern "C"
-{
-	#include "lauxlib.h"
-	#include "lua.h"
-	#include "lualib.h"
-}
-
-
 #include "LuaScript.h"
 
 /*
diff --git a/YoggieEngine/src/YoggieEngine.h b/YoggieEngine/src/YoggieEngine.h
index 4e1f5a2..fc3be8f 100644
--- a/YoggieEngine/src/YoggieEngine.h
+++ b/YoggieEngine/src/YoggieEngine.h
@@ -1,17 +1,42 @@
 #pragma once
-#include <glad/glad.h>
-#include "glm/glm.hpp"
 
+// Important STL 
+#include <string>
+#include <list>
+#include <iostream>
+#include <fstream>
+#include <vector>
+#include <stdlib.h>
+#include <memory>
+#include <chrono>
+
+// Important libraries
+#include "spdlog/spdlog.h"
+#include <glad/glad.h>
+#include <glm/glm.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
+#include <imgui.h>
+#include <entt/entt.hpp>
+
+extern "C"
+{
+	#include "lauxlib.h"
+	#include "lua.h"
+	#include "lualib.h"
+}
+
+
+// Main library stuff
 #include "Platform/Window.h"
 
+#include "Graphics/Primitives/Mesh.h"
 #include "Graphics/Primitives/Shader.h"
 #include "Graphics/Primitives/Texture.h"
 #include "Graphics/Primitives/Camera.h"
 #include "Graphics/Primitives/Material.h"
 #include "Graphics/Renderer.h"
 
-#include "spdlog/spdlog.h"
-
 #include "EventSystem/EventEmitter.h"
 #include "EventSystem/EventListener.h"