I definitely get the desire for isolation but I think the improved error messages for now are worth it, and if we in the future want to isolate this header completely / pull it out we can still. This one dependency would be pretty easy to embed inside this header if we need that.