Adding builtin type
Adding closure type
Removing useless includes