diff --git a/glm/gtx/type_trait.hpp b/glm/gtx/type_trait.hpp
index 08dcc1a7..0f14f308 100644
--- a/glm/gtx/type_trait.hpp
+++ b/glm/gtx/type_trait.hpp
@@ -17,18 +17,7 @@
 #endif
 
 // Dependency:
-#include "../detail/type_vec2.hpp"
-#include "../detail/type_vec3.hpp"
-#include "../detail/type_vec4.hpp"
-#include "../detail/type_mat2x2.hpp"
-#include "../detail/type_mat2x3.hpp"
-#include "../detail/type_mat2x4.hpp"
-#include "../detail/type_mat3x2.hpp"
-#include "../detail/type_mat3x3.hpp"
-#include "../detail/type_mat3x4.hpp"
-#include "../detail/type_mat4x2.hpp"
-#include "../detail/type_mat4x3.hpp"
-#include "../detail/type_mat4x4.hpp"
+#include "../detail/qualifier.hpp"
 #include "../gtc/quaternion.hpp"
 #include "../gtx/dual_quaternion.hpp"
 
@@ -64,130 +53,15 @@ namespace glm
 		};
 	};
 
-	template<typename T, qualifier Q>
-	struct type<mat<2, 2, T, Q> >
+	template<length_t C, length_t R, typename T, qualifier Q>
+	struct type<mat<C, R, T, Q> >
 	{
 		static bool const is_vec = false;
 		static bool const is_mat = true;
 		static bool const is_quat = false;
-		enum
-		{
-			components = 2,
-			cols = 2,
-			rows = 2
-		};
-	};
-
-	template<typename T, qualifier Q>
-	struct type<mat<2, 3, T, Q> >
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 2,
-			cols = 2,
-			rows = 3
-		};
-	};
-
-	template<typename T, qualifier Q>
-	struct type<mat<2, 4, T, Q> >
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 2,
-			cols = 2,
-			rows = 4
-		};
-	};
-
-	template<typename T, qualifier Q>
-	struct type<mat<3, 2, T, Q> >
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 3,
-			cols = 3,
-			rows = 2
-		};
-	};
-
-	template<typename T, qualifier Q>
-	struct type<mat<3, 3, T, Q> >
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 3,
-			cols = 3,
-			rows = 3
-		};
-	};
-
-	template<typename T, qualifier Q>
-	struct type<mat<3, 4, T, Q> >
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 3,
-			cols = 3,
-			rows = 4
-		};
-	};
-
-	template<typename T, qualifier Q>
-	struct type<mat<4, 2, T, Q> >
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 4,
-			cols = 4,
-			rows = 2
-		};
-	};
-
-	template<typename T, qualifier Q>
-	struct type<mat<4, 3, T, Q> >
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 4,
-			cols = 4,
-			rows = 3
-		};
-	};
-
-	template<typename T, qualifier Q>
-	struct type<mat<4, 4, T, Q> >
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 4,
-			cols = 4,
-			rows = 4
-		};
+		static length_t const components = C;
+		static length_t const cols = C;
+		static length_t const rows = R;
 	};
 
 	template<typename T, qualifier Q>