update include guards to be consistent