make include guards consistent. This was SVN commit r5040.
This is the first step towards fixing #142 This was SVN commit r4385.