eugeneepshteyn wrote: Hold on, we need to be extra careful when introducing new build dependencies. A better fix *may* be do move some declarations around the headers. https://github.com/llvm/llvm-project/pull/213508