diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index 0bd3646f31..6774d6b6b4 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -281,6 +281,8 @@ typedef enum
    EOLIAN_TYPE_BUILTIN_ITERATOR,
    EOLIAN_TYPE_BUILTIN_HASH,
    EOLIAN_TYPE_BUILTIN_LIST,
+   EOLIAN_TYPE_BUILTIN_INARRAY,
+   EOLIAN_TYPE_BUILTIN_INLIST,
 
    EOLIAN_TYPE_BUILTIN_FUTURE,
 
diff --git a/src/lib/eolian/database_validate.c b/src/lib/eolian/database_validate.c
index da83072d50..7559303e24 100644
--- a/src/lib/eolian/database_validate.c
+++ b/src/lib/eolian/database_validate.c
@@ -149,8 +149,9 @@ _validate_typedecl(Eolian_Typedecl *tp)
 
 static const char * const eo_complex_frees[] =
 {
-   "eina_accessor_free", "eina_array_free", "eina_iterator_free",
-   "eina_hash_free", "eina_list_free",
+   "eina_accessor_free", "eina_array_free",
+   "eina_iterator_free", "eina_hash_free",
+   "eina_list_free", "eina_inarray_free", "eina_inlist_free",
 
    "efl_del" /* future */
 };
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index d3f3f09b03..affe61efa7 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -73,7 +73,7 @@ static const char * const ctypes[] =
    "void",
 
    "Eina_Accessor *", "Eina_Array *", "Eina_Iterator *", "Eina_Hash *",
-   "Eina_List *",
+   "Eina_List *", "Eina_Inarray *", "Eina_Inlist *",
    "Efl_Future *",
    "Eina_Value", "Eina_Value *",
    "char *", "const char *", "Eina_Stringshare *",
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 18d6f7e2f0..0cf76ce489 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -51,7 +51,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(inarray), KW(inlist), \
     KW(future),                                   \
     KW(any_value), KW(any_value_ptr), \
     KW(mstring), KW(string), KW(stringshare), \