Added include guards for logger