Simplify type names.
Remove useless include.