diff --git a/src/lib/efl/interfaces/efl_model_base.eo b/src/lib/efl/interfaces/efl_model_base.eo
index 8ba6c5ae45..dbda997c45 100644
--- a/src/lib/efl/interfaces/efl_model_base.eo
+++ b/src/lib/efl/interfaces/efl_model_base.eo
@@ -111,7 +111,7 @@ interface Efl.Model.Base ()
                property: const(char)*; /*@ Property name */
             }
             values {
-               value: const(Eina_Value)*; /*@ New value */
+               value: const(generic_value)*; /*@ New value */
             }
          }
          @property children_slice {
diff --git a/src/lib/eo/eina_types.eot b/src/lib/eo/eina_types.eot
index 691c6d8219..eef43fbc06 100644
--- a/src/lib/eo/eina_types.eot
+++ b/src/lib/eo/eina_types.eot
@@ -1,3 +1,2 @@
 /* FIXME: Move to Eina when we decide they are handled properly. */
 type @extern Eina_Stringshare: const(char) *;
-type @extern Eina_Value: void *;
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index 3e1f781a30..546a61d375 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -26,7 +26,7 @@ struct Eo.Dbg_Info {
       * The structure for the debug info used by Eo.
       */
      name: Eina_Stringshare *; /*@< The name of the part (stringshare). */
-     value: Eina_Value; /*@< The value. */
+     value: generic_value; /*@< The value. */
 }
 
 
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index 9f69c7f410..7b79d23cad 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -72,7 +72,10 @@ static const char * const ctypes[] =
 
    "void",
 
-   "Eina_Accessor", "Eina_Array", "Eina_Iterator", "Eina_Hash", "Eina_List"
+   "Eina_Accessor", "Eina_Array", "Eina_Iterator", "Eina_Hash", "Eina_List",
+   "Eina_Value",
+
+   "Eo_Event_Cb"
 };
 
 #undef KW
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 3812d47753..aea3a1c839 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -50,7 +50,7 @@ enum Tokens
     \
     KW(void), \
     \
-    KW(accessor), KW(array), KW(iterator), KW(hash), KW(list), \
+    KW(accessor), KW(array), KW(iterator), KW(hash), KW(list), KW(generic_value), \
     \
     KW(__builtin_event_cb), \
     \