Visual C++ 2015 breaks Intel C++ 15

After installing Visual C++ 2015 my Intel C++ 15 compiles started failing. It looks like Intel C++ is automatically picking up (incompatible) headers from the latest Visual C++.

Is there a way to force Intel C++ to use specific Visual C++ headers?

Do we have assurances that Intel C++ 2016 will be compatible with Visual C++ 2015?

Thanks,
Stuart