APF-1454: Fixed dependencies for modular projects.