benlangmuir added a comment. Something weird seems to have been going on with Phab emails and I missed your patch for the header/requires ordering issue. Anyway, I fixed it in r242055 with a similar approach. http://reviews.llvm.org/D10423