seranu wrote: I created a new PR for separating the includes at https://github.com/llvm/llvm-project/pull/78957 and will continue to work on getting the top-level comment code fixed as per review comments. Closing this PR. https://github.com/llvm/llvm-project/pull/77918