Fix nested structs being expanded in headers