diff --git a/src/body/Body.cpp b/src/body/Body.cpp
index 94a62f60..297afa7e 100644
--- a/src/body/Body.cpp
+++ b/src/body/Body.cpp
@@ -25,7 +25,7 @@
 
 // Libraries
 #include "Body.h"
-#include "../collision/shapes/CollisionShape.h"
+#include "collision/shapes/CollisionShape.h"
 
 // We want to use the ReactPhysics3D namespace
 using namespace reactphysics3d;
diff --git a/src/body/Body.h b/src/body/Body.h
index 4249569d..9cddfc27 100644
--- a/src/body/Body.h
+++ b/src/body/Body.h
@@ -29,7 +29,7 @@
 // Libraries
 #include <stdexcept>
 #include <cassert>
-#include "../configuration.h"
+#include "configuration.h"
 
 /// Namespace reactphysics3d
 namespace reactphysics3d {
diff --git a/src/body/CollisionBody.cpp b/src/body/CollisionBody.cpp
index 51b87e6f..9ce0dcdb 100644
--- a/src/body/CollisionBody.cpp
+++ b/src/body/CollisionBody.cpp
@@ -25,8 +25,8 @@
 
  // Libraries
 #include "CollisionBody.h"
-#include "../engine/CollisionWorld.h"
-#include "../engine/ContactManifold.h"
+#include "engine/CollisionWorld.h"
+#include "engine/ContactManifold.h"
 
 // We want to use the ReactPhysics3D namespace
 using namespace reactphysics3d;
diff --git a/src/body/CollisionBody.h b/src/body/CollisionBody.h
index b66bf0e7..e2f542b9 100644
--- a/src/body/CollisionBody.h
+++ b/src/body/CollisionBody.h
@@ -30,12 +30,12 @@
 #include <stdexcept>
 #include <cassert>
 #include "Body.h"
-#include "../mathematics/Transform.h"
-#include "../collision/shapes/AABB.h"
-#include "../collision/shapes/CollisionShape.h"
-#include "../collision/RaycastInfo.h"
-#include "../memory/MemoryAllocator.h"
-#include "../configuration.h"
+#include "mathematics/Transform.h"
+#include "collision/shapes/AABB.h"
+#include "collision/shapes/CollisionShape.h"
+#include "collision/RaycastInfo.h"
+#include "memory/MemoryAllocator.h"
+#include "configuration.h"
 
 /// Namespace reactphysics3d
 namespace reactphysics3d {
diff --git a/src/body/RigidBody.cpp b/src/body/RigidBody.cpp
index 9c02030d..21ae595c 100644
--- a/src/body/RigidBody.cpp
+++ b/src/body/RigidBody.cpp
@@ -26,8 +26,8 @@
 // Libraries
 #include "RigidBody.h"
 #include "constraint/Joint.h"
-#include "../collision/shapes/CollisionShape.h"
-#include "../engine/DynamicsWorld.h"
+#include "collision/shapes/CollisionShape.h"
+#include "engine/DynamicsWorld.h"
 
 // We want to use the ReactPhysics3D namespace
 using namespace reactphysics3d;
diff --git a/src/body/RigidBody.h b/src/body/RigidBody.h
index 6a8191ee..6375f8f6 100644
--- a/src/body/RigidBody.h
+++ b/src/body/RigidBody.h
@@ -29,9 +29,9 @@
 // Libraries
 #include <cassert>
 #include "CollisionBody.h"
-#include "../engine/Material.h"
-#include "../mathematics/mathematics.h"
-#include "../memory/MemoryAllocator.h"
+#include "engine/Material.h"
+#include "mathematics/mathematics.h"
+#include "memory/MemoryAllocator.h"
 
 /// Namespace reactphysics3d
 namespace reactphysics3d {
diff --git a/src/collision/BroadPhasePair.h b/src/collision/BroadPhasePair.h
index 3b7e7e6f..493332b5 100644
--- a/src/collision/BroadPhasePair.h
+++ b/src/collision/BroadPhasePair.h
@@ -27,7 +27,7 @@
 #define REACTPHYSICS3D_BROAD_PHASE_PAIR_H
 
 // Libraries
-#include "../body/CollisionBody.h"
+#include "body/CollisionBody.h"
 
 /// ReactPhysics3D namespace
 namespace reactphysics3d {
diff --git a/src/collision/CollisionDetection.cpp b/src/collision/CollisionDetection.cpp
index bd03fb5f..b2f10fa9 100644
--- a/src/collision/CollisionDetection.cpp
+++ b/src/collision/CollisionDetection.cpp
@@ -25,11 +25,11 @@
 
 // Libraries
 #include "CollisionDetection.h"
-#include "../engine/CollisionWorld.h"
-#include "../body/Body.h"
-#include "../collision/shapes/BoxShape.h"
-#include "../body/RigidBody.h"
-#include "../configuration.h"
+#include "engine/CollisionWorld.h"
+#include "body/Body.h"
+#include "collision/shapes/BoxShape.h"
+#include "body/RigidBody.h"
+#include "configuration.h"
 #include <cassert>
 #include <complex>
 #include <set>
diff --git a/src/collision/CollisionDetection.h b/src/collision/CollisionDetection.h
index 533484db..00ec5b5a 100644
--- a/src/collision/CollisionDetection.h
+++ b/src/collision/CollisionDetection.h
@@ -27,13 +27,13 @@
 #define REACTPHYSICS3D_COLLISION_DETECTION_H
 
 // Libraries
-#include "../body/CollisionBody.h"
+#include "body/CollisionBody.h"
 #include "broadphase/BroadPhaseAlgorithm.h"
-#include "../engine/OverlappingPair.h"
+#include "engine/OverlappingPair.h"
 #include "narrowphase/GJK/GJKAlgorithm.h"
 #include "narrowphase/SphereVsSphereAlgorithm.h"
-#include "../memory/MemoryAllocator.h"
-#include "../constraint/ContactPoint.h"
+#include "memory/MemoryAllocator.h"
+#include "constraint/ContactPoint.h"
 #include <vector>
 #include <map>
 #include <set>
diff --git a/src/collision/RaycastInfo.h b/src/collision/RaycastInfo.h
index 34443697..ee2722f9 100644
--- a/src/collision/RaycastInfo.h
+++ b/src/collision/RaycastInfo.h
@@ -27,7 +27,7 @@
 #define REACTPHYSICS3D_RAYCAST_INFO_H
 
 // Libraries
-#include "../mathematics/Vector3.h"
+#include "mathematics/Vector3.h"
 
 /// ReactPhysics3D namespace
 namespace reactphysics3d {
diff --git a/src/collision/broadphase/BroadPhaseAlgorithm.cpp b/src/collision/broadphase/BroadPhaseAlgorithm.cpp
index 4491c068..d2722f4d 100644
--- a/src/collision/broadphase/BroadPhaseAlgorithm.cpp
+++ b/src/collision/broadphase/BroadPhaseAlgorithm.cpp
@@ -25,8 +25,8 @@
 
 // Libraries
 #include "BroadPhaseAlgorithm.h"
-#include "../CollisionDetection.h"
-#include "../../engine/Profiler.h"
+#include "collision/CollisionDetection.h"
+#include "engine/Profiler.h"
 
 // We want to use the ReactPhysics3D namespace
 using namespace reactphysics3d;
diff --git a/src/collision/broadphase/BroadPhaseAlgorithm.h b/src/collision/broadphase/BroadPhaseAlgorithm.h
index 75830a91..31bfffea 100644
--- a/src/collision/broadphase/BroadPhaseAlgorithm.h
+++ b/src/collision/broadphase/BroadPhaseAlgorithm.h
@@ -28,7 +28,7 @@
 
 // Libraries
 #include <vector>
-#include "../../body/CollisionBody.h"
+#include "body/CollisionBody.h"
 #include "collision/ProxyShape.h"
 #include "DynamicAABBTree.h"
 
diff --git a/src/collision/broadphase/DynamicAABBTree.cpp b/src/collision/broadphase/DynamicAABBTree.cpp
index 6d1c57cd..aa2a7a09 100644
--- a/src/collision/broadphase/DynamicAABBTree.cpp
+++ b/src/collision/broadphase/DynamicAABBTree.cpp
@@ -26,8 +26,8 @@
 // Libraries
 #include "DynamicAABBTree.h"
 #include "BroadPhaseAlgorithm.h"
-#include "../../memory/Stack.h"
-#include "../../engine/Profiler.h"
+#include "memory/Stack.h"
+#include "engine/Profiler.h"
 
 using namespace reactphysics3d;
 
diff --git a/src/collision/broadphase/DynamicAABBTree.h b/src/collision/broadphase/DynamicAABBTree.h
index 874c5a60..e4d07a83 100644
--- a/src/collision/broadphase/DynamicAABBTree.h
+++ b/src/collision/broadphase/DynamicAABBTree.h
@@ -27,9 +27,9 @@
 #define REACTPHYSICS3D_DYNAMIC_AABB_TREE_H
 
 // Libraries
-#include "../../configuration.h"
-#include "../shapes/AABB.h"
-#include "../../body/CollisionBody.h"
+#include "configuration.h"
+#include "collision/shapes/AABB.h"
+#include "body/CollisionBody.h"
 
 /// Namespace ReactPhysics3D
 namespace reactphysics3d {
diff --git a/src/collision/narrowphase/EPA/EPAAlgorithm.cpp b/src/collision/narrowphase/EPA/EPAAlgorithm.cpp
index 35d18bb9..45ca8446 100644
--- a/src/collision/narrowphase/EPA/EPAAlgorithm.cpp
+++ b/src/collision/narrowphase/EPA/EPAAlgorithm.cpp
@@ -25,7 +25,7 @@
 
 // Libraries
 #include "EPAAlgorithm.h"
-#include "../GJK/GJKAlgorithm.h"
+#include "collision/narrowphase//GJK/GJKAlgorithm.h"
 #include "TrianglesStore.h"
 
 // We want to use the ReactPhysics3D namespace
diff --git a/src/collision/narrowphase/EPA/EPAAlgorithm.h b/src/collision/narrowphase/EPA/EPAAlgorithm.h
index f033ee42..1ef9fbf8 100644
--- a/src/collision/narrowphase/EPA/EPAAlgorithm.h
+++ b/src/collision/narrowphase/EPA/EPAAlgorithm.h
@@ -27,12 +27,12 @@
 #define REACTPHYSICS3D_EPA_ALGORITHM_H
 
 // Libraries
-#include "../GJK/Simplex.h"
-#include "../../shapes/CollisionShape.h"
-#include "../../../constraint/ContactPoint.h"
-#include "../../../mathematics/mathematics.h"
+#include "collision/narrowphase/GJK/Simplex.h"
+#include "collision/shapes/CollisionShape.h"
+#include "constraint/ContactPoint.h"
+#include "mathematics/mathematics.h"
 #include "TriangleEPA.h"
-#include "../../../memory/MemoryAllocator.h"
+#include "memory/MemoryAllocator.h"
 #include <algorithm>
 
 /// ReactPhysics3D namespace
diff --git a/src/collision/narrowphase/EPA/EdgeEPA.h b/src/collision/narrowphase/EPA/EdgeEPA.h
index ef6e9873..52ede794 100644
--- a/src/collision/narrowphase/EPA/EdgeEPA.h
+++ b/src/collision/narrowphase/EPA/EdgeEPA.h
@@ -28,7 +28,7 @@
 
 
 // Libraries
-#include "../../../mathematics/mathematics.h"
+#include "mathematics/mathematics.h"
 
 /// ReactPhysics3D namespace
 namespace reactphysics3d {
diff --git a/src/collision/narrowphase/EPA/TriangleEPA.h b/src/collision/narrowphase/EPA/TriangleEPA.h
index 4e83c2d6..bc285422 100644
--- a/src/collision/narrowphase/EPA/TriangleEPA.h
+++ b/src/collision/narrowphase/EPA/TriangleEPA.h
@@ -27,8 +27,8 @@
 #define REACTPHYSICS3D_TRIANGLE_EPA_H
 
 // Libraries
-#include "../../../mathematics/mathematics.h"
-#include "../../../configuration.h"
+#include "mathematics/mathematics.h"
+#include "configuration.h"
 #include "EdgeEPA.h"
 #include <cassert>
 
diff --git a/src/collision/narrowphase/GJK/GJKAlgorithm.cpp b/src/collision/narrowphase/GJK/GJKAlgorithm.cpp
index 74d67d80..bd3f5757 100644
--- a/src/collision/narrowphase/GJK/GJKAlgorithm.cpp
+++ b/src/collision/narrowphase/GJK/GJKAlgorithm.cpp
@@ -26,8 +26,8 @@
 // Libraries
 #include "GJKAlgorithm.h"
 #include "Simplex.h"
-#include "../../../constraint/ContactPoint.h"
-#include "../../../configuration.h"
+#include "constraint/ContactPoint.h"
+#include "configuration.h"
 #include <algorithm>
 #include <cmath>
 #include <cfloat>
diff --git a/src/collision/narrowphase/GJK/GJKAlgorithm.h b/src/collision/narrowphase/GJK/GJKAlgorithm.h
index db77a621..6f1e7211 100644
--- a/src/collision/narrowphase/GJK/GJKAlgorithm.h
+++ b/src/collision/narrowphase/GJK/GJKAlgorithm.h
@@ -27,10 +27,10 @@
 #define REACTPHYSICS3D_GJK_ALGORITHM_H
 
 // Libraries
-#include "../NarrowPhaseAlgorithm.h"
-#include "../../../constraint/ContactPoint.h"
-#include "../../../collision/shapes/CollisionShape.h"
-#include "../EPA/EPAAlgorithm.h"
+#include "collision/narrowphase/NarrowPhaseAlgorithm.h"
+#include "constraint/ContactPoint.h"
+#include "collision/shapes/CollisionShape.h"
+#include "collision/narrowphase/EPA/EPAAlgorithm.h"
 
 
 /// ReactPhysics3D namespace
diff --git a/src/collision/narrowphase/GJK/Simplex.h b/src/collision/narrowphase/GJK/Simplex.h
index ab1a56c9..aa7cc41b 100644
--- a/src/collision/narrowphase/GJK/Simplex.h
+++ b/src/collision/narrowphase/GJK/Simplex.h
@@ -27,7 +27,7 @@
 #define	REACTPHYSICS3D_SIMPLEX_H
 
 // Libraries
-#include "../../../mathematics/mathematics.h"
+#include "mathematics/mathematics.h"
 #include <vector>
 
 /// ReactPhysics3D namespace
diff --git a/src/collision/narrowphase/NarrowPhaseAlgorithm.h b/src/collision/narrowphase/NarrowPhaseAlgorithm.h
index de778e1b..4fdb07b0 100644
--- a/src/collision/narrowphase/NarrowPhaseAlgorithm.h
+++ b/src/collision/narrowphase/NarrowPhaseAlgorithm.h
@@ -27,11 +27,11 @@
 #define REACTPHYSICS3D_NARROW_PHASE_ALGORITHM_H
 
 // Libraries
-#include "../../body/Body.h"
-#include "../../constraint/ContactPoint.h"
-#include "../broadphase/PairManager.h"
-#include "../../memory/MemoryAllocator.h"
-#include "../../engine/OverlappingPair.h"
+#include "body/Body.h"
+#include "constraint/ContactPoint.h"
+#include "collision/broadphase/PairManager.h"
+#include "memory/MemoryAllocator.h"
+#include "engine/OverlappingPair.h"
 
 
 /// Namespace ReactPhysics3D
diff --git a/src/collision/narrowphase/SphereVsSphereAlgorithm.cpp b/src/collision/narrowphase/SphereVsSphereAlgorithm.cpp
index e197343c..edf35fbf 100644
--- a/src/collision/narrowphase/SphereVsSphereAlgorithm.cpp
+++ b/src/collision/narrowphase/SphereVsSphereAlgorithm.cpp
@@ -25,7 +25,7 @@
 
 // Libraries
 #include "SphereVsSphereAlgorithm.h"
-#include "../../collision/shapes/SphereShape.h"
+#include "collision/shapes/SphereShape.h"
 
 // We want to use the ReactPhysics3D namespace
 using namespace reactphysics3d;
diff --git a/src/collision/narrowphase/SphereVsSphereAlgorithm.h b/src/collision/narrowphase/SphereVsSphereAlgorithm.h
index ba4e8a2d..f514ccbb 100644
--- a/src/collision/narrowphase/SphereVsSphereAlgorithm.h
+++ b/src/collision/narrowphase/SphereVsSphereAlgorithm.h
@@ -27,8 +27,8 @@
 #define	REACTPHYSICS3D_SPHERE_VS_SPHERE_ALGORITHM_H
 
 // Libraries
-#include "../../body/Body.h"
-#include "../../constraint/ContactPoint.h"
+#include "body/Body.h"
+#include "constraint/ContactPoint.h"
 #include "NarrowPhaseAlgorithm.h"
 
 
diff --git a/src/collision/shapes/AABB.cpp b/src/collision/shapes/AABB.cpp
index 63e542a2..6f4fc7ef 100644
--- a/src/collision/shapes/AABB.cpp
+++ b/src/collision/shapes/AABB.cpp
@@ -25,7 +25,7 @@
 
 // Libraries
 #include "AABB.h"
-#include "../../configuration.h"
+#include "configuration.h"
 #include <cassert>
 
 using namespace reactphysics3d;
diff --git a/src/collision/shapes/AABB.h b/src/collision/shapes/AABB.h
index 987280a9..5a557e95 100644
--- a/src/collision/shapes/AABB.h
+++ b/src/collision/shapes/AABB.h
@@ -27,7 +27,7 @@
 #define REACTPHYSICS3D_AABB_H
 
 // Libraries
-#include "../../mathematics/mathematics.h"
+#include "mathematics/mathematics.h"
 
 /// ReactPhysics3D namespace
 namespace reactphysics3d {
diff --git a/src/collision/shapes/BoxShape.cpp b/src/collision/shapes/BoxShape.cpp
index 4fd5f7c4..1e680650 100644
--- a/src/collision/shapes/BoxShape.cpp
+++ b/src/collision/shapes/BoxShape.cpp
@@ -25,7 +25,7 @@
 
 // Libraries
 #include "BoxShape.h"
-#include "../../configuration.h"
+#include "configuration.h"
 #include <vector>
 #include <cassert>
 
diff --git a/src/collision/shapes/BoxShape.h b/src/collision/shapes/BoxShape.h
index bee7397a..bd6b2d65 100644
--- a/src/collision/shapes/BoxShape.h
+++ b/src/collision/shapes/BoxShape.h
@@ -29,8 +29,8 @@
 // Libraries
 #include <cfloat>
 #include "CollisionShape.h"
-#include "../../body/CollisionBody.h"
-#include "../../mathematics/mathematics.h"
+#include "body/CollisionBody.h"
+#include "mathematics/mathematics.h"
 
 
 /// ReactPhysics3D namespace
diff --git a/src/collision/shapes/CapsuleShape.cpp b/src/collision/shapes/CapsuleShape.cpp
index 22202c8d..be12a362 100644
--- a/src/collision/shapes/CapsuleShape.cpp
+++ b/src/collision/shapes/CapsuleShape.cpp
@@ -25,7 +25,7 @@
 
 // Libraries
 #include "CapsuleShape.h"
-#include "../../configuration.h"
+#include "configuration.h"
 #include <cassert>
 
 using namespace reactphysics3d;
diff --git a/src/collision/shapes/CapsuleShape.h b/src/collision/shapes/CapsuleShape.h
index e36a56aa..ea83f889 100644
--- a/src/collision/shapes/CapsuleShape.h
+++ b/src/collision/shapes/CapsuleShape.h
@@ -28,8 +28,8 @@
 
 // Libraries
 #include "CollisionShape.h"
-#include "../../body/CollisionBody.h"
-#include "../../mathematics/mathematics.h"
+#include "body/CollisionBody.h"
+#include "mathematics/mathematics.h"
 
 // ReactPhysics3D namespace
 namespace reactphysics3d {
diff --git a/src/collision/shapes/CollisionShape.cpp b/src/collision/shapes/CollisionShape.cpp
index 5b001e71..e35bf8cf 100644
--- a/src/collision/shapes/CollisionShape.cpp
+++ b/src/collision/shapes/CollisionShape.cpp
@@ -25,7 +25,7 @@
 
 // Libraries
 #include "CollisionShape.h"
-#include "../../engine/Profiler.h"
+#include "engine/Profiler.h"
 #include "body/CollisionBody.h"
 
 // We want to use the ReactPhysics3D namespace
diff --git a/src/collision/shapes/CollisionShape.h b/src/collision/shapes/CollisionShape.h
index 48faa881..e931d94b 100644
--- a/src/collision/shapes/CollisionShape.h
+++ b/src/collision/shapes/CollisionShape.h
@@ -29,12 +29,12 @@
 // Libraries
 #include <cassert>
 #include <typeinfo>
-#include "../../mathematics/Vector3.h"
-#include "../../mathematics/Matrix3x3.h"
-#include "../../mathematics/Ray.h"
+#include "mathematics/Vector3.h"
+#include "mathematics/Matrix3x3.h"
+#include "mathematics/Ray.h"
 #include "AABB.h"
-#include "../RaycastInfo.h"
-#include "../../memory/MemoryAllocator.h"
+#include "collision/RaycastInfo.h"
+#include "memory/MemoryAllocator.h"
 
 /// ReactPhysics3D namespace
 namespace reactphysics3d {
diff --git a/src/collision/shapes/ConeShape.cpp b/src/collision/shapes/ConeShape.cpp
index cad743cc..82f7a119 100644
--- a/src/collision/shapes/ConeShape.cpp
+++ b/src/collision/shapes/ConeShape.cpp
@@ -25,7 +25,7 @@
 
 // Libraries
 #include <complex>
-#include "../../configuration.h"
+#include "configuration.h"
 #include "ConeShape.h"
 
 using namespace reactphysics3d;
diff --git a/src/collision/shapes/ConeShape.h b/src/collision/shapes/ConeShape.h
index 683ddb4c..2cfdddd7 100644
--- a/src/collision/shapes/ConeShape.h
+++ b/src/collision/shapes/ConeShape.h
@@ -28,8 +28,8 @@
 
 // Libraries
 #include "CollisionShape.h"
-#include "../../body/CollisionBody.h"
-#include "../../mathematics/mathematics.h"
+#include "body/CollisionBody.h"
+#include "mathematics/mathematics.h"
 
 /// ReactPhysics3D namespace
 namespace reactphysics3d {
diff --git a/src/collision/shapes/ConvexMeshShape.cpp b/src/collision/shapes/ConvexMeshShape.cpp
index 86ca3b87..8387f77c 100644
--- a/src/collision/shapes/ConvexMeshShape.cpp
+++ b/src/collision/shapes/ConvexMeshShape.cpp
@@ -25,7 +25,7 @@
 
 // Libraries
 #include <complex>
-#include "../../configuration.h"
+#include "configuration.h"
 #include "ConvexMeshShape.h"
 
 using namespace reactphysics3d;
diff --git a/src/collision/shapes/ConvexMeshShape.h b/src/collision/shapes/ConvexMeshShape.h
index 6dbc584d..43e4df94 100644
--- a/src/collision/shapes/ConvexMeshShape.h
+++ b/src/collision/shapes/ConvexMeshShape.h
@@ -28,9 +28,9 @@
 
 // Libraries
 #include "CollisionShape.h"
-#include "../../engine/CollisionWorld.h"
-#include "../../mathematics/mathematics.h"
-#include "../narrowphase/GJK/GJKAlgorithm.h"
+#include "engine/CollisionWorld.h"
+#include "mathematics/mathematics.h"
+#include "collision/narrowphase/GJK/GJKAlgorithm.h"
 #include <vector>
 #include <set>
 #include <map>
diff --git a/src/collision/shapes/CylinderShape.cpp b/src/collision/shapes/CylinderShape.cpp
index 3218914d..c451dde3 100644
--- a/src/collision/shapes/CylinderShape.cpp
+++ b/src/collision/shapes/CylinderShape.cpp
@@ -25,7 +25,7 @@
 
 // Libraries
 #include "CylinderShape.h"
-#include "../../configuration.h"
+#include "configuration.h"
 
 using namespace reactphysics3d;
 
diff --git a/src/collision/shapes/CylinderShape.h b/src/collision/shapes/CylinderShape.h
index ab0ccd64..b0037f65 100644
--- a/src/collision/shapes/CylinderShape.h
+++ b/src/collision/shapes/CylinderShape.h
@@ -28,8 +28,8 @@
 
 // Libraries
 #include "CollisionShape.h"
-#include "../../body/CollisionBody.h"
-#include "../../mathematics/mathematics.h"
+#include "body/CollisionBody.h"
+#include "mathematics/mathematics.h"
 
 
 /// ReactPhysics3D namespace
diff --git a/src/collision/shapes/SphereShape.cpp b/src/collision/shapes/SphereShape.cpp
index cb12e6c2..fe4fae4f 100644
--- a/src/collision/shapes/SphereShape.cpp
+++ b/src/collision/shapes/SphereShape.cpp
@@ -25,7 +25,7 @@
 
 // Libraries
 #include "SphereShape.h"
-#include "../../configuration.h"
+#include "configuration.h"
 #include <cassert>
 
 using namespace reactphysics3d;
diff --git a/src/collision/shapes/SphereShape.h b/src/collision/shapes/SphereShape.h
index 8517c287..4271474b 100644
--- a/src/collision/shapes/SphereShape.h
+++ b/src/collision/shapes/SphereShape.h
@@ -28,8 +28,8 @@
 
 // Libraries
 #include "CollisionShape.h"
-#include "../../body/CollisionBody.h"
-#include "../../mathematics/mathematics.h"
+#include "body/CollisionBody.h"
+#include "mathematics/mathematics.h"
 
 // ReactPhysics3D namespace
 namespace reactphysics3d {
diff --git a/src/constraint/BallAndSocketJoint.cpp b/src/constraint/BallAndSocketJoint.cpp
index f4ef3d39..3090c16c 100644
--- a/src/constraint/BallAndSocketJoint.cpp
+++ b/src/constraint/BallAndSocketJoint.cpp
@@ -25,7 +25,7 @@
 
 // Libraries
 #include "BallAndSocketJoint.h"
-#include "../engine/ConstraintSolver.h"
+#include "engine/ConstraintSolver.h"
 
 using namespace reactphysics3d;
 
diff --git a/src/constraint/BallAndSocketJoint.h b/src/constraint/BallAndSocketJoint.h
index 2030627f..b194dc0d 100644
--- a/src/constraint/BallAndSocketJoint.h
+++ b/src/constraint/BallAndSocketJoint.h
@@ -28,7 +28,7 @@
 
 // Libraries
 #include "Joint.h"
-#include "../mathematics/mathematics.h"
+#include "mathematics/mathematics.h"
 
 namespace reactphysics3d {
 
diff --git a/src/constraint/ContactPoint.h b/src/constraint/ContactPoint.h
index bd8c7922..b638656e 100644
--- a/src/constraint/ContactPoint.h
+++ b/src/constraint/ContactPoint.h
@@ -27,10 +27,10 @@
 #define REACTPHYSICS3D_CONTACT_POINT_H
 
 // Libraries
-#include "../body/CollisionBody.h"
-#include "../configuration.h"
-#include "../mathematics/mathematics.h"
-#include "../configuration.h"
+#include "body/CollisionBody.h"
+#include "configuration.h"
+#include "mathematics/mathematics.h"
+#include "configuration.h"
 
 /// ReactPhysics3D namespace
 namespace reactphysics3d {
diff --git a/src/constraint/FixedJoint.cpp b/src/constraint/FixedJoint.cpp
index 075b13eb..2d5b915b 100644
--- a/src/constraint/FixedJoint.cpp
+++ b/src/constraint/FixedJoint.cpp
@@ -25,7 +25,7 @@
 
 // Libraries
 #include "FixedJoint.h"
-#include "../engine/ConstraintSolver.h"
+#include "engine/ConstraintSolver.h"
 
 using namespace reactphysics3d;
 
diff --git a/src/constraint/FixedJoint.h b/src/constraint/FixedJoint.h
index 9fe3b055..9a9e9bac 100644
--- a/src/constraint/FixedJoint.h
+++ b/src/constraint/FixedJoint.h
@@ -28,7 +28,7 @@
 
 // Libraries
 #include "Joint.h"
-#include "../mathematics/mathematics.h"
+#include "mathematics/mathematics.h"
 
 namespace reactphysics3d {
 
diff --git a/src/constraint/HingeJoint.cpp b/src/constraint/HingeJoint.cpp
index aa3954d3..fce93901 100644
--- a/src/constraint/HingeJoint.cpp
+++ b/src/constraint/HingeJoint.cpp
@@ -25,7 +25,7 @@
 
 // Libraries
 #include "HingeJoint.h"
-#include "../engine/ConstraintSolver.h"
+#include "engine/ConstraintSolver.h"
 #include <cmath>
 
 using namespace reactphysics3d;
diff --git a/src/constraint/HingeJoint.h b/src/constraint/HingeJoint.h
index 00dacd29..143cda4e 100644
--- a/src/constraint/HingeJoint.h
+++ b/src/constraint/HingeJoint.h
@@ -28,7 +28,7 @@
 
 // Libraries
 #include "Joint.h"
-#include "../mathematics/mathematics.h"
+#include "mathematics/mathematics.h"
 
 namespace reactphysics3d {
 
diff --git a/src/constraint/Joint.h b/src/constraint/Joint.h
index 253907df..9daeb04d 100644
--- a/src/constraint/Joint.h
+++ b/src/constraint/Joint.h
@@ -27,9 +27,9 @@
 #define REACTPHYSICS3D_CONSTRAINT_H
 
 // Libraries
-#include "../configuration.h"
-#include "../body/RigidBody.h"
-#include "../mathematics/mathematics.h"
+#include "configuration.h"
+#include "body/RigidBody.h"
+#include "mathematics/mathematics.h"
 
 // ReactPhysics3D namespace
 namespace reactphysics3d {
diff --git a/src/constraint/SliderJoint.h b/src/constraint/SliderJoint.h
index 645c2e47..2938baac 100644
--- a/src/constraint/SliderJoint.h
+++ b/src/constraint/SliderJoint.h
@@ -27,8 +27,8 @@
 #define REACTPHYSICS3D_SLIDER_JOINT_H
 
 // Libraries
-#include "../mathematics/mathematics.h"
-#include "../engine/ConstraintSolver.h"
+#include "mathematics/mathematics.h"
+#include "engine/ConstraintSolver.h"
 
 namespace reactphysics3d {
 
diff --git a/src/engine/CollisionWorld.h b/src/engine/CollisionWorld.h
index 7a52845e..fb3209e9 100644
--- a/src/engine/CollisionWorld.h
+++ b/src/engine/CollisionWorld.h
@@ -31,15 +31,15 @@
 #include <set>
 #include <list>
 #include <algorithm>
-#include "../mathematics/mathematics.h"
+#include "mathematics/mathematics.h"
 #include "Profiler.h"
-#include "../body/CollisionBody.h"
-#include "../collision/RaycastInfo.h"
+#include "body/CollisionBody.h"
+#include "collision/RaycastInfo.h"
 #include "OverlappingPair.h"
-#include "../collision/CollisionDetection.h"
-#include "../constraint/Joint.h"
-#include "../constraint/ContactPoint.h"
-#include "../memory/MemoryAllocator.h"
+#include "collision/CollisionDetection.h"
+#include "constraint/Joint.h"
+#include "constraint/ContactPoint.h"
+#include "memory/MemoryAllocator.h"
 #include "EventListener.h"
 
 /// Namespace reactphysics3d
diff --git a/src/engine/ConstraintSolver.h b/src/engine/ConstraintSolver.h
index ab5dcc01..1c7833bc 100644
--- a/src/engine/ConstraintSolver.h
+++ b/src/engine/ConstraintSolver.h
@@ -27,9 +27,9 @@
 #define REACTPHYSICS3D_CONSTRAINT_SOLVER_H
 
 // Libraries
-#include "../configuration.h"
+#include "configuration.h"
 #include "mathematics/mathematics.h"
-#include "../constraint/Joint.h"
+#include "constraint/Joint.h"
 #include "Island.h"
 #include <map>
 #include <set>
diff --git a/src/engine/ContactManifold.h b/src/engine/ContactManifold.h
index 70ebaae9..922f0943 100644
--- a/src/engine/ContactManifold.h
+++ b/src/engine/ContactManifold.h
@@ -28,9 +28,9 @@
 
 // Libraries
 #include <vector>
-#include "../body/CollisionBody.h"
-#include "../constraint/ContactPoint.h"
-#include "../memory/MemoryAllocator.h"
+#include "body/CollisionBody.h"
+#include "constraint/ContactPoint.h"
+#include "memory/MemoryAllocator.h"
 
 /// ReactPhysics3D namespace
 namespace reactphysics3d {
diff --git a/src/engine/ContactSolver.cpp b/src/engine/ContactSolver.cpp
index 773f072e..92f91d46 100644
--- a/src/engine/ContactSolver.cpp
+++ b/src/engine/ContactSolver.cpp
@@ -26,7 +26,7 @@
 // Libraries
 #include "ContactSolver.h"
 #include "DynamicsWorld.h"
-#include "../body/RigidBody.h"
+#include "body/RigidBody.h"
 #include "Profiler.h"
 #include <limits>
 
diff --git a/src/engine/ContactSolver.h b/src/engine/ContactSolver.h
index 099bdb80..a96a322f 100644
--- a/src/engine/ContactSolver.h
+++ b/src/engine/ContactSolver.h
@@ -27,9 +27,9 @@
 #define REACTPHYSICS3D_CONTACT_SOLVER_H
 
 // Libraries
-#include "../constraint/ContactPoint.h"
-#include "../configuration.h"
-#include "../constraint/Joint.h"
+#include "constraint/ContactPoint.h"
+#include "configuration.h"
+#include "constraint/Joint.h"
 #include "ContactManifold.h"
 #include "Island.h"
 #include "Impulse.h"
diff --git a/src/engine/DynamicsWorld.h b/src/engine/DynamicsWorld.h
index 70ef5522..58f2fc03 100644
--- a/src/engine/DynamicsWorld.h
+++ b/src/engine/DynamicsWorld.h
@@ -28,13 +28,13 @@
 
 // Libraries
 #include "CollisionWorld.h"
-#include "../collision/CollisionDetection.h"
+#include "collision/CollisionDetection.h"
 #include "ContactSolver.h"
 #include "ConstraintSolver.h"
-#include "../body/RigidBody.h"
+#include "body/RigidBody.h"
 #include "Timer.h"
 #include "Island.h"
-#include "../configuration.h"
+#include "configuration.h"
 
 /// Namespace ReactPhysics3D
 namespace reactphysics3d {
diff --git a/src/engine/EventListener.h b/src/engine/EventListener.h
index 97d7c347..2e17710f 100644
--- a/src/engine/EventListener.h
+++ b/src/engine/EventListener.h
@@ -27,7 +27,7 @@
 #define REACTPHYSICS3D_EVENT_LISTENER_H
 
 // Libraries
-#include "../constraint/ContactPoint.h"
+#include "constraint/ContactPoint.h"
 
 namespace reactphysics3d {
 
diff --git a/src/engine/Impulse.h b/src/engine/Impulse.h
index 849d90ed..8e4fa4fc 100644
--- a/src/engine/Impulse.h
+++ b/src/engine/Impulse.h
@@ -27,7 +27,7 @@
 #define REACTPHYSICS3D_IMPULSE_H
 
 // Libraries
-#include "../mathematics/mathematics.h"
+#include "mathematics/mathematics.h"
 
 namespace reactphysics3d {
 
diff --git a/src/engine/Island.h b/src/engine/Island.h
index 2aa067f3..a07d9339 100644
--- a/src/engine/Island.h
+++ b/src/engine/Island.h
@@ -27,9 +27,9 @@
 #define REACTPHYSICS3D_ISLAND_H
 
 // Libraries
-#include "../memory/MemoryAllocator.h"
-#include "../body/RigidBody.h"
-#include "../constraint/Joint.h"
+#include "memory/MemoryAllocator.h"
+#include "body/RigidBody.h"
+#include "constraint/Joint.h"
 #include "ContactManifold.h"
 
 namespace reactphysics3d {
diff --git a/src/engine/Material.h b/src/engine/Material.h
index 4d06f1a9..3909c6b9 100644
--- a/src/engine/Material.h
+++ b/src/engine/Material.h
@@ -28,7 +28,7 @@
 
 // Libraries
 #include <cassert>
-#include "../configuration.h"
+#include "configuration.h"
 
 namespace reactphysics3d {
 
diff --git a/src/engine/OverlappingPair.h b/src/engine/OverlappingPair.h
index 578f1e43..fb0e9f25 100644
--- a/src/engine/OverlappingPair.h
+++ b/src/engine/OverlappingPair.h
@@ -29,7 +29,7 @@
 // Libraries
 #include "ContactManifold.h"
 #include "collision/ProxyShape.h"
-#include "../collision/shapes/CollisionShape.h"
+#include "collision/shapes/CollisionShape.h"
 
 /// ReactPhysics3D namespace
 namespace reactphysics3d {
diff --git a/src/engine/Profiler.h b/src/engine/Profiler.h
index 7030e685..1b92e85d 100644
--- a/src/engine/Profiler.h
+++ b/src/engine/Profiler.h
@@ -29,7 +29,7 @@
 #ifdef IS_PROFILING_ACTIVE
 
 // Libraries
-#include "../configuration.h"
+#include "configuration.h"
 #include "Timer.h"
 
 /// ReactPhysics3D namespace
diff --git a/src/engine/Timer.h b/src/engine/Timer.h
index 7e1b3b7d..9aa7ef16 100644
--- a/src/engine/Timer.h
+++ b/src/engine/Timer.h
@@ -31,7 +31,7 @@
 #include <iostream>
 #include <ctime>
 #include <cassert>
-#include "../configuration.h"
+#include "configuration.h"
 
 #if defined(WINDOWS_OS)   // For Windows platform
    #define NOMINMAX       // This is used to avoid definition of max() and min() macros
diff --git a/src/mathematics/Quaternion.h b/src/mathematics/Quaternion.h
index 8895ceff..62626459 100644
--- a/src/mathematics/Quaternion.h
+++ b/src/mathematics/Quaternion.h
@@ -30,7 +30,7 @@
 #include <cmath>
 #include "Vector3.h"
 #include "Matrix3x3.h"
-#include "../decimal.h"
+#include "decimal.h"
 
 /// ReactPhysics3D namespace
 namespace reactphysics3d {
diff --git a/src/mathematics/Vector2.h b/src/mathematics/Vector2.h
index 6f1f518e..fc310a7a 100644
--- a/src/mathematics/Vector2.h
+++ b/src/mathematics/Vector2.h
@@ -30,7 +30,7 @@
 #include <cmath>
 #include <cassert>
 #include "mathematics_functions.h"
-#include "../decimal.h"
+#include "decimal.h"
 
 
 /// ReactPhysics3D namespace
diff --git a/src/mathematics/Vector3.h b/src/mathematics/Vector3.h
index 24385fb1..7595dd92 100644
--- a/src/mathematics/Vector3.h
+++ b/src/mathematics/Vector3.h
@@ -30,7 +30,7 @@
 #include <cmath>
 #include <cassert>
 #include "mathematics_functions.h"
-#include "../decimal.h"
+#include "decimal.h"
 
 
 /// ReactPhysics3D namespace
diff --git a/src/mathematics/mathematics.h b/src/mathematics/mathematics.h
index 3697634f..66676dd6 100644
--- a/src/mathematics/mathematics.h
+++ b/src/mathematics/mathematics.h
@@ -33,7 +33,7 @@
 #include "Vector3.h"
 #include "Vector2.h"
 #include "Transform.h"
-#include "../configuration.h"
+#include "configuration.h"
 #include "mathematics_functions.h"
 #include <vector>
 #include <cstdio>
diff --git a/src/mathematics/mathematics_functions.h b/src/mathematics/mathematics_functions.h
index 6ac380d8..6db31ec3 100644
--- a/src/mathematics/mathematics_functions.h
+++ b/src/mathematics/mathematics_functions.h
@@ -27,8 +27,8 @@
 #define REACTPHYSICS3D_MATHEMATICS_FUNCTIONS_H
 
 // Libraries
-#include "../configuration.h"
-#include "../decimal.h"
+#include "configuration.h"
+#include "decimal.h"
 #include <algorithm>
 
 /// ReactPhysics3D namespace
diff --git a/src/memory/MemoryAllocator.h b/src/memory/MemoryAllocator.h
index 23365949..02bcd209 100644
--- a/src/memory/MemoryAllocator.h
+++ b/src/memory/MemoryAllocator.h
@@ -28,7 +28,7 @@
 
 // Libraries
 #include <cstring>
-#include "../configuration.h"
+#include "configuration.h"
 
 /// ReactPhysics3D namespace
 namespace reactphysics3d {
diff --git a/src/memory/Stack.h b/src/memory/Stack.h
index a6c68c2b..c09581d9 100644
--- a/src/memory/Stack.h
+++ b/src/memory/Stack.h
@@ -27,7 +27,7 @@
 #define REACTPHYSICS3D_STACK_H
 
 // Libraries
-#include "../configuration.h"
+#include "configuration.h"
 
 namespace reactphysics3d {
 
diff --git a/test/tests/collision/TestRaycast.h b/test/tests/collision/TestRaycast.h
index c164f048..149ff093 100644
--- a/test/tests/collision/TestRaycast.h
+++ b/test/tests/collision/TestRaycast.h
@@ -27,7 +27,7 @@
 #define TEST_RAYCAST_H
 
 // Libraries
-#include "../../Test.h"
+#include "Test.h"
 #include "engine/CollisionWorld.h"
 #include "body/CollisionBody.h"
 #include "collision/shapes/BoxShape.h"
diff --git a/test/tests/mathematics/TestMatrix2x2.h b/test/tests/mathematics/TestMatrix2x2.h
index ad8b9da0..611b93ce 100644
--- a/test/tests/mathematics/TestMatrix2x2.h
+++ b/test/tests/mathematics/TestMatrix2x2.h
@@ -27,8 +27,8 @@
 #define TEST_MATRIX2X2_H
 
 // Libraries
-#include "../../Test.h"
-#include "../../../src/mathematics/Matrix2x2.h"
+#include "Test.h"
+#include "mathematics/Matrix2x2.h"
 
 /// Reactphysics3D namespace
 namespace reactphysics3d {
diff --git a/test/tests/mathematics/TestMatrix3x3.h b/test/tests/mathematics/TestMatrix3x3.h
index 480275b7..7dfb0faf 100644
--- a/test/tests/mathematics/TestMatrix3x3.h
+++ b/test/tests/mathematics/TestMatrix3x3.h
@@ -27,8 +27,8 @@
 #define TEST_MATRIX3X3_H
 
 // Libraries
-#include "../../Test.h"
-#include "../../../src/mathematics/Matrix3x3.h"
+#include "Test.h"
+#include "mathematics/Matrix3x3.h"
 
 /// Reactphysics3D namespace
 namespace reactphysics3d {
diff --git a/test/tests/mathematics/TestQuaternion.h b/test/tests/mathematics/TestQuaternion.h
index f343ce84..31d50c88 100644
--- a/test/tests/mathematics/TestQuaternion.h
+++ b/test/tests/mathematics/TestQuaternion.h
@@ -28,8 +28,8 @@
 #define TEST_QUATERNION_H
 
 // Libraries
-#include "../../Test.h"
-#include "../../../src/mathematics/Quaternion.h"
+#include "Test.h"
+#include "mathematics/Quaternion.h"
 
 /// Reactphysics3D namespace
 namespace reactphysics3d {
diff --git a/test/tests/mathematics/TestTransform.h b/test/tests/mathematics/TestTransform.h
index 2d24aaa8..38f4d138 100644
--- a/test/tests/mathematics/TestTransform.h
+++ b/test/tests/mathematics/TestTransform.h
@@ -28,8 +28,8 @@
 #define TEST_TRANSFORM_H
 
 // Libraries
-#include "../../Test.h"
-#include "../../../src/mathematics/Transform.h"
+#include "Test.h"
+#include "mathematics/Transform.h"
 
 /// Reactphysics3D namespace
 namespace reactphysics3d {
diff --git a/test/tests/mathematics/TestVector2.h b/test/tests/mathematics/TestVector2.h
index f001fa0a..febd414f 100644
--- a/test/tests/mathematics/TestVector2.h
+++ b/test/tests/mathematics/TestVector2.h
@@ -27,8 +27,8 @@
 #define TEST_VECTOR2_H
 
 // Libraries
-#include "../../Test.h"
-#include "../../../src/mathematics/Vector2.h"
+#include "Test.h"
+#include "mathematics/Vector2.h"
 
 /// Reactphysics3D namespace
 namespace reactphysics3d {
diff --git a/test/tests/mathematics/TestVector3.h b/test/tests/mathematics/TestVector3.h
index 274624fb..4968ee7e 100644
--- a/test/tests/mathematics/TestVector3.h
+++ b/test/tests/mathematics/TestVector3.h
@@ -27,8 +27,8 @@
 #define TEST_VECTOR3_H
 
 // Libraries
-#include "../../Test.h"
-#include "../../../src/mathematics/Vector3.h"
+#include "Test.h"
+#include "mathematics/Vector3.h"
 
 /// Reactphysics3D namespace
 namespace reactphysics3d {