Fix incorrect header includes for and multiset
Merge pull request #73 from pfultz2/header-fix

Fix incorrect header includes for multiset