diff --git a/legacy/ecore/src/lib/ecore/ecore_main.c b/legacy/ecore/src/lib/ecore/ecore_main.c
index eff90d720e..e4280bf324 100644
--- a/legacy/ecore/src/lib/ecore/ecore_main.c
+++ b/legacy/ecore/src/lib/ecore/ecore_main.c
@@ -958,7 +958,7 @@ _ecore_main_win32_select(int nfds, fd_set *readfds, fd_set *writefds,
 
    if (timeout == 0) return 0;
 
-   result = MsgWaitForMultipleObjects(objects_nbr, (const HANDLE *)objects, FALSE,
+   result = MsgWaitForMultipleObjects(objects_nbr, (const HANDLE *)objects, EINA_FALSE,
 				      timeout, QS_ALLINPUT);
 
    FD_ZERO(readfds);
diff --git a/legacy/ecore/src/lib/ecore/ecore_pipe.c b/legacy/ecore/src/lib/ecore/ecore_pipe.c
index 0628a3c641..824690055e 100644
--- a/legacy/ecore/src/lib/ecore/ecore_pipe.c
+++ b/legacy/ecore/src/lib/ecore/ecore_pipe.c
@@ -238,8 +238,8 @@ static int _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler);
  *     printf ("no sink");
  *     goto failure;
  *   }
- *   g_object_set (G_OBJECT (sink), "sync", TRUE, NULL);
- *   g_object_set (G_OBJECT (sink), "signal-handoffs", TRUE, NULL);
+ *   g_object_set (G_OBJECT (sink), "sync", EINA_TRUE, NULL);
+ *   g_object_set (G_OBJECT (sink), "signal-handoffs", EINA_TRUE, NULL);
  *   g_signal_connect (sink, "handoff",
  *                     G_CALLBACK (handoff), pipe);
  *
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_win32.c b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_win32.c
index c9992c5a9e..364f534fb6 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_win32.c
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_win32.c
@@ -68,7 +68,7 @@ _ecore_file_monitor_win32_data_new(Ecore_File_Monitor *monitor, int type)
    if (md->handle == INVALID_HANDLE_VALUE)
      goto free_md;
 
-   md->event = CreateEvent(NULL, FALSE, FALSE, NULL);
+   md->event = CreateEvent(NULL, EINA_FALSE, EINA_FALSE, NULL);
    if (!md->event)
      goto close_handle;
 
