Remove underscores from header guard
Merge branch 'header_guard'