Do other half of moving some globals to dependencies.c