Add back the headers we're getting via (likely) transitive includes.
We really do use these things in the header.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204180 91177308-0d34-0410-b5e6-96231b3b80d8