Fix header guards and namespace trailing comments.

Changed comments to respect the coding convention guide.
No functional changes intended.