diff --git a/glm/detail/func_common.hpp b/glm/detail/func_common.hpp
index a4c9bfcd..a3e5d633 100644
--- a/glm/detail/func_common.hpp
+++ b/glm/detail/func_common.hpp
@@ -258,6 +258,18 @@ namespace glm
 	/// glm::dvec3 t = glm::mix(e, f, a); // Types of the third parameter is not required to match with the first and the second.
 	/// glm::vec4 u = glm::mix(g, h, r); // Interpolations can be perform per component with a vector for the last parameter.
 	/// @endcode
+	template <typename T, typename U, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<T, P> mix(
+		vecType<T, P> const & x,
+		vecType<T, P> const & y,
+		vecType<U, P> const & a);
+
+	template <typename T, typename U, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<T, P> mix(
+		vecType<T, P> const & x,
+		vecType<T, P> const & y,
+		U const & a);
+
 	template <typename genTypeT, typename genTypeU>
 	GLM_FUNC_DECL genTypeT mix(
 		genTypeT const & x,
diff --git a/glm/detail/func_common.inl b/glm/detail/func_common.inl
index b5279795..65304a45 100644
--- a/glm/detail/func_common.inl
+++ b/glm/detail/func_common.inl
@@ -64,6 +64,63 @@ namespace detail
 			return x;
 		}
 	};
+
+	template <typename T, typename U, precision P, template <class, precision> class vecType>
+	struct compute_mix_vector
+	{
+		GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, vecType<T, P> const & y, vecType<U, P> const & a)
+		{
+			return vecType<T, P>(vecType<U, P>(x) + a * vecType<U, P>(y - x));
+		}
+	};
+
+	template <typename T, precision P, template <class, precision> class vecType>
+	struct compute_mix_vector<T, bool, P, vecType>
+	{
+		GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, vecType<T, P> const & y, vecType<bool, P> const & a)
+		{
+			vecType<T, P> Result;
+			for(length_t i = 0; i < x.length(); ++i)
+				Result[i] = a[i] ? y[i] : x[i];
+			return Result;
+		}
+	};
+
+	template <typename T, typename U, precision P, template <class, precision> class vecType>
+	struct compute_mix_scalar
+	{
+		GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, vecType<T, P> const & y, U const & a)
+		{
+			return vecType<T, P>(vecType<U, P>(x) + a * vecType<U, P>(y - x));
+		}
+	};
+
+	template <typename T, precision P, template <class, precision> class vecType>
+	struct compute_mix_scalar<T, bool, P, vecType>
+	{
+		GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, vecType<T, P> const & y, bool const & a)
+		{
+			return a ? y : x;
+		}
+	};
+
+	template <typename T, typename U>
+	struct compute_mix
+	{
+		GLM_FUNC_QUALIFIER static T call(T const & x, T const & y, U const & a)
+		{
+			return static_cast<T>(static_cast<U>(x) + a * static_cast<U>(y - x));
+		}
+	};
+
+	template <typename T>
+	struct compute_mix<T, bool>
+	{
+		GLM_FUNC_QUALIFIER static T call(T const & x, T const & y, bool const & a)
+		{
+			return a ? y : x;
+		}
+	};
 }//namespace detail
 
 	// abs
@@ -459,250 +516,37 @@ namespace detail
 			clamp(x.w, minVal.w, maxVal.w));
 	}
 
