clangd friendly headers

[timblechmann]

quality of life improvements when working with clangd enabled IDEs. these two patches fix issues when clangd parses the headers in isolation in a c++ compile context

---

• make headers self-contained
• avoid c++ keyword