Header guard updates.