diff --git a/ortools/constraint_solver/constraint_solver.cc b/ortools/constraint_solver/constraint_solver.cc
index 9976c68489..0b89317240 100644
--- a/ortools/constraint_solver/constraint_solver.cc
+++ b/ortools/constraint_solver/constraint_solver.cc
@@ -17,6 +17,7 @@
 
 #include "ortools/constraint_solver/constraint_solver.h"
 
+#include <algorithm>
 #include <csetjmp>
 #include <cstdint>
 #include <deque>
diff --git a/ortools/constraint_solver/count_cst.cc b/ortools/constraint_solver/count_cst.cc
index 52da8c3eca..d1c828c6d5 100644
--- a/ortools/constraint_solver/count_cst.cc
+++ b/ortools/constraint_solver/count_cst.cc
@@ -18,6 +18,7 @@
 #include <cstdint>
 #include <limits>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/strings/str_format.h"
diff --git a/ortools/constraint_solver/default_search.cc b/ortools/constraint_solver/default_search.cc
index 59ddc83b05..0e60ccb403 100644
--- a/ortools/constraint_solver/default_search.cc
+++ b/ortools/constraint_solver/default_search.cc
@@ -16,6 +16,7 @@
 #include <functional>
 #include <limits>
 #include <memory>
+#include <random>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/ortools/constraint_solver/element.cc b/ortools/constraint_solver/element.cc
index 9db56a5db7..7ee1bf3077 100644
--- a/ortools/constraint_solver/element.cc
+++ b/ortools/constraint_solver/element.cc
@@ -13,6 +13,7 @@
 
 #include <algorithm>
 #include <cstdint>
+#include <functional>
 #include <limits>
 #include <memory>
 #include <numeric>
diff --git a/ortools/constraint_solver/expr_cst.cc b/ortools/constraint_solver/expr_cst.cc
index 3926e1dbc5..745e6b3b90 100644
--- a/ortools/constraint_solver/expr_cst.cc
+++ b/ortools/constraint_solver/expr_cst.cc
@@ -14,11 +14,13 @@
 //
 //  Expression constraints
 
+#include <algorithm>
 #include <cstddef>
 #include <cstdint>
 #include <limits>
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/strings/str_format.h"
diff --git a/ortools/constraint_solver/interval.cc b/ortools/constraint_solver/interval.cc
index cc8d1e9432..bd63842907 100644
--- a/ortools/constraint_solver/interval.cc
+++ b/ortools/constraint_solver/interval.cc
@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <algorithm>
 #include <cstdint>
 #include <limits>
 #include <string>
diff --git a/ortools/constraint_solver/local_search.cc b/ortools/constraint_solver/local_search.cc
index d92c8382ea..25f94dfd6f 100644
--- a/ortools/constraint_solver/local_search.cc
+++ b/ortools/constraint_solver/local_search.cc
@@ -13,11 +13,13 @@
 
 #include <algorithm>
 #include <cstdint>
+#include <functional>
 #include <iterator>
 #include <limits>
 #include <map>
 #include <memory>
 #include <numeric>
+#include <random>
 #include <set>
 #include <string>
 #include <utility>
diff --git a/ortools/constraint_solver/resource.cc b/ortools/constraint_solver/resource.cc
index 61f04043ef..49eeb804b9 100644
--- a/ortools/constraint_solver/resource.cc
+++ b/ortools/constraint_solver/resource.cc
@@ -22,6 +22,7 @@
 
 #include <algorithm>
 #include <cstdint>
+#include <functional>
 #include <limits>
 #include <queue>
 #include <string>
diff --git a/ortools/constraint_solver/routing_filters.cc b/ortools/constraint_solver/routing_filters.cc
index 5e461ca900..e4070c8c44 100644
--- a/ortools/constraint_solver/routing_filters.cc
+++ b/ortools/constraint_solver/routing_filters.cc
@@ -37,6 +37,7 @@
 #include "absl/container/flat_hash_set.h"
 #include "absl/flags/flag.h"
 #include "absl/memory/memory.h"
