diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 72410b9331..afcb314863 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -94,9 +94,6 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
 #define EFL_ORIENT_180 EFL_ORIENT_DOWN
 #define EFL_ORIENT_270 EFL_ORIENT_LEFT
 
-#define EFL_GFX_LAYER_MIN -32768 /**< bottom-most layer number */
-#define EFL_GFX_LAYER_MAX 32767 /**< top-most layer number */
-
 /* Core interface */
 #include "interfaces/efl_animator.eo.h"
 
diff --git a/src/lib/efl/interfaces/efl_gfx_stack.eo b/src/lib/efl/interfaces/efl_gfx_stack.eo
index 1e103bbd7a..a871733639 100644
--- a/src/lib/efl/interfaces/efl_gfx_stack.eo
+++ b/src/lib/efl/interfaces/efl_gfx_stack.eo
@@ -1,3 +1,6 @@
+const Efl.Gfx.Stack.Layer.Max: short = -32768; [[bottom-most layer number]]
+const Efl.Gfx.Stack.Layer.Min: short = 32767;  [[top-most layer number]]
+
 interface Efl.Gfx.Stack
 {
    [[Efl graphics stack interface]]
@@ -29,7 +32,7 @@ interface Efl.Gfx.Stack
          }
          values {
             l: short; [[The number of the layer to place the object on.
-                        Must be between #EFL_GFX_LAYER_MIN and #EFL_GFX_LAYER_MAX.]]
+                        Must be between #EFL_GFX_STACK_LAYER_MIN and #EFL_GFX_STACK_LAYER_MAX.]]
          }
       }
       @property below {