diff --git a/intel-win32-tools.jam b/intel-win32-tools.jam
index 5f2fae7ff..8c59f79e9 100644
--- a/intel-win32-tools.jam
+++ b/intel-win32-tools.jam
@@ -29,11 +29,14 @@ INTEL_BASE_MSVC_TOOLSET ?= msvc ;
 
 extends-toolset $(INTEL_BASE_MSVC_TOOLSET) ;
 
-flags intel-win32 STDHDRS : $(VC_TOOL_PATH)../include ;
-flags intel-win32 STDLIBPATH : "$(INTEL_PATH)"\\Lib "$(INTEL_PATH)"\\Bin ;
 flags intel-win32 RUN_PATH : "$(INTEL_PATH)"\\Bin ;
 
 VC_TOOL_PATH = $(INTEL_TOOL_PATH) ;
 VC_STDLIB_PATH = "$(INTEL_PATH)"\\Bin ;
 VC_COMPILER = icl ;
 VC_LINKER = xilink ;
+
+if $(VC_SETUP)
+{
+    VC_SETUP = "CALL $(INTEL_TOOL_PATH)ICCVARS.BAT > nul" ;
+}
diff --git a/v1/intel-win32-tools.jam b/v1/intel-win32-tools.jam
index 5f2fae7ff..8c59f79e9 100644
--- a/v1/intel-win32-tools.jam
+++ b/v1/intel-win32-tools.jam
@@ -29,11 +29,14 @@ INTEL_BASE_MSVC_TOOLSET ?= msvc ;
 
 extends-toolset $(INTEL_BASE_MSVC_TOOLSET) ;
 
-flags intel-win32 STDHDRS : $(VC_TOOL_PATH)../include ;
-flags intel-win32 STDLIBPATH : "$(INTEL_PATH)"\\Lib "$(INTEL_PATH)"\\Bin ;
 flags intel-win32 RUN_PATH : "$(INTEL_PATH)"\\Bin ;
 
 VC_TOOL_PATH = $(INTEL_TOOL_PATH) ;
 VC_STDLIB_PATH = "$(INTEL_PATH)"\\Bin ;
 VC_COMPILER = icl ;
 VC_LINKER = xilink ;
+
+if $(VC_SETUP)
+{
+    VC_SETUP = "CALL $(INTEL_TOOL_PATH)ICCVARS.BAT > nul" ;
+}