unify headers guards
unify headers guards -2