various minor include fixes to support libc++/clang++ on os x