Consistent #include guards without leading underscore, resolves #11