Fix header guard mismatch issue -- basically cleanup as the guard mismatch doesn't have an effect in this case.