diff --git a/legacy/elementary/src/lib/elc_scrolled_entry.c b/legacy/elementary/src/lib/elc_scrolled_entry.c
index d593df6788..dcab883f63 100644
--- a/legacy/elementary/src/lib/elc_scrolled_entry.c
+++ b/legacy/elementary/src/lib/elc_scrolled_entry.c
@@ -571,9 +571,9 @@ elm_scrolled_entry_select_all(Evas_Object *obj)
 EAPI Eina_Bool
 elm_scrolled_entry_cursor_next(Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) 0;
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return 0;
+   if (!wd) return EINA_FALSE;
    return elm_entry_cursor_next(wd->entry);
 }
 
@@ -588,9 +588,9 @@ elm_scrolled_entry_cursor_next(Evas_Object *obj)
 EAPI Eina_Bool
 elm_scrolled_entry_cursor_prev(Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) 0;
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return 0;
+   if (!wd) return EINA_FALSE;
    return elm_entry_cursor_prev(wd->entry);
 }
 
@@ -605,9 +605,9 @@ elm_scrolled_entry_cursor_prev(Evas_Object *obj)
 EAPI Eina_Bool
 elm_scrolled_entry_cursor_up(Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) 0;
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return 0;
+   if (!wd) return EINA_FALSE;
    return elm_entry_cursor_up(wd->entry);
 }
 
@@ -622,9 +622,9 @@ elm_scrolled_entry_cursor_up(Evas_Object *obj)
 EAPI Eina_Bool
 elm_scrolled_entry_cursor_down(Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) 0;
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return 0;
+   if (!wd) return EINA_FALSE;
    return elm_entry_cursor_down(wd->entry);
 }
 
@@ -737,9 +737,9 @@ elm_scrolled_entry_cursor_selection_end(Evas_Object *obj)
 EAPI Eina_Bool
 elm_scrolled_entry_cursor_is_format_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) 0;
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return 0;
+   if (!wd) return EINA_FALSE;
    return elm_entry_cursor_is_format_get(wd->entry);
 }
 
@@ -754,9 +754,9 @@ elm_scrolled_entry_cursor_is_format_get(const Evas_Object *obj)
 EAPI Eina_Bool
 elm_scrolled_entry_cursor_is_visible_format_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) 0;
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return 0;
+   if (!wd) return EINA_FALSE;
    return elm_entry_cursor_is_visible_format_get(wd->entry);
 }
 
@@ -890,9 +890,9 @@ elm_scrolled_entry_context_menu_disabled_set(Evas_Object *obj, Eina_Bool disable
 EAPI Eina_Bool
 elm_scrolled_entry_context_menu_disabled_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) 0;
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return 0;
+   if (!wd) return EINA_FALSE;
    return elm_entry_context_menu_disabled_get(wd->entry);
 }
 
diff --git a/legacy/elementary/src/lib/elm_config.c b/legacy/elementary/src/lib/elm_config.c
index bb112b884d..44b36bebb0 100644
--- a/legacy/elementary/src/lib/elm_config.c
+++ b/legacy/elementary/src/lib/elm_config.c
@@ -64,7 +64,7 @@ _prop_config_get(void)
                                               _atom[ATOM_E_CONFIG], 
                                               _atom[ATOM_E_CONFIG], 
                                               8, &data, &size))
-          return 0;
+          return EINA_FALSE;
         else
           _atom_config = _atom[ATOM_E_CONFIG];
      }
@@ -73,16 +73,16 @@ _prop_config_get(void)
    if (size < 1)
      {
         free(data);
-        return 0;
+        return EINA_FALSE;
      }
    config_data = eet_data_descriptor_decode(_config_edd, data, size);
    free(data);
-   if (!config_data) return 0;
+   if (!config_data) return EINA_FALSE;
    _config_free();
    _elm_config = config_data;
    _config_apply();
    _elm_rescale();
-   return 1;
+   return EINA_TRUE;
 }
 
 static int
diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index 436c42b2ef..fac0cff74f 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -705,7 +705,7 @@ _mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *
 {
    Elm_Genlist_Item *it = data;
    Evas_Event_Mouse_Up *ev = event_info;
-   Eina_Bool dragged = 0;
+   Eina_Bool dragged = EINA_FALSE;
 
    if (ev->button != 1) return;
    it->down = 0;
@@ -2112,7 +2112,7 @@ elm_genlist_realized_items_get(const Evas_Object *obj)
    Widget_Data *wd = elm_widget_data_get(obj);
    Eina_List *list = NULL;
    Item_Block *itb;
-   Eina_Bool done = 0;
+   Eina_Bool done = EINA_FALSE;
    if (!wd) return NULL;
    EINA_INLIST_FOREACH(wd->blocks, itb)
      {
diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c
index 31c1a1f6fe..48c547f0c5 100644
--- a/legacy/elementary/src/lib/elm_index.c
+++ b/legacy/elementary/src/lib/elm_index.c
@@ -268,7 +268,7 @@ _sel_eval(Evas_Object *obj, Evas_Coord evx, Evas_Coord evy)
    Evas_Coord x, y, w, h, bx, by, bw, bh, xx, yy;
    double cdv = 0.5;
    Evas_Coord dist;
-   Eina_Bool change = 0;
+   Eina_Bool change = EINA_FALSE;
    char *label = NULL, *last = NULL;
    int i;
    if (!wd) return;
diff --git a/legacy/elementary/src/lib/elm_main.c b/legacy/elementary/src/lib/elm_main.c
index 5a8397bf3e..e72bcf6b7f 100644
--- a/legacy/elementary/src/lib/elm_main.c
+++ b/legacy/elementary/src/lib/elm_main.c
@@ -328,7 +328,7 @@ elm_shutdown(void)
 }
 
 #ifdef ELM_EDBUS
-static Eina_Bool _elm_need_e_dbus = 0;
+static Eina_Bool _elm_need_e_dbus = EINA_FALSE;
 #endif
 EAPI void
 elm_need_e_dbus(void)
@@ -355,7 +355,7 @@ _elm_unneed_e_dbus(void)
 }
 
 #ifdef ELM_EFREET
-static Eina_Bool _elm_need_efreet = 0;
+static Eina_Bool _elm_need_efreet = EINA_FALSE;
 #endif
 EAPI void
 elm_need_efreet(void)
diff --git a/legacy/elementary/src/lib/elm_menu.c b/legacy/elementary/src/lib/elm_menu.c
index 4556e9623b..85d9ca97fc 100644
--- a/legacy/elementary/src/lib/elm_menu.c
+++ b/legacy/elementary/src/lib/elm_menu.c
@@ -657,7 +657,7 @@ elm_menu_item_disabled_set(Elm_Menu_Item *item, Eina_Bool disabled)
 EAPI Eina_Bool
 elm_menu_item_disabled_get(Elm_Menu_Item *item)
 {
-   if (!item) return 0;
+   if (!item) return EINA_FALSE;
    return item->disabled;
 }
 
@@ -733,7 +733,7 @@ elm_menu_item_icon_get(Elm_Menu_Item *item)
 EAPI Eina_Bool
 elm_menu_item_is_separator(Elm_Menu_Item *item)
 {
-   if (!item) return 0;
+   if (!item) return EINA_FALSE;
    return item->separator;
 }
 
diff --git a/legacy/elementary/src/lib/elm_photo.c b/legacy/elementary/src/lib/elm_photo.c
index 5526ee6929..8d8b8ab633 100644
--- a/legacy/elementary/src/lib/elm_photo.c
+++ b/legacy/elementary/src/lib/elm_photo.c
@@ -132,13 +132,13 @@ elm_photo_add(Evas_Object *parent)
 EAPI Eina_Bool
 elm_photo_file_set(Evas_Object *obj, const char *file)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) 0;
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return 0;
+   if (!wd) return EINA_FALSE;
    if (!_els_smart_icon_file_key_set(wd->img, file, NULL))
