Use the right header guard.

Believe it or not, clang found this detail with -Wheader-guard.
Merge branch 'V5-7-patches' into V5-7-travis
One more attempt before I abandon python for now