Fixed redefinition of typedef in generators