Fix some inter dll dependencies.

3 files changed