-     return 0;
+     return EINA_FALSE;
    _sizing_eval(obj);
-   return 1;
+   return EINA_TRUE;
 }
 
 /**
diff --git a/legacy/elementary/src/lib/elm_photocam.c b/legacy/elementary/src/lib/elm_photocam.c
index 426cd8a8da..183ec05d46 100644
--- a/legacy/elementary/src/lib/elm_photocam.c
+++ b/legacy/elementary/src/lib/elm_photocam.c
@@ -375,7 +375,7 @@ grid_load(Evas_Object *obj, Grid *g)
         for (x = 0; x < g->gw; x++)
           {
              int tn, xx, yy, ww, hh;
-             Eina_Bool visible = 0;
+             Eina_Bool visible = EINA_FALSE;
              
              tn = (y * g->gw) + x;
              xx = g->grid[tn].out.x;
diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c
index 564f14aa8b..96fcbd2918 100644
--- a/legacy/elementary/src/lib/elm_spinner.c
+++ b/legacy/elementary/src/lib/elm_spinner.c
@@ -208,14 +208,14 @@ _value_set(Evas_Object *obj, double delta)
           new_val = wd->val_max;
      }
 
-   if (new_val == wd->val) return 0;
+   if (new_val == wd->val) return EINA_FALSE;
    wd->val = new_val;
 
    evas_object_smart_callback_call(obj, "changed", NULL);
    if (wd->delay) ecore_timer_del(wd->delay);
    wd->delay = ecore_timer_add(0.2, _delay_change, obj);
 
-   return 1;
+   return EINA_TRUE;
 }
 
 static void
diff --git a/legacy/elementary/src/lib/elm_thumb.c b/legacy/elementary/src/lib/elm_thumb.c
index d12fa55edb..afeffc8319 100644
--- a/legacy/elementary/src/lib/elm_thumb.c
+++ b/legacy/elementary/src/lib/elm_thumb.c
@@ -308,7 +308,7 @@ _thumb_hide_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void
 #endif
 
 #ifdef ELM_ETHUMB
-static Eina_Bool _elm_need_ethumb = 0;
+static Eina_Bool _elm_need_ethumb = EINA_FALSE;
 
 static void _on_die_cb(void *, Ethumb_Client *);
 
diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c
index 94763e76c1..878ffa60f8 100644
--- a/legacy/elementary/src/lib/elm_toolbar.c
+++ b/legacy/elementary/src/lib/elm_toolbar.c
@@ -659,10 +659,10 @@ elm_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable)
 EAPI Eina_Bool
 elm_toolbar_scrollable_get(Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) 0;
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
 
-   if (!wd) return 0;
+   if (!wd) return EINA_FALSE;
    return wd->scrollable;
 }
 
@@ -696,10 +696,10 @@ elm_toolbar_homogenous_set(Evas_Object *obj, Eina_Bool homogenous)
 EAPI Eina_Bool
 elm_toolbar_homogenous_get(Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) 0;
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
 
-   if (!wd) return 0;
+   if (!wd) return EINA_FALSE;
    return wd->homogeneous;
 }
 
diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c
index 684d19775d..cee9846056 100644
--- a/legacy/elementary/src/lib/elm_widget.c
+++ b/legacy/elementary/src/lib/elm_widget.c
@@ -1011,7 +1011,7 @@ elm_widget_drag_lock_y_set(Evas_Object *obj, Eina_Bool lock)
 EAPI Eina_Bool
 elm_widget_drag_lock_x_get(Evas_Object *obj)
 {
-   API_ENTRY return 0;
+   API_ENTRY return EINA_FALSE;
    printf("check %p x lock %i\n", obj, sd->drag_x_locked);
    return sd->drag_x_locked;
 }
@@ -1019,7 +1019,7 @@ elm_widget_drag_lock_x_get(Evas_Object *obj)
 EAPI Eina_Bool
 elm_widget_drag_lock_y_get(Evas_Object *obj)
 {
-   API_ENTRY return 0;
+   API_ENTRY return EINA_FALSE;
    printf("check %p y lock %i\n", obj, sd->drag_y_locked);
    return sd->drag_y_locked;
 }
diff --git a/legacy/elementary/src/lib/els_icon.c b/legacy/elementary/src/lib/els_icon.c
index 371b16bbd5..5cd0988939 100644
--- a/legacy/elementary/src/lib/els_icon.c
+++ b/legacy/elementary/src/lib/els_icon.c
@@ -48,15 +48,15 @@ _els_smart_icon_file_key_set(Evas_Object *obj, const char *file, const char *key
    Smart_Data *sd;
 
    sd = evas_object_smart_data_get(obj);
-   if (!sd) return 0;
+   if (!sd) return EINA_FALSE;
    /* smart code here */
    if (sd->size != 0)
      evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
    evas_object_image_file_set(sd->obj, file, key);
    if (evas_object_image_load_error_get(sd->obj) != EVAS_LOAD_ERROR_NONE)
