From ba9df47b38ef5d948215c83217e8d19cecdfaa25 Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Wed, 15 Oct 2025 10:58:11 +0200
Subject: [PATCH] constraint_solver: rework zlib support

---
 ortools/constraint_solver/BUILD.bazel          | 1 +
 ortools/constraint_solver/constraint_solver.cc | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ortools/constraint_solver/BUILD.bazel b/ortools/constraint_solver/BUILD.bazel
index f03fd3a6be..daef322c02 100644
--- a/ortools/constraint_solver/BUILD.bazel
+++ b/ortools/constraint_solver/BUILD.bazel
@@ -227,6 +227,7 @@ cc_library(
         "@abseil-cpp//absl/strings:str_format",
         "@abseil-cpp//absl/time",
         "@abseil-cpp//absl/types:span",
+        "@zlib",
     ],
 )
 
diff --git a/ortools/constraint_solver/constraint_solver.cc b/ortools/constraint_solver/constraint_solver.cc
index 25ff2af9b9..77db75638a 100644
--- a/ortools/constraint_solver/constraint_solver.cc
+++ b/ortools/constraint_solver/constraint_solver.cc
@@ -16,9 +16,6 @@
 
 #include "ortools/constraint_solver/constraint_solver.h"
 
-#include <zconf.h>
-#include <zlib.h>
-
 #include <algorithm>
 #include <csetjmp>
 #include <cstdint>
@@ -42,6 +39,7 @@
 #include "ortools/base/timer.h"
 #include "ortools/constraint_solver/constraint_solveri.h"
 #include "ortools/util/tuple_set.h"
+#include "zlib.h"
 
 // These flags are used to set the fields in the DefaultSolverParameters proto.
 ABSL_FLAG(bool, cp_trace_propagation, false,