Merge pull request #4896 from RosettaCommons/dpaoliello/UseNonFwdHeader Ensure the non-forward declaration headers are included for types used in standard library containers