NXP-11463: refactor dependency management