updated include guards