header guard style changes