+#include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "ortools/base/integral_types.h"
 #include "ortools/base/logging.h"
diff --git a/ortools/constraint_solver/routing_flags.cc b/ortools/constraint_solver/routing_flags.cc
index 6069979208..755c7cc895 100644
--- a/ortools/constraint_solver/routing_flags.cc
+++ b/ortools/constraint_solver/routing_flags.cc
@@ -16,6 +16,7 @@
 #include <cstdint>
 #include <limits>
 #include <map>
+#include <string>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/ortools/constraint_solver/routing_parameters.cc b/ortools/constraint_solver/routing_parameters.cc
index 643347cce6..f7a11bb13d 100644
--- a/ortools/constraint_solver/routing_parameters.cc
+++ b/ortools/constraint_solver/routing_parameters.cc
@@ -17,6 +17,7 @@
 #include <string>
 
 #include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
 #include "absl/time/time.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/duration.pb.h"
diff --git a/ortools/constraint_solver/sched_constraints.cc b/ortools/constraint_solver/sched_constraints.cc
index f8252c5160..13479237a9 100644
--- a/ortools/constraint_solver/sched_constraints.cc
+++ b/ortools/constraint_solver/sched_constraints.cc
@@ -21,6 +21,7 @@
 //   var unperformed implies all intervals unperformed, cover var
 //   performed implis at least one interval performed).
 
+#include <algorithm>
 #include <cstdint>
 #include <limits>
 #include <string>
diff --git a/ortools/constraint_solver/sched_search.cc b/ortools/constraint_solver/sched_search.cc
index bd787ce272..7534414ea7 100644
--- a/ortools/constraint_solver/sched_search.cc
+++ b/ortools/constraint_solver/sched_search.cc
@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <algorithm>
 #include <cstdint>
 #include <cstring>
 #include <limits>
diff --git a/ortools/constraint_solver/search.cc b/ortools/constraint_solver/search.cc
index a1306feaf9..fb75789453 100644
--- a/ortools/constraint_solver/search.cc
+++ b/ortools/constraint_solver/search.cc
@@ -18,6 +18,7 @@
 #include <list>
 #include <memory>
 #include <queue>
+#include <random>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/ortools/linear_solver/glpk_interface.cc b/ortools/linear_solver/glpk_interface.cc
index 2729b2049b..485f774ad7 100644
--- a/ortools/linear_solver/glpk_interface.cc
+++ b/ortools/linear_solver/glpk_interface.cc
@@ -15,6 +15,7 @@
 
 #if defined(USE_GLPK)
 
+#include <algorithm>
 #include <cmath>
 #include <cstddef>
 #include <cstdint>
diff --git a/ortools/linear_solver/gurobi_interface.cc b/ortools/linear_solver/gurobi_interface.cc
index f5ec00c2e5..03974e9e5d 100644
--- a/ortools/linear_solver/gurobi_interface.cc
+++ b/ortools/linear_solver/gurobi_interface.cc
@@ -47,12 +47,14 @@
 #include <cstdint>
 #include <limits>
 #include <memory>
+#include <optional>
 #include <stdexcept>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "absl/base/attributes.h"
+#include "absl/container/flat_hash_set.h"
 #include "absl/status/status.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_format.h"
diff --git a/ortools/linear_solver/gurobi_proto_solver.cc b/ortools/linear_solver/gurobi_proto_solver.cc
index 0e9252a8d5..8925aba5b4 100644
--- a/ortools/linear_solver/gurobi_proto_solver.cc
+++ b/ortools/linear_solver/gurobi_proto_solver.cc
@@ -13,6 +13,7 @@
 
 #include "ortools/linear_solver/gurobi_proto_solver.h"
 
+#include <algorithm>
 #include <limits>
 #include <memory>
 #include <numeric>
diff --git a/ortools/linear_solver/linear_expr.cc b/ortools/linear_solver/linear_expr.cc
index bc5a212aaf..671d7db07d 100644
--- a/ortools/linear_solver/linear_expr.cc
+++ b/ortools/linear_solver/linear_expr.cc
@@ -13,7 +13,9 @@
 
 #include "ortools/linear_solver/linear_expr.h"
 
