include/cxx: Fix some bad idempotence defintions in header files