Cleaned up a few inter-dll dependencies.

12 files changed