EricWF added a comment. I've updated the diff so it merges and also fixed <ostream>, <istream>, <sstream> and <streambuf>. It can be found here: https://gist.github.com/EricWF/487e5b1de2bb320e93fbb3c9c758b013 Repository: rL LLVM http://reviews.llvm.org/D15404