Header fix for trunk llvm.