diff --git a/Escape-the-Dawn/Camera.h b/Escape-the-Dawn/Camera.h
index bc2cb83..973ff5d 100644
--- a/Escape-the-Dawn/Camera.h
+++ b/Escape-the-Dawn/Camera.h
@@ -1,13 +1,7 @@
 #ifndef Camera_h__
 #define Camera_h__
 
-#define GLM_FORCE_RADIANS
-#include <glm/glm.hpp>
-#include <glm/gtc/constants.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtx/rotate_vector.hpp>
-#include <glm/gtc/quaternion.hpp>
-#include <glm/gtx/quaternion.hpp>
+#include "GLM.h"
 
 class Camera
 {
@@ -55,7 +49,6 @@ private:
 	float m_AspectRatio;
 	float m_NearClip;
 	float m_FarClip;
-	
 
 	glm::vec3 m_Position;
 	glm::quat m_Orientation;
diff --git a/Escape-the-Dawn/Component.h b/Escape-the-Dawn/Component.h
index 21d59f6..adaa4f7 100644
--- a/Escape-the-Dawn/Component.h
+++ b/Escape-the-Dawn/Component.h
@@ -1,6 +1,8 @@
 #ifndef Component_h__
 #define Component_h__
 
+#include "GLM.h"
+
 #include "Factory.h"
 #include "Entity.h"
 
diff --git a/Escape-the-Dawn/Components/Bounds.h b/Escape-the-Dawn/Components/Bounds.h
index 3845485..f05c6d8 100644
--- a/Escape-the-Dawn/Components/Bounds.h
+++ b/Escape-the-Dawn/Components/Bounds.h
@@ -2,7 +2,6 @@
 #define Components_Bounds_h__
 
 #include "Component.h"
-#include <glm/common.hpp>
 
 namespace Components
 {
diff --git a/Escape-the-Dawn/Components/Transform.h b/Escape-the-Dawn/Components/Transform.h
index 5d20a67..8d0073f 100644
--- a/Escape-the-Dawn/Components/Transform.h
+++ b/Escape-the-Dawn/Components/Transform.h
@@ -2,7 +2,6 @@
 #define Components_Transform_h__
 
 #include "Component.h"
-#include <glm/gtc/quaternion.hpp>
 
 namespace Components
 {
diff --git a/Escape-the-Dawn/Escape-the-Dawn.vcxproj b/Escape-the-Dawn/Escape-the-Dawn.vcxproj
index d8c44c3..0b8fcfa 100644
--- a/Escape-the-Dawn/Escape-the-Dawn.vcxproj
+++ b/Escape-the-Dawn/Escape-the-Dawn.vcxproj
@@ -144,6 +144,7 @@
     <ClInclude Include="Frame.h" />
     <ClInclude Include="GameFrame.h" />
     <ClInclude Include="GameWorld.h" />
+    <ClInclude Include="GLM.h" />
     <ClInclude Include="GUIManager.h" />
     <ClInclude Include="logging.h" />
     <ClInclude Include="glerror.h" />
diff --git a/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters b/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
index 06f96a7..e19e833 100644
--- a/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
+++ b/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
@@ -154,6 +154,7 @@
     <ClInclude Include="Systems\TransformSystem.h">
       <Filter>Systems</Filter>
     </ClInclude>
+    <ClInclude Include="GLM.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Shaders\Fragment.glsl">
diff --git a/Escape-the-Dawn/GLM.h b/Escape-the-Dawn/GLM.h
new file mode 100644
index 0000000..db5bcc1
--- /dev/null
+++ b/Escape-the-Dawn/GLM.h
@@ -0,0 +1,9 @@
+#define GLM_FORCE_RADIANS
+#include <glm/glm.hpp>
+#include <glm/common.hpp>
+#include <glm/gtc/constants.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtx/rotate_vector.hpp>
+#include <glm/gtc/quaternion.hpp>
+#include <glm/gtx/quaternion.hpp>
+#include <glm/gtc/type_ptr.hpp>
\ No newline at end of file
diff --git a/Escape-the-Dawn/Model.h b/Escape-the-Dawn/Model.h
index 716d1c2..2888f95 100644
--- a/Escape-the-Dawn/Model.h
+++ b/Escape-the-Dawn/Model.h
@@ -9,10 +9,7 @@
 #include <memory>
 
 #include "OpenGL.h"
-#include <glm/glm.hpp>
-#include <glm/gtc/constants.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/type_ptr.hpp>
+#include "GLM.h"
 
 #include <cstdlib>
 #include <stack>
diff --git a/Escape-the-Dawn/OpenGL.h b/Escape-the-Dawn/OpenGL.h
index dec332d..2e34a34 100644
--- a/Escape-the-Dawn/OpenGL.h
+++ b/Escape-the-Dawn/OpenGL.h
@@ -1,5 +1,4 @@
 #include <GL/glew.h>
 #define GLFW_INCLUDE_GLU
 #include <GLFW/glfw3.h>
-#include <glext.h>
-#define GLM_FORCE_RADIANS
\ No newline at end of file
+#include <glext.h>
\ No newline at end of file
diff --git a/Escape-the-Dawn/Renderer.h b/Escape-the-Dawn/Renderer.h
index 5c35b4f..777643c 100644
--- a/Escape-the-Dawn/Renderer.h
+++ b/Escape-the-Dawn/Renderer.h
@@ -8,12 +8,7 @@
 #include <vector>
 
 #include "OpenGL.h"
-#include <glm/glm.hpp>
-#include <glm/gtc/constants.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/type_ptr.hpp>
-#include <glm/gtc/quaternion.hpp>
-#include <glm/gtx/quaternion.hpp>
+#include "GLM.h"
 
 #include "glerror.h"
 #include "Camera.h"
diff --git a/Escape-the-Dawn/Systems/SoundSystem.h b/Escape-the-Dawn/Systems/SoundSystem.h
index f8b97eb..303b5c5 100644
--- a/Escape-the-Dawn/Systems/SoundSystem.h
+++ b/Escape-the-Dawn/Systems/SoundSystem.h
@@ -7,7 +7,6 @@
 #include <AL/al.h>
 #include <AL/alc.h>
 #include <vector>
-#include <glm/gtx/quaternion.hpp>
 
 namespace Systems
 {