Fixed several incorrect, inconsistent, and missing include guards
Merge branches 'master' and 'FixIncludeGuards'