diff --git a/src/lib/eina/eina_quaternion.c b/src/lib/eina/eina_quaternion.c
index b9b73e2c98..93dbb31d7a 100644
--- a/src/lib/eina/eina_quaternion.c
+++ b/src/lib/eina/eina_quaternion.c
@@ -28,6 +28,7 @@
 #include "eina_fp.h"
 #include "eina_matrix.h"
 #include "eina_quaternion.h"
+#include "eina_util.h"
 
 EAPI void
 eina_quaternion_f16p16_set(Eina_Quaternion *out,
@@ -446,12 +447,12 @@ eina_quaternion_lerp(Eina_Quaternion *out,
                      const Eina_Quaternion *b,
                      double pos)
 {
-   if (pos == 0)
+   if (EINA_DBL_CMP(pos, 0.0))
      {
         *out = *a;
         return ;
      }
-   else if (pos == 1.0)
+   else if (EINA_DBL_CMP(pos, 1.0))
      {
         *out = *b;
         return ;
@@ -474,12 +475,12 @@ eina_quaternion_slerp(Eina_Quaternion *out,
    double dot;
    double pos1, pos2;
 
-   if (pos == 0)
+   if (EINA_DBL_CMP(pos, 0.0))
      {
         *out = *a;
         return ;
      }
-   else if (pos == 1.0)
+   else if (EINA_DBL_CMP(pos, 1.0))
      {
         *out = *b;
         return ;
@@ -527,12 +528,12 @@ eina_quaternion_nlerp(Eina_Quaternion *out,
    Eina_Quaternion not_normalize;
    double dot;
 
-   if (pos == 0)
+   if (EINA_DBL_CMP(pos, 0.0))
      {
         *out = *a;
         return ;
      }
-   else if (pos == 1.0)
+   else if (EINA_DBL_CMP(pos, 1.0))
      {
         *out = *b;
         return ;
@@ -691,7 +692,7 @@ eina_matrix4_quaternion_to(Eina_Quaternion *rotation,
    Eina_Matrix4 n, pm;
    double det, factor;
 
-   if (m->ww == 0) return EINA_FALSE;
+   if (EINA_DBL_CMP(m->ww, 0.0)) return EINA_FALSE;
 
    // Normalize the matrix.
    factor = 1 / m->ww;
@@ -931,7 +932,7 @@ eina_quaternion_matrix4_to(Eina_Matrix4 *m,
 
    // apply skew
    // rm is a identity 4x4 matrix initially
-   if (skew->z)
+   if (!EINA_DBL_CMP(skew->z, 0.0))
      {
         Eina_Matrix4 cp;
 
@@ -942,7 +943,7 @@ eina_quaternion_matrix4_to(Eina_Matrix4 *m,
         tmp = cp;
      }
 
-   if (skew->y)
+   if (!EINA_DBL_CMP(skew->y, 0.0))
      {
         Eina_Matrix4 cp;
 
@@ -954,7 +955,7 @@ eina_quaternion_matrix4_to(Eina_Matrix4 *m,
         tmp = cp;
      }
 
-   if (skew->x)
+   if (!EINA_DBL_CMP(skew->x, 0.0))
      {
         Eina_Matrix4 cp;
 
@@ -1028,7 +1029,7 @@ eina_quaternion_copy(Eina_Quaternion *dst, const Eina_Quaternion *src)
 EAPI void
 eina_quaternion_homogeneous_regulate(Eina_Quaternion *out, const Eina_Quaternion *v)
 {
-   if (v->w != 0.0)
+   if (!EINA_DBL_CMP(v->w, 0.0))
      {
         double scale = 1.0 / v->w;