diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp
index 2440301c..9916388a 100644
--- a/glm/gtx/component_wise.hpp
+++ b/glm/gtx/component_wise.hpp
@@ -38,8 +38,8 @@
 #ifndef GLM_GTX_component_wise
 #define GLM_GTX_component_wise
 
-// Dependency:
-#include "../glm.hpp"
+// Dependencies
+#include "../detail/setup.hpp"
 
 #if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
 #	pragma message("GLM: GLM_GTX_component_wise extension included")
diff --git a/glm/gtx/component_wise.inl b/glm/gtx/component_wise.inl
index 76147101..7f9a3df4 100644
--- a/glm/gtx/component_wise.inl
+++ b/glm/gtx/component_wise.inl
@@ -13,7 +13,7 @@ namespace glm
 	GLM_FUNC_QUALIFIER T compAdd(vecType<T, P> const & v)
 	{
 		T result(0);
-		for(int i = 0; i < v.length(); ++i)
+		for(length_t i = 0; i < v.length(); ++i)
 			result += v[i];
 		return result;
 	}
@@ -22,7 +22,7 @@ namespace glm
 	GLM_FUNC_QUALIFIER T compMul(vecType<T, P> const & v)
 	{
 		T result(1);
-		for(int i = 0; i < v.length(); ++i)
+		for(length_t i = 0; i < v.length(); ++i)
 			result *= v[i];
 		return result;
 	}
@@ -31,7 +31,7 @@ namespace glm
 	GLM_FUNC_QUALIFIER T compMin(vecType<T, P> const & v)
 	{
 		T result(v[0]);
-		for(int i = 1; i < v.length(); ++i)
+		for(length_t i = 1; i < v.length(); ++i)
 			result = min(result, v[i]);
 		return result;
 	}
@@ -40,7 +40,7 @@ namespace glm
 	GLM_FUNC_QUALIFIER T compMax(vecType<T, P> const & v)
 	{
 		T result(v[0]);
-		for(int i = 1; i < v.length(); ++i)
+		for(length_t i = 1; i < v.length(); ++i)
 			result = max(result, v[i]);
 		return result;
 	}