diff --git a/src/bin/elementary/config.c b/src/bin/elementary/config.c
--- a/src/bin/elementary/config.c
+++ b/src/bin/elementary/config.c
@@ -213,7 +213,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -224,7 +224,7 @@
    double bf = elm_config_scroll_bounce_friction_get();
    double val = elm_slider_value_get(obj);
 
-   if (bf == val) return;
+   if (EINA_DBL_EQ(bf, val)) return;
    elm_config_scroll_bounce_friction_set(val);
    elm_config_all_flush();
 }
@@ -238,7 +238,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -249,7 +249,7 @@
    double ps = elm_config_scroll_page_scroll_friction_get();
    double val = elm_slider_value_get(obj);
 
-   if (ps == val) return;
+   if (EINA_DBL_EQ(ps, val)) return;
    elm_config_scroll_page_scroll_friction_set(val);
    elm_config_all_flush();
 }
@@ -263,7 +263,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -274,7 +274,7 @@
    double bis = elm_config_scroll_bring_in_scroll_friction_get();
    double val = elm_slider_value_get(obj);
 
-   if (bis == val) return;
+   if (EINA_DBL_EQ(bis, val)) return;
    elm_config_scroll_bring_in_scroll_friction_set(val);
    elm_config_all_flush();
 }
@@ -288,7 +288,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -299,7 +299,7 @@
    double zf = elm_config_scroll_zoom_friction_get();
    double val = elm_slider_value_get(obj);
 
-   if (zf == val) return;
+   if (EINA_DBL_EQ(zf, val)) return;
    elm_config_scroll_zoom_friction_set(val);
    elm_config_all_flush();
 }
@@ -313,7 +313,7 @@
    double v;
 
    v = ((double)((int)(val * 100.0))) / 100.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -324,7 +324,7 @@
    double zf = elm_config_scroll_thumbscroll_smooth_amount_get();
    double val = elm_slider_value_get(obj);
 
-   if (zf == val) return;
+   if (EINA_DBL_EQ(zf, val)) return;
    elm_config_scroll_thumbscroll_smooth_amount_set(val);
    elm_config_all_flush();
 }
@@ -338,7 +338,7 @@
    double v;
 
    v = ((double)((int)(val * 100.0))) / 100.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -349,7 +349,7 @@
    double zf = elm_config_scroll_thumbscroll_smooth_time_window_get();
    double val = elm_slider_value_get(obj);
 
-   if (zf == val) return;
+   if (EINA_DBL_EQ(zf, val)) return;
    elm_config_scroll_thumbscroll_smooth_time_window_set(val);
    elm_config_all_flush();
 }
@@ -378,7 +378,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -389,7 +389,7 @@
    double tst = elm_config_scroll_thumbscroll_threshold_get();
    double val = elm_slider_value_get(obj);
 
-   if (tst == val) return;
+   if (EINA_DBL_EQ(tst, val)) return;
    elm_config_scroll_thumbscroll_threshold_set(val);
    elm_config_all_flush();
 }
@@ -403,7 +403,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -414,7 +414,7 @@
    double tst = elm_config_scroll_thumbscroll_hold_threshold_get();
    double val = elm_slider_value_get(obj);
 
-   if (tst == val) return;
+   if (EINA_DBL_EQ(tst, val)) return;
    elm_config_scroll_thumbscroll_hold_threshold_set(val);
    elm_config_all_flush();
 }
@@ -428,7 +428,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -439,7 +439,7 @@
    double tsmt = elm_config_scroll_thumbscroll_momentum_threshold_get();
    double val = elm_slider_value_get(obj);
 
-   if (tsmt == val) return;
+   if (EINA_DBL_EQ(tsmt, val)) return;
    elm_config_scroll_thumbscroll_momentum_threshold_set(val);
    elm_config_all_flush();
 }
@@ -453,7 +453,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -464,7 +464,7 @@
    double tsfdt = elm_config_scroll_thumbscroll_flick_distance_tolerance_get();
    double val = elm_slider_value_get(obj);
 
