Header guard canonicalization, clang part.

Modifications made by clang-tidy with minor tweaks.