diff --git a/legacy/evas/src/lib/cache/evas_cache_engine_image.c b/legacy/evas/src/lib/cache/evas_cache_engine_image.c
index 544a918e26..d01dcc1e2e 100644
--- a/legacy/evas/src/lib/cache/evas_cache_engine_image.c
+++ b/legacy/evas/src/lib/cache/evas_cache_engine_image.c
@@ -238,14 +238,14 @@ evas_cache_engine_image_dup(const Evas_Cache_Engine_Image_Func *cb, Evas_Cache_E
    return new;
 }
 
-static Evas_Bool
+static Eina_Bool
 _evas_cache_engine_image_free_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, void *fdata)
 {
    Eina_List **delete_list = fdata;
 
    *delete_list = eina_list_prepend(*delete_list, data);
 
-   return 1;
+   return EINA_TRUE;
 }
 
 EAPI void
diff --git a/legacy/evas/src/lib/cache/evas_cache_image.c b/legacy/evas/src/lib/cache/evas_cache_image.c
index 22a4ad0e72..988cdaaeaa 100644
--- a/legacy/evas/src/lib/cache/evas_cache_image.c
+++ b/legacy/evas/src/lib/cache/evas_cache_image.c
@@ -44,7 +44,7 @@ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t mutex_surface_alloc = PTHREAD_MUTEX_INITIALIZER;
 static pthread_t tid = 0;
 
-static Evas_Bool running = 0;
+static Eina_Bool running = EINA_FALSE;
 
 static void* _evas_cache_background_load(void *);
 #endif
@@ -362,13 +362,13 @@ _evas_cache_image_entry_preload_add(Image_Entry *ie,
 	       {
 		  if (tid)
 		    {
-		       running = 1;
+		       running = EINA_TRUE;
 		       pthread_cond_signal(&cond_new);
 		    }
 		  else
 		    {
 		       if (pthread_create(&tid, NULL, _evas_cache_background_load, NULL) == 0)
-			 running = 1;
+			 running = EINA_TRUE;
 		    }
 	       }
 
@@ -500,14 +500,14 @@ evas_cache_image_init(const Evas_Cache_Image_Func *cb)
    return new;
 }
 
-static Evas_Bool
+static Eina_Bool
 _evas_cache_image_free_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, void *fdata)
 {
    Eina_List **delete_list = fdata;
 
    *delete_list = eina_list_prepend(*delete_list, data);
 
-   return 1;
+   return EINA_TRUE;
 }
 
 #ifdef BUILD_ASYNC_PRELOAD
@@ -1297,7 +1297,7 @@ _evas_cache_background_load(void *data)
 	goto restart;
      }
 
-   running = 0;
+   running = EINA_FALSE;
    pthread_mutex_unlock(&mutex);
 
    pthread_mutex_lock(&mutex_new);
