Fix include guards (#4200)
Merge pull request #4282 from dschwen/fix_4200

Fix include guards