-   if (tsfdt == val) return;
+   if (EINA_DBL_EQ(tsfdt, val)) return;
    elm_config_scroll_thumbscroll_flick_distance_tolerance_set(val);
    elm_config_all_flush();
 }
@@ -478,7 +478,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -489,7 +489,7 @@
    double tsf = elm_config_scroll_thumbscroll_friction_get();
    double val = elm_slider_value_get(obj);
 
-   if (tsf == val) return;
+   if (EINA_DBL_EQ(tsf, val)) return;
    elm_config_scroll_thumbscroll_friction_set(val);
    elm_config_all_flush();
 }
@@ -503,7 +503,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -514,7 +514,7 @@
    double tsmf = elm_config_scroll_thumbscroll_min_friction_get();
    double val = elm_slider_value_get(obj);
 
-   if (tsmf == val) return;
+   if (EINA_DBL_EQ(tsmf, val)) return;
    elm_config_scroll_thumbscroll_min_friction_set(val);
    elm_config_all_flush();
 }
@@ -528,7 +528,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -539,7 +539,7 @@
    double tsfs = elm_config_scroll_thumbscroll_friction_standard_get();
    double val = elm_slider_value_get(obj);
 
-   if (tsfs == val) return;
+   if (EINA_DBL_EQ(tsfs, val)) return;
    elm_config_scroll_thumbscroll_friction_standard_set(val);
    elm_config_all_flush();
 }
@@ -553,7 +553,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -564,7 +564,7 @@
    double tsbf = elm_config_scroll_thumbscroll_border_friction_get();
    double val = elm_slider_value_get(obj);
 
-   if (tsbf == val) return;
+   if (EINA_DBL_EQ(tsbf, val)) return;
    elm_config_scroll_thumbscroll_border_friction_set(val);
    elm_config_all_flush();
 }
@@ -578,7 +578,7 @@
    double v;
 
    v = ((double)((int)(val * 20.0))) / 20.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -589,7 +589,7 @@
    double tssf = elm_config_scroll_thumbscroll_sensitivity_friction_get();
    double val = elm_slider_value_get(obj);
 
-   if (tssf == val) return;
+   if (EINA_DBL_EQ(tssf, val)) return;
    elm_config_scroll_thumbscroll_sensitivity_friction_set(val);
    elm_config_all_flush();
 }
@@ -603,7 +603,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -614,7 +614,7 @@
    double tsat = elm_config_scroll_thumbscroll_acceleration_threshold_get();
    double val = elm_slider_value_get(obj);
 
-   if (tsat == val) return;
+   if (EINA_DBL_EQ(tsat, val)) return;
    elm_config_scroll_thumbscroll_acceleration_threshold_set(val);
    elm_config_all_flush();
 }
@@ -628,7 +628,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -639,7 +639,7 @@
    double tsatl = elm_config_scroll_thumbscroll_acceleration_time_limit_get();
    double val = elm_slider_value_get(obj);
 
-   if (tsatl == val) return;
+   if (EINA_DBL_EQ(tsatl, val)) return;
    elm_config_scroll_thumbscroll_acceleration_time_limit_set(val);
    elm_config_all_flush();
 }
@@ -653,7 +653,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -664,7 +664,7 @@
    double tsaw = elm_config_scroll_thumbscroll_acceleration_weight_get();
    double val = elm_slider_value_get(obj);
 
-   if (tsaw == val) return;
+   if (EINA_DBL_EQ(tsaw, val)) return;
    elm_config_scroll_thumbscroll_acceleration_weight_set(val);
    elm_config_all_flush();
 }
@@ -692,7 +692,7 @@
    double v;
 
    v = ((double)((int)(val * 5.0))) / 5.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -703,7 +703,7 @@
    double cf = elm_config_cache_flush_interval_get();
    double val = elm_slider_value_get(obj);
 
