header guard enhancements