diff --git a/include/onnxruntime/core/common/common.h b/include/onnxruntime/core/common/common.h
index 6ae0cd6ac0..ceb178d1cf 100644
--- a/include/onnxruntime/core/common/common.h
+++ b/include/onnxruntime/core/common/common.h
@@ -18,6 +18,8 @@
 #pragma once
 
 #include <algorithm>
+#include <cstring>
+#include <climits>
 #include <functional>
 #include <memory>
 #include <numeric>
diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py
index 489955490f..a54c939d96 100644
--- a/tools/ci_build/build.py
+++ b/tools/ci_build/build.py
@@ -201,8 +201,12 @@ def generate_build_tree(cmake_path, source_dir, build_dir, cuda_home, cudnn_home
                  "-Donnxruntime_USE_NUPHAR=" + ("ON" if args.use_nuphar else "OFF"),
                  ]
     if args.use_brainslice:
-        cmake_args += ["-Donnxruntime_BRAINSLICE_LIB_PATH=%s/%s" % (args.brain_slice_package_path, args.brain_slice_package_name),
-                       "-Donnxruntime_BS_CLIENT_PACKAGE=%s/%s" % (args.brain_slice_package_path, args.brain_slice_client_package_name)]
+        bs_pkg_name = args.brain_slice_package_name.split('.', 1)
+        bs_shared_lib_name = '.'.join((bs_pkg_name[0], 'redist', bs_pkg_name[1]))
+        cmake_args += [
+            "-Donnxruntime_BRAINSLICE_LIB_PATH=%s/%s" % (args.brain_slice_package_path, args.brain_slice_package_name),
+            "-Donnxruntime_BS_CLIENT_PACKAGE=%s/%s" % (args.brain_slice_package_path, args.brain_slice_client_package_name),
+            "-Donnxruntime_BRAINSLICE_dynamic_lib_PATH=%s/%s" % (args.brain_slice_package_path, bs_shared_lib_name)]
 
     if args.use_llvm:
         cmake_args += ["-DLLVM_DIR=%s" % args.llvm_path]