diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 81c9d5ad61..83baae2f0b 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -3199,7 +3199,7 @@ typedef enum _Evas_Native_Surface_Type
  *
  * @see evas_object_image_native_surface_set()
  */
-struct _Evas_Native_Surface
+typedef struct _Evas_Native_Surface
 {
    int                      version; /**< Current Native Surface Version. Use EVAS_NATIVE_SURFACE_VERSION */
    Evas_Native_Surface_Type type; /**< Surface type. @see Evas_Native_Surface_Type */
@@ -3236,7 +3236,7 @@ struct _Evas_Native_Surface
          void *surface; /**< evas gl surface to use @since 1.14 */
       } evasgl; /**< Set this struct fields if surface data is Evas GL based. @since 1.14 */
    } data; /**< Choose one union data according to your surface. */
-};
+} Evas_Native_Surface;
 
 /**
  * Set the native surface of a given image of the canvas
diff --git a/src/lib/evas/canvas/evas_types.eot b/src/lib/evas/canvas/evas_types.eot
index af8529a775..109de28fb4 100644
--- a/src/lib/evas/canvas/evas_types.eot
+++ b/src/lib/evas/canvas/evas_types.eot
@@ -1,9 +1,6 @@
 type @extern Evas.Load_Error: int; /* FIXME: Need to migrate emile. */
 struct @extern Evas.Video_Surface; /* FIXME: The structure is full of the unsupported func pointers. */
 
-/* FIXME: Unsupported annonymous structures inside */
-struct Evas.Native_Surface; [[A generic datatype for engine specific native surface information]]
-
 type Evas.Modifier_Mask: ullong;  [[An Evas modifier mask type]]
 type Evas.Coord: int; [[A type for coordinates]]