Stop using C/C++ reserved identifiers

[kpet]

The headers are using a number of identifiers that are reserved in C/C++ (e.g. those beginning with __, see https://en.cppreference.com/w/c/language/identifier). We should rename all of these.