Yet more LLVM header renames