> I'm inclined to forget about trying to fix everything and just do the
> minimal set of changes to make the tooling happy with parsing the headers.

Yeah, at this point I'd totally support that.