added fix for multiple declarations included in struct definitions