diff --git a/legacy/evas/src/lib/canvas/evas_async_events.c b/legacy/evas/src/lib/canvas/evas_async_events.c
index 5411f900ad..b574e6df47 100644
--- a/legacy/evas/src/lib/canvas/evas_async_events.c
+++ b/legacy/evas/src/lib/canvas/evas_async_events.c
@@ -123,14 +123,14 @@ evas_async_events_process(void)
 #endif
 }
 
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_async_events_put(const void *target, Evas_Callback_Type type, void *event_info, void (*func)(void *target, Evas_Callback_Type type, void *event_info))
 {
 #ifdef BUILD_ASYNC_EVENTS
    Evas_Event_Async new;
    ssize_t check;
    int offset = 0;
-   Evas_Bool result = 0;
+   Eina_Bool result = EINA_FALSE;
 
    if (!func) return 0;
    if (_fd_write == -1) return 0;
@@ -150,7 +150,7 @@ evas_async_events_put(const void *target, Evas_Callback_Type type, void *event_i
    } while (offset != sizeof(new) && (errno == EINTR || errno == EAGAIN));
 
    if (offset == sizeof(new))
-     result = 1;
+     result = EINA_TRUE;
    else
      switch (errno)
        {
@@ -167,7 +167,7 @@ evas_async_events_put(const void *target, Evas_Callback_Type type, void *event_i
 #else
    func(target, type, event_info);
 
-   return 1;
+   return EINA_TRUE;
 #endif
 }
 
diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/legacy/evas/src/lib/canvas/evas_events.c
index aed2f3a034..9c1ca129c5 100644
--- a/legacy/evas/src/lib/canvas/evas_events.c
+++ b/legacy/evas/src/lib/canvas/evas_events.c
@@ -1008,7 +1008,7 @@ evas_event_feed_hold(Evas *e, int hold, unsigned int timestamp, const void *data
  * @ingroup Evas_Object_Event_Flags_Group
  */
 EAPI void
-evas_object_pass_events_set(Evas_Object *obj, Evas_Bool pass)
+evas_object_pass_events_set(Evas_Object *obj, Eina_Bool pass)
 {
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
    return;
@@ -1036,7 +1036,7 @@ evas_object_pass_events_set(Evas_Object *obj, Evas_Bool pass)
  *
  * @ingroup Evas_Object_Event_Flags_Group
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_object_pass_events_get(const Evas_Object *obj)
 {
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -1060,7 +1060,7 @@ evas_object_pass_events_get(const Evas_Object *obj)
  * @ingroup Evas_Object_Event_Flags_Group
  */
 EAPI void
-evas_object_repeat_events_set(Evas_Object *obj, Evas_Bool repeat)
+evas_object_repeat_events_set(Evas_Object *obj, Eina_Bool repeat)
 {
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
    return;
@@ -1087,7 +1087,7 @@ evas_object_repeat_events_set(Evas_Object *obj, Evas_Bool repeat)
  *
  * @ingroup Evas_Object_Event_Flags_Group
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_object_repeat_events_get(const Evas_Object *obj)
 {
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -1115,7 +1115,7 @@ evas_object_repeat_events_get(const Evas_Object *obj)
  * @ingroup Evas_Object_Event_Flags_Group
  */
 EAPI void
-evas_object_propagate_events_set(Evas_Object *obj, Evas_Bool prop)
+evas_object_propagate_events_set(Evas_Object *obj, Eina_Bool prop)
 {
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
    return;
@@ -1130,7 +1130,7 @@ evas_object_propagate_events_set(Evas_Object *obj, Evas_Bool prop)
  *
  * @ingroup Evas_Object_Event_Flags_Group
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_object_propagate_events_get(const Evas_Object *obj)
 {
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
diff --git a/legacy/evas/src/lib/canvas/evas_focus.c b/legacy/evas/src/lib/canvas/evas_focus.c
index ad6e2591db..cc144bc34f 100644
--- a/legacy/evas/src/lib/canvas/evas_focus.c
+++ b/legacy/evas/src/lib/canvas/evas_focus.c
@@ -26,7 +26,7 @@
  * @see evas_object_key_ungrab
  */
 EAPI void
-evas_object_focus_set(Evas_Object *obj, Evas_Bool focus)
+evas_object_focus_set(Evas_Object *obj, Eina_Bool focus)
 {
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
    return;
@@ -65,7 +65,7 @@ evas_object_focus_set(Evas_Object *obj, Evas_Bool focus)
  *
  * @return 1 if the object has the focus, 0 otherwise.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_object_focus_get(const Evas_Object *obj)
 {
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
diff --git a/legacy/evas/src/lib/canvas/evas_font_dir.c b/legacy/evas/src/lib/canvas/evas_font_dir.c
index cf977f2120..1b1be60185 100644
--- a/legacy/evas/src/lib/canvas/evas_font_dir.c
+++ b/legacy/evas/src/lib/canvas/evas_font_dir.c
@@ -35,7 +35,7 @@ struct _Fndat
 };
 
 /* private methods for font dir cache */
-static Evas_Bool font_cache_dir_free(const Eina_Hash *hash, const void *key, void *data, void *fdata);
+static Eina_Bool font_cache_dir_free(const Eina_Hash *hash, const void *key, void *data, void *fdata);
 static Evas_Font_Dir *object_text_font_cache_dir_update(char *dir, Evas_Font_Dir *fd);
 static Evas_Font *object_text_font_cache_font_find_x(Evas_Font_Dir *fd, char *font);
 static Evas_Font *object_text_font_cache_font_find_file(Evas_Font_Dir *fd, char *font);
diff --git a/legacy/evas/src/lib/canvas/evas_key.c b/legacy/evas/src/lib/canvas/evas_key.c
index 289a3f4b63..e6529cc998 100644
--- a/legacy/evas/src/lib/canvas/evas_key.c
+++ b/legacy/evas/src/lib/canvas/evas_key.c
@@ -95,7 +95,7 @@ evas_key_lock_get(const Evas *e)
  *
  * @return 1 if the @p keyname is on, 0 otherwise.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_key_modifier_is_set(const Evas_Modifier *m, const char *keyname)
 {
    Evas_Modifier_Mask num;
@@ -126,7 +126,7 @@ evas_key_modifier_is_set(const Evas_Modifier *m, const char *keyname)
  * 
  * @param 1 if the @p keyname kock is set, 0 otherwise.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_key_lock_is_set(const Evas_Lock *l, const char *keyname)
 {
    Evas_Modifier_Mask num;
diff --git a/legacy/evas/src/lib/canvas/evas_key_grab.c b/legacy/evas/src/lib/canvas/evas_key_grab.c
index 6008824511..18e5d90ea4 100644
--- a/legacy/evas/src/lib/canvas/evas_key_grab.c
+++ b/legacy/evas/src/lib/canvas/evas_key_grab.c
@@ -171,8 +171,8 @@ evas_key_grab_free(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask mod
  * @param exclusive request that the @p obj is the only object receiving the @p keyname events.
  * @return Boolean indicating whether the grab succeeded
  */
-EAPI Evas_Bool
-evas_object_key_grab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Evas_Bool exclusive)
+EAPI Eina_Bool
+evas_object_key_grab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive)
 {
    /* MEM OK */
    Evas_Key_Grab *g;
diff --git a/legacy/evas/src/lib/canvas/evas_main.c b/legacy/evas/src/lib/canvas/evas_main.c
index 3953f77df7..51e1e9e69c 100644
--- a/legacy/evas/src/lib/canvas/evas_main.c
+++ b/legacy/evas/src/lib/canvas/evas_main.c
@@ -966,7 +966,7 @@ evas_pointer_button_down_mask_get(const Evas *e)
  * else printf("Mouse is out!\n");
  * @endcode
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_pointer_inside_get(const Evas *e)
 {
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
diff --git a/legacy/evas/src/lib/canvas/evas_object_box.c b/legacy/evas/src/lib/canvas/evas_object_box.c
index ffcb4ae660..d6fa4757bb 100644
--- a/legacy/evas/src/lib/canvas/evas_object_box.c
+++ b/legacy/evas/src/lib/canvas/evas_object_box.c
@@ -2022,15 +2022,14 @@ evas_object_box_insert_at(Evas_Object *o, Evas_Object *child, unsigned int pos)
  * Remove an object @a child from the box @a o. On error, @c 0 is
  * returned.
  */
-Evas_Bool
+Eina_Bool
 evas_object_box_remove(Evas_Object *o, Evas_Object *child)
 {
    const Evas_Object_Box_Api *api;
    Evas_Object *obj;
 
    EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-   if (!child)
-     return 0;
+   if (!child) return EINA_FALSE;
 
    api = priv->api;
    if ((!api) || (!api->remove))
@@ -2043,17 +2042,17 @@ evas_object_box_remove(Evas_Object *o, Evas_Object *child)
         _evas_object_box_child_callbacks_unregister(obj);
         evas_object_smart_member_del(obj);
         evas_object_smart_changed(o);
-        return 1;
+        return EINA_TRUE;
      }
 
-   return 0;
+   return EINA_FALSE;
 }
 
 /**
  * Remove an object from the box @a o which occupies position @a
  * pos. On error, @c 0 is returned.
  */
-Evas_Bool
+Eina_Bool
 evas_object_box_remove_at(Evas_Object *o, unsigned int pos)
 {
    const Evas_Object_Box_Api *api;
@@ -2061,8 +2060,7 @@ evas_object_box_remove_at(Evas_Object *o, unsigned int pos)
 
    EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, 0);
    api = priv->api;
-   if ((!api) || (!api->remove_at))
-     return 0;
+   if ((!api) || (!api->remove_at)) return EINA_FALSE;
 
    obj = api->remove_at(o, priv, pos);
 
@@ -2071,26 +2069,25 @@ evas_object_box_remove_at(Evas_Object *o, unsigned int pos)
         _evas_object_box_child_callbacks_unregister(obj);
         evas_object_smart_member_del(obj);
         evas_object_smart_changed(o);
-        return 1;
+        return EINA_TRUE;
      }
 
-   return 0;
+   return EINA_FALSE;
 }
 
 /**
  * Remove all child objects.
  * @return 0 on errors
  */
-Evas_Bool
-evas_object_box_remove_all(Evas_Object *o, Evas_Bool clear)
+Eina_Bool
+evas_object_box_remove_all(Evas_Object *o, Eina_Bool clear)
 {
    const Evas_Object_Box_Api *api;
 
    EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, 0);
 
    api = priv->api;
-   if ((!api) || (!api->remove))
-     return 0;
+   if ((!api) || (!api->remove)) return EINA_FALSE;
 
    evas_object_smart_changed(o);
 
@@ -2107,10 +2104,10 @@ evas_object_box_remove_all(Evas_Object *o, Evas_Bool clear)
              if (clear)
                evas_object_del(obj);
           }
-        else return 0;
+        else return EINA_FALSE;
      }
 
-   return 1;
+   return EINA_TRUE;
 }
 
 /**
@@ -2239,10 +2236,10 @@ evas_object_box_option_property_id_get(Evas_Object *o, const char *name)
  * must be the last arguments and their type *must* match that of the
  * property itself. On error, @c 0 is returned.
  */
-Evas_Bool
+Eina_Bool
 evas_object_box_option_property_set(Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...)
 {
-   Evas_Bool ret;
+   Eina_Bool ret;
    va_list args;
 
    va_start(args, property);
@@ -2260,24 +2257,23 @@ evas_object_box_option_property_set(Evas_Object *o, Evas_Object_Box_Option *opt,
  * is returned.
  */
 
-Evas_Bool
+Eina_Bool
 evas_object_box_option_property_vset(Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
 {
    EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, 0);
    const Evas_Object_Box_Api *api;
 
-   if (!opt)
-     return 0;
+   if (!opt) return EINA_FALSE;
 
    api = priv->api;
    if ((!api) || (!api->property_set))
-     return 0;
+     return EINA_FALSE;
 
    if (!api->property_set(o, opt, property, args))
-     return 0;
+     return EINA_FALSE;
 
    evas_object_smart_changed(o);
-   return 1;
+   return EINA_TRUE;
 }
 
 /**
@@ -2286,10 +2282,10 @@ evas_object_box_option_property_vset(Evas_Object *o, Evas_Object_Box_Option *opt
  * be addresses of variables with the same type of that property. On
  * error, @c 0 is returned.
  */
-Evas_Bool
+Eina_Bool
 evas_object_box_option_property_get(Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...)
 {
-   Evas_Bool ret;
+   Eina_Bool ret;
    va_list args;
 
    va_start(args, property);
@@ -2305,18 +2301,17 @@ evas_object_box_option_property_get(Evas_Object *o, Evas_Object_Box_Option *opt,
  * va_list @a args is initialized with must be addresses of variables
  * with the same type of that property. On error, @c 0 is returned.
  */
-Evas_Bool
+Eina_Bool
 evas_object_box_option_property_vget(Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
 {
    EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, 0);
    const Evas_Object_Box_Api *api;
 
-   if (!opt)
-     return 0;
+   if (!opt) return EINA_FALSE;
 
    api = priv->api;
    if ((!api) || (!api->property_get))
-     return 0;
+     return EINA_FALSE;
 
    return api->property_get(o, opt, property, args);
 }
diff --git a/legacy/evas/src/lib/canvas/evas_object_gradient.c b/legacy/evas/src/lib/canvas/evas_object_gradient.c
index 44b9031f1d..f8c0ffc0c9 100644
--- a/legacy/evas/src/lib/canvas/evas_object_gradient.c
+++ b/legacy/evas/src/lib/canvas/evas_object_gradient.c
@@ -239,7 +239,7 @@ evas_object_gradient_clear(Evas_Object *obj)
  * @param   has_alpha A flag indicating if the data has alpha or not.
  */
 EAPI void
-evas_object_gradient_color_data_set(Evas_Object *obj, void *data, int len, Evas_Bool has_alpha)
+evas_object_gradient_color_data_set(Evas_Object *obj, void *data, int len, Eina_Bool has_alpha)
 {
    Evas_Object_Gradient *o;
 
diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c
index f425e3ddd0..61438f6a8d 100644
--- a/legacy/evas/src/lib/canvas/evas_object_image.c
+++ b/legacy/evas/src/lib/canvas/evas_object_image.c
@@ -63,7 +63,7 @@ struct _Evas_Object_Image
 };
 
 /* private methods for image objects */
-static void evas_object_image_unload(Evas_Object *obj, Evas_Bool dirty);
+static void evas_object_image_unload(Evas_Object *obj, Eina_Bool dirty);
 static void evas_object_image_load(Evas_Object *obj);
 static Evas_Coord evas_object_image_figure_x_fill(Evas_Object *obj, Evas_Coord start, Evas_Coord size, Evas_Coord *size_ret);
 static Evas_Coord evas_object_image_figure_y_fill(Evas_Object *obj, Evas_Coord start, Evas_Coord size, Evas_Coord *size_ret);
@@ -478,7 +478,7 @@ evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Border_Fill_Mode
  * @return 1 if it is tracking, 0 if not and evas_object_fill_set()
  * must be called manually.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_object_image_filled_get(const Evas_Object *obj)
 {
    Evas_Object_Image *o;
@@ -508,7 +508,7 @@ evas_object_image_filled_get(const Evas_Object *obj)
  * @see evas_object_image_fill_set()
  */
 EAPI void
-evas_object_image_filled_set(Evas_Object *obj, Evas_Bool setting)
+evas_object_image_filled_set(Evas_Object *obj, Eina_Bool setting)
 {
    Evas_Object_Image *o;
 
@@ -1026,7 +1026,7 @@ evas_object_image_data_set(Evas_Object *obj, void *data)
  * @return The raw image data.
  */
 EAPI void *
-evas_object_image_data_get(const Evas_Object *obj, Evas_Bool for_writing)
+evas_object_image_data_get(const Evas_Object *obj, Eina_Bool for_writing)
 {
    Evas_Object_Image *o;
    DATA32 *data;
@@ -1068,7 +1068,7 @@ evas_object_image_data_get(const Evas_Object *obj, Evas_Bool for_writing)
  * @param cancel 0 means add to the workqueue, 1 remove it.
  */
 EAPI void
-evas_object_image_preload(Evas_Object *obj, Evas_Bool cancel)
+evas_object_image_preload(Evas_Object *obj, Eina_Bool cancel)
 {
    Evas_Object_Image *o;
 
@@ -1194,7 +1194,7 @@ evas_object_image_data_update_add(Evas_Object *obj, int x, int y, int w, int h)
  * @param has_alpha Whether to use alpha channel data or not.
  */
 EAPI void
-evas_object_image_alpha_set(Evas_Object *obj, Evas_Bool has_alpha)
+evas_object_image_alpha_set(Evas_Object *obj, Eina_Bool has_alpha)
 {
    Evas_Object_Image *o;
 
@@ -1229,7 +1229,7 @@ evas_object_image_alpha_set(Evas_Object *obj, Evas_Bool has_alpha)
  * @param obj The given image object.
  * @return Whether the alpha channel data is being used.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_object_image_alpha_get(const Evas_Object *obj)
 {
    Evas_Object_Image *o;
@@ -1256,7 +1256,7 @@ evas_object_image_alpha_get(const Evas_Object *obj)
  * @param smooth_scale Whether to use smooth scale or not.
  */
 EAPI void
-evas_object_image_smooth_scale_set(Evas_Object *obj, Evas_Bool smooth_scale)
+evas_object_image_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth_scale)
 {
    Evas_Object_Image *o;
 
@@ -1284,7 +1284,7 @@ evas_object_image_smooth_scale_set(Evas_Object *obj, Evas_Bool smooth_scale)
  * @param obj The given image object.
  * @return Whether smooth scale is being used.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_object_image_smooth_scale_get(const Evas_Object *obj)
 {
    Evas_Object_Image *o;
@@ -1346,7 +1346,7 @@ evas_object_image_reload(Evas_Object *obj)
  * @param key The image key in file, or NULL.
  * @param flags String containing the flags to be used.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_object_image_save(const Evas_Object *obj, const char *file, const char *key, const char *flags)
 {
    Evas_Object_Image *o;
@@ -1418,7 +1418,7 @@ evas_object_image_save(const Evas_Object *obj, const char *file, const char *key
  * FIXME: To be fixed.
  *
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_object_image_pixels_import(Evas_Object *obj, Evas_Pixel_Import_Source *pixels)
 {
    Evas_Object_Image *o;
@@ -1533,7 +1533,7 @@ evas_object_image_pixels_get_callback_set(Evas_Object *obj, void (*func) (void *
  * @param dirty Whether the image is dirty.
  */
 EAPI void
-evas_object_image_pixels_dirty_set(Evas_Object *obj, Evas_Bool dirty)
+evas_object_image_pixels_dirty_set(Evas_Object *obj, Eina_Bool dirty)
 {
    Evas_Object_Image *o;
 
@@ -1556,7 +1556,7 @@ evas_object_image_pixels_dirty_set(Evas_Object *obj, Evas_Bool dirty)
  * @param obj The given image object.
  * @return Whether the image is dirty.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_object_image_pixels_dirty_get(const Evas_Object *obj)
 {
    Evas_Object_Image *o;
@@ -1953,7 +1953,7 @@ evas_image_cache_get(const Evas *e)
 /* all nice and private */
 
 static void
-evas_object_image_unload(Evas_Object *obj, Evas_Bool dirty)
+evas_object_image_unload(Evas_Object *obj, Eina_Bool dirty)
 {
    Evas_Object_Image *o;
 
diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/legacy/evas/src/lib/canvas/evas_object_main.c
index 07ed7c56ee..2fed50bdb0 100644
--- a/legacy/evas/src/lib/canvas/evas_object_main.c
+++ b/legacy/evas/src/lib/canvas/evas_object_main.c
@@ -1153,7 +1153,7 @@ evas_object_hide(Evas_Object *obj)
  * @return  @c 1 if the object is visible.  @c 0 otherwise.
  * @ingroup Evas_Object_Group
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_object_visible_get(const Evas_Object *obj)
 {
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -1244,7 +1244,7 @@ evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a)
  * @ingroup Evas_Object_Group
  */
 EAPI void
-evas_object_anti_alias_set(Evas_Object *obj, Evas_Bool anti_alias)
+evas_object_anti_alias_set(Evas_Object *obj, Eina_Bool anti_alias)
 {
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
    return;
@@ -1263,7 +1263,7 @@ evas_object_anti_alias_set(Evas_Object *obj, Evas_Bool anti_alias)
  * @return  @c 1 if the object is to be anti_aliased.  @c 0 otherwise.
  * @ingroup Evas_Object_Group
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_object_anti_alias_get(const Evas_Object *obj)
 {
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -1409,7 +1409,7 @@ evas_object_evas_get(const Evas_Object *obj)
  * FIXME: To be fixed.
  */
 EAPI Evas_Object *
-evas_object_top_at_xy_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Bool include_pass_events_objects, Evas_Bool include_hidden_objects)
+evas_object_top_at_xy_get(const Evas *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
 {
    Evas_Layer *lay;
    int xx, yy;
@@ -1457,7 +1457,7 @@ evas_object_top_at_pointer_get(const Evas *e)
  * FIXME: To be fixed.
  */
 EAPI Evas_Object *
-evas_object_top_in_rectangle_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Evas_Bool include_pass_events_objects, Evas_Bool include_hidden_objects)
+evas_object_top_in_rectangle_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
 {
    Evas_Layer *lay;
    int xx, yy, ww, hh;
@@ -1499,7 +1499,7 @@ evas_object_top_in_rectangle_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas
  * FIXME: To be fixed.
  */
 EAPI Eina_List *
-evas_objects_at_xy_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Bool include_pass_events_objects, Evas_Bool include_hidden_objects)
+evas_objects_at_xy_get(const Evas *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
 {
    Eina_List *in = NULL;
    Evas_Layer *lay;
@@ -1536,7 +1536,7 @@ evas_objects_at_xy_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Bool incl
  * FIXME: To be fixed.
  */
 EAPI Eina_List *
-evas_objects_in_rectangle_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Evas_Bool include_pass_events_objects, Evas_Bool include_hidden_objects)
+evas_objects_in_rectangle_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
 {
    Eina_List *in = NULL;
    Evas_Layer *lay;
@@ -1595,7 +1595,7 @@ evas_object_type_get(const Evas_Object *obj)
  * The default value is false.
  */
 EAPI void
-evas_object_precise_is_inside_set(Evas_Object *obj, Evas_Bool precise)
+evas_object_precise_is_inside_set(Evas_Object *obj, Eina_Bool precise)
 {
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
    return;
@@ -1607,7 +1607,7 @@ evas_object_precise_is_inside_set(Evas_Object *obj, Evas_Bool precise)
  * Determine whether an object is set to use a precise point collision detection.
  * @param obj The given object.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_object_precise_is_inside_get(const Evas_Object *obj)
 {
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
diff --git a/legacy/evas/src/lib/canvas/evas_object_smart.c b/legacy/evas/src/lib/canvas/evas_object_smart.c
index b7f7c0c798..836c08eb79 100644
--- a/legacy/evas/src/lib/canvas/evas_object_smart.c
+++ b/legacy/evas/src/lib/canvas/evas_object_smart.c
@@ -12,8 +12,8 @@ struct _Evas_Object_Smart
    Eina_List        *callbacks;
    Eina_Inlist *contained;
    int               walking_list;
-   Evas_Bool         deletions_waiting : 1;
-   Evas_Bool         need_recalculate : 1;
+   Eina_Bool         deletions_waiting : 1;
+   Eina_Bool         need_recalculate : 1;
 };
 
 struct _Evas_Smart_Callback
@@ -471,7 +471,7 @@ evas_object_smart_callback_call(Evas_Object *obj, const char *event, void *event
  * @ingroup Evas_Smart_Object_Group
  */
 EAPI void
-evas_object_smart_need_recalculate_set(Evas_Object *obj, Evas_Bool value)
+evas_object_smart_need_recalculate_set(Evas_Object *obj, Eina_Bool value)
 {
    Evas_Object_Smart *o;
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -516,7 +516,7 @@ evas_object_smart_need_recalculate_set(Evas_Object *obj, Evas_Bool value)
  *
  * @ingroup Evas_Smart_Object_Group
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_object_smart_need_recalculate_get(const Evas_Object *obj)
 {
    Evas_Object_Smart *o;
diff --git a/legacy/evas/src/lib/canvas/evas_object_table.c b/legacy/evas/src/lib/canvas/evas_object_table.c
index 7aa6c48149..cc78e64590 100644
--- a/legacy/evas/src/lib/canvas/evas_object_table.c
+++ b/legacy/evas/src/lib/canvas/evas_object_table.c
@@ -20,8 +20,8 @@ struct _Evas_Object_Table_Option
    struct {
       Evas_Coord l, r, t, b;
    } pad;
-   Evas_Bool expand_h : 1; /* XXX required? */
-   Evas_Bool expand_v : 1; /* XXX required? */
+   Eina_Bool expand_h : 1; /* XXX required? */
+   Eina_Bool expand_v : 1; /* XXX required? */
 };
 
 struct _Evas_Object_Table_Cache
@@ -38,7 +38,7 @@ struct _Evas_Object_Table_Cache
       Evas_Coord *h, *v;
    } sizes;
    struct {
-      Evas_Bool *h, *v;
+      Eina_Bool *h, *v;
    } expands;
 };
 
@@ -57,9 +57,9 @@ struct _Evas_Object_Table_Data
    } size;
    Evas_Object_Table_Cache *cache;
    Evas_Object_Table_Homogeneous_Mode homogeneous;
-   Evas_Bool hints_changed : 1;
-   Evas_Bool expand_h : 1;
-   Evas_Bool expand_v : 1;
+   Eina_Bool hints_changed : 1;
+   Eina_Bool expand_h : 1;
+   Eina_Bool expand_v : 1;
 };
 
 struct _Evas_Object_Table_Iterator
@@ -166,7 +166,7 @@ _evas_object_table_cache_alloc(int cols, int rows)
    int size;
 
    size = (sizeof(Evas_Object_Table_Cache) +
-	   (cols + rows) * (sizeof(Evas_Bool) + sizeof(Evas_Coord)));
+	   (cols + rows) * (sizeof(Eina_Bool) + sizeof(Evas_Coord)));
    cache = malloc(size);
    if (!cache)
      {
@@ -178,8 +178,8 @@ _evas_object_table_cache_alloc(int cols, int rows)
 
    cache->sizes.h = (Evas_Coord *)(cache + 1);
    cache->sizes.v = (Evas_Coord *)(cache->sizes.h + cols);
-   cache->expands.h = (Evas_Bool *)(cache->sizes.v + rows);
-   cache->expands.v = (Evas_Bool *)(cache->expands.h + cols);
+   cache->expands.h = (Eina_Bool *)(cache->sizes.v + rows);
+   cache->expands.v = (Eina_Bool *)(cache->expands.h + cols);
 
    return cache;
 }
@@ -202,7 +202,7 @@ _evas_object_table_cache_reset(Evas_Object_Table_Data *priv)
    c->total.min.h = 0;
 
    size = ((priv->size.rows + priv->size.cols) *
-	   (sizeof(Evas_Bool) + sizeof(Evas_Coord)));
+	   (sizeof(Eina_Bool) + sizeof(Evas_Coord)));
    memset(c + 1, 0, size);
 }
 
@@ -305,7 +305,7 @@ _evas_object_table_calculate_cell(const Evas_Object_Table_Option *opt, Evas_Coor
      }
 }
 
-/* static Evas_Bool */
+/* static Eina_Bool */
 /* _evas_object_table_check_hints_homogeneous_table(Evas_Object *child, double *align, Evas_Coord min, const char *axis_name) */
 /* { */
 /*    if (*align < 0.0) */
@@ -337,7 +337,7 @@ _evas_object_table_calculate_hints_homogeneous(Evas_Object *o, Evas_Object_Table
    Eina_List *l;
    Evas_Object_Table_Option *opt;
    Evas_Coord minw, minh, o_minw, o_minh;
-   Evas_Bool expand_h, expand_v;
+   Eina_Bool expand_h, expand_v;
 
    o_minw = 0;
    o_minh = 0;
@@ -450,7 +450,7 @@ static void
 _evas_object_table_calculate_layout_homogeneous_sizes_item(const Evas_Object *o, const Evas_Object_Table_Data *priv, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
 {
    Evas_Coord minw, minh;
-   Evas_Bool expand_h, expand_v;
+   Eina_Bool expand_h, expand_v;
 
    evas_object_size_hint_min_get(o, &minw, &minh);
    expand_h = priv->expand_h;
@@ -522,9 +522,9 @@ _evas_object_table_smart_calculate_homogeneous(Evas_Object *o, Evas_Object_Table
 }
 
 static int
-_evas_object_table_count_expands(const Evas_Bool *expands, int start, int end)
+_evas_object_table_count_expands(const Eina_Bool *expands, int start, int end)
 {
-   const Evas_Bool *itr = expands + start, *itr_end = expands + end;
+   const Eina_Bool *itr = expands + start, *itr_end = expands + end;
    int count = 0;
 
    for (; itr < itr_end; itr++)
@@ -563,10 +563,10 @@ _evas_object_table_sizes_calc_noexpand(Evas_Coord *sizes, int start, int end, Ev
 }
 
 static void
-_evas_object_table_sizes_calc_expand(Evas_Coord *sizes, int start, int end, Evas_Coord space, const Evas_Bool *expands, int expand_count)
+_evas_object_table_sizes_calc_expand(Evas_Coord *sizes, int start, int end, Evas_Coord space, const Eina_Bool *expands, int expand_count)
 {
    Evas_Coord *itr = sizes + start, *itr_end = sizes + end;
-   const Evas_Bool *itr_expand = expands + start;
+   const Eina_Bool *itr_expand = expands + start;
    Evas_Coord step, last_space;
 
    /* XXX move to fixed point math and spread errors among cells */
@@ -1093,7 +1093,7 @@ evas_object_table_padding_get(const Evas_Object *o, Evas_Coord *horizontal, Evas
  *
  * @return 1 on success, 0 on failure.
  */
-Evas_Bool
+Eina_Bool
 evas_object_table_pack(Evas_Object *o, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan)
 {
    EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(o, priv, 0);
@@ -1102,12 +1102,12 @@ evas_object_table_pack(Evas_Object *o, Evas_Object *child, unsigned short col, u
    if (rowspan < 1)
      {
 	fputs("ERROR: rowspan < 1\n", stderr);
-	return 0;
+	return EINA_FALSE;
      }
    if (colspan < 1)
      {
 	fputs("ERROR: colspan < 1\n", stderr);
-	return 0;
+	return EINA_FALSE;
      }
 
    opt = _evas_object_table_option_get(child);
@@ -1115,14 +1115,14 @@ evas_object_table_pack(Evas_Object *o, Evas_Object *child, unsigned short col, u
      {
 	fputs("ERROR: cannot add object that is already part of a table!\n",
 	      stderr);
-	return 0;
+	return EINA_FALSE;
      }
 
    opt = malloc(sizeof(*opt));
    if (!opt)
      {
 	fputs("ERROR: could not allocate table option data.\n", stderr);
-	return 0;
+	return EINA_FALSE;
      }
 
    opt->obj = child;
@@ -1158,7 +1158,7 @@ evas_object_table_pack(Evas_Object *o, Evas_Object *child, unsigned short col, u
    _evas_object_table_cache_invalidate(priv);
    evas_object_smart_changed(o);
 
-   return 1;
+   return EINA_TRUE;
 }
 
 static void
@@ -1216,7 +1216,7 @@ _evas_object_table_remove_opt(Evas_Object_Table_Data *priv, Evas_Object_Table_Op
  *
  * @return 1 on success, 0 on failure.
  */
-Evas_Bool
+Eina_Bool
 evas_object_table_unpack(Evas_Object *o, Evas_Object *child)
 {
    EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(o, priv, 0);
@@ -1225,14 +1225,14 @@ evas_object_table_unpack(Evas_Object *o, Evas_Object *child)
    if (o != evas_object_smart_parent_get(child))
      {
 	fputs("ERROR: cannot unpack child from incorrect table!\n", stderr);
-	return 0;
+	return EINA_FALSE;
      }
 
    opt = _evas_object_table_option_del(child);
    if (!opt)
      {
 	fputs("ERROR: cannot unpack child with no packing option!\n", stderr);
-	return 0;
+	return EINA_FALSE;
      }
 
    _evas_object_table_child_disconnect(o, child);
@@ -1242,7 +1242,7 @@ evas_object_table_unpack(Evas_Object *o, Evas_Object *child)
    _evas_object_table_cache_invalidate(priv);
    evas_object_smart_changed(o);
 
-   return 1;
+   return EINA_TRUE;
 }
 
 /**
@@ -1251,24 +1251,21 @@ evas_object_table_unpack(Evas_Object *o, Evas_Object *child)
  * @param clear if true, it will delete just removed children.
  */
 void
-evas_object_table_clear(Evas_Object *o, Evas_Bool clear)
+evas_object_table_clear(Evas_Object *o, Eina_Bool clear)
 {
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(o, priv);
-   Eina_List *l;
+   Evas_Object_Table_Option *opt;
 
-   l = priv->children;
-   while (l)
+   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(o, priv);
+
+   EINA_LIST_FREE(priv->children, opt)
      {
-	Evas_Object_Table_Option *opt = l->data;
 	_evas_object_table_child_disconnect(o, opt->obj);
 	_evas_object_table_option_del(opt->obj);
 	evas_object_smart_member_del(opt->obj);
 	if (clear)
 	  evas_object_del(opt->obj);
 	free(opt);
-	l = eina_list_remove_list(l, l);
      }
-   priv->children = NULL;
    priv->size.cols = 0;
    priv->size.rows = 0;
    _evas_object_table_cache_invalidate(priv);
diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/legacy/evas/src/lib/canvas/evas_object_text.c
index bf6f6b8fbb..c4ae24e532 100644
--- a/legacy/evas/src/lib/canvas/evas_object_text.c
+++ b/legacy/evas/src/lib/canvas/evas_object_text.c
@@ -1085,7 +1085,7 @@ evas_font_hinting_get(const Evas *e)
    return e->hinting;
 }
 
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_font_hinting_can_hint(const Evas *e, Evas_Font_Hinting_Flags hinting)
 {
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
@@ -1094,7 +1094,7 @@ evas_font_hinting_can_hint(const Evas *e, Evas_Font_Hinting_Flags hinting)
    if (e->engine.func->font_hinting_can_hint)
      return e->engine.func->font_hinting_can_hint(e->engine.data.output,
 						  hinting);
-   return 0;
+   return EINA_FALSE;
 }
 
 
diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index 679722e288..07ae750f8a 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c
@@ -3211,19 +3211,19 @@ evas_textblock_cursor_node_last(Evas_Textblock_Cursor *cur)
  * @param cur  to be documented.
  * @return to be documented.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_textblock_cursor_node_next(Evas_Textblock_Cursor *cur)
 {
-   if (!cur) return 0;
-   if (!cur->node) return 0;
+   if (!cur) return EINA_FALSE;
+   if (!cur->node) return EINA_FALSE;
    if ((EINA_INLIST_GET(cur->node))->next)
      {
 	cur->node = (Evas_Object_Textblock_Node *)((EINA_INLIST_GET(cur->node))->next);
 	cur->pos = 0;
         cur->eol = 0;
-	return 1;
+	return EINA_TRUE;
      }
-   return 0;
+   return EINA_FALSE;
 }
 
 /**
@@ -3231,18 +3231,18 @@ evas_textblock_cursor_node_next(Evas_Textblock_Cursor *cur)
  * @param cur  to be documented.
  * @return to be documented.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_textblock_cursor_node_prev(Evas_Textblock_Cursor *cur)
 {
-   if (!cur) return 0;
-   if (!cur->node) return 0;
+   if (!cur) return EINA_FALSE;
+   if (!cur->node) return EINA_FALSE;
    if ((EINA_INLIST_GET(cur->node))->prev)
      {
 	cur->node = (Evas_Object_Textblock_Node *)((EINA_INLIST_GET(cur->node))->prev);
 	evas_textblock_cursor_char_last(cur);
-	return 1;
+	return EINA_TRUE;
      }
-   return 0;
+   return EINA_FALSE;
 }
 
 /**
@@ -3250,16 +3250,16 @@ evas_textblock_cursor_node_prev(Evas_Textblock_Cursor *cur)
  * @param cur  to be documented.
  * @return to be documented.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur)
 {
    int index, ch;
    int at_start_of_line = 0;
    
-   if (!cur) return 0;
-   if (!cur->node) return 0;
-   if (cur->node->type == NODE_FORMAT) return 0;
-   if (!cur->node->text) return 0;
+   if (!cur) return EINA_FALSE;
+   if (!cur->node) return EINA_FALSE;
+   if (cur->node->type == NODE_FORMAT) return EINA_FALSE;
+   if (!cur->node->text) return EINA_FALSE;
    index = cur->pos;
 
    if (cur->node->type == NODE_TEXT)
@@ -3274,11 +3274,11 @@ evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur)
      }
    
    ch = evas_common_font_utf8_get_next((unsigned char *)(cur->node->text), &index);
-   if ((ch == 0) || (index < 0)) return 0;
-   if (cur->node->text[index] == 0) return 0;
+   if ((ch == 0) || (index < 0)) return EINA_FALSE;
+   if (cur->node->text[index] == 0) return EINA_FALSE;
    cur->pos = index;
    cur->eol = 0; // 1
-   return 1;
+   return EINA_TRUE;
 }
 
 /**
@@ -3286,19 +3286,19 @@ evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur)
  * @param cur  to be documented.
  * @return to be documented.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur)
 {
    int index;
    int at_end_of_line = 0;
    int at_start_of_line = 0;
    
-   if (!cur) return 0;
-   if (!cur->node) return 0;
-   if (cur->node->type == NODE_FORMAT) return 0;
-   if (!cur->node->text) return 0;
+   if (!cur) return EINA_FALSE;
+   if (!cur->node) return EINA_FALSE;
+   if (cur->node->type == NODE_FORMAT) return EINA_FALSE;
+   if (!cur->node->text) return EINA_FALSE;
    index = cur->pos;
-   if (index == 0) return 0;
+   if (index == 0) return EINA_FALSE;
    
    // XXX: FIXME: determine at_end_of_line and at_start_of_line
   
@@ -3326,16 +3326,16 @@ evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur)
    if ((cur->eol) && (at_end_of_line))
      {
         cur->eol = 0;
-        return 1;
+        return EINA_TRUE;
      }
    evas_common_font_utf8_get_prev((unsigned char *)(cur->node->text), &index);
-   if (/*(ch == 0) || */(index < 0)) return 0;
+   if (/*(ch == 0) || */(index < 0)) return EINA_FALSE;
    cur->pos = index;
    if (at_start_of_line)
      cur->eol =1;
    else
      cur->eol = 0;
-   return 1;
+   return EINA_TRUE;
 }
 
 /**
@@ -3505,7 +3505,7 @@ evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int pos)
  * @param int to be documented.
  * @return to be documented.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
 {
    Evas_Object_Textblock *o;
@@ -3513,12 +3513,12 @@ evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
    Evas_Object_Textblock_Item *it;
    Evas_Object_Textblock_Format_Item *fi;
    
-   if (!cur) return 0;
+   if (!cur) return EINA_FALSE;
    o = (Evas_Object_Textblock *)(cur->obj->object_data);
    if (!o->formatted.valid) _relayout(cur->obj);
 
    ln = _find_layout_line_num(cur->obj, line);
-   if (!ln) return 0;
+   if (!ln) return EINA_FALSE;
    it = (Evas_Object_Textblock_Item *)ln->items;
    fi = (Evas_Object_Textblock_Format_Item *)ln->format_items;
    if ((it) && (fi))
@@ -3539,7 +3539,7 @@ evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
 	cur->node = fi->source_node;
      }
    cur->eol = 0;
-   return 1;
+   return EINA_TRUE;
 }
 
 /**
@@ -4393,16 +4393,16 @@ evas_textblock_cursor_node_format_get(const Evas_Textblock_Cursor *cur)
  * @param cur to be documented.
  * @return to be documented.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_textblock_cursor_node_format_is_visible_get(const Evas_Textblock_Cursor *cur)
 {
    Evas_Object_Textblock_Node *n;
    
-   if (!cur) return 0;
+   if (!cur) return EINA_FALSE;
    n = cur->node;
-   if (!n) return 0;
-   if (n->type != NODE_FORMAT) return 0;
-   if (!n->text) return 0;
+   if (!n) return EINA_FALSE;
+   if (n->type != NODE_FORMAT) return EINA_FALSE;
+   if (!n->text) return EINA_FALSE;
      {
 	char *s;
 	char *item;
@@ -4422,10 +4422,10 @@ evas_textblock_cursor_node_format_is_visible_get(const Evas_Textblock_Cursor *cu
 	     else if ((!strcmp(item, "\t")) || (!strcmp(item, "\\t")))
 	       visible = 1;
 	     *s = tmp_delim;
-	     if (visible) return 1;
+	     if (visible) return EINA_TRUE;
 	  }
      }
-   return 0;
+   return EINA_FALSE;
 }
 
 /**
@@ -4718,7 +4718,7 @@ evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_C
  * @param y to be documented.
  * @return to be documented.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y)
 {
    Evas_Object_Textblock *o;
@@ -4726,7 +4726,7 @@ evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, E
    Evas_Object_Textblock_Item *it = NULL, *it_break = NULL;
    Evas_Object_Textblock_Format_Item *fi = NULL;
    
-   if (!cur) return 0;
+   if (!cur) return EINA_FALSE;
    o = (Evas_Object_Textblock *)(cur->obj->object_data);
    if (!o->formatted.valid) _relayout(cur->obj);
    x += o->style_pad.l;
@@ -4756,7 +4756,7 @@ evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, E
 								  x - it->x - ln->x, 0,
 								  &cx, &cy, &cw, &ch);
 		       if (pos < 0)
-			 return 0;
+			 return EINA_FALSE;
 		       cur->pos = pos + it->source_pos;
 		       cur->node = it->source_node;
 		       return 1;
@@ -4770,7 +4770,7 @@ evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, E
 		       cur->pos = 0;
                        cur->eol = 0;
 		       cur->node = fi->source_node;
-		       return 1;
+		       return EINA_TRUE;
 		    }
 	       }
 	     if (it_break)
@@ -4779,11 +4779,11 @@ evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, E
 		  cur->pos = it->source_pos;
                   cur->eol = 0;
 		  cur->node = it->source_node;
-		  return 1;
+		  return EINA_TRUE;
 	       }
 	  }
      }
-   return 0;
+   return EINA_FALSE;
 }
 
 /**
@@ -4915,7 +4915,7 @@ evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, cons
 EAPI Eina_Bool
 evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur)
 {
-   if (!cur) return 0;
+   if (!cur) return EINA_FALSE;
    return cur->eol;
 }
 
@@ -4938,19 +4938,19 @@ evas_textblock_cursor_eol_set(Evas_Textblock_Cursor *cur, Eina_Bool eol)
  * @param ch to be documented.
  * @return to be documented.
  */
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_object_textblock_line_number_geometry_get(const Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
 {
    Evas_Object_Textblock_Line *ln;
    
    TB_HEAD_RETURN(0);
    ln = _find_layout_line_num(obj, line);
-   if (!ln) return 0;
+   if (!ln) return EINA_FALSE;
    if (cx) *cx = ln->x;
    if (cy) *cy = ln->y;
    if (cw) *cw = ln->w;
    if (ch) *ch = ln->h;
-   return 1;
+   return EINA_TRUE;
 }
 
 /**
diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c
index f3695f682c..9c77e9c878 100644
--- a/legacy/evas/src/lib/canvas/evas_render.c
+++ b/legacy/evas/src/lib/canvas/evas_render.c
@@ -89,10 +89,10 @@ _evas_render_phase1_direct(Evas *e, Eina_Array *render_objects)
      }
 }
 
-static Evas_Bool
+static Eina_Bool
 _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, Eina_Array *active_objects, Eina_Array *restack_objects, Eina_Array *delete_objects, Eina_Array *render_objects, int restack)
 {
-   int clean_them = 0;
+   Eina_Bool clean_them = EINA_FALSE;
    int is_active;
 
    obj->rect_del = 0;
@@ -106,7 +106,7 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, Eina_Array *active
    else if (obj->delete_me != 0) obj->delete_me++;
    /* If the object will be removed, we should not cache anything during this run. */
    if (obj->delete_me != 0)
-     clean_them = 1;
+     clean_them = EINA_TRUE;
 
    /* build active object list */
    is_active = evas_object_is_active(obj);
@@ -120,7 +120,7 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, Eina_Array *active
 	  eina_array_push(&e->pending_objects, obj);
 	obj->restack = 1;
 	obj->changed = 1;
-	clean_them = 1;
+	clean_them = EINA_TRUE;
      }
    if (obj->changed)
      {
@@ -192,11 +192,11 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, Eina_Array *active
    return clean_them;
 }
 
-static Evas_Bool
+static Eina_Bool
 _evas_render_phase1_process(Evas *e, Eina_Array *active_objects, Eina_Array *restack_objects, Eina_Array *delete_objects, Eina_Array *render_objects)
 {
    Evas_Layer *lay;
-   int clean_them = 0;
+   Eina_Bool clean_them = EINA_FALSE;
 
    EINA_INLIST_FOREACH(e->layers, lay)
      {
@@ -314,7 +314,7 @@ evas_render_updates_internal(Evas *e, unsigned char make_updates, unsigned char
    Eina_List *updates = NULL;
    Eina_List *ll;
    void *surface;
-   Evas_Bool clean_them = 0;
+   Eina_Bool clean_them = EINA_FALSE;
    Evas_Rectangle *r;
    int ux, uy, uw, uh;
    int cx, cy, cw, ch;
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_colorspace.c b/legacy/evas/src/lib/engines/common/evas_convert_colorspace.c
index c158317da7..1ad9ad7a24 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_colorspace.c
+++ b/legacy/evas/src/lib/engines/common/evas_convert_colorspace.c
@@ -14,13 +14,13 @@
 	((((s) << 3) & 0xf8) | (((s) >> 2) & 0x7))
 
 static inline void *
-evas_common_convert_argb8888_to_rgb565_a5p(void *data __UNUSED__, int w __UNUSED__, int h __UNUSED__, int stride __UNUSED__, Evas_Bool has_alpha __UNUSED__)
+evas_common_convert_argb8888_to_rgb565_a5p(void *data __UNUSED__, int w __UNUSED__, int h __UNUSED__, int stride __UNUSED__, Eina_Bool has_alpha __UNUSED__)
 {
    return NULL;
 }
 
 static inline void *
-evas_common_convert_rgb565_a5p_to_argb8888(void *data, int w, int h, int stride, Evas_Bool has_alpha)
+evas_common_convert_rgb565_a5p_to_argb8888(void *data, int w, int h, int stride, Eina_Bool has_alpha)
 {
    DATA16 *src, *end;
    DATA32 *ret, *dst;
@@ -48,7 +48,7 @@ evas_common_convert_rgb565_a5p_to_argb8888(void *data, int w, int h, int stride,
 }
 
 EAPI void *
-evas_common_convert_argb8888_to(void *data, int w, int h, int stride, Evas_Bool has_alpha, Evas_Colorspace cspace)
+evas_common_convert_argb8888_to(void *data, int w, int h, int stride, Eina_Bool has_alpha, Evas_Colorspace cspace)
 {
    switch (cspace)
      {
@@ -61,7 +61,7 @@ evas_common_convert_argb8888_to(void *data, int w, int h, int stride, Evas_Bool
 }
 
 EAPI void *
-evas_common_convert_rgb565_a5p_to(void *data, int w, int h, int stride, Evas_Bool has_alpha, Evas_Colorspace cspace)
+evas_common_convert_rgb565_a5p_to(void *data, int w, int h, int stride, Eina_Bool has_alpha, Evas_Colorspace cspace)
 {
    switch (cspace)
      {
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_colorspace.h b/legacy/evas/src/lib/engines/common/evas_convert_colorspace.h
index 96301105ec..d82a5d9379 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_colorspace.h
+++ b/legacy/evas/src/lib/engines/common/evas_convert_colorspace.h
@@ -6,8 +6,8 @@
 #define _EVAS_CONVERT_COLORSPACE_H
 
 
-EAPI void *evas_common_convert_argb8888_to                         (void *data, int w, int h, int stride, Evas_Bool has_alpha, Evas_Colorspace cspace);
-EAPI void *evas_common_convert_rgb565_a5p_to                       (void *data, int w, int h, int stride, Evas_Bool has_alpha, Evas_Colorspace cspace);
+EAPI void *evas_common_convert_argb8888_to                         (void *data, int w, int h, int stride, Eina_Bool has_alpha, Evas_Colorspace cspace);
+EAPI void *evas_common_convert_rgb565_a5p_to                       (void *data, int w, int h, int stride, Eina_Bool has_alpha, Evas_Colorspace cspace);
 
 
 #endif /* _EVAS_CONVERT_COLORSPACE_H */
diff --git a/legacy/evas/src/lib/engines/common/evas_font.h b/legacy/evas/src/lib/engines/common/evas_font.h
index 0eb3b41e48..219324d855 100644
--- a/legacy/evas/src/lib/engines/common/evas_font.h
+++ b/legacy/evas/src/lib/engines/common/evas_font.h
@@ -46,7 +46,7 @@ EAPI RGBA_Font        *evas_common_font_add                  (RGBA_Font *fn, con
 EAPI RGBA_Font        *evas_common_font_memory_add           (RGBA_Font *fn, const char *name, int size, const void *data, int data_size);
 EAPI void              evas_common_font_free                 (RGBA_Font *fn);
 EAPI void              evas_common_font_hinting_set          (RGBA_Font *fn, Font_Hint_Flags hinting);
-EAPI Evas_Bool         evas_common_hinting_available         (Font_Hint_Flags hinting);
+EAPI Eina_Bool         evas_common_hinting_available         (Font_Hint_Flags hinting);
 EAPI RGBA_Font        *evas_common_font_memory_hinting_load  (const char *name, int size, const void *data, int data_size, Font_Hint_Flags hinting);
 EAPI RGBA_Font        *evas_common_font_hinting_load         (const char *name, int size, Font_Hint_Flags hinting);
 EAPI RGBA_Font        *evas_common_font_hinting_add          (RGBA_Font *fn, const char *name, int size, Font_Hint_Flags hinting);
diff --git a/legacy/evas/src/lib/engines/common/evas_font_draw.c b/legacy/evas/src/lib/engines/common/evas_font_draw.c
index 485c7fbdff..18b151fd18 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_draw.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_draw.c
@@ -110,6 +110,7 @@ evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, int gl)
 
 	fi = l->data;
 
+#if 0 /* FIXME: charmap user is disabled and use a deprecated data type. */
 	if (fi->src->charmap) /* Charmap loaded, FI/FS blank */
 	  {
 	     index = evas_array_hash_search(fi->src->charmap, gl);
@@ -125,7 +126,9 @@ evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, int gl)
 		  return index;
 	       }
 	  }
-	else if (!fi->src->ft.face) /* Charmap not loaded, FI/FS blank */
+	else
+#endif
+	  if (!fi->src->ft.face) /* Charmap not loaded, FI/FS blank */
 	  {
 	     if (evas_common_font_source_load_complete(fi->src))
 	       return 0;
diff --git a/legacy/evas/src/lib/engines/common/evas_font_load.c b/legacy/evas/src/lib/engines/common/evas_font_load.c
index 5cedcc9f2e..fc305e305e 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_load.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_load.c
@@ -16,8 +16,8 @@ static Eina_Hash * fonts_src = NULL;
 static Eina_Hash * fonts = NULL;
 static Eina_List * fonts_lru = NULL;
 
-static Evas_Bool font_modify_cache_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
-static Evas_Bool font_flush_free_glyph_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
+static Eina_Bool font_modify_cache_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
+static Eina_Bool font_flush_free_glyph_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
 
 static unsigned int
 _evas_font_cache_int_length(const RGBA_Font_Int *key)
@@ -50,7 +50,9 @@ static void
 _evas_common_font_source_free(RGBA_Font_Source *fs)
 {
    FT_Done_Face(fs->ft.face);
+#if 0 /* FIXME: Disable as it is only used by dead code using deprecated datatype. */
    if (fs->charmap) evas_array_hash_free(fs->charmap);
+#endif
    if (fs->name) eina_stringshare_del(fs->name);
    free(fs);
 }
@@ -560,7 +562,7 @@ evas_common_font_hinting_set(RGBA_Font *fn, Font_Hint_Flags hinting)
      fi->hinting = fn->hinting;
 }
 
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_common_hinting_available(Font_Hint_Flags hinting)
 {
    switch (hinting)
@@ -568,7 +570,7 @@ evas_common_hinting_available(Font_Hint_Flags hinting)
       case FONT_NO_HINT:
       case FONT_AUTO_HINT:
 	 /* these two hinting modes are always available */
-	 return 1;
+	 return EINA_TRUE;
       case FONT_BYTECODE_HINT:
 	 /* Only use the bytecode interpreter if support for the _patented_
 	  * algorithms is available because the free bytecode
@@ -587,12 +589,12 @@ evas_common_hinting_available(Font_Hint_Flags hinting)
 	  *
 	  * so, assume it is. o_O
 	  */
-	 return 1;
+	 return EINA_TRUE;
 #endif
      }
 
    /* shouldn't get here - need to add another case statement */
-   return 0;
+   return EINA_FALSE;
 }
 
 EAPI RGBA_Font *
diff --git a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c b/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
index 3f992023e9..0ac4995ee7 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
+++ b/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
@@ -266,7 +266,7 @@ _sci_find(RGBA_Image *im,
 }
 
 static void
-_cache_prune(Scaleitem *notsci, Evas_Bool copies_only)
+_cache_prune(Scaleitem *notsci, Eina_Bool copies_only)
 {
    Scaleitem *sci;
    while (cache_size > max_cache_size)
diff --git a/legacy/evas/src/lib/imaging/evas_imaging.c b/legacy/evas/src/lib/imaging/evas_imaging.c
index 9bd0d49b5e..6892136d37 100644
--- a/legacy/evas/src/lib/imaging/evas_imaging.c
+++ b/legacy/evas/src/lib/imaging/evas_imaging.c
@@ -47,12 +47,12 @@ evas_imaging_image_size_get(const Evas_Imaging_Image *im, int *w, int *h)
    if (h) *h = im->image->cache_entry.h;
 }
 
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_imaging_image_alpha_get(const Evas_Imaging_Image *im)
 {
-   if (!im) return 0;
-   if (im->image->cache_entry.flags.alpha) return 1;
-   return 0;
+   if (!im) return EINA_FALSE;
+   if (im->image->cache_entry.flags.alpha) return EINA_TRUE;
+   return EINA_FALSE;
 }
 
 EAPI void
@@ -81,7 +81,7 @@ evas_imaging_font_hinting_get(void)
    return _evas_hinting;
 }
 
-EAPI Evas_Bool
+EAPI Eina_Bool
 evas_imaging_font_hinting_can_hint(Evas_Font_Hinting_Flags hinting)
 {
    return evas_common_hinting_available(hinting);
diff --git a/legacy/evas/src/lib/include/evas_common.h b/legacy/evas/src/lib/include/evas_common.h
index b083140333..236f62963e 100644
--- a/legacy/evas/src/lib/include/evas_common.h
+++ b/legacy/evas/src/lib/include/evas_common.h
@@ -410,16 +410,16 @@ struct _RGBA_Image_Loadopts
 
 struct _Image_Entry_Flags
 {
-   Evas_Bool loaded       : 1;
-   Evas_Bool dirty        : 1;
-   Evas_Bool activ        : 1;
-   Evas_Bool need_data    : 1;
-   Evas_Bool lru_nodata   : 1;
-   Evas_Bool cached       : 1;
-   Evas_Bool alpha        : 1;
-   Evas_Bool alpha_sparse : 1;
+   Eina_Bool loaded       : 1;
+   Eina_Bool dirty        : 1;
+   Eina_Bool activ        : 1;
+   Eina_Bool need_data    : 1;
+   Eina_Bool lru_nodata   : 1;
+   Eina_Bool cached       : 1;
+   Eina_Bool alpha        : 1;
+   Eina_Bool alpha_sparse : 1;
 #ifdef BUILD_ASYNC_PRELOAD
-   Evas_Bool preload      : 1;
+   Eina_Bool preload      : 1;
 #endif
 };
 
@@ -490,11 +490,11 @@ struct _Engine_Image_Entry
 
    struct
    {
-     Evas_Bool                   cached : 1;
-     Evas_Bool                   activ : 1;
-     Evas_Bool                   dirty : 1;
-     Evas_Bool                   loaded : 1;
-     Evas_Bool                   need_parent : 1;
+     Eina_Bool                   cached : 1;
+     Eina_Bool                   activ : 1;
+     Eina_Bool                   dirty : 1;
+     Eina_Bool                   loaded : 1;
+     Eina_Bool                   need_parent : 1;
    } flags;
 
    int                           references;
@@ -524,7 +524,7 @@ struct _Evas_Common_Transform
 struct _RGBA_Draw_Context
 {
    struct {
-      Evas_Bool use : 1;
+      Eina_Bool use : 1;
       DATA32 col;
    } mul;
    struct {
@@ -532,7 +532,7 @@ struct _RGBA_Draw_Context
    } col;
    struct RGBA_Draw_Context_clip {
       int    x, y, w, h;
-      Evas_Bool use : 1;
+      Eina_Bool use : 1;
    } clip;
    Cutout_Rects cutout;
    struct {
@@ -550,7 +550,7 @@ struct _RGBA_Draw_Context
       int y, h;
    } sli;
    int            render_op;
-   Evas_Bool anti_alias : 1;
+   Eina_Bool anti_alias : 1;
 };
 
 #ifdef BUILD_PIPE_RENDER
@@ -633,14 +633,14 @@ struct _RGBA_Image
    /* Colorspace stuff. */
    struct {
       void              *data;
-      Evas_Bool          no_free : 1;
-      Evas_Bool          dirty : 1;
+      Eina_Bool          no_free : 1;
+      Eina_Bool          dirty : 1;
    } cs;
 
    /* RGBA stuff */
    struct {
       DATA32            *data;
-      Evas_Bool          no_free : 1;
+      Eina_Bool          no_free : 1;
    } image;
    
    struct {
@@ -677,7 +677,7 @@ struct _RGBA_Gradient
 	float          angle;
 	int            direction;
 	float          offset;
-	Evas_Bool      has_alpha : 1;
+	Eina_Bool      has_alpha : 1;
      } map;
 
    struct {
@@ -709,8 +709,8 @@ struct _RGBA_Gradient
 
    int references;
 
-   Evas_Bool imported_data : 1;
-   Evas_Bool has_alpha : 1;
+   Eina_Bool imported_data : 1;
+   Eina_Bool has_alpha : 1;
 };
 
 struct _RGBA_Gradient_Type
@@ -741,7 +741,7 @@ struct _RGBA_Gradient2
      {
 	DATA32        *data;
 	int            len;
-	Evas_Bool      has_alpha : 1;
+	Eina_Bool      has_alpha : 1;
      } map;
 
    struct {
@@ -766,7 +766,7 @@ struct _RGBA_Gradient2
 
    int references;
 
-   Evas_Bool has_alpha : 1;
+   Eina_Bool has_alpha : 1;
 };
 
 struct _RGBA_Gradient2_Type
@@ -831,7 +831,9 @@ struct _RGBA_Font_Source
    void             *data;
    int               data_size;
    int               current_size;
+#if 0 /* FIXME: charmap user is disabled and use a deprecated data type. */
    Evas_Array_Hash  *charmap;
+#endif
 
    struct {
       int           orig_upem;
@@ -951,12 +953,12 @@ struct _Tilebuf
 
 struct _Tilebuf_Tile
 {
-   Evas_Bool redraw : 1;
+   Eina_Bool redraw : 1;
 /* FIXME: need these flags later - but not now */
 /*
-   Evas_Bool done   : 1;
-   Evas_Bool edge   : 1;
-   Evas_Bool from   : 1;
+   Eina_Bool done   : 1;
+   Eina_Bool edge   : 1;
+   Eina_Bool from   : 1;
 
    struct {
       int dx, dy;
diff --git a/legacy/evas/src/lib/include/evas_private.h b/legacy/evas/src/lib/include/evas_private.h
index 5cb35eeff4..1fd41bfbbc 100644
--- a/legacy/evas/src/lib/include/evas_private.h
+++ b/legacy/evas/src/lib/include/evas_private.h
@@ -391,8 +391,8 @@ struct _Evas_Object
 	 struct {
 	    int            x, y, w, h;
 	    unsigned char  r, g, b, a;
-	    Evas_Bool      visible : 1;
-	    Evas_Bool      dirty : 1;
+	    Eina_Bool      visible : 1;
+	    Eina_Bool      dirty : 1;
 	 } clip;
       } cache;
       double scale;
@@ -402,9 +402,9 @@ struct _Evas_Object
       } color;
       Evas_Object      *clipper;
       short             layer;
-      Evas_Bool         visible : 1;
-      Evas_Bool         have_clipees : 1;
-      Evas_Bool         anti_alias : 1;
+      Eina_Bool         visible : 1;
+      Eina_Bool         have_clipees : 1;
+      Eina_Bool         anti_alias : 1;
       unsigned char     interpolation_color_space : 1;
       Evas_Render_Op    render_op : 4;
    } cur, prev;
@@ -443,23 +443,23 @@ struct _Evas_Object
 
    Evas_Object_Pointer_Mode    pointer_mode : 1;
 
-   Evas_Bool                   store : 1;
-   Evas_Bool                   pass_events : 1;
-   Evas_Bool                   parent_pass_events : 1;
-   Evas_Bool                   parent_cache_valid : 1;
-   Evas_Bool                   repeat_events : 1;
-   Evas_Bool                   restack : 1;
-   Evas_Bool                   changed : 1;
-   Evas_Bool                   is_active : 1;
-   Evas_Bool                   render_pre : 1;
-   Evas_Bool                   rect_del : 1;
-   Evas_Bool                   mouse_in : 1;
-   Evas_Bool                   pre_render_done : 1;
-   Evas_Bool                   intercepted : 1;
-   Evas_Bool                   focused : 1;
-   Evas_Bool                   in_layer : 1;
-   Evas_Bool                   no_propagate : 1;
-   Evas_Bool                   precise_is_inside : 1;
+   Eina_Bool                   store : 1;
+   Eina_Bool                   pass_events : 1;
+   Eina_Bool                   parent_pass_events : 1;
+   Eina_Bool                   parent_cache_valid : 1;
+   Eina_Bool                   repeat_events : 1;
+   Eina_Bool                   restack : 1;
+   Eina_Bool                   changed : 1;
+   Eina_Bool                   is_active : 1;
+   Eina_Bool                   render_pre : 1;
+   Eina_Bool                   rect_del : 1;
+   Eina_Bool                   mouse_in : 1;
+   Eina_Bool                   pre_render_done : 1;
+   Eina_Bool                   intercepted : 1;
+   Eina_Bool                   focused : 1;
+   Eina_Bool                   in_layer : 1;
+   Eina_Bool                   no_propagate : 1;
+   Eina_Bool                   precise_is_inside : 1;
 
    unsigned char               delete_me;
 };
diff --git a/legacy/evas/src/modules/engines/directfb/evas_engine.c b/legacy/evas/src/modules/engines/directfb/evas_engine.c
index 6a41d78947..b445cf31db 100644
--- a/legacy/evas/src/modules/engines/directfb/evas_engine.c
+++ b/legacy/evas/src/modules/engines/directfb/evas_engine.c
@@ -689,7 +689,7 @@ evas_engine_dfb_info_free(Evas *e __UNUSED__, void *in)
    free(info);
 }
 
-static Evas_Bool
+static Eina_Bool
 _is_dfb_data_ok(IDirectFB *idfb, IDirectFBSurface *surface, int w, int h)
 {
    DFBResult r;
@@ -698,14 +698,14 @@ _is_dfb_data_ok(IDirectFB *idfb, IDirectFBSurface *surface, int w, int h)
    if (!idfb)
      {
 	fputs("ERROR: missing IDirectFB\n", stderr);
-	return 0;
+	return EINA_FALSE;
      }
    dfb = idfb;
 
    if (!surface)
      {
 	fputs("ERROR: missing IDirectFBSurface\n", stderr);
-	return 0;
+	return EINA_FALSE;
      }
 
    r = surface->GetSize(surface, &sw, &sh);
@@ -713,7 +713,7 @@ _is_dfb_data_ok(IDirectFB *idfb, IDirectFBSurface *surface, int w, int h)
      {
 	fprintf(stderr, "ERROR: could not get surface %p size: %s\n",
 		surface, DirectFBErrorString(r));
-	return 0;
+	return EINA_FALSE;
      }
 
    if ((w > sw) || (h > sh))
@@ -721,7 +721,7 @@ _is_dfb_data_ok(IDirectFB *idfb, IDirectFBSurface *surface, int w, int h)
 	fprintf(stderr,
 		"ERROR: requested size is larger than surface: %dx%d > %dx%d\n",
 		w, h, sw, sh);
-	return 0;
+	return EINA_FALSE;
      }
    else if ((w <= 0) || (h <= 0))
      {
@@ -729,7 +729,7 @@ _is_dfb_data_ok(IDirectFB *idfb, IDirectFBSurface *surface, int w, int h)
 	h = sh;
      }
 
-   return 1;
+   return EINA_TRUE;
 }
 
 static void
diff --git a/legacy/evas/src/modules/engines/directfb/evas_engine.h b/legacy/evas/src/modules/engines/directfb/evas_engine.h
index ff964e2249..dff4a1f9d2 100644
--- a/legacy/evas/src/modules/engines/directfb/evas_engine.h
+++ b/legacy/evas/src/modules/engines/directfb/evas_engine.h
@@ -13,8 +13,8 @@ struct _DirectFB_Engine_Image_Entry
 
    struct
    {
-      Evas_Bool                   engine_surface : 1;
-      Evas_Bool                   is_locked : 1;
+      Eina_Bool                   engine_surface : 1;
+      Eina_Bool                   is_locked : 1;
    } flags;
 };
 
@@ -35,7 +35,7 @@ struct _Render_Engine
    unsigned int                  update_regions_count;
    unsigned int                  update_regions_limit;
 
-   Evas_Bool                     end : 1;
+   Eina_Bool                     end : 1;
 };
 
 int _dfb_surface_set_color_from_context(IDirectFBSurface *surface, RGBA_Draw_Context *dc);
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_common.h b/legacy/evas/src/modules/engines/gl_common/evas_gl_common.h
index 1fd8b97097..926c3464f5 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_common.h
+++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_common.h
@@ -143,7 +143,7 @@ struct _Evas_GL_Polygon
 {
    Eina_List *points;
    GLuint     dl;
-   Evas_Bool  changed : 1;
+   Eina_Bool  changed : 1;
 };
 
 struct _Evas_GL_Polygon_Point