diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c
index edb7ed1629..0047102b0f 100644
--- a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c
+++ b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c
@@ -209,7 +209,7 @@ _ecore_config_ipc_bundle_label_find(Ecore_Config_Server * srv,
    return ns ? ecore_config_bundle_serial_get(ns) : -1;
 }
 
-static int
+static Eina_Bool
 _ecore_config_ipc_poll(void *data __UNUSED__)
 {
    Ecore_Config_Server *s;
@@ -221,7 +221,7 @@ _ecore_config_ipc_poll(void *data __UNUSED__)
         s = s->next;
      }
 
-   return 1;
+   return EINA_TRUE;
 }
 
 int
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_cocoa.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_cocoa.c
index 9eea6cc16e..3e2103bbf0 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_cocoa.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_cocoa.c
@@ -86,17 +86,17 @@ _ecore_evas_cocoa_match(void)
    return ecore_evases;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_cocoa_event_got_focus(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Evas                   *ee;
 
    ee = _ecore_evas_cocoa_match();
 
-   if (!ee) return 1;
+   if (!ee) return EINA_TRUE;
    ee->prop.focused = 1;
 
-   return 0;
+   return EINA_FALSE;
 }
 
 static Eina_Bool
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c
index 97ed9e23b4..86ffeb19cd 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c
@@ -78,7 +78,7 @@ _ecore_evas_directfb_match(DFBWindowID win)
    return ee;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_directfb_event_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Evas *ee;
@@ -87,10 +87,10 @@ _ecore_evas_directfb_event_key_down(void *data __UNUSED__, int type __UNUSED__,
    e = event;
    ee = _ecore_evas_directfb_match(e->win);
 
-   if (!ee) return 1; /* pass on event */
+   if (!ee) return EINA_TRUE; /* pass on event */
    evas_event_feed_key_down(ee->evas, e->name, e->name, e->string,
                             e->key_compose, e->time, NULL);
-   return 1;
+   return EINA_TRUE;
 }
 
 static Eina_Bool
diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_ps2.c b/legacy/ecore/src/lib/ecore_fb/ecore_fb_ps2.c
index 7c8dc62ec2..161c200ec8 100644
--- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_ps2.c
+++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb_ps2.c
@@ -40,7 +40,7 @@ ecore_fb_ps2_shutdown(void)
    _ecore_fb_ps2_fd = 0;
 }
 
-static int
+static Eina_Bool
 _ecore_fb_ps2_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UNUSED__)
 {
    static int prev_x = 0, prev_y = 0, prev_button = 0;
@@ -60,9 +60,9 @@ _ecore_fb_ps2_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U
 	ptr += _ecore_fb_ps2_event_byte_count;
 	num = sizeof(Ecore_Fb_Ps2_Event) - _ecore_fb_ps2_event_byte_count;
 	v = read(_ecore_fb_ps2_fd, ptr, num);
-	if (v < 0) return 1;
+	if (v < 0) return EINA_TRUE;
 	_ecore_fb_ps2_event_byte_count += v;
-	if (v < num) return 1;
+	if (v < num) return EINA_TRUE;
 	t = ecore_time_get();
 	_ecore_fb_ps2_event_byte_count = 0;
 	if (_ecore_fb_ps2_event.button & 0x10)
@@ -144,7 +144,7 @@ _ecore_fb_ps2_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U
 	prev_button = button;
      }
    while (v > 0);
-   return 1;
+   return EINA_TRUE;
 }
 /**
  * @defgroup Ecore_FB_Click_Group Framebuffer Double Click Functions