Fixed includes and standardized them

43 files changed, 146 insertions, 153 deletions

diff --git a/.dir-locals.el b/.dir-locals.el
index 7f49a89d..40c788b1 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,19 +1,14 @@
-((nil . ((company-clang-arguments . ("-I../include/YAGE/"
-				     "-I../../include/YAGE/"
-				     "-I../../../include/YAGE/"
-				     "-I/usr/include/"
-				     "-I/usr/include/SDL2/"
-                     "-I../googletest/googletest/include/")) 
-	 (company-c-headers-path-user . ("../include/YAGE/"
-					 "../../include/YAGE/"
-					 "../../../include/YAGE/"
-					 "/usr/include/"
-					 "/usr/include/SDL2/"
-                     "../googletest/googletest/include/"))
-	 (flycheck-clang-include-path . ("../include/YAGE/"
-					 "../../include/YAGE/"
-					 "../../../include/YAGE/"
-					 "/usr/include/"
-					 "/usr/include/SDL2/"
-                     "../googletest/googletest/include")))))
-
+((nil . ((eval . (progn
+                   (require 'projectile)
+                   (setq company-clang-arguments (delete-dups (append
+                                                               company-clang-arguments
+                                                               (list (concat "-I" (projectile-project-root) "include")))))
+                   (setq company-clang-arguments (delete-dups (append
+                                                               company-clang-arguments
+                                                               (list (concat "-I" (projectile-project-root) "googletest/googletest/include")))))
+                   (setq flycheck-clang-include-path (delete-dups (append
+                                                                   flycheck-clang-include-path
+                                                                   (list (concat (projectile-project-root) "include")))))
+                   (setq flycheck-clang-include-path (delete-dups (append
+                                                                   flycheck-clang-include-path
+                                                                   (list (concat (projectile-project-root) "googletest/googletest/include"))))))))))
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c0f48ae..5bc84149 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ set(YAGE_TEST_DIR ${PROJECT_SOURCE_DIR}/test)
 set(YAGE_LIBRARIES yage)
 
 # add include directory
-set(YAGE_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include/YAGE)
+set(YAGE_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
 
 # set binary directory
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
diff --git a/include/YAGE/Math/math.h b/include/YAGE/Math/math.h
index b587cf9f..b729dbe6 100644
--- a/include/YAGE/Math/math.h
+++ b/include/YAGE/Math/math.h
@@ -1,14 +1,14 @@
 /* ----------------------------------------------------------------------------
- * math.hpp
+ * math.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef YAGE_MATH_HPP
-#define YAGE_MATH_HPP
+#ifndef YAGE_MATH_H
+#define YAGE_MATH_H
 
-#include "matrix.hpp"
+#include "matrix.h"
 
 #endif
diff --git a/include/YAGE/Math/matrix.h b/include/YAGE/Math/matrix.h
index aa78954e..3992acfe 100644
--- a/include/YAGE/Math/matrix.h
+++ b/include/YAGE/Math/matrix.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * matrix.hpp
+ * matrix.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
@@ -9,8 +9,8 @@
 /** @file 
   */
 
-#ifndef YAGE_MATH_MATRIX_HPP
-#define YAGE_MATH_MATRIX_HPP
+#ifndef YAGE_MATH_MATRIX_H
+#define YAGE_MATH_MATRIX_H
 
 #include <algorithm>
 #include <exception>
diff --git a/include/YAGE/Physics/body.h b/include/YAGE/Physics/body.h
index c67d2b12..bd33a9ac 100644
--- a/include/YAGE/Physics/body.h
+++ b/include/YAGE/Physics/body.h
@@ -1,15 +1,15 @@
 /* ----------------------------------------------------------------------------
- * body.hpp
+ * body.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef YAGE_PHYSICS_BODY_HPP
-#define YAGE_PHYSICS_BODY_HPP
+#ifndef YAGE_PHYSICS_BODY_H
+#define YAGE_PHYSICS_BODY_H
 
-#include "Math/matrix.hpp"
+#include <YAGE/Math/matrix.h>
 
 namespace yage
 {
diff --git a/include/YAGE/Physics/collider.h b/include/YAGE/Physics/collider.h
index 7b4ff060..2fd2ff89 100644
--- a/include/YAGE/Physics/collider.h
+++ b/include/YAGE/Physics/collider.h
@@ -1,13 +1,13 @@
 /* ----------------------------------------------------------------------------
- * collider.hpp
+ * collider.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef YAGE_PHYSICS_COLLIDER_HPP
-#define YAGE_PHYSICS_COLLIDER_HPP
+#ifndef YAGE_PHYSICS_COLLIDER_H
+#define YAGE_PHYSICS_COLLIDER_H
 
 #include <glm/glm.hpp>
 
diff --git a/include/YAGE/Physics/collisionbody.h b/include/YAGE/Physics/collisionbody.h
index b7403e81..715c4a54 100644
--- a/include/YAGE/Physics/collisionbody.h
+++ b/include/YAGE/Physics/collisionbody.h
@@ -1,15 +1,15 @@
 /* ----------------------------------------------------------------------------
- * collisionbody.hpp
+ * collisionbody.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef YAGE_COLLISION_BODY_HPP
-#define YAGE_COLLISION_BODY_HPP
+#ifndef YAGE_COLLISION_BODY_H
+#define YAGE_COLLISION_BODY_H
 
-#include "Physics/body.hpp"
+#include "body.h"
 
 namespace yage
 {
diff --git a/include/YAGE/Physics/particlebody.h b/include/YAGE/Physics/particlebody.h
index 15f1ae5a..a0b9bdad 100644
--- a/include/YAGE/Physics/particlebody.h
+++ b/include/YAGE/Physics/particlebody.h
@@ -1,16 +1,17 @@
 /* ----------------------------------------------------------------------------
- * particlebody.hpp
+ * particlebody.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef YAGE_PHYSICS_PARTICLE_BODY_HPP
-#define YAGE_PHYSICS_PARTICLE_BODY_HPP
+#ifndef YAGE_PHYSICS_PARTICLE_BODY_H
+#define YAGE_PHYSICS_PARTICLE_BODY_H
 
-#include "Math/matrix.hpp"
-#include "Physics/body.hpp"
+#include "body.h"
+
+#include <YAGE/Math/matrix.h>
 
 namespace yage
 {
diff --git a/include/YAGE/Physics/physics.h b/include/YAGE/Physics/physics.h
index 8146672a..900f4b6a 100644
--- a/include/YAGE/Physics/physics.h
+++ b/include/YAGE/Physics/physics.h
@@ -1,19 +1,19 @@
 /* ----------------------------------------------------------------------------
- * physics.hpp
+ * physics.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef YAGE_PHYSICS_HPP
-#define YAGE_PHYSICS_HPP
+#ifndef YAGE_PHYSICS_H
+#define YAGE_PHYSICS_H
 
-#include "body.hpp"
-#include "collider.hpp"
-#include "collisionbody.hpp"
-#include "particlebody.hpp"
-#include "rectanglecollider.hpp"
-#include "rigidbody.hpp"
+#include "body.h"
+#include "collider.h"
+#include "collisionbody.h"
+#include "particlebody.h"
+#include "rectanglecollider.h"
+#include "rigidbody.h"
 
 #endif
diff --git a/include/YAGE/Physics/rectanglecollider.h b/include/YAGE/Physics/rectanglecollider.h
index f6f6c481..c009f665 100644
--- a/include/YAGE/Physics/rectanglecollider.h
+++ b/include/YAGE/Physics/rectanglecollider.h
@@ -1,15 +1,15 @@
 /* ----------------------------------------------------------------------------
- * rectanglecollider.hpp
+ * rectanglecollider.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef YAGE_RECTANGLE_COLLIDER_HPP
-#define YAGE_RECTANGLE_COLLIDER_HPP
+#ifndef YAGE_RECTANGLE_COLLIDER_H
+#define YAGE_RECTANGLE_COLLIDER_H
 
-#include "Physics/collider.hpp"
+#include "collider.h"
 
 #include <glm/glm.hpp>
 
diff --git a/include/YAGE/Physics/rigidbody.h b/include/YAGE/Physics/rigidbody.h
index 48ca6761..67ccb4ca 100644
--- a/include/YAGE/Physics/rigidbody.h
+++ b/include/YAGE/Physics/rigidbody.h
@@ -1,17 +1,17 @@
 /* ----------------------------------------------------------------------------
- * rigidbody.hpp
+ * rigidbody.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef YAGE_RIGID_BODY_HPP
-#define YAGE_RIGID_BODY_HPP
+#ifndef YAGE_RIGID_BODY_H
+#define YAGE_RIGID_BODY_H
 
-#include <glm/glm.hpp>
+#include "particlebody.h"
 
-#include "particlebody.hpp"
+#include <glm/glm.hpp>
 
 namespace yage
 {
diff --git a/include/YAGE/camera2d.h b/include/YAGE/camera2d.h
index ecf819b6..a50544a4 100644
--- a/include/YAGE/camera2d.h
+++ b/include/YAGE/camera2d.h
@@ -1,15 +1,15 @@
 /* ----------------------------------------------------------------------------
- * camera2d.hpp
+ * camera2d.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
  * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
-#ifndef CAMERA_2D_HPP
-#define CAMERA_2D_HPP
+#ifndef CAMERA_2D_H
+#define CAMERA_2D_H
 
-#include "glslprogram.hpp"
+#include "glslprogram.h"
 
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
diff --git a/include/YAGE/glslprogram.h b/include/YAGE/glslprogram.h
index 154e2e57..fbe5ac5c 100644
--- a/include/YAGE/glslprogram.h
+++ b/include/YAGE/glslprogram.h
@@ -1,13 +1,13 @@
 /* ----------------------------------------------------------------------------
- * glslprogram.hpp
+ * glslprogram.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef GLSL_PROGRAM_HPP
-#define GLSL_PROGRAM_HPP
+#ifndef GLSL_PROGRAM_H
+#define GLSL_PROGRAM_H
 
 #include <GL/glew.h>
 
diff --git a/include/YAGE/imageloader.h b/include/YAGE/imageloader.h
index 770307d1..8d5c5cd1 100644
--- a/include/YAGE/imageloader.h
+++ b/include/YAGE/imageloader.h
@@ -1,15 +1,15 @@
 /* ----------------------------------------------------------------------------
- * imageloader.hpp
+ * imageloader.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef IMAGE_LOADER_HPP
-#define IMAGE_LOADER_HPP
+#ifndef IMAGE_LOADER_H
+#define IMAGE_LOADER_H
 
-#include "texture.hpp"
+#include "texture.h"
 
 #include <string>
 
diff --git a/include/YAGE/inputmanager.h b/include/YAGE/inputmanager.h
index 61c5ce53..84728fff 100644
--- a/include/YAGE/inputmanager.h
+++ b/include/YAGE/inputmanager.h
@@ -1,13 +1,13 @@
 /* ----------------------------------------------------------------------------
- * inputmanager.hpp
+ * inputmanager.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef INPUT_MANAGER_HPP
-#define INPUT_MANAGER_HPP
+#ifndef INPUT_MANAGER_H
+#define INPUT_MANAGER_H
 
 #include <unordered_map>
 
diff --git a/include/YAGE/iomanager.h b/include/YAGE/iomanager.h
index 4f30e51c..95abd652 100644
--- a/include/YAGE/iomanager.h
+++ b/include/YAGE/iomanager.h
@@ -1,13 +1,13 @@
 /* ----------------------------------------------------------------------------
- * iomanager.hpp
+ * iomanager.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef IO_MANAGER_HPP
-#define IO_MANAGER_HPP
+#ifndef IO_MANAGER_H
+#define IO_MANAGER_H
 
 #include <string>
 #include <vector>
diff --git a/include/YAGE/picopng.h b/include/YAGE/picopng.h
index c0a42c28..095bf68a 100644
--- a/include/YAGE/picopng.h
+++ b/include/YAGE/picopng.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * picopng.hpp
+ * picopng.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
diff --git a/include/YAGE/resourcemanager.h b/include/YAGE/resourcemanager.h
index ebd30476..3c5081c4 100644
--- a/include/YAGE/resourcemanager.h
+++ b/include/YAGE/resourcemanager.h
@@ -1,16 +1,16 @@
 /* ----------------------------------------------------------------------------
- * resourcemanager.hpp
+ * resourcemanager.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef RESOURCE_MANAGER_HPP
-#define RESOURCE_MANAGER_HPP
+#ifndef RESOURCE_MANAGER_H
+#define RESOURCE_MANAGER_H
 
-#include "texture.hpp"
-#include "texturecache.hpp"
+#include "texture.h"
+#include "texturecache.h"
 
 #include <string>
 
diff --git a/include/YAGE/sprite.h b/include/YAGE/sprite.h
index 28e13437..0f5a0b8a 100644
--- a/include/YAGE/sprite.h
+++ b/include/YAGE/sprite.h
@@ -1,15 +1,15 @@
 /* ----------------------------------------------------------------------------
- * sprite.hpp
+ * sprite.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef SPRITE_HPP
-#define SPRITE_HPP
+#ifndef SPRITE_H
+#define SPRITE_H
 
-#include "texture.hpp"
+#include "texture.h"
 
 #include <GL/glew.h>
 
diff --git a/include/YAGE/spritebatch.h b/include/YAGE/spritebatch.h
index add58b43..7235bd25 100644
--- a/include/YAGE/spritebatch.h
+++ b/include/YAGE/spritebatch.h
@@ -1,15 +1,15 @@
 /* ----------------------------------------------------------------------------
- * spritebatch.hpp
+ * spritebatch.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef YAGE_SPRITE_BATCH_HPP
-#define YAGE_SPRITE_BATCH_HPP
+#ifndef YAGE_SPRITE_BATCH_H
+#define YAGE_SPRITE_BATCH_H
 
-#include "vertex.hpp"
+#include "vertex.h"
 
 #include <GL/glew.h>
 #include <glm/glm.hpp>
diff --git a/include/YAGE/texture.h b/include/YAGE/texture.h
index d2cc3bdd..d1fdcbf2 100644
--- a/include/YAGE/texture.h
+++ b/include/YAGE/texture.h
@@ -1,13 +1,13 @@
 /* ----------------------------------------------------------------------------
- * texture.hpp
+ * texture.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef GL_TEXTURE_HPP
-#define GL_TEXTURE_HPP
+#ifndef GL_TEXTURE_H
+#define GL_TEXTURE_H
 
 #include <GL/glew.h>
 
diff --git a/include/YAGE/texturecache.h b/include/YAGE/texturecache.h
index 1542ad79..414c9ec3 100644
--- a/include/YAGE/texturecache.h
+++ b/include/YAGE/texturecache.h
@@ -1,15 +1,15 @@
 /* ----------------------------------------------------------------------------
- * texturecache.hpp
+ * texturecache.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef TEXTURE_CACHE_HPP
-#define TEXTURE_CACHE_HPP
+#ifndef TEXTURE_CACHE_H
+#define TEXTURE_CACHE_H
 
-#include "texture.hpp"
+#include "texture.h"
 
 #include <unordered_map>
 
diff --git a/include/YAGE/vertex.h b/include/YAGE/vertex.h
index ef379888..15b46ed9 100644
--- a/include/YAGE/vertex.h
+++ b/include/YAGE/vertex.h
@@ -1,13 +1,13 @@
 /* ----------------------------------------------------------------------------
- * vertex.hpp
+ * vertex.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef VERTEX_HPP
-#define VERTEX_HPP
+#ifndef VERTEX_H
+#define VERTEX_H
 
 #include <GL/glew.h>
 
diff --git a/include/YAGE/window.h b/include/YAGE/window.h
index 51b217f8..8639e075 100644
--- a/include/YAGE/window.h
+++ b/include/YAGE/window.h
@@ -1,13 +1,13 @@
 /* ----------------------------------------------------------------------------
- * window.hpp
+ * window.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
  */
 
-#ifndef WINDOW_HPP
-#define WINDOW_HPP
+#ifndef WINDOW_H
+#define WINDOW_H
 
 #include <SDL2/SDL.h>
 
diff --git a/include/YAGE/yage.h b/include/YAGE/yage.h
index 13d6d560..6157e6bf 100644
--- a/include/YAGE/yage.h
+++ b/include/YAGE/yage.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * yage.hpp
+ * yage.h
  *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
@@ -11,20 +11,20 @@
   * This does not include
   */
 
-#ifndef YAGE_HPP
-#define YAGE_HPP
-
-#include "camera2d.hpp"
-#include "glslprogram.hpp"
-#include "imageloader.hpp"
-#include "inputmanager.hpp"
-#include "iomanager.hpp"
-#include "picopng.hpp"
-#include "resourcemanager.hpp"
-#include "spritebatch.hpp"
-#include "texture.hpp"
-#include "vertex.hpp"
-#include "window.hpp"
+#ifndef YAGE_YAGE_H
+#define YAGE_YAGE_H
+
+#include "camera2d.h"
+#include "glslprogram.h"
+#include "imageloader.h"
+#include "inputmanager.h"
+#include "iomanager.h"
+#include "picopng.h"
+#include "resourcemanager.h"
+#include "spritebatch.h"
+#include "texture.h"
+#include "vertex.h"
+#include "window.h"
 
 #include <SDL2/SDL.h>
 
diff --git a/src/body.cpp b/src/body.cpp
index e38cd641..8d38e70a 100644
--- a/src/body.cpp
+++ b/src/body.cpp
@@ -6,9 +6,9 @@
  * ----------------------------------------------------------------------------
  */
 
-#include <utility>
+#include <YAGE/Physics/body.h>
 
-#include "Physics/body.hpp"
+#include <utility>
 
 namespace yage
 {
diff --git a/src/camera2d.cpp b/src/camera2d.cpp
index 7f2dd2d7..292f998a 100644
--- a/src/camera2d.cpp
+++ b/src/camera2d.cpp
@@ -6,7 +6,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#include "camera2d.hpp"
+#include <YAGE/camera2d.h>
 
 #include <GL/glew.h>
 
diff --git a/src/glslprogram.cpp b/src/glslprogram.cpp
index d148ea8b..11a3191e 100644
--- a/src/glslprogram.cpp
+++ b/src/glslprogram.cpp
@@ -6,7 +6,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#include "glslprogram.hpp"
+#include <YAGE/glslprogram.h>
 
 #include <fstream>
 #include <stdexcept>
diff --git a/src/imageloader.cpp b/src/imageloader.cpp
index a833f754..812110d8 100644
--- a/src/imageloader.cpp
+++ b/src/imageloader.cpp
@@ -6,9 +6,9 @@
  * ----------------------------------------------------------------------------
  */
 
-#include "imageloader.hpp"
-#include "iomanager.hpp"
-#include "picopng.hpp"
+#include <YAGE/imageloader.h>
+#include <YAGE/iomanager.h>
+#include <YAGE/picopng.h>
 
 #include <stdexcept>
 
diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp
index 4e1abdf2..d429abd7 100644
--- a/src/inputmanager.cpp
+++ b/src/inputmanager.cpp
@@ -6,7 +6,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#include "inputmanager.hpp"
+#include <YAGE/inputmanager.h>
 
 namespace yage
 {
diff --git a/src/iomanager.cpp b/src/iomanager.cpp
index 7ecd6795..93ab41c9 100644
--- a/src/iomanager.cpp
+++ b/src/iomanager.cpp
@@ -6,7 +6,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#include "iomanager.hpp"
+#include <YAGE/iomanager.h>
 
 #include <fstream>
 #include <stdexcept>
diff --git a/src/particlebody.cpp b/src/particlebody.cpp
index 216f2db9..bdb81eac 100644
--- a/src/particlebody.cpp
+++ b/src/particlebody.cpp
@@ -6,7 +6,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#include "Physics/particlebody.hpp"
+#include <YAGE/Physics/particlebody.h>
 
 #include <cmath>
 #include <iostream>
diff --git a/src/rectanglecollider.cpp b/src/rectanglecollider.cpp
index 71913817..64887278 100644
--- a/src/rectanglecollider.cpp
+++ b/src/rectanglecollider.cpp
@@ -6,7 +6,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#include "Physics/rectanglecollider.hpp"
+#include <YAGE/Physics/rectanglecollider.h>
 
 namespace yage
 {
diff --git a/src/resourcemanager.cpp b/src/resourcemanager.cpp
index a7c07207..473ea37e 100644
--- a/src/resourcemanager.cpp
+++ b/src/resourcemanager.cpp
@@ -6,7 +6,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#include "resourcemanager.hpp"
+#include <YAGE/resourcemanager.h>
 
 namespace yage
 {
diff --git a/src/rigidbody.cpp b/src/rigidbody.cpp
index 2b57beaf..dcab5f2f 100644
--- a/src/rigidbody.cpp
+++ b/src/rigidbody.cpp
@@ -6,7 +6,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#include "Physics/rigidbody.hpp"
+#include <YAGE/Physics/rigidbody.h>
 
 namespace yage
 {
diff --git a/src/sprite.cpp b/src/sprite.cpp
index b4584561..68e08e5d 100644
--- a/src/sprite.cpp
+++ b/src/sprite.cpp
@@ -6,9 +6,9 @@
  * ----------------------------------------------------------------------------
  */
 
-#include "sprite.hpp"
-#include "resourcemanager.hpp"
-#include "vertex.hpp"
+#include <YAGE/sprite.h>
+#include <YAGE/resourcemanager.h>
+#include <YAGE/vertex.h>
 
 #include <cstddef>
 
diff --git a/src/spritebatch.cpp b/src/spritebatch.cpp
index 8cfc8bc2..ac98130b 100644
--- a/src/spritebatch.cpp
+++ b/src/spritebatch.cpp
@@ -6,7 +6,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#include "spritebatch.hpp"
+#include <YAGE/spritebatch.h>
 
 #include <algorithm>
 #include <stdexcept>
diff --git a/src/texturecache.cpp b/src/texturecache.cpp
index 4e6c9bcf..fda5fcd9 100644
--- a/src/texturecache.cpp
+++ b/src/texturecache.cpp
@@ -6,8 +6,8 @@
  * ----------------------------------------------------------------------------
  */
 
-#include "texturecache.hpp"
-#include "imageloader.hpp"
+#include <YAGE/texturecache.h>
+#include <YAGE/imageloader.h>
 
 namespace yage
 {
diff --git a/src/window.cpp b/src/window.cpp
index e5a6582b..143b1d5d 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -6,8 +6,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#include "window.hpp"
-
+#include <YAGE/window.h>
 #include <GL/glew.h>
 
 #include <iostream>
diff --git a/test/matrixtest.cpp b/test/matrixtest.cpp
index c969f39f..b570f6d4 100644
--- a/test/matrixtest.cpp
+++ b/test/matrixtest.cpp
@@ -6,15 +6,14 @@
  * ----------------------------------------------------------------------------
  */
 
+#include <YAGE/Math/math.h>
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <cstdlib>
 #include <ctime>
 #include <vector>
 
-#include "Math/math.hpp"
-
-#include "gtest/gtest.h"
-
 template <int Size>
 int matrixAddition(int num1, int num2)
 {
diff --git a/test/particlebodytest.cpp b/test/particlebodytest.cpp
index 65c3885c..b359cb73 100644
--- a/test/particlebodytest.cpp
+++ b/test/particlebodytest.cpp
@@ -6,12 +6,12 @@
  * ----------------------------------------------------------------------------
  */
 
+#include <YAGE/Physics/particlebody.h>
+#include <gtest/gtest.h>
+
 #include <cmath>
 #include <cstdlib>
 
-#include "Physics/particlebody.hpp"
-#include "gtest/gtest.h"
-
 double gravityAcceleration(int iterations)
 {
     yage::ParticleBody body;
diff --git a/test/windowtest.cpp b/test/windowtest.cpp
index 22760c21..e6739720 100644
--- a/test/windowtest.cpp
+++ b/test/windowtest.cpp
@@ -6,9 +6,8 @@
  * ----------------------------------------------------------------------------
  */
 
-#include "gtest/gtest.h"
-
-#include "yage.hpp"
+#include <YAGE/yage.h>
+#include <gtest/gtest.h>
 
 TEST(Window, Open)
 {
diff --git a/test/yagetest.cpp b/test/yagetest.cpp
index 39ef5072..8d590b4a 100644
--- a/test/yagetest.cpp
+++ b/test/yagetest.cpp
@@ -6,9 +6,9 @@
  * ----------------------------------------------------------------------------
  */
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
-#include "yage.hpp"
+#include <YAGE/yage.h>
 
 TEST(YAGE, InitQuit)
 {