+#include <algorithm>
 #include <limits>
+#include <string>
 
 #include "absl/strings/str_join.h"
 #include "ortools/base/logging.h"
diff --git a/ortools/linear_solver/linear_solver.cc b/ortools/linear_solver/linear_solver.cc
index ff287dd096..3ef946185a 100644
--- a/ortools/linear_solver/linear_solver.cc
+++ b/ortools/linear_solver/linear_solver.cc
@@ -19,6 +19,7 @@
 #include <unistd.h>
 #endif
 
+#include <algorithm>
 #include <atomic>
 #include <cmath>
 #include <cstddef>
diff --git a/ortools/linear_solver/linear_solver.h b/ortools/linear_solver/linear_solver.h
index 27815940e0..2ef1eb0b6a 100644
--- a/ortools/linear_solver/linear_solver.h
+++ b/ortools/linear_solver/linear_solver.h
@@ -140,6 +140,7 @@
 #include <limits>
 #include <map>
 #include <memory>
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/ortools/linear_solver/linear_solver_callback.cc b/ortools/linear_solver/linear_solver_callback.cc
index bf7b4ebe57..9ea8d2f3c5 100644
--- a/ortools/linear_solver/linear_solver_callback.cc
+++ b/ortools/linear_solver/linear_solver_callback.cc
@@ -13,6 +13,8 @@
 
 #include "ortools/linear_solver/linear_solver_callback.h"
 