-     return 0;
+     return EINA_FALSE;
    _smart_reconfigure(sd);
-   return 1;
+   return EINA_TRUE;
 }
 
 Eina_Bool
@@ -65,15 +65,15 @@ _els_smart_icon_file_edje_set(Evas_Object *obj, const char *file, const char *pa
    Smart_Data *sd;
 
    sd = evas_object_smart_data_get(obj);
-   if (!sd) return 0;
+   if (!sd) return EINA_FALSE;
    /* smart code here */
    if (sd->obj) evas_object_del(sd->obj);
    sd->obj = edje_object_add(evas_object_evas_get(obj));
    evas_object_smart_member_add(sd->obj, obj);
    if (!edje_object_file_set(sd->obj, file, part))
-     return 0;
+     return EINA_FALSE;
    _smart_reconfigure(sd);
-   return 1;
+   return EINA_TRUE;
 }
 
 void
diff --git a/legacy/elementary/src/lib/els_scroller.c b/legacy/elementary/src/lib/els_scroller.c
index 0af0fd43ac..b56545619f 100644
--- a/legacy/elementary/src/lib/els_scroller.c
+++ b/legacy/elementary/src/lib/els_scroller.c
@@ -415,8 +415,8 @@ _smart_do_page(Smart_Data *sd)
 {
    if ((sd->pagerel_h == 0.0) && (sd->pagesize_h == 0) &&
        (sd->pagerel_v == 0.0) && (sd->pagesize_v == 0))
-     return 0;
-   return 1;
+     return EINA_FALSE;
+   return EINA_TRUE;
 }
 
 static Evas_Coord
@@ -570,21 +570,21 @@ can_scroll(Smart_Data *sd, int dir)
    switch (dir)
      {
      case LEFT:
-        if (px > 0) return 1;
+        if (px > 0) return EINA_TRUE;
         break;
      case RIGHT:
-        if (px < mx) return 1;
+        if (px < mx) return EINA_TRUE;
         break;
      case UP:
-        if (py > 0) return 1;
+        if (py > 0) return EINA_TRUE;
         break;
      case DOWN:
-        if (py < my) return 1;
+        if (py < my) return EINA_TRUE;
         break;
      default:
         break;
      }
-   return 0;
+   return EINA_FALSE;
 }
 
 static int
@@ -1424,7 +1424,7 @@ _smart_event_post_up(void *data, Evas *e)
              elm_widget_drag_lock_y_set(sd->widget, 0);
           }
      }
-   return 1;
+   return EINA_TRUE;
 }
 
 static void
@@ -1694,7 +1694,7 @@ _smart_event_post_move(void *data, Evas *e)
           }
         if (start) _smart_drag_start(sd->smart_obj);
      }
-   return 1;
+   return EINA_TRUE;
 }
 
 static void