Merge pull request #443 from negativeExponent/add-header-guards