Updated include guards