Rename include guards for consistency and to avoid reserved identifiers
Merge pull request #200 from craigbarnes/incguard-fix

Rename include guards for consistency and to avoid reserved identifiers