Removed a few inter-dll dependencies.