The total changes LGTM (with the include order nit) but I agree that this ought to be multiple commits. Eric's suggestion for splitting it up makes sense to me. http://reviews.llvm.org/D7838 EMAIL PREFERENCES http://reviews.llvm.org/settings/panel/emailpreferences/