Fix nested structs being expanded in headers
Merge pull request #896 from jbrodman/master

Fix nested structs being expanded in headers