modularize - Fix of header dependencies.

git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@189983 91177308-0d34-0410-b5e6-96231b3b80d8
modularize - Fix of header dependencies - this time with the source.

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