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

Fix include guards
Merge commit 'c9f7663b3ec5c099b046763740e9cedbc6fcde31'