diff --git a/Aeon/Aeon.cpp b/Aeon/Aeon.cpp
index 9178c52..e15e328 100644
--- a/Aeon/Aeon.cpp
+++ b/Aeon/Aeon.cpp
@@ -1,9 +1,8 @@
-#include "Aeon/Aeon.hpp"
+#include "Aeon.hpp"
 
-#include <iostream>
-#include <thread>
+#include <Aeon/Includes.hpp>
 
-#include "Aeon/Rendering/ImGui.hpp"
+#include <Aeon/Rendering/ImGui.hpp>
 
 using Core::App;
 using Core::Display;
diff --git a/Aeon/Aeon.hpp b/Aeon/Aeon.hpp
index 4f51259..70664dd 100644
--- a/Aeon/Aeon.hpp
+++ b/Aeon/Aeon.hpp
@@ -1,13 +1,12 @@
 #ifndef AEON_AEON_H_
 #define AEON_AEON_H_
 
-#include <string>
-#include <vector>
+#include <Aeon/Includes.hpp>
 
-#include "Aeon/Core/Display.hpp"
-#include "Aeon/Core/Events.hpp"
-#include "Aeon/Core/GameLayer.hpp"
-#include "Aeon/Input/Input.hpp"
+#include <Aeon/Core/Display.hpp>
+#include <Aeon/Core/Events.hpp>
+#include <Aeon/Core/GameLayer.hpp>
+#include <Aeon/Input/Input.hpp>
 
 namespace Core 
 {
diff --git a/Aeon/Assert.hpp b/Aeon/Assert.hpp
index c22799c..5f27491 100644
--- a/Aeon/Assert.hpp
+++ b/Aeon/Assert.hpp
@@ -1,8 +1,7 @@
 #ifndef AEON_ASSERT_H_
 #define AEON_ASSERT_H_
 
-#include <assert.h>
-#include <iostream>
+#include <Aeon/Includes.hpp>
 
 #define AEON_ASSERT(x, m) \
     if (! (x)) { \
diff --git a/Aeon/Core/Display.cpp b/Aeon/Core/Display.cpp
index 4edd164..5264e67 100644
--- a/Aeon/Core/Display.cpp
+++ b/Aeon/Core/Display.cpp
@@ -1,10 +1,10 @@
-#include "Aeon/Core/Display.hpp"
+#include "Display.hpp"
 
-#include <iostream>
+#include <Aeon/Includes.hpp>
 
-#include "Aeon/Assert.hpp"
-#include "Aeon/Rendering/RenderMaster.hpp"
-#include "Aeon/Rendering/ImGui.hpp"
+#include <Aeon/Assert.hpp>
+#include <Aeon/Rendering/RenderMaster.hpp>
+#include <Aeon/Rendering/ImGui.hpp>
 
 using Core::Display;
 
diff --git a/Aeon/Core/Display.hpp b/Aeon/Core/Display.hpp
index a8b136c..f2183dd 100644
--- a/Aeon/Core/Display.hpp
+++ b/Aeon/Core/Display.hpp
@@ -1,17 +1,11 @@
 #ifndef AEON_CORE_DISPLAY_H_
 #define AEON_CORE_DISPLAY_H_
 
-#include <string>
+#include <Aeon/Includes.hpp>
 
-#include <SDL.h>
-extern "C" {
-#include <ThirdParty/glad.h>
-}
-
-#include "Aeon/Rendering/RenderMaster.hpp"
-
-#include "Aeon/Core/EngineConfig.hpp"
-#include "Aeon/Core/Events.hpp"
+#include <Aeon/Rendering/RenderMaster.hpp>
+#include <Aeon/Core/EngineConfig.hpp>
+#include <Aeon/Core/Events.hpp>
 
 using namespace Rendering;
 
diff --git a/Aeon/Core/Events.cpp b/Aeon/Core/Events.cpp
index 5c21abc..b556970 100644
--- a/Aeon/Core/Events.cpp
+++ b/Aeon/Core/Events.cpp
@@ -1,6 +1,6 @@
-#include "Aeon/Core/Events.hpp"
+#include "Events.hpp"
 
-#include "Aeon/Assert.hpp"
+#include <Aeon/Assert.hpp>
 
 using Core::GenericEvent;
 using Core::EventListener;
diff --git a/Aeon/Core/Events.hpp b/Aeon/Core/Events.hpp
index 37f6eb3..0101759 100644
--- a/Aeon/Core/Events.hpp
+++ b/Aeon/Core/Events.hpp
@@ -14,13 +14,10 @@
 	- Events are blocking for now
 */
 
-#include <string>
-#include <tuple>
-#include <vector>
-#include <map>
+#include <Aeon/Includes.hpp>
 
-#include "Aeon/Singleton.hpp"
-#include "Aeon/Input/InputMap.hpp"
+#include <Aeon/Singleton.hpp>
+#include <Aeon/Input/InputMap.hpp>
 
 namespace Core 
 {
diff --git a/Aeon/Core/GameLayer.hpp b/Aeon/Core/GameLayer.hpp
index b12f6c9..3c52811 100644
--- a/Aeon/Core/GameLayer.hpp
+++ b/Aeon/Core/GameLayer.hpp
@@ -1,7 +1,7 @@
 #ifndef AEON_CORE_GAMELAYER_H_
 #define AEON_CORE_GAMELAYER_H_
 
-#include "Aeon/Core/Events.hpp"
+#include <Aeon/Core/Events.hpp>
 
 namespace Core
 {
diff --git a/Aeon/Entity/Entity.hpp b/Aeon/Entity/Entity.hpp
index 4f2bf95..17a2c37 100644
--- a/Aeon/Entity/Entity.hpp
+++ b/Aeon/Entity/Entity.hpp
@@ -1,4 +1,6 @@
 
+#include <Aeon/Includes.hpp>
+
 namespace EC
 {
 
diff --git a/Aeon/Includes.hpp b/Aeon/Includes.hpp
new file mode 100644
index 0000000..f69b0ef
--- /dev/null
+++ b/Aeon/Includes.hpp
@@ -0,0 +1,23 @@
+#ifndef AEON_INCLUDES_H_
+#define AEON_INCLUDES_H_
+
+// shut up
+
+#include <SDL.h>
+extern "C" {
+#include <Aeon/ThirdParty/glad.h>
+}
+
+#include <assert.h>
+#include <iostream>
+#include <string>
+#include <vector>
+#include <thread>
+#include <algorithm>
+#include <iterator>
+#include <bitset>
+#include <iomanip>
+#include <tuple>
+#include <map>
+
+#endif
diff --git a/Aeon/Input/Input.cpp b/Aeon/Input/Input.cpp
index 1603914..2a7eed9 100644
--- a/Aeon/Input/Input.cpp
+++ b/Aeon/Input/Input.cpp
@@ -1,14 +1,10 @@
-#include "Aeon/Input/Input.hpp"
+#include "Input.hpp"
 
-#include <iostream>
-#include <algorithm>
-#include <iterator>
-#include <bitset>
-#include <iomanip>
+#include <Aeon/Includes.hpp>
 
-#include "Aeon/Core/Events.hpp"
-#include "Aeon/Input/InputMap.hpp"
-#include "Aeon/Rendering/ImGui.hpp"
+#include <Aeon/Core/Events.hpp>
+#include <Aeon/Input/InputMap.hpp>
+#include <Aeon/Rendering/ImGui.hpp>
 
 using Input::InputController;
 
diff --git a/Aeon/Input/Input.hpp b/Aeon/Input/Input.hpp
index 5cc53ef..fe6dec7 100644
--- a/Aeon/Input/Input.hpp
+++ b/Aeon/Input/Input.hpp
@@ -1,12 +1,10 @@
 #ifndef AEON_INPUT_INPUT_H_
 #define AEON_INPUT_INPUT_H_
 
-#include <vector>
+#include <Aeon/Includes.hpp>
 
-#include <SDL.h>
-
-#include "Aeon/Singleton.hpp"
-#include "Aeon/Core/Events.hpp"
+#include <Aeon/Singleton.hpp>
+#include <Aeon/Core/Events.hpp>
 
 namespace Input 
 {
diff --git a/Aeon/Input/InputMap.hpp b/Aeon/Input/InputMap.hpp
index c0d956e..1585ae0 100644
--- a/Aeon/Input/InputMap.hpp
+++ b/Aeon/Input/InputMap.hpp
@@ -1,7 +1,7 @@
 #ifndef AEON_INPUT_INPUTMAP_H_
 #define AEON_INPUT_INPUTMAP_H_
 
-#include <SDL.h>
+#include <Aeon/Includes.hpp>
 
 namespace Input
 {
diff --git a/Aeon/Maths/Maths.hpp b/Aeon/Maths/Maths.hpp
index b86f25d..fa3c60a 100644
--- a/Aeon/Maths/Maths.hpp
+++ b/Aeon/Maths/Maths.hpp
@@ -3,4 +3,6 @@
 
 #include <Aeon/ThirdParty/glm/glm.hpp>
 
+// Need hashing function for vectors and shit
+
 #endif
diff --git a/Aeon/Rendering/ImGui.hpp b/Aeon/Rendering/ImGui.hpp
index 3ba2de4..b715f31 100644
--- a/Aeon/Rendering/ImGui.hpp
+++ b/Aeon/Rendering/ImGui.hpp
@@ -1,12 +1,7 @@
 #ifndef AEON_RENDERING_IMGUI_H_
 #define AEON_RENDERING_IMGUI_H_
 
-#include <type_traits>
-
-#include <SDL.h>
-extern "C" {
-#include <ThirdParty/glad.h>
-}
+#include <Aeon/Includes.hpp>
 
 #include <Aeon/ThirdParty/ImGui/imgui.h>
 #include <Aeon/ThirdParty/ImGui/imgui_impl_sdl.h>
diff --git a/Aeon/Rendering/RenderMaster.cpp b/Aeon/Rendering/RenderMaster.cpp
index 23595e5..aa6da79 100644
--- a/Aeon/Rendering/RenderMaster.cpp
+++ b/Aeon/Rendering/RenderMaster.cpp
@@ -1,4 +1,4 @@
-#include "Aeon/Rendering/RenderMaster.hpp"
+#include "RenderMaster.hpp"
 
 using namespace Rendering;
 
diff --git a/Aeon/Rendering/RenderMaster.hpp b/Aeon/Rendering/RenderMaster.hpp
index 5322927..84108c3 100644
--- a/Aeon/Rendering/RenderMaster.hpp
+++ b/Aeon/Rendering/RenderMaster.hpp
@@ -1,7 +1,7 @@
 #ifndef AEON_RENDERING_RENDERMASTER_H_
 #define AEON_RENDERING_RENDERMASTER_H_
 
-#include "Aeon/Singleton.hpp"
+#include <Aeon/Singleton.hpp>
 
 class Renderable;