Fixed some extern guards.