make include guards consistent. This was SVN commit r5040.
This was SVN commit r3802.
This was SVN commit r1453.