This was SVN commit r6830.
make include guards consistent. This was SVN commit r5040.
This was SVN commit r4725.