[COMPONENTS] Fixes to make enabling components on multiple OSs faster

[DEP] Added dependencies for submakefile to allow swtich changes to affect dependencies
Merge branch 'integration'