Bug 895758 followup.  Fix the include guard and some spacing issues.