header guard fixes