Updated dependency resolution, built-in CPUS and SOUNDS macro resolution