Fixing inconsistent header guards. This fix helps out the various code completion schemes used by IDEs.