diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 303a4b4ef8..1864fb8ade 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -323,8 +323,6 @@ typedef struct _Evas_Native_Surface Evas_Native_Surface; /**< A generic datatype
  */
 typedef struct _Evas_Video_Surface Evas_Video_Surface;
 
-typedef unsigned long long         Evas_Modifier_Mask;  /**< An Evas modifier mask type */
-
 typedef int                        Evas_Font_Size; /**< A type for font size */
 typedef int                        Evas_Angle; /**< A type for angle */
 
@@ -383,14 +381,6 @@ struct _Evas_Precision_Position /** A position with precision*/
    Evas_Coord_Precision_Point canvas; /**< position on the canvas */
 };
 
-typedef enum _Evas_Display_Mode
-{
-   EVAS_DISPLAY_MODE_NONE = 0, /**<Default mode */
-   EVAS_DISPLAY_MODE_COMPRESS = 1, /**< Use this mode when you want to give compress display mode hint to an object */
-   EVAS_DISPLAY_MODE_EXPAND = 2, /**< Use this mode when you want to give expand display mode hint to an object */
-   EVAS_DISPLAY_MODE_DONT_CHANGE = 3 /**< Use this mode when an object should not change its display mode */
-} Evas_Display_Mode; /**< object's display mode type related with compress/expand or etc mode */
-
 typedef struct _Evas_Pixel_Import_Source Evas_Pixel_Import_Source; /**< A source description of pixels for importing pixels */
 typedef struct _Evas_Engine_Info         Evas_Engine_Info; /**< A generic Evas Engine information structure */
 typedef struct _Evas_Device              Evas_Device; /**< A source device handle - where the event came from */
@@ -579,26 +569,6 @@ typedef enum _Evas_Video_Surface_Caps
 #define evas_object_size_hint_expand_set evas_object_size_hint_weight_set /**< Convenience macro to make it easier to understand that weight is also used for expand properties */
 #define evas_object_size_hint_expand_get evas_object_size_hint_weight_get /**< Convenience macro to make it easier to understand that weight is also used for expand properties */
 
-/**
- * How the object should be rendered to output.
- * @ingroup Evas_Object_Group_Extras
- */
-typedef enum _Evas_Render_Op
-{
-   EVAS_RENDER_BLEND = 0, /**< default op: d = d*(1-sa) + s */
-   EVAS_RENDER_BLEND_REL = 1, /**< d = d*(1 - sa) + s*da */
-   EVAS_RENDER_COPY = 2, /**< d = s */
-   EVAS_RENDER_COPY_REL = 3, /**< d = s*da */
-   EVAS_RENDER_ADD = 4, /* d = d + s */
-   EVAS_RENDER_ADD_REL = 5, /**< d = d + s*da */
-   EVAS_RENDER_SUB = 6, /**< d = d - s */
-   EVAS_RENDER_SUB_REL = 7, /* d = d - s*da */
-   EVAS_RENDER_TINT = 8, /**< d = d*s + d*(1 - sa) + s*(1 - da) */
-   EVAS_RENDER_TINT_REL = 9, /**< d = d*(1 - sa + s) */
-   EVAS_RENDER_MASK = 10, /**< d = d*sa */
-   EVAS_RENDER_MUL = 11 /**< d = d*s */
-} Evas_Render_Op; /**< How the object should be rendered to output. */
-
 typedef enum _Evas_Border_Fill_Mode
 {
    EVAS_BORDER_FILL_NONE = 0, /**< Image's center region is @b not to be rendered */
@@ -909,28 +879,6 @@ struct _Evas_Event_Axis_Update
    Evas_Device *dev;
 };
 
-/**
- * How the mouse pointer should be handled by Evas.
- *
- * In the mode #EVAS_OBJECT_POINTER_MODE_AUTOGRAB, when a mouse button
- * is pressed down over an object and held, with the mouse pointer
- * being moved outside of it, the pointer still behaves as being bound
- * to that object, albeit out of its drawing region. When the button
- * is released, the event will be fed to the object, that may check if
- * the final position is over it or not and do something about it.
- *
- * In the mode #EVAS_OBJECT_POINTER_MODE_NOGRAB, the pointer will
- * always be bound to the object right below it.
- *
- * @ingroup Evas_Object_Group_Extras
- */
-typedef enum _Evas_Object_Pointer_Mode
-{
-   EVAS_OBJECT_POINTER_MODE_AUTOGRAB, /**< default, X11-like */
-   EVAS_OBJECT_POINTER_MODE_NOGRAB, /**< pointer always bound to the object right below it */
-   EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN /**< useful on object with "repeat events" enabled, where mouse/touch up and down events WONT be repeated to objects and these objects wont be auto-grabbed. @since 1.2 */
-} Evas_Object_Pointer_Mode; /**< How the mouse pointer should be handled by Evas. */
-
 typedef void      (*Evas_Smart_Cb)(void *data, Evas_Object *obj, void *event_info);  /**< Evas smart objects' "smart callback" function signature */
 typedef void      (*Evas_Event_Cb)(void *data, Evas *e, void *event_info);  /**< Evas event callback function signature */
 typedef Eina_Bool (*Evas_Object_Event_Post_Cb)(void *data, Evas *e);  /**< Evas object event (post) callback function signature */
diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo
index 98f4d01350..0536536c6c 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -189,7 +189,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac
             @ingroup Evas_Object_Group_Extras */
          }
          values {
-            pointer_mode: Evas_Object_Pointer_Mode; /*@ desired behavior. */
+            pointer_mode: Evas.Object_Pointer_Mode; /*@ desired behavior. */
          }
       }
       @property render_op {
@@ -205,7 +205,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac
             @ingroup Evas_Object_Group_Extras */
          }
          values {
-            render_op: Evas_Render_Op; /*@ one of the Evas_Render_Op values. */
+            render_op: Evas.Render_Op; /*@ one of the Evas_Render_Op values. */
          }
       }
       @property freeze_events {
@@ -1091,7 +1091,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac
             can be used whenever appropriate.*/
          }
          values {
-            dispmode: Evas_Display_Mode; /*@ display mode hint */
+            dispmode: Evas.Display_Mode; /*@ display mode hint */
          }
       }
       clipees_has @const {
@@ -1146,9 +1146,9 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac
          return: bool @warn_unused;
          params {
             @in keyname: const(char)* @nonull; /*@ the key to request events for. */
-            @in modifiers: Evas_Modifier_Mask; /*@ a mask of modifiers that must be present to
+            @in modifiers: Evas.Modifier_Mask; /*@ a mask of modifiers that must be present to
             trigger the event. */
-            @in not_modifiers: Evas_Modifier_Mask; /*@ a mask of modifiers that must @b not be present
+            @in not_modifiers: Evas.Modifier_Mask; /*@ a mask of modifiers that must @b not be present
             to trigger the event. */
             @in exclusive: bool; /*@ request that the @p obj is the only object
             receiving the @p keyname events. */
@@ -1226,9 +1226,9 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac
 
          params {
             @in keyname: const(char)* @nonull; /*@ the key the grab is set for. */
-            @in modifiers: Evas_Modifier_Mask; /*@ a mask of modifiers that must be present to
+            @in modifiers: Evas.Modifier_Mask; /*@ a mask of modifiers that must be present to
             trigger the event. */
-            @in not_modifiers: Evas_Modifier_Mask; /*@ a mask of modifiers that must not not be
+            @in not_modifiers: Evas.Modifier_Mask; /*@ a mask of modifiers that must not not be
             present to trigger the event. */
          }
       }
diff --git a/src/lib/evas/canvas/evas_types.eot b/src/lib/evas/canvas/evas_types.eot
index 1d48cba518..bb03fd815f 100644
--- a/src/lib/evas/canvas/evas_types.eot
+++ b/src/lib/evas/canvas/evas_types.eot
@@ -1,3 +1,4 @@
+type Evas.Modifier_Mask: ullong;  /*@ An Evas modifier mask type */
 type Evas.Coord: int; /*@ A type for coordinates */
 enum Evas.Aspect_Control {
    /**< Aspect types/policies for scaling size hints, used for evas_object_size_hint_aspect_set() */
@@ -7,6 +8,56 @@ enum Evas.Aspect_Control {
    vertical = 3, /**< Use all vertical container space to place an object, using the given aspect */
    both = 4 /**< Use all horizontal @b and vertical container spaces to place an object (never growing it out of those bounds), using the given aspect */
 }
+
+enum Evas.Render_Op {
+   /*@
+    * How the object should be rendered to output.
+    * @ingroup Evas_Object_Group_Extras
+    */
+   legacy: Evas_Render;
+
+   blend = 0, /**< default op: d = d*(1-sa) + s */
+   blend_rel = 1, /**< d = d*(1 - sa) + s*da */
+   copy = 2, /**< d = s */
+   copy_rel = 3, /**< d = s*da */
+   add = 4, /* d = d + s */
+   add_rel = 5, /**< d = d + s*da */
+   sub = 6, /**< d = d - s */
+   sub_rel = 7, /* d = d - s*da */
+   tint = 8, /**< d = d*s + d*(1 - sa) + s*(1 - da) */
+   tint_rel = 9, /**< d = d*(1 - sa + s) */
+   mask = 10, /**< d = d*sa */
+   mul = 11 /**< d = d*s */
+}
+
+enum Evas.Object_Pointer_Mode {
+   /**
+    * How the mouse pointer should be handled by Evas.
+    *
+    * In the mode #EVAS_OBJECT_POINTER_MODE_AUTOGRAB, when a mouse button
+    * is pressed down over an object and held, with the mouse pointer
+    * being moved outside of it, the pointer still behaves as being bound
+    * to that object, albeit out of its drawing region. When the button
+    * is released, the event will be fed to the object, that may check if
+    * the final position is over it or not and do something about it.
+    *
+    * In the mode #EVAS_OBJECT_POINTER_MODE_NOGRAB, the pointer will
+    * always be bound to the object right below it.
+    *
+    * @ingroup Evas_Object_Group_Extras
+    */
+   autograb, /**< default, X11-like */
+   nograb, /**< pointer always bound to the object right below it */
+   nograb_no_repeat_updown /**< useful on object with "repeat events" enabled, where mouse/touch up and down events WONT be repeated to objects and these objects wont be auto-grabbed. @since 1.2 */
+}
+
+enum Evas.Display_Mode {
+   none = 0, /**<Default mode */
+   compress = 1, /**< Use this mode when you want to give compress display mode hint to an object */
+   expand = 2, /**< Use this mode when you want to give expand display mode hint to an object */
+   dont_change = 3 /**< Use this mode when an object should not change its display mode */
+}
+
 struct Evas.Map; /*@ An opaque handle to map points
                   *
                   * @see evas_map_new()