Join typedef and struct definitions in single file.

Recommend that style on CONVENTIONS.md.