Merge "Update makefies: no 'types' internal"