Cleaned up a few inter-dll dependencies.