diff --git a/glm/core/_detail.hpp b/glm/core/_detail.hpp
index 55e4fc02..9b36a921 100644
--- a/glm/core/_detail.hpp
+++ b/glm/core/_detail.hpp
@@ -10,7 +10,7 @@
 #ifndef glm_core_detail
 #define glm_core_detail
 
-#include "../setup.hpp"
+#include "setup.hpp"
 #include <cassert>
 
 namespace glm{
diff --git a/glm/core/intrinsic_common.hpp b/glm/core/intrinsic_common.hpp
index 9028b4e7..ec2516e5 100644
--- a/glm/core/intrinsic_common.hpp
+++ b/glm/core/intrinsic_common.hpp
@@ -10,7 +10,7 @@
 #ifndef glm_detail_intrinsic_common
 #define glm_detail_intrinsic_common
 
-#include "../setup.hpp"
+#include "setup.hpp"
 
 #if((GLM_ARCH & GLM_ARCH_SSE2) != GLM_ARCH_SSE2)
 #	error "SSE2 instructions not supported or enabled"
diff --git a/glm/core/intrinsic_geometric.hpp b/glm/core/intrinsic_geometric.hpp
index 3791e6df..d640774b 100644
--- a/glm/core/intrinsic_geometric.hpp
+++ b/glm/core/intrinsic_geometric.hpp
@@ -10,7 +10,7 @@
 #ifndef glm_core_intrinsic_geometric
 #define glm_core_intrinsic_geometric
 
-#include "../setup.hpp"
+#include "setup.hpp"
 
 #if((GLM_ARCH & GLM_ARCH_SSE2) != GLM_ARCH_SSE2)
 #	error "SSE2 instructions not supported or enabled"
diff --git a/glm/setup.hpp b/glm/core/setup.hpp
similarity index 100%
rename from glm/setup.hpp
rename to glm/core/setup.hpp
diff --git a/glm/core/type_float.hpp b/glm/core/type_float.hpp
index 43aabb41..b62c7755 100644
--- a/glm/core/type_float.hpp
+++ b/glm/core/type_float.hpp
@@ -11,7 +11,7 @@
 #define glm_core_type_float
 
 #include "type_half.hpp"
-#include "../setup.hpp"
+#include "setup.hpp"
 
 namespace glm
 {
diff --git a/glm/core/type_int.hpp b/glm/core/type_int.hpp
index 3f7aa0ab..6903c2b0 100644
--- a/glm/core/type_int.hpp
+++ b/glm/core/type_int.hpp
@@ -10,7 +10,7 @@
 #ifndef glm_core_type_int
 #define glm_core_type_int
 
-#include "../setup.hpp"
+#include "setup.hpp"
 #include "_detail.hpp"
 
 namespace glm
diff --git a/glm/glm.hpp b/glm/glm.hpp
index 26a182ba..ac418334 100644
--- a/glm/glm.hpp
+++ b/glm/glm.hpp
@@ -21,7 +21,7 @@
 #include <climits>
 #include <cfloat>
 #include <limits>
-#include "setup.hpp"
+#include "core/setup.hpp"
 
 #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_CORE_INCLUDED_DISPLAYED))
 #	define GLM_MESSAGE_CORE_INCLUDED_DISPLAYED