Update HEADER guards to be consistent