add typedef statements and const quantifier