Re-apply r115363 and r115366 now that r115525 has removed the un-needed header

that caused the circular dependencies on Linux.

Built OK for me on OSX and Linux (Ubuntu) with configure/make and CMake. Will
keep an eye on the bots....

llvm-svn: 115582