[TYPEDEF] more fixes from revert problems with git