Remove some dependencies from battle.c.