diff --git a/glm/ext.hpp b/glm/ext.hpp
index 03d38864..164dc2a1 100644
--- a/glm/ext.hpp
+++ b/glm/ext.hpp
@@ -214,7 +214,11 @@
 #include "./gtx/functions.hpp"
 #include "./gtx/gradient_paint.hpp"
 #include "./gtx/handed_coordinate_space.hpp"
+
+#if __cplusplus >= 201103L
 #include "./gtx/hash.hpp"
+#endif
+
 #include "./gtx/integer.hpp"
 #include "./gtx/intersect.hpp"
 #include "./gtx/io.hpp"
diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp
index 2d42ded7..f4324209 100644
--- a/glm/gtx/hash.hpp
+++ b/glm/gtx/hash.hpp
@@ -40,11 +40,11 @@
 #include "../mat4x3.hpp"
 #include "../mat4x4.hpp"
 
-#if !GLM_HAS_CXX11_STL
+#if __cplusplus >= 201103L
 #pragma message("GLM_GTX_hash requires C++11 standard library support")
 #endif
 
-#if 0 && GLM_LANG & GLM_LANG_CXX11
+#if GLM_LANG & GLM_LANG_CXX11
 #define GLM_GTX_hash 1
 #include <functional>
 
diff --git a/glm/gtx/hash.inl b/glm/gtx/hash.inl
index 200dfa39..bcadfe53 100644
--- a/glm/gtx/hash.inl
+++ b/glm/gtx/hash.inl
@@ -68,7 +68,7 @@ namespace std
 	GLM_FUNC_QUALIFIER size_t hash<glm::tdualquat<T, Q> >::operator()(glm::tdualquat<T, Q> const& q) const GLM_NOEXCEPT
 	{
 		size_t seed = 0;
-		hash<glm::qua<T, Q>> hasher;
+		hash<glm::qua<T, Q> > hasher;
 		glm::detail::hash_combine(seed, hasher(q.real));
 		glm::detail::hash_combine(seed, hasher(q.dual));
 		return seed;
@@ -78,7 +78,7 @@ namespace std
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<2, 2, T, Q> >::operator()(glm::mat<2, 2, T, Q> const& m) const GLM_NOEXCEPT
 	{
 		size_t seed = 0;
-		hash<glm::vec<2, T, Q>> hasher;
+		hash<glm::vec<2, T, Q> > hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		return seed;
@@ -88,7 +88,7 @@ namespace std
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<2, 3, T, Q> >::operator()(glm::mat<2, 3, T, Q> const& m) const GLM_NOEXCEPT
 	{
 		size_t seed = 0;
-		hash<glm::vec<3, T, Q>> hasher;
+		hash<glm::vec<3, T, Q> > hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		return seed;
@@ -98,7 +98,7 @@ namespace std
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<2, 4, T, Q> >::operator()(glm::mat<2, 4, T, Q> const& m) const GLM_NOEXCEPT
 	{
 		size_t seed = 0;
-		hash<glm::vec<4, T, Q>> hasher;
+		hash<glm::vec<4, T, Q> > hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		return seed;
@@ -108,7 +108,7 @@ namespace std
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<3, 2, T, Q> >::operator()(glm::mat<3, 2, T, Q> const& m) const GLM_NOEXCEPT
 	{
 		size_t seed = 0;
-		hash<glm::vec<2, T, Q>> hasher;
+		hash<glm::vec<2, T, Q> > hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		glm::detail::hash_combine(seed, hasher(m[2]));
@@ -119,7 +119,7 @@ namespace std
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<3, 3, T, Q> >::operator()(glm::mat<3, 3, T, Q> const& m) const GLM_NOEXCEPT
 	{
 		size_t seed = 0;
-		hash<glm::vec<3, T, Q>> hasher;
+		hash<glm::vec<3, T, Q> > hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		glm::detail::hash_combine(seed, hasher(m[2]));
@@ -130,7 +130,7 @@ namespace std
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<3, 4, T, Q> >::operator()(glm::mat<3, 4, T, Q> const& m) const GLM_NOEXCEPT
 	{
 		size_t seed = 0;
-		hash<glm::vec<4, T, Q>> hasher;
+		hash<glm::vec<4, T, Q> > hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		glm::detail::hash_combine(seed, hasher(m[2]));
@@ -141,7 +141,7 @@ namespace std
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<4, 2, T,Q> >::operator()(glm::mat<4, 2, T,Q> const& m) const GLM_NOEXCEPT
 	{
 		size_t seed = 0;
-		hash<glm::vec<2, T, Q>> hasher;
+		hash<glm::vec<2, T, Q> > hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		glm::detail::hash_combine(seed, hasher(m[2]));
@@ -153,7 +153,7 @@ namespace std
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<4, 3, T,Q> >::operator()(glm::mat<4, 3, T,Q> const& m) const GLM_NOEXCEPT
 	{
 		size_t seed = 0;
-		hash<glm::vec<3, T, Q>> hasher;
+		hash<glm::vec<3, T, Q> > hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		glm::detail::hash_combine(seed, hasher(m[2]));
@@ -165,7 +165,7 @@ namespace std
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<4, 4, T,Q> >::operator()(glm::mat<4, 4, T, Q> const& m) const GLM_NOEXCEPT
 	{
 		size_t seed = 0;
-		hash<glm::vec<4, T, Q>> hasher;
+		hash<glm::vec<4, T, Q> > hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		glm::detail::hash_combine(seed, hasher(m[2]));
diff --git a/test/gtx/gtx_hash.cpp b/test/gtx/gtx_hash.cpp
index 127d255b..4ecd2e8d 100644
--- a/test/gtx/gtx_hash.cpp
+++ b/test/gtx/gtx_hash.cpp
@@ -1,7 +1,7 @@
+#if __cplusplus >= 201103L
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/hash.hpp>
 
-#if defined(GLM_GTX_hash) && GLM_LANG & GLM_LANG_CXX11
 #include <unordered_map>
 
 int test_compile()
@@ -46,16 +46,23 @@ int test_compile()
 
     return Error > 0 ? 0 : 1;
 }
-#endif//GLM_LANG& GLM_LANG_CXX11
 
 int main()
 {
     int Error = 0;
 
-#if defined(GLM_GTX_hash)
     Error += test_compile();
-#endif//
 
     return Error;
 }
 
+#else
+
+int main()
+{
+    return 0;
+}
+
+#endif// __cplusplus >= 201103L
+
+
diff --git a/test/gtx/gtx_quaternion.cpp b/test/gtx/gtx_quaternion.cpp
index 80cbbacd..ed90faa3 100644
--- a/test/gtx/gtx_quaternion.cpp
+++ b/test/gtx/gtx_quaternion.cpp
@@ -5,7 +5,6 @@
 #include <glm/gtx/transform.hpp>
 #include <glm/gtx/quaternion.hpp>
 #include <glm/gtx/compatibility.hpp>
-#include <glm/ext.hpp>
 
 int test_quat_fastMix()
 {