diff --git a/buildbot/dependency.py b/buildbot/dependency.py
index 145a7c18429f1..6f8cede47bb0a 100644
--- a/buildbot/dependency.py
+++ b/buildbot/dependency.py
@@ -71,6 +71,7 @@ def do_dependency(args):
     install_dir = os.path.join(args.obj_dir, "install")
     cmake_cmd = ["cmake", "-G", "Ninja",
                  "-DCMAKE_INSTALL_PREFIX={}".format(install_dir),
+                 "-DOPENCL_ICD_LOADER_HEADERS_DIR={}".format(ocl_header_dir),
                  ".." ]
     subprocess.check_call(cmake_cmd, cwd=icd_build_dir)
 
diff --git a/clang/lib/Sema/CMakeLists.txt b/clang/lib/Sema/CMakeLists.txt
index 6d9f50e8c4b64..75255f990d80e 100644
--- a/clang/lib/Sema/CMakeLists.txt
+++ b/clang/lib/Sema/CMakeLists.txt
@@ -9,6 +9,7 @@ if (MSVC)
   set_source_files_properties(SemaExprCXX.cpp PROPERTIES COMPILE_FLAGS /bigobj)
   set_source_files_properties(SemaSYCL.cpp PROPERTIES COMPILE_FLAGS /bigobj)
   set_source_files_properties(SemaTemplate.cpp PROPERTIES COMPILE_FLAGS /bigobj)
+  set_source_files_properties(SemaTemplateDeduction.cpp PROPERTIES COMPILE_FLAGS /bigobj)
 endif()
 
 clang_tablegen(OpenCLBuiltins.inc -gen-clang-opencl-builtins