@@ -87,7 +87,7 @@ _ecore_file_monitor_win32_data_new(Ecore_File_Monitor *monitor, int type)
    if (!ReadDirectoryChangesW(md->handle,
                               md->buffer,
                               ECORE_FILE_MONITOR_WIN32_BUFFER_SIZE,
-                              FALSE,
+                              EINA_FALSE,
                               filter,
                               &md->buf_length,
                               &md->overlapped,
@@ -140,7 +140,7 @@ _ecore_file_monitor_win32_cb(void *data, Ecore_Win32_Handler *wh)
 
    md = (Ecore_File_Monitor_Win32_Data *)data;
 
-   if (!GetOverlappedResult (md->handle, &md->overlapped, &buf_length, TRUE))
+   if (!GetOverlappedResult (md->handle, &md->overlapped, &buf_length, EINA_TRUE))
      return 1;
 
    fni = (PFILE_NOTIFY_INFORMATION)md->buffer;
@@ -216,7 +216,7 @@ _ecore_file_monitor_win32_cb(void *data, Ecore_Win32_Handler *wh)
     ReadDirectoryChangesW(md->handle,
                           md->buffer,
                           ECORE_FILE_MONITOR_WIN32_BUFFER_SIZE,
-                          FALSE,
+                          EINA_FALSE,
                           filter,
                           &md->buf_length,
                           &md->overlapped,
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32.c b/legacy/ecore/src/lib/ecore_win32/ecore_win32.c
index eb707639e6..3c250cab69 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32.c
+++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32.c
@@ -381,7 +381,7 @@ _ecore_win32_window_procedure(HWND   window,
        return 0;
      case WM_MOVING:
        printf (" * ecore message : moving\n");
-       return TRUE;
+       return EINA_TRUE;
      case WM_MOVE:
        printf (" * ecore message : moved\n");
        return 0;
@@ -389,7 +389,7 @@ _ecore_win32_window_procedure(HWND   window,
        printf (" * ecore message : sizing\n");
        _ecore_win32_event_handle_resize(data);
        _ecore_win32_event_handle_configure_notify(data);
-       return TRUE;
+       return EINA_TRUE;
      case WM_SIZE:
        printf (" * ecore message : sized\n");
        return 0;
@@ -416,7 +416,7 @@ _ecore_win32_window_procedure(HWND   window,
        {
          RECT rect;
 
-         if (GetUpdateRect(window, &rect, FALSE))
+         if (GetUpdateRect(window, &rect, EINA_FALSE))
            {
               PAINTSTRUCT ps;
               HDC         hdc;
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c b/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c
index 618b516490..b7f0c359b8 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c
+++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c
@@ -152,7 +152,7 @@ ecore_win32_window_move(Ecore_Win32_Window *window,
    if (!MoveWindow(w, x, y,
                    rect.right - rect.left,
                    rect.bottom - rect.top,
-                   TRUE))
+                   EINA_TRUE))
      {
         ERR("MoveWindow() failed");
      }
@@ -198,7 +198,7 @@ ecore_win32_window_resize(Ecore_Win32_Window *window,
         ERR("GetWindowLong() failed");
         return;
      }
-   if (!AdjustWindowRect(&rect, style, FALSE))
+   if (!AdjustWindowRect(&rect, style, EINA_FALSE))
      {
         ERR("AdjustWindowRect() failed");
         return;
@@ -207,7 +207,7 @@ ecore_win32_window_resize(Ecore_Win32_Window *window,
    if (!MoveWindow(w->window, x, y,
                    rect.right - rect.left,
                    rect.bottom - rect.top,
-                   TRUE))
+                   EINA_TRUE))
      {
         ERR("MoveWindow() failed");
      }
@@ -242,7 +242,7 @@ ecore_win32_window_move_resize(Ecore_Win32_Window *window,
         ERR("GetWindowLong() failed");
         return;
      }
-   if (!AdjustWindowRect(&rect, style, FALSE))
+   if (!AdjustWindowRect(&rect, style, EINA_FALSE))
      {
         ERR("AdjustWindowRect() failed");
         return;
@@ -251,7 +251,7 @@ ecore_win32_window_move_resize(Ecore_Win32_Window *window,
    if (!MoveWindow(w->window, x, y,
                    rect.right - rect.left,
                    rect.bottom - rect.top,
-                   TRUE))
+                   EINA_TRUE))
      {
         ERR("MoveWindow() failed");
      }
@@ -506,7 +506,7 @@ ecore_win32_window_shape_set(Ecore_Win32_Window *window,
 #endif
           }
         else
-          if (!SetWindowRgn(wnd->window, NULL, TRUE))
+          if (!SetWindowRgn(wnd->window, NULL, EINA_TRUE))
             {
                ERR("SetWindowRgn() failed");
             }
@@ -535,7 +535,7 @@ ecore_win32_window_shape_set(Ecore_Win32_Window *window,
 
 #if defined(WS_EX_LAYERED)
    version_info.dwOSVersionInfoSize = sizeof(version_info);
-   if (GetVersionEx(&version_info) == TRUE && version_info.dwMajorVersion == 5)
+   if (GetVersionEx(&version_info) == EINA_TRUE && version_info.dwMajorVersion == 5)
      {
        SetLastError(0);
        if (!SetWindowLongPtr(wnd->window, GWL_EXSTYLE,
@@ -596,7 +596,7 @@ ecore_win32_window_shape_set(Ecore_Win32_Window *window,
              return;
           }
      }
-   if (!SetWindowRgn(wnd->window, rgn, TRUE))
+   if (!SetWindowRgn(wnd->window, rgn, EINA_TRUE))
      {
         ERR("SetWindowRgn() failed");
      }
@@ -748,7 +748,7 @@ ecore_win32_window_borderless_set(Ecore_Win32_Window *window,
              return;
           }
         style |= WS_CAPTION | WS_THICKFRAME;
-        if (!AdjustWindowRect (&rect, style, FALSE))
+        if (!AdjustWindowRect (&rect, style, EINA_FALSE))
           {
              ERR("AdjustWindowRect() failed");
              return;
@@ -978,7 +978,7 @@ ecore_win32_window_state_request_send(Ecore_Win32_Window      *window,
               if (!MoveWindow(w, rect.left, y,
                               rect.right - rect.left,
                               height,
-                              TRUE))
+                              EINA_TRUE))
                 {
                    ERR("MoveWindow() failed");
                 }
@@ -998,7 +998,7 @@ ecore_win32_window_state_request_send(Ecore_Win32_Window      *window,
               if (!MoveWindow(w, 0, rect.top,
                               GetSystemMetrics(SM_CXSCREEN),
                               rect.bottom - rect.top,
-                              TRUE))
+                              EINA_TRUE))
                 {
                    ERR("MoveWindow() failed");
                 }
@@ -1019,7 +1019,7 @@ ecore_win32_window_state_request_send(Ecore_Win32_Window      *window,
               if (!MoveWindow(w, 0, 0,
                               GetSystemMetrics(SM_CXSCREEN),
                               rect.bottom - rect.top,
-                              TRUE))
+                              EINA_TRUE))
                 {
                    ERR("MoveWindow() failed");
                 }
@@ -1132,7 +1132,7 @@ ecore_win32_window_internal_new(Ecore_Win32_Window *parent,
    rect.top = 0;
    rect.right = width;
    rect.bottom = height;
-   if (!AdjustWindowRect(&rect, style, FALSE))
+   if (!AdjustWindowRect(&rect, style, EINA_FALSE))
      {
         ERR("AdjustWindowRect() failed");
         free(w);
diff --git a/legacy/ecore/src/lib/ecore_wince/ecore_wince.c b/legacy/ecore/src/lib/ecore_wince/ecore_wince.c
index c507471514..903c045abd 100644
--- a/legacy/ecore/src/lib/ecore_wince/ecore_wince.c
+++ b/legacy/ecore/src/lib/ecore_wince/ecore_wince.c
@@ -154,7 +154,7 @@ ecore_wince_shutdown()
    if (task_bar)
      {
         ShowWindow(task_bar, SW_SHOW);
-        EnableWindow(task_bar, TRUE);
+        EnableWindow(task_bar, EINA_TRUE);
      }
 
    if (!UnregisterClass(ECORE_WINCE_WINDOW_CLASS, _ecore_wince_instance))
diff --git a/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c b/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c
index cf6b23fbbe..5b95f7f450 100644
--- a/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c
+++ b/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c
@@ -50,7 +50,7 @@ ecore_wince_window_new(Ecore_WinCE_Window *parent,
    rect.top = 0;
    rect.right = width;
    rect.bottom = height;
-   if (!AdjustWindowRectEx(&rect, WS_CAPTION | WS_SYSMENU | WS_VISIBLE, FALSE, WS_EX_TOPMOST))
+   if (!AdjustWindowRectEx(&rect, WS_CAPTION | WS_SYSMENU | WS_VISIBLE, EINA_FALSE, WS_EX_TOPMOST))
      {
         ERR("AdjustWindowRectEx() failed");
         free(w);
@@ -139,7 +139,7 @@ ecore_wince_window_move(Ecore_WinCE_Window *window,
    if (!MoveWindow(w, x, y,
                    rect.right - rect.left,
                    rect.bottom - rect.top,
-                   TRUE))
+                   EINA_TRUE))
      {
         ERR("MoveWindow() failed");
      }
@@ -185,7 +185,7 @@ ecore_wince_window_resize(Ecore_WinCE_Window *window,
         ERR("GetWindowLong() failed");
         return;
      }
-   if (!AdjustWindowRectEx(&rect, style, FALSE, exstyle))
+   if (!AdjustWindowRectEx(&rect, style, EINA_FALSE, exstyle))
      {
         ERR("AdjustWindowRectEx() failed");
         return;
@@ -194,7 +194,7 @@ ecore_wince_window_resize(Ecore_WinCE_Window *window,
    if (!MoveWindow(w->window, x, y,
                    rect.right - rect.left,
                    rect.bottom - rect.top,
-                   FALSE))
+                   EINA_FALSE))
      {
         ERR("MoveWindow() failed");
      }
@@ -232,7 +232,7 @@ ecore_wince_window_move_resize(Ecore_WinCE_Window *window,
         ERR("GetWindowLong() failed");
         return;
      }
-   if (!AdjustWindowRectEx(&rect, style, FALSE, exstyle))
+   if (!AdjustWindowRectEx(&rect, style, EINA_FALSE, exstyle))
      {
         ERR("AdjustWindowRectEx() failed");
         return;
@@ -241,7 +241,7 @@ ecore_wince_window_move_resize(Ecore_WinCE_Window *window,
    if (!MoveWindow(w->window, x, y,
               rect.right - rect.left,
               rect.bottom - rect.top,
-              TRUE))
+              EINA_TRUE))
      {
         ERR("MoveWindow() failed");
      }
@@ -478,7 +478,7 @@ ecore_wince_window_fullscreen_set(Ecore_WinCE_Window *window,
           {
              INF("ShowWindow(): task bar already hidden");
           }
-        if (!EnableWindow(task_bar, FALSE))
+        if (!EnableWindow(task_bar, EINA_FALSE))
           {
              INF("EnableWindow(): input already disabled");
           }
@@ -505,7 +505,7 @@ ecore_wince_window_fullscreen_set(Ecore_WinCE_Window *window,
         if (!MoveWindow(w,
                         0, 0,
                         GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
-                        TRUE))
+                        EINA_TRUE))
           {
              INF("MoveWindow() failed");
           }
@@ -522,7 +522,7 @@ ecore_wince_window_fullscreen_set(Ecore_WinCE_Window *window,
           {
              INF("ShowWindow(): task bar already visible");
           }
-        if (!EnableWindow(task_bar, TRUE))
+        if (!EnableWindow(task_bar, EINA_TRUE))
           {
              INF("EnableWindow():  input already enabled");
           }
@@ -552,7 +552,7 @@ ecore_wince_window_fullscreen_set(Ecore_WinCE_Window *window,
                         ew->rect.top,
                         ew->rect.right - ew->rect.left,
                         ew->rect.bottom - ew->rect.top,
-                        TRUE))
+                        EINA_TRUE))
           {
              INF("MoveWindow() failed");
           }