-	// mix
-	template <typename genType>
-	GLM_FUNC_QUALIFIER genType mix
+	template <typename T, typename U, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<T, P> mix
 	(
-		genType const & x,
-		genType const & y,
-		genType const & a
+		vecType<T, P> const & x,
+		vecType<T, P> const & y,
+		vecType<U, P> const & a
 	)
 	{
-		GLM_STATIC_ASSERT(
-			std::numeric_limits<genType>::is_iec559,
-			"'mix' only accept floating-point inputs");
-
-		return x + a * (y - x);
+		return detail::compute_mix_vector<T, U, P, vecType>::call(x, y, a);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER detail::tvec2<T, P> mix
+	template <typename T, typename U, precision P, template <typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<T, P> mix
 	(
-		detail::tvec2<T, P> const & x,
-		detail::tvec2<T, P> const & y,
-		T const & a
+		vecType<T, P> const & x,
+		vecType<T, P> const & y,
+		U const & a
 	)
 	{
-		GLM_STATIC_ASSERT(
-			std::numeric_limits<T>::is_iec559,
-			"'mix' only accept floating-point inputs");
-
-		return x + a * (y - x);
+		return detail::compute_mix_scalar<T, U, P, vecType>::call(x, y, a);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER detail::tvec3<T, P> mix
+	template <typename genTypeT, typename genTypeU>
+	GLM_FUNC_QUALIFIER genTypeT mix
 	(
-		detail::tvec3<T, P> const & x,
-		detail::tvec3<T, P> const & y,
-		T const & a
+		genTypeT const & x,
+		genTypeT const & y,
+		genTypeU const & a
 	)
 	{
-		GLM_STATIC_ASSERT(
-			std::numeric_limits<T>::is_iec559,
-			"'mix' only accept floating-point inputs");
-
-		return x + a * (y - x);
-	}
-
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER detail::tvec4<T, P> mix
-	(
-		detail::tvec4<T, P> const & x,
-		detail::tvec4<T, P> const & y,
-		T const & a
-	)
-	{
-		GLM_STATIC_ASSERT(
-			std::numeric_limits<T>::is_iec559,
-			"'mix' only accept floating-point inputs");
-
-		return x + a * (y - x);
-	}
-
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER detail::tvec2<T, P> mix
-	(
-		detail::tvec2<T, P> const & x,
-		detail::tvec2<T, P> const & y,
-		detail::tvec2<T, P> const & a
-	)
-	{
-		GLM_STATIC_ASSERT(
-			std::numeric_limits<T>::is_iec559,
-			"'mix' only accept floating-point inputs");
-
-		return x + a * (y - x);
-	}
-
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER detail::tvec3<T, P> mix
-	(
-		detail::tvec3<T, P> const & x,
-		detail::tvec3<T, P> const & y,
-		detail::tvec3<T, P> const & a
-	)
-	{
-		GLM_STATIC_ASSERT(
-			std::numeric_limits<T>::is_iec559,
-			"'mix' only accept floating-point inputs");
-
-		return x + a * (y - x);
-	}
-
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER detail::tvec4<T, P> mix
-	(
-		detail::tvec4<T, P> const & x,
-		detail::tvec4<T, P> const & y,
-		detail::tvec4<T, P> const & a
-	)
-	{
-		GLM_STATIC_ASSERT(
-			std::numeric_limits<T>::is_iec559,
-			"'mix' only accept floating-point inputs");
-
-		return x + a * (y - x);
-	}
-
-	//template <typename genTypeT>
-	//GLM_FUNC_QUALIFIER genTypeT mix
-	//(
-	//	genTypeT const & x, 
-	//	genTypeT const & y, 
-	//	float const & a
-	//)
-	//{
-	//	// It could be a vector too
-	//	//GLM_STATIC_ASSERT(
-	//	//	detail::type<genTypeT>::is_float && 
-	//	//	detail::type<genTypeU>::is_float);
-
-	//	return x + a * (y - x);
-	//}
-
-	template <>
-	GLM_FUNC_QUALIFIER float mix
-	(
-		float const & x,
-		float const & y,
-		bool const & a
-	)
-	{
-		return a ? y : x;
-	}
-
-	template <>
-	GLM_FUNC_QUALIFIER double mix
-	(
-		double const & x,
-		double const & y,
-		bool const & a
-	)
-	{
-		return a ? y : x;
-	}
-
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER detail::tvec2<T, P> mix
-	(
-		detail::tvec2<T, P> const & x,
-		detail::tvec2<T, P> const & y,
-		bool a
-	)
-	{
-		GLM_STATIC_ASSERT(
-			std::numeric_limits<T>::is_iec559,
-			"'mix' only accept floating-point inputs");
-
-		return a ? y : x;
-	}
-
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER detail::tvec3<T, P> mix
-	(
-		detail::tvec3<T, P> const & x,
-		detail::tvec3<T, P> const & y,
-		bool a
-	)
-	{
-		GLM_STATIC_ASSERT(
-			std::numeric_limits<T>::is_iec559,
-			"'mix' only accept floating-point inputs");
-
-		return a ? y : x;
-	}
-
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER detail::tvec4<T, P> mix
-	(
-		detail::tvec4<T, P> const & x,
-		detail::tvec4<T, P> const & y,
-		bool a
-	)
-	{
-		GLM_STATIC_ASSERT(
-			std::numeric_limits<T>::is_iec559,
-			"'mix' only accept floating-point inputs");
-
-		return a ? y : x;
-	}
-
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER detail::tvec2<T, P> mix
-	(
-		detail::tvec2<T, P> const & x,
-		detail::tvec2<T, P> const & y,
-		typename detail::tvec2<T, P>::bool_type a
-	)
-	{
-		GLM_STATIC_ASSERT(
-			std::numeric_limits<T>::is_iec559,
-			"'mix' only accept floating-point inputs");
-
-		detail::tvec2<T, P> result;
-		for(int i = 0; i < x.length(); ++i)
-			result[i] = a[i] ? y[i] : x[i];
-
-		return result;
-	}
-
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER detail::tvec3<T, P> mix
-	(
-		detail::tvec3<T, P> const & x,
-		detail::tvec3<T, P> const & y,
-		typename detail::tvec3<T, P>::bool_type a
-	)
-	{
-		GLM_STATIC_ASSERT(
-			std::numeric_limits<T>::is_iec559,
-			"'mix' only accept floating-point inputs");
-
-		detail::tvec3<T, P> result;
-		for(int i = 0; i < x.length(); ++i)
-			result[i] = a[i] ? y[i] : x[i];
-
-		return result;
-	}
-
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER detail::tvec4<T, P> mix
-	(
-		detail::tvec4<T, P> const & x,
-		detail::tvec4<T, P> const & y,
-		typename detail::tvec4<T, P>::bool_type a
-	)
-	{
-		GLM_STATIC_ASSERT(
-			std::numeric_limits<T>::is_iec559,
-			"'mix' only accept floating-point inputs");
-
-		detail::tvec4<T, P> result;
-		for(int i = 0; i < x.length(); ++i)
-			result[i] = a[i] ? y[i] : x[i];
-
-		return result;
+		return detail::compute_mix<genTypeT, genTypeU>::call(x, y, a);
 	}
 
 	// step
diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
index 1ad465ef..34524ab1 100644
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@@ -668,7 +668,7 @@
 #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_ARCH_DISPLAYED))
 #	define GLM_MESSAGE_ARCH_DISPLAYED
 #	if(GLM_ARCH == GLM_ARCH_PURE)
-#		pragma message("GLM: Platform independent")
+#		pragma message("GLM: Platform independent code")
 #	elif(GLM_ARCH & GLM_ARCH_AVX2)
 #		pragma message("GLM: AVX2 instruction set")
 #	elif(GLM_ARCH & GLM_ARCH_AVX)
diff --git a/readme.txt b/readme.txt
index 603d6cf7..c4142f51 100644
--- a/readme.txt
+++ b/readme.txt
@@ -49,6 +49,8 @@ GLM 0.9.5.2: 2014-0X-XX
 --------------------------------------------------------------------------------
 - Fixed warnings with the Android NDK 9c
 - Fixed non power of two matrix products
+- Fixed mix function link error
+- Fixed SSE code included in GLM tests on "pure" platforms
 
 ================================================================================
 GLM 0.9.5.1: 2014-01-11
diff --git a/test/gtx/gtx_bit.cpp b/test/gtx/gtx_bit.cpp
index d3ec857a..34e80364 100644
--- a/test/gtx/gtx_bit.cpp
+++ b/test/gtx/gtx_bit.cpp
@@ -11,7 +11,6 @@
 #include <glm/gtx/bit.hpp>
 #include <glm/gtc/type_precision.hpp>
 
-#include <emmintrin.h>
 #if(GLM_ARCH != GLM_ARCH_PURE)
 #	include <glm/detail/intrinsic_integer.hpp>
 #endif
@@ -152,6 +151,7 @@ namespace bitfieldInterleave
 		return REG1 | (REG2 << 1);
 	}
 
+#if(GLM_ARCH != GLM_ARCH_PURE)
 	inline glm::uint64 sseBitfieldInterleave(glm::uint32 x, glm::uint32 y)
 	{
 		GLM_ALIGN(16) glm::uint32 const Array[4] = {x, 0, y, 0};
@@ -267,6 +267,7 @@ namespace bitfieldInterleave
 
 		return Result[0];
 	}
+#endif//(GLM_ARCH != GLM_ARCH_PURE)
 
 	int test()
 	{
@@ -287,16 +288,17 @@ namespace bitfieldInterleave
 				glm::uint64 B = fastBitfieldInterleave(x, y);
 				glm::uint64 C = loopBitfieldInterleave(x, y);
 				glm::uint64 D = interleaveBitfieldInterleave(x, y);
-				glm::uint64 E = sseBitfieldInterleave(x, y);
-				glm::uint64 F = sseUnalignedBitfieldInterleave(x, y);
 
 				assert(A == B);
 				assert(A == C);
 				assert(A == D);
-				assert(A == E);
-				assert(A == F);
 
 #				if(GLM_ARCH != GLM_ARCH_PURE)
+					glm::uint64 E = sseBitfieldInterleave(x, y);
+					glm::uint64 F = sseUnalignedBitfieldInterleave(x, y);
+					assert(A == E);
+					assert(A == F);
+
 					__m128i G = glm::detail::_mm_bit_interleave_si128(_mm_set_epi32(0, y, 0, x));
 					glm::uint64 Result[2];
 					_mm_storeu_si128((__m128i*)Result, G);
@@ -366,6 +368,7 @@ namespace bitfieldInterleave
 			std::cout << "interleaveBitfieldInterleave Time " << Time << " clocks" << std::endl;
 		}
 
+#		if(GLM_ARCH != GLM_ARCH_PURE)
 		{
 			std::clock_t LastTime = std::clock();
 
@@ -387,6 +390,7 @@ namespace bitfieldInterleave
 
 			std::cout << "sseUnalignedBitfieldInterleave Time " << Time << " clocks" << std::endl;
 		}
+#		endif//(GLM_ARCH != GLM_ARCH_PURE)
 
 		{
 			std::clock_t LastTime = std::clock();
diff --git a/test/gtx/gtx_int_10_10_10_2.cpp b/test/gtx/gtx_int_10_10_10_2.cpp
index 65ae56c8..ab59bb2f 100644
--- a/test/gtx/gtx_int_10_10_10_2.cpp
+++ b/test/gtx/gtx_int_10_10_10_2.cpp
@@ -7,9 +7,6 @@
 // File    : test/gtx/associated_min_max.cpp
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include <emmintrin.h>
-
-#include <glm/glm.hpp>
 #include <glm/gtc/type_precision.hpp>
 #include <glm/gtx/associated_min_max.hpp>
 
diff --git a/test/gtx/gtx_mixed_product.cpp b/test/gtx/gtx_mixed_product.cpp
index 65ae56c8..ab59bb2f 100644
--- a/test/gtx/gtx_mixed_product.cpp
+++ b/test/gtx/gtx_mixed_product.cpp
@@ -7,9 +7,6 @@
 // File    : test/gtx/associated_min_max.cpp
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include <emmintrin.h>
-
-#include <glm/glm.hpp>
 #include <glm/gtc/type_precision.hpp>
 #include <glm/gtx/associated_min_max.hpp>