diff --git a/ortools/base/BUILD.bazel b/ortools/base/BUILD.bazel
index 32bbf1229f..c2d62df735 100644
--- a/ortools/base/BUILD.bazel
+++ b/ortools/base/BUILD.bazel
@@ -142,6 +142,12 @@ cc_library(
 cc_library(
     name = "dump_vars",
     hdrs = ["dump_vars.h"],
+    copts = select({
+        "on_linux": [],
+        "on_macos": [],
+        "on_windows": ["/Zc:preprocessor"],
+        "//conditions:default": [],
+    }),
     deps = [
         "@com_google_absl//absl/container:inlined_vector",
     ],
diff --git a/ortools/constraint_solver/BUILD.bazel b/ortools/constraint_solver/BUILD.bazel
index 0b76a700c0..0fb6e32b74 100644
--- a/ortools/constraint_solver/BUILD.bazel
+++ b/ortools/constraint_solver/BUILD.bazel
@@ -15,8 +15,21 @@
 
 load("@rules_cc//cc:defs.bzl", "cc_proto_library")
 
-package(
-    default_visibility = ["//visibility:public"],
+package(default_visibility = ["//visibility:public"])
+
+config_setting(
+    name = "on_linux",
+    constraint_values = ["@platforms//os:linux"],
+)
+
+config_setting(
+    name = "on_macos",
+    constraint_values = ["@platforms//os:macos"],
+)
+
+config_setting(
+    name = "on_windows",
+    constraint_values = ["@platforms//os:windows"],
 )
 
 proto_library(
@@ -144,7 +157,6 @@ cc_library(
         "constraint_solver.h",
         "constraint_solveri.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         ":assignment_cc_proto",
         ":demon_profiler_cc_proto",
@@ -199,7 +211,6 @@ cc_library(
 proto_library(
     name = "routing_enums_proto",
     srcs = ["routing_enums.proto"],
-    visibility = ["//visibility:public"],
 )
 
 cc_proto_library(
@@ -243,7 +254,6 @@ cc_library(
     name = "routing_parameters",
     srcs = ["routing_parameters.cc"],
     hdrs = ["routing_parameters.h"],
-    visibility = ["//visibility:public"],
     deps = [
         ":cp",
         ":routing_enums_cc_proto",
@@ -266,7 +276,6 @@ cc_library(
         "routing_flags.cc",
     ],
     hdrs = ["routing_flags.h"],
-    visibility = ["//visibility:public"],
     deps = [
         ":cp",
         ":routing_enums_cc_proto",
@@ -284,7 +293,6 @@ cc_library(
 cc_library(
     name = "routing_types",
     hdrs = ["routing_types.h"],
-    visibility = ["//visibility:public"],
     deps = [
         "//ortools/base",
         "//ortools/base:intops",
@@ -295,7 +303,6 @@ cc_library(
     name = "routing_index_manager",
     srcs = ["routing_index_manager.cc"],
     hdrs = ["routing_index_manager.h"],
-    visibility = ["//visibility:public"],
     deps = [
         ":routing_types",
         "//ortools/base",
@@ -324,7 +331,12 @@ cc_library(
         "routing_neighborhoods.h",
         "routing_search.h",
     ],
-    visibility = ["//visibility:public"],
+    copts = select({
+        "on_linux": [],
+        "on_macos": [],
+        "on_windows": ["/Zc:preprocessor"],
+        "//conditions:default": [],
+    }),
     deps = [
         ":cp",
         ":routing_enums_cc_proto",
diff --git a/ortools/graph/BUILD.bazel b/ortools/graph/BUILD.bazel
index e42355d3bb..d063938b93 100644
--- a/ortools/graph/BUILD.bazel
+++ b/ortools/graph/BUILD.bazel
@@ -15,6 +15,21 @@ load("@rules_cc//cc:defs.bzl", "cc_proto_library")
 
 package(default_visibility = ["//visibility:public"])
 
+config_setting(
+    name = "on_linux",
+    constraint_values = ["@platforms//os:linux"],
+)
+
+config_setting(
+    name = "on_macos",
+    constraint_values = ["@platforms//os:macos"],
+)
+
+config_setting(
+    name = "on_windows",
+    constraint_values = ["@platforms//os:windows"],
+)
+
 cc_library(
     name = "graph",
     hdrs = ["graph.h"],
@@ -288,6 +303,12 @@ cc_library(
     name = "min_cost_flow",
     srcs = ["min_cost_flow.cc"],
     hdrs = ["min_cost_flow.h"],
+    copts = select({
+        "on_linux": [],
+        "on_macos": [],
+        "on_windows": ["/Zc:preprocessor"],
+        "//conditions:default": [],
+    }),
     deps = [
         ":connected_components",
         ":ebert_graph",