diff --git a/ortools/base/BUILD b/ortools/base/BUILD
index 1c5923de70..c748ad5f01 100644
--- a/ortools/base/BUILD
+++ b/ortools/base/BUILD
@@ -184,7 +184,12 @@ cc_library(
     hdrs = [
         "recordio.h",
     ],
-    linkopts = ["-lz"],
+    linkopts = select({
+        "on_linux": ["-lz"],
+        "on_macos": ["-lz"],
+        "on_windows": [],
+        "//conditions:default": ["-lz"],
+    }),
     deps = [
         ":base",
         ":file",
diff --git a/ortools/constraint_solver/samples/BUILD b/ortools/constraint_solver/samples/BUILD
index 1f940e1706..fc01d7db16 100644
--- a/ortools/constraint_solver/samples/BUILD
+++ b/ortools/constraint_solver/samples/BUILD
@@ -1,3 +1,5 @@
+exports_files(["CMakeLists.txt"] + glob(["*.cc"]) + glob(["*.cs"]) + glob(["*.py"]))
+
 load(":code_samples.bzl", "code_sample_cc")
 
 code_sample_cc(name = "minimal_jobshop_cp")