-   if (cf == val) return;
+   if (EINA_DBL_EQ(cf, val)) return;
    elm_config_cache_flush_interval_set(val);
    elm_config_all_flush();
 }
@@ -717,7 +717,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -728,7 +728,7 @@
    double font_cache = elm_config_cache_font_cache_size_get();
    double val = elm_slider_value_get(obj);
 
-   if (font_cache == val) return;
+   if (EINA_DBL_EQ(font_cache, val)) return;
    elm_config_cache_font_cache_size_set(val * 1024);
    elm_config_all_flush();
 }
@@ -742,7 +742,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -753,7 +753,7 @@
    double image_cache = elm_config_cache_image_cache_size_get();
    double val = elm_slider_value_get(obj);
 
-   if (image_cache == val) return;
+   if (EINA_DBL_EQ(image_cache, val)) return;
    elm_config_cache_image_cache_size_set(val * 1024);
    elm_config_all_flush();
 }
@@ -767,7 +767,7 @@
    double v;
 
    v = ((double)((int)(val * 10.0))) / 10.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -778,7 +778,7 @@
    double scale = elm_config_scale_get();
    double val = elm_slider_value_get(obj);
 
-   if (scale == val) return;
+   if (EINA_DBL_EQ(scale, val)) return;
    elm_config_scale_set(val);
    elm_config_all_flush();
 }
@@ -792,7 +792,7 @@
    double v;
 
    v = ((double)((int)(val * 5.0))) / 5.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -803,7 +803,7 @@
    double fs = elm_config_finger_size_get();
    double val = elm_slider_value_get(obj);
 
-   if (fs == val) return;
+   if (EINA_DBL_EQ(fs, val)) return;
    elm_config_finger_size_set(val);
    elm_config_all_flush();
 }
@@ -817,7 +817,7 @@
    double v;
 
    v = ((double)((int)(val * 5.0))) / 5.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -828,7 +828,7 @@
    double efc = elm_config_cache_edje_file_cache_size_get();
    double val = elm_slider_value_get(obj);
 
-   if (efc == val) return;
+   if (EINA_DBL_EQ(efc, val)) return;
    elm_config_cache_edje_file_cache_size_set(val);
    elm_config_all_flush();
 }
@@ -842,7 +842,7 @@
    double v;
 
    v = ((double)((int)(val * 5.0))) / 5.0;
-   if (v != val) elm_slider_value_set(obj, v);
+   if (!EINA_DBL_EQ(v, val)) elm_slider_value_set(obj, v);
 }
 
 static void
@@ -853,7 +853,7 @@
    double ecc = elm_config_cache_edje_collection_cache_size_get();
    double val = elm_slider_value_get(obj);
 
-   if (ecc == val) return;
+   if (EINA_DBL_EQ(ecc, val)) return;
    elm_config_cache_edje_collection_cache_size_set(val);
    elm_config_all_flush();
 }
@@ -944,7 +944,7 @@
    double val = elm_slider_value_get(obj);
    Eina_Bool scale = elm_config_transition_duration_factor_get();
 
-   if (scale == val) return;
+   if (EINA_DBL_EQ(scale, val)) return;
    elm_config_transition_duration_factor_set(val);
    elm_config_all_flush();
 }
diff --git a/src/bin/elementary/elm_prefs_cc_parse.c b/src/bin/elementary/elm_prefs_cc_parse.c
--- a/src/bin/elementary/elm_prefs_cc_parse.c
+++ b/src/bin/elementary/elm_prefs_cc_parse.c
@@ -1345,7 +1345,7 @@
         return a;
 
       case '/':
-        if (b != 0) a /= b;
+        if (EINA_DBL_NONZERO(b)) a /= b;
         else
           ERR("%s:%i divide by zero", file_in, line - 1);
         return a;
@@ -1355,7 +1355,7 @@
         return a;
 
       case '%':
-        if (0 != b) a = (double)((int)a % (int)b);
+        if (EINA_DBL_NONZERO(b)) a = (double)((int)a % (int)b);
         else
           ERR("%s:%i modula by zero", file_in, line - 1);
         return a;
