Merge "Update makefies: no 'types'"