Add missing dependencies for correct build ordering