diff --git a/src/bin/elementary/test_gesture_layer3.c b/src/bin/elementary/test_gesture_layer3.c
--- a/src/bin/elementary/test_gesture_layer3.c
+++ b/src/bin/elementary/test_gesture_layer3.c
@@ -272,7 +272,7 @@
    po->rot_tot_time = fabs(r_info->momentum) / ROTATE_MOMENTUM_FRICTION;
    po->rot_momentum = r_info->momentum;
    po->rot_progress = 0.0;
-   if (po->rot_momentum)
+   if (EINA_DBL_NONZERO(po->rot_momentum))
      {
         po->rot_timer = ecore_animator_add(rotate_momentum_animation_operation, po);
      }
@@ -334,7 +334,7 @@
    po->zoom_mom_time = tot_time;
    po->zoom_mom = p->momentum;
    po->base_zoom = po->zoom;
-   if (po->zoom_mom)
+   if (EINA_DBL_NONZERO(po->zoom_mom))
      {
         po->zoom_momentum = elm_transit_add();
         elm_transit_duration_set(po->zoom_momentum,
@@ -425,7 +425,7 @@
    po->mom_tot_time = sqrt((p->mx * p->mx) + (p->my * p->my))
       / MOMENTUM_FRICTION;
 
-   if (po->mom_tot_time)
+   if (EINA_DBL_NONZERO(po->mom_tot_time))
      {  /* Compute acceleration for both compenents, and launch timer */
         po->mom_x_acc = (p->mx) / po->mom_tot_time; /* a = (v-v0) / t */
         po->mom_y_acc = (p->my) / po->mom_tot_time; /* a = (v-v0) / t */
diff --git a/src/bin/elementary/test_glview_manygears.c b/src/bin/elementary/test_glview_manygears.c
--- a/src/bin/elementary/test_glview_manygears.c
+++ b/src/bin/elementary/test_glview_manygears.c
@@ -405,7 +405,7 @@
    sine = sin(radians);
    cosine = cos(radians);
 
-   if ((deltaZ == 0) || (sine == 0) || (aspect == 0))
+   if (EINA_DBL_EQ(deltaZ, 0) || EINA_DBL_EQ(sine, 0) || EINA_DBL_EQ(aspect, 0))
       return;
 
    cotangent = cosine / sine;
diff --git a/src/bin/elementary/test_map.c b/src/bin/elementary/test_map.c
--- a/src/bin/elementary/test_map.c
+++ b/src/bin/elementary/test_map.c
@@ -448,7 +448,7 @@
    if (addr)
      {
         printf("name of [lon = %lf, lat = %lf] is %s\n", lon, lat, addr);
-        if ((lon != 0.0) && (lat !=0.0))
+        if (EINA_DBL_NONZERO(lon) && EINA_DBL_NONZERO(lat))
           {
              Eina_Bool b = elm_map_paused_get(data);
              elm_map_paused_set(data, EINA_TRUE);
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -175,7 +175,7 @@
      zoom -= 0.5;
    else if ((zoom > 1.0) && (zoom <= 1.5))
      zoom = 1.0;
-   else if (zoom == 1.0)
+   else if (EINA_DBL_EQ(zoom, 1.0))
      zoom = 0.8;
    else
      zoom = zoom * zoom;
diff --git a/src/bin/elementary/test_tooltip.c b/src/bin/elementary/test_tooltip.c
--- a/src/bin/elementary/test_tooltip.c
+++ b/src/bin/elementary/test_tooltip.c
@@ -157,7 +157,7 @@
           sc = ((float)sw * 0.8) / (float)w;
         else if ((float)h / (float)sh >= 0.8)
           sc = ((float)sh * 0.8) / (float)h;
-        if (sc) elm_object_scale_set(ic, sc);
+        if (EINA_FLT_NONZERO(sc)) elm_object_scale_set(ic, sc);
      }
    return ic;
 }