diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/legacy/evas/src/lib/canvas/evas_object_main.c
index b7d9e88ad5..866676092e 100644
--- a/legacy/evas/src/lib/canvas/evas_object_main.c
+++ b/legacy/evas/src/lib/canvas/evas_object_main.c
@@ -696,7 +696,9 @@ _position_set(Eo *eo_obj, void *_pd, va_list *list)
    Evas_Coord y = va_arg(*list, Evas_Coord);
 
    Evas_Public_Data *evas;
-   int is, was = 0, pass = 0, freeze = 0, source_invisible = 0;
+   Eina_Bool is, was = EINA_FALSE;
+   Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE;
+   Eina_Bool source_invisible = EINA_FALSE;
    int nx = 0, ny = 0;
 
    if (obj->delete_me) return;
@@ -790,8 +792,9 @@ _size_set(Eo *eo_obj, void *_pd, va_list *list)
 
    Evas_Coord w = va_arg(*list, Evas_Coord);
    Evas_Coord h = va_arg(*list, Evas_Coord);
-
-   int is, was = 0, pass = 0, freeze = 0, source_invisible = 0;
+   Eina_Bool is, was = EINA_FALSE;
+   Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE;
+   Eina_Bool source_invisible = EINA_FALSE;
 
    if (obj->delete_me) return;
    if (w < 0) w = 0; if (h < 0) h = 0;
diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/legacy/evas/src/lib/canvas/evas_object_text.c
index bb1ed2eafa..b7b101397e 100644
--- a/legacy/evas/src/lib/canvas/evas_object_text.c
+++ b/legacy/evas/src/lib/canvas/evas_object_text.c
@@ -346,7 +346,9 @@ static void
 _text_font_set(Eo *eo_obj, void *_pd, va_list *list)
 {
    Evas_Object_Text *o = _pd;
-   int is, was = 0, pass = 0, freeze = 0, source_invisible = 0;
+   Eina_Bool is, was = EINA_FALSE;
+   Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE;
+   Eina_Bool source_invisible = EINA_FALSE;
    Evas_Font_Description *fdesc;
 
    const char *font = va_arg(*list, const char*);
diff --git a/legacy/evas/src/lib/canvas/evas_object_textgrid.c b/legacy/evas/src/lib/canvas/evas_object_textgrid.c
index 3d26d75d8c..1c72bfa9fc 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textgrid.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textgrid.c
@@ -1078,7 +1078,9 @@ _font_set(Eo *eo_obj, void *_pd, va_list *list)
    Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
    const char *font_name = va_arg(*list, const char *);
    Evas_Font_Size font_size = va_arg(*list, Evas_Font_Size);
-   int is, was = 0, pass = 0, freeze = 0, source_invisible = 0;
+   Eina_Bool is, was = EINA_FALSE;
+   Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE;
+   Eina_Bool source_invisible = EINA_FALSE;
    Evas_Font_Description *font_description;
    
    if ((!font_name) || (!*font_name) || (font_size <= 0))