diff --git a/legacy/ecore/src/lib/ecore/Ecore.h b/legacy/ecore/src/lib/ecore/Ecore.h
index 68838852db..e8faa9f4cb 100644
--- a/legacy/ecore/src/lib/ecore/Ecore.h
+++ b/legacy/ecore/src/lib/ecore/Ecore.h
@@ -31,9 +31,13 @@
 extern "C" {
 #endif
 
-/* FIXME: [deprecated] Convenience macros */
-#define ECORE_MIN(x, y)          (((x) > (y)) ? (y) : (x))
-#define ECORE_MAX(x, y)          (((x) > (y)) ? (x) : (y))
+#ifndef MIN
+#define MIN(x, y) (((x) > (y)) ? (y) : (x))
+#endif
+
+#ifndef MAX
+#define MAX(x, y) (((x) > (y)) ? (x) : (y))
+#endif
 
 #define ECORE_EVENT_NONE         0
 #define ECORE_EVENT_EXE_EXIT     1 /**< Spawned Exe has exit event */
diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_dnd.c b/legacy/ecore/src/lib/ecore_x/ecore_x_dnd.c
index ebe40459d7..a8bfa94700 100644
--- a/legacy/ecore/src/lib/ecore_x/ecore_x_dnd.c
+++ b/legacy/ecore/src/lib/ecore_x/ecore_x_dnd.c
@@ -170,8 +170,8 @@ _ecore_x_dnd_drag(int x, int y)
 
    if (win)
    {
-      _xdnd->version = ECORE_MIN(ECORE_X_DND_VERSION, 
-                                 ecore_x_dnd_version_get(win));
+      _xdnd->version = MIN(ECORE_X_DND_VERSION, 
+                           ecore_x_dnd_version_get(win));
       if (win != _xdnd->dest)
       {
          int i;
@@ -186,7 +186,7 @@ _ecore_x_dnd_drag(int x, int y)
             xev.xclient.data.l[1] &= 0xfffffffeUL;
          xev.xclient.data.l[1] |= ((unsigned long) _xdnd->version) << 24;
          
-         for (i = 0; i < ECORE_MIN(_xdnd->num_types, 3); ++i)
+         for (i = 0; i < MIN(_xdnd->num_types, 3); ++i)
             xev.xclient.data.l[i + 2] = _xdnd->types[i];
          XSendEvent(_ecore_x_disp, win, False, 0, &xev);
          _xdnd->await_status = 0;