Move to more standard use of include guards