Fix include guards

Two include guards in the PR for #4200 were broken (ifndef with a different symbol than the define below it) and some more were not quite according to the convention. This fixes it.