diff --git a/glm/core/_detail.hpp b/glm/core/_detail.hpp
index 9ec2a941..e6d2e128 100644
--- a/glm/core/_detail.hpp
+++ b/glm/core/_detail.hpp
@@ -31,6 +31,9 @@
 
 #include "setup.hpp"
 #include <cassert>
+#if(defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))
+#include <cstdint>
+#endif
 
 namespace glm{
 namespace detail
diff --git a/test/core/core_func_integer.cpp b/test/core/core_func_integer.cpp
index 988119df..af2a9a2c 100644
--- a/test/core/core_func_integer.cpp
+++ b/test/core/core_func_integer.cpp
@@ -31,7 +31,7 @@ namespace extractField
 		result		Result;
 	};
 
-	typedef type<glm::uint64, glm::uint> typeU64;
+	typedef type<glm::uint64, glm::uint32> typeU64;
 
 	typeU64 const Data64[] =
 	{