Join typedef and struct definitions in single file.
Merge pull request #2575 from cirosantilli/factor-struct-typedef

[factor] Join typedef and struct definitions in single file.