make include guards consistent. This was SVN commit r5040.
Just does static geometry at the moment. This was SVN commit r4680.