+#include <string>
+
 #include "ortools/base/logging.h"
 
 namespace operations_research {
diff --git a/ortools/linear_solver/model_exporter.cc b/ortools/linear_solver/model_exporter.cc
index c6fa69351e..8a2ad36986 100644
--- a/ortools/linear_solver/model_exporter.cc
+++ b/ortools/linear_solver/model_exporter.cc
@@ -16,6 +16,8 @@
 #include <algorithm>
 #include <cmath>
 #include <limits>
+#include <string>
+#include <utility>
 
 #include "absl/container/flat_hash_set.h"
 #include "absl/status/status.h"
diff --git a/ortools/linear_solver/model_validator.cc b/ortools/linear_solver/model_validator.cc
index f79474f285..7a13064829 100644
--- a/ortools/linear_solver/model_validator.cc
+++ b/ortools/linear_solver/model_validator.cc
@@ -16,6 +16,9 @@
 #include <algorithm>
 #include <cmath>
 #include <limits>
+#include <optional>
+#include <string>
+#include <utility>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
diff --git a/ortools/linear_solver/model_validator.h b/ortools/linear_solver/model_validator.h
index b470aff68d..94f6bf34c7 100644
--- a/ortools/linear_solver/model_validator.h
+++ b/ortools/linear_solver/model_validator.h
@@ -14,6 +14,7 @@
 #ifndef OR_TOOLS_LINEAR_SOLVER_MODEL_VALIDATOR_H_
 #define OR_TOOLS_LINEAR_SOLVER_MODEL_VALIDATOR_H_
 
+#include <optional>
 #include <string>
 
 #include "absl/types/optional.h"
diff --git a/ortools/linear_solver/pdlp_interface.cc b/ortools/linear_solver/pdlp_interface.cc
index 91058f5465..5f2745c711 100644
--- a/ortools/linear_solver/pdlp_interface.cc
+++ b/ortools/linear_solver/pdlp_interface.cc
@@ -13,6 +13,7 @@
 
 #include <atomic>
 #include <cstdint>
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/ortools/linear_solver/sat_interface.cc b/ortools/linear_solver/sat_interface.cc
index ea5a7b034c..34af5c8019 100644
--- a/ortools/linear_solver/sat_interface.cc
+++ b/ortools/linear_solver/sat_interface.cc
@@ -13,7 +13,9 @@
 
 #include <atomic>
 #include <cstdint>
+#include <optional>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/base/attributes.h"
diff --git a/ortools/linear_solver/sat_proto_solver.cc b/ortools/linear_solver/sat_proto_solver.cc
index 831de61f9c..ac8168b54d 100644
--- a/ortools/linear_solver/sat_proto_solver.cc
+++ b/ortools/linear_solver/sat_proto_solver.cc
@@ -14,6 +14,9 @@
 #include "ortools/linear_solver/sat_proto_solver.h"
 
 #include <cstdint>
+#include <functional>
+#include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/status/statusor.h"
diff --git a/ortools/linear_solver/sat_solver_utils.cc b/ortools/linear_solver/sat_solver_utils.cc
index f51adf77a6..9c34064938 100644
--- a/ortools/linear_solver/sat_solver_utils.cc
+++ b/ortools/linear_solver/sat_solver_utils.cc
@@ -14,6 +14,8 @@
 #include "ortools/linear_solver/sat_solver_utils.h"
 
 #include <memory>
+#include <string>
+#include <utility>
 
 #include "absl/memory/memory.h"
 #include "ortools/glop/parameters.pb.h"
diff --git a/ortools/linear_solver/scip_callback.cc b/ortools/linear_solver/scip_callback.cc
index bb1e2e6397..e7a606128e 100644
--- a/ortools/linear_solver/scip_callback.cc
+++ b/ortools/linear_solver/scip_callback.cc
@@ -15,7 +15,10 @@
 
 #include "ortools/linear_solver/scip_callback.h"
 
+#include <algorithm>
 #include <cstdint>
+#include <string>
+#include <utility>
 
 #include "absl/strings/str_cat.h"
 #include "absl/types/span.h"
diff --git a/ortools/linear_solver/scip_interface.cc b/ortools/linear_solver/scip_interface.cc
index 5b2af478af..0e6b6bc319 100644
--- a/ortools/linear_solver/scip_interface.cc
+++ b/ortools/linear_solver/scip_interface.cc
@@ -19,7 +19,9 @@
 #include <cstdint>
 #include <limits>
 #include <memory>
+#include <optional>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/base/attributes.h"
diff --git a/ortools/linear_solver/scip_proto_solver.cc b/ortools/linear_solver/scip_proto_solver.cc
index 106048cdb7..97ed5152fe 100644
--- a/ortools/linear_solver/scip_proto_solver.cc
+++ b/ortools/linear_solver/scip_proto_solver.cc
@@ -15,6 +15,7 @@
 
 #include "ortools/linear_solver/scip_proto_solver.h"
 
+#include <algorithm>
 #include <cmath>
 #include <limits>
 #include <memory>
diff --git a/ortools/lp_data/lp_decomposer.cc b/ortools/lp_data/lp_decomposer.cc
index 4a002affa7..f742a3eb5e 100644
--- a/ortools/lp_data/lp_decomposer.cc
+++ b/ortools/lp_data/lp_decomposer.cc
@@ -13,6 +13,7 @@
 
 #include "ortools/lp_data/lp_decomposer.h"
 
+#include <algorithm>
 #include <vector>
 
 #include "absl/synchronization/mutex.h"
diff --git a/ortools/lp_data/lp_print_utils.cc b/ortools/lp_data/lp_print_utils.cc
index 10c3408a0a..f8f373870f 100644
--- a/ortools/lp_data/lp_print_utils.cc
+++ b/ortools/lp_data/lp_print_utils.cc
@@ -17,6 +17,7 @@
 #include <cstdint>
 #include <cstdio>
 #include <limits>
+#include <string>
 
 #include "absl/strings/str_cat.h"
 #include "ortools/base/integral_types.h"
diff --git a/ortools/lp_data/lp_types.cc b/ortools/lp_data/lp_types.cc
index 14866abcb9..a4f1e8f12e 100644
--- a/ortools/lp_data/lp_types.cc
+++ b/ortools/lp_data/lp_types.cc
@@ -13,6 +13,8 @@
 
 #include "ortools/lp_data/lp_types.h"
 
+#include <string>
+
 namespace operations_research {
 namespace glop {
 
diff --git a/ortools/lp_data/lp_types.h b/ortools/lp_data/lp_types.h
index 8c6802bd8f..3a2eae0017 100644
--- a/ortools/lp_data/lp_types.h
+++ b/ortools/lp_data/lp_types.h
@@ -19,6 +19,7 @@
 #include <cmath>
 #include <cstdint>
 #include <limits>
+#include <string>
 
 #include "ortools/base/basictypes.h"
 #include "ortools/base/logging.h"
diff --git a/ortools/lp_data/lp_utils.cc b/ortools/lp_data/lp_utils.cc
index 58788792bf..51a0bd63c9 100644
--- a/ortools/lp_data/lp_utils.cc
+++ b/ortools/lp_data/lp_utils.cc
@@ -13,6 +13,8 @@
 
 #include "ortools/lp_data/lp_utils.h"
 
+#include <algorithm>
+
 #include "ortools/lp_data/sparse_column.h"
 
 namespace operations_research {
diff --git a/ortools/lp_data/matrix_scaler.cc b/ortools/lp_data/matrix_scaler.cc
index 070195ed64..a5e5f36505 100644
--- a/ortools/lp_data/matrix_scaler.cc
+++ b/ortools/lp_data/matrix_scaler.cc
@@ -15,6 +15,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <string>
 #include <vector>
 
 #include "absl/strings/str_format.h"
diff --git a/ortools/lp_data/matrix_scaler.h b/ortools/lp_data/matrix_scaler.h
index 160e64f297..bb73ea194a 100644
--- a/ortools/lp_data/matrix_scaler.h
+++ b/ortools/lp_data/matrix_scaler.h
@@ -60,6 +60,7 @@
 #ifndef OR_TOOLS_LP_DATA_MATRIX_SCALER_H_
 #define OR_TOOLS_LP_DATA_MATRIX_SCALER_H_
 
+#include <string>
 #include <vector>
 
 #include "ortools/base/integral_types.h"
diff --git a/ortools/lp_data/model_reader.cc b/ortools/lp_data/model_reader.cc
index 2548939844..a6e649950f 100644
--- a/ortools/lp_data/model_reader.cc
+++ b/ortools/lp_data/model_reader.cc
@@ -13,6 +13,8 @@
 
 #include "ortools/lp_data/model_reader.h"
 
+#include <string>
+
 #include "ortools/base/file.h"
 #include "ortools/linear_solver/linear_solver.pb.h"
 #include "ortools/lp_data/proto_utils.h"
diff --git a/ortools/lp_data/mps_reader.cc b/ortools/lp_data/mps_reader.cc
index 2fef93dd84..7196a81565 100644
--- a/ortools/lp_data/mps_reader.cc
+++ b/ortools/lp_data/mps_reader.cc
@@ -14,6 +14,7 @@
 #include "ortools/lp_data/mps_reader.h"
 
 #include <cstdint>
+#include <string>
 
 #include "absl/container/btree_set.h"
 #include "absl/status/status.h"
diff --git a/ortools/lp_data/sparse.cc b/ortools/lp_data/sparse.cc
index 4d07cc503d..2dbd3478e0 100644
--- a/ortools/lp_data/sparse.cc
+++ b/ortools/lp_data/sparse.cc
@@ -14,6 +14,9 @@
 #include "ortools/lp_data/sparse.h"
 
 #include <algorithm>
+#include <initializer_list>
+#include <string>
+#include <utility>
 
 #include "absl/strings/str_format.h"
 #include "ortools/base/logging.h"
diff --git a/ortools/lp_data/sparse.h b/ortools/lp_data/sparse.h
index 6b9d491ffe..347bfb5f5a 100644
--- a/ortools/lp_data/sparse.h
+++ b/ortools/lp_data/sparse.h
@@ -29,6 +29,7 @@
 #ifndef OR_TOOLS_LP_DATA_SPARSE_H_
 #define OR_TOOLS_LP_DATA_SPARSE_H_
 
+#include <algorithm>
 #include <cstdint>
 #include <string>