diff --git a/examples/cpp/BUILD b/examples/cpp/BUILD
index 82c1956a3a..42b2c10898 100644
--- a/examples/cpp/BUILD
+++ b/examples/cpp/BUILD
@@ -109,7 +109,7 @@ cc_library(
     deps = [
         "//ortools/base",
         "//ortools/base:file",
-        "//ortools/base:status",
+        "@com_google_absl//absl/status",
         "//ortools/graph:ebert_graph",
         "//ortools/graph:linear_assignment",
     ],
@@ -402,7 +402,7 @@ cc_binary(
         "//ortools/base:file",
         "//ortools/base:filelineiter",
         "//ortools/base:random",
-        "//ortools/base:status",
+        "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
         "//ortools/base:threadpool",
         "//ortools/lp_data:mps_reader",
diff --git a/examples/cpp/mps_driver.cc b/examples/cpp/mps_driver.cc
index a517ef5f83..ae605163d3 100644
--- a/examples/cpp/mps_driver.cc
+++ b/examples/cpp/mps_driver.cc
@@ -18,6 +18,7 @@
 
 #include <string>
 
+#include "absl/status/status.h"
 #include "absl/strings/match.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/message.h"
@@ -25,7 +26,6 @@
 #include "ortools/base/commandlineflags.h"
 #include "ortools/base/file.h"
 #include "ortools/base/logging.h"
-#include "ortools/base/status.h"
 #include "ortools/base/timer.h"
 #include "ortools/glop/lp_solver.h"
 #include "ortools/glop/parameters.pb.h"
@@ -93,7 +93,7 @@ int main(int argc, char* argv[]) {
     operations_research::MPModelProto model_proto;
     if (absl::EndsWith(file_name, ".mps") ||
         absl::EndsWith(file_name, ".mps.gz")) {
-      const util::Status parse_status =
+      const absl::Status parse_status =
           mps_reader.ParseFile(file_name, &linear_program);
       if (!parse_status.ok()) {
         LOG(INFO) << "Parse error for " << file_name << ": " << parse_status;
diff --git a/examples/cpp/print_dimacs_assignment.h b/examples/cpp/print_dimacs_assignment.h
index 594cee2403..43d4fb452f 100644
--- a/examples/cpp/print_dimacs_assignment.h
+++ b/examples/cpp/print_dimacs_assignment.h
@@ -21,10 +21,10 @@
 #include <cstdio>
 #include <string>
 
+#include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "ortools/base/file.h"
 #include "ortools/base/logging.h"
-#include "ortools/base/status.h"
 #include "ortools/graph/ebert_graph.h"
 #include "ortools/graph/linear_assignment.h"
 
diff --git a/examples/cpp/sat_runner.cc b/examples/cpp/sat_runner.cc
index 3019e9893d..7ccb04c51c 100644
--- a/examples/cpp/sat_runner.cc
+++ b/examples/cpp/sat_runner.cc
@@ -21,6 +21,7 @@
 #include "absl/memory/memory.h"
 #include "absl/strings/match.h"
 #include "absl/strings/numbers.h"
+#include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "examples/cpp/opb_reader.h"
@@ -32,7 +33,6 @@
 #include "ortools/base/int_type.h"
 #include "ortools/base/integral_types.h"
 #include "ortools/base/logging.h"
-#include "ortools/base/status.h"
 #include "ortools/base/timer.h"
 #include "ortools/sat/boolean_problem.h"
 #include "ortools/sat/boolean_problem.pb.h"
@@ -243,9 +243,9 @@ int Run() {
   }
 
   if (FLAGS_strict_validity) {
-    const util::Status status = ValidateBooleanProblem(problem);
+    const absl::Status status = ValidateBooleanProblem(problem);
     if (!status.ok()) {
-      LOG(ERROR) << "Invalid Boolean problem: " << status.error_message();
+      LOG(ERROR) << "Invalid Boolean problem: " << status.message();
       return EXIT_FAILURE;
     }
   }
diff --git a/examples/cpp/solve.cc b/examples/cpp/solve.cc
index 4ade6a5e56..41017c938b 100644
--- a/examples/cpp/solve.cc
+++ b/examples/cpp/solve.cc
@@ -128,7 +128,7 @@ bool Run() {
 
   // Create the solver, we use the name of the model as the solver name.
   MPSolver solver(model_proto.name(), type);
-  const util::Status set_num_threads_status =
+  const absl::Status set_num_threads_status =
       solver.SetNumThreads(FLAGS_num_threads);
   if (set_num_threads_status.ok()) {
     LOG(INFO) << "Set number of threads to " << FLAGS_num_threads << ".";
diff --git a/makefiles/Makefile.gen.mk b/makefiles/Makefile.gen.mk
index b7cdcad25f..59e181e33f 100644
--- a/makefiles/Makefile.gen.mk
+++ b/makefiles/Makefile.gen.mk
@@ -1,20 +1,19 @@
 BASE_DEPS = \
  $(SRC_DIR)/ortools/base/accurate_sum.h \
- $(SRC_DIR)/ortools/base/adjustable_priority_queue-inl.h \
  $(SRC_DIR)/ortools/base/adjustable_priority_queue.h \
+ $(SRC_DIR)/ortools/base/adjustable_priority_queue-inl.h \
  $(SRC_DIR)/ortools/base/base_export.h \
  $(SRC_DIR)/ortools/base/basictypes.h \
  $(SRC_DIR)/ortools/base/bitmap.h \
- $(SRC_DIR)/ortools/base/canonical_errors.h \
  $(SRC_DIR)/ortools/base/cleanup.h \
  $(SRC_DIR)/ortools/base/commandlineflags.h \
  $(SRC_DIR)/ortools/base/encodingutils.h \
  $(SRC_DIR)/ortools/base/file.h \
  $(SRC_DIR)/ortools/base/filelineiter.h \
  $(SRC_DIR)/ortools/base/hash.h \
+ $(SRC_DIR)/ortools/base/integral_types.h \
  $(SRC_DIR)/ortools/base/int_type.h \
  $(SRC_DIR)/ortools/base/int_type_indexed_vector.h \
- $(SRC_DIR)/ortools/base/integral_types.h \
  $(SRC_DIR)/ortools/base/iterator_adaptors.h \
  $(SRC_DIR)/ortools/base/jniutil.h \
  $(SRC_DIR)/ortools/base/logging.h \
@@ -30,7 +29,6 @@ BASE_DEPS = \
  $(SRC_DIR)/ortools/base/recordio.h \
  $(SRC_DIR)/ortools/base/small_map.h \
  $(SRC_DIR)/ortools/base/small_ordered_set.h \
- $(SRC_DIR)/ortools/base/status.h \
  $(SRC_DIR)/ortools/base/status_macros.h \
  $(SRC_DIR)/ortools/base/statusor.h \
  $(SRC_DIR)/ortools/base/stl_util.h \
@@ -53,43 +51,43 @@ BASE_LIB_OBJS = \
  $(OBJ_DIR)/base/version.$O
 
 objs/base/bitmap.$O: ortools/base/bitmap.cc ortools/base/bitmap.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h | $(OBJ_DIR)/base
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h | $(OBJ_DIR)/base
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Sbitmap.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sbitmap.$O
 
 objs/base/file.$O: ortools/base/file.cc ortools/base/file.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/status.h | $(OBJ_DIR)/base
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h | $(OBJ_DIR)/base
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Sfile.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sfile.$O
 
 objs/base/logging.$O: ortools/base/logging.cc ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/base/commandlineflags.h | $(OBJ_DIR)/base
+ ortools/base/integral_types.h ortools/base/macros.h \
+ ortools/base/commandlineflags.h | $(OBJ_DIR)/base
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Slogging.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Slogging.$O
 
 objs/base/random.$O: ortools/base/random.cc ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/random.h | $(OBJ_DIR)/base
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/random.h | $(OBJ_DIR)/base
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Srandom.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Srandom.$O
 
 objs/base/recordio.$O: ortools/base/recordio.cc ortools/base/recordio.h \
-  ortools/base/file.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/status.h | $(OBJ_DIR)/base
+ ortools/base/file.h ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h | $(OBJ_DIR)/base
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Srecordio.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Srecordio.$O
 
 objs/base/sysinfo.$O: ortools/base/sysinfo.cc ortools/base/sysinfo.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h | $(OBJ_DIR)/base
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h | $(OBJ_DIR)/base
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Ssysinfo.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Ssysinfo.$O
 
 objs/base/threadpool.$O: ortools/base/threadpool.cc \
-  ortools/base/threadpool.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h | $(OBJ_DIR)/base
+ ortools/base/threadpool.h ortools/base/logging.h \
+ ortools/base/integral_types.h ortools/base/macros.h | $(OBJ_DIR)/base
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Sthreadpool.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Sthreadpool.$O
 
 objs/base/timer.$O: ortools/base/timer.cc ortools/base/timer.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h | $(OBJ_DIR)/base
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h | $(OBJ_DIR)/base
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbase$Stimer.cc $(OBJ_OUT)$(OBJ_DIR)$Sbase$Stimer.$O
 
 objs/base/version.$O: ortools/base/version.cc | $(OBJ_DIR)/base
@@ -106,15 +104,14 @@ PORT_LIB_OBJS = \
  $(OBJ_DIR)/port/sysinfo_nonport.$O
 
 objs/port/file_nonport.$O: ortools/port/file_nonport.cc \
-  ortools/port/file.h ortools/base/status.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/base/file.h | $(OBJ_DIR)/port
+ ortools/port/file.h ortools/base/file.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h | $(OBJ_DIR)/port
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sport$Sfile_nonport.cc $(OBJ_OUT)$(OBJ_DIR)$Sport$Sfile_nonport.$O
 
 objs/port/sysinfo_nonport.$O: ortools/port/sysinfo_nonport.cc \
-  ortools/base/sysinfo.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/port/sysinfo.h | $(OBJ_DIR)/port
+ ortools/base/sysinfo.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/port/sysinfo.h | $(OBJ_DIR)/port
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sport$Ssysinfo_nonport.cc $(OBJ_OUT)$(OBJ_DIR)$Sport$Ssysinfo_nonport.$O
 
 UTIL_DEPS = \
@@ -142,8 +139,8 @@ UTIL_DEPS = \
  $(SRC_DIR)/ortools/util/running_stat.h \
  $(SRC_DIR)/ortools/util/saturated_arithmetic.h \
  $(SRC_DIR)/ortools/util/sigint.h \
- $(SRC_DIR)/ortools/util/sort.h \
  $(SRC_DIR)/ortools/util/sorted_interval_list.h \
+ $(SRC_DIR)/ortools/util/sort.h \
  $(SRC_DIR)/ortools/util/stats.h \
  $(SRC_DIR)/ortools/util/string_array.h \
  $(SRC_DIR)/ortools/util/time_limit.h \
@@ -170,81 +167,80 @@ UTIL_LIB_OBJS = \
  $(OBJ_DIR)/util/optional_boolean.pb.$O
 
 objs/util/bitset.$O: ortools/util/bitset.cc ortools/util/bitset.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/commandlineflags.h | $(OBJ_DIR)/util
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/commandlineflags.h | $(OBJ_DIR)/util
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Sbitset.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sbitset.$O
 
 objs/util/cached_log.$O: ortools/util/cached_log.cc \
-  ortools/util/cached_log.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h | $(OBJ_DIR)/util
+ ortools/util/cached_log.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h | $(OBJ_DIR)/util
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Scached_log.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Scached_log.$O
 
 objs/util/file_util.$O: ortools/util/file_util.cc ortools/util/file_util.h \
-  ortools/base/file.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/status.h \
-  ortools/base/recordio.h ortools/base/statusor.h \
-  ortools/base/status_macros.h | $(OBJ_DIR)/util
+ ortools/base/file.h ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/recordio.h ortools/base/statusor.h \
+ ortools/base/status_macros.h | $(OBJ_DIR)/util
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Sfile_util.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sfile_util.$O
 
 objs/util/fp_utils.$O: ortools/util/fp_utils.cc ortools/util/fp_utils.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/util/bitset.h | $(OBJ_DIR)/util
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/util/bitset.h | $(OBJ_DIR)/util
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Sfp_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sfp_utils.$O
 
 objs/util/graph_export.$O: ortools/util/graph_export.cc \
-  ortools/util/graph_export.h ortools/base/file.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/status.h | $(OBJ_DIR)/util
+ ortools/util/graph_export.h ortools/base/file.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h | $(OBJ_DIR)/util
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Sgraph_export.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sgraph_export.$O
 
 objs/util/piecewise_linear_function.$O: \
-  ortools/util/piecewise_linear_function.cc \
-  ortools/util/piecewise_linear_function.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/util/saturated_arithmetic.h \
-  ortools/util/bitset.h | $(OBJ_DIR)/util
+ ortools/util/piecewise_linear_function.cc \
+ ortools/util/piecewise_linear_function.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/util/saturated_arithmetic.h \
+ ortools/util/bitset.h | $(OBJ_DIR)/util
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Spiecewise_linear_function.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Spiecewise_linear_function.$O
 
 objs/util/proto_tools.$O: ortools/util/proto_tools.cc \
-  ortools/util/proto_tools.h | $(OBJ_DIR)/util
+ ortools/util/proto_tools.h | $(OBJ_DIR)/util
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Sproto_tools.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sproto_tools.$O
 
 objs/util/range_query_function.$O: ortools/util/range_query_function.cc \
-  ortools/util/range_query_function.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/util/range_minimum_query.h ortools/util/bitset.h | $(OBJ_DIR)/util
+ ortools/util/range_query_function.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/util/range_minimum_query.h ortools/util/bitset.h | $(OBJ_DIR)/util
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Srange_query_function.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Srange_query_function.$O
 
 objs/util/rational_approximation.$O: \
-  ortools/util/rational_approximation.cc \
-  ortools/util/rational_approximation.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h | $(OBJ_DIR)/util
+ ortools/util/rational_approximation.cc \
+ ortools/util/rational_approximation.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h | $(OBJ_DIR)/util
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Srational_approximation.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Srational_approximation.$O
 
 objs/util/sigint.$O: ortools/util/sigint.cc ortools/util/sigint.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h | $(OBJ_DIR)/util
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h | $(OBJ_DIR)/util
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Ssigint.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Ssigint.$O
 
 objs/util/sorted_interval_list.$O: ortools/util/sorted_interval_list.cc \
-  ortools/util/sorted_interval_list.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h | $(OBJ_DIR)/util
+ ortools/util/sorted_interval_list.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h | $(OBJ_DIR)/util
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Ssorted_interval_list.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Ssorted_interval_list.$O
 
 objs/util/stats.$O: ortools/util/stats.cc ortools/util/stats.h \
-  ortools/base/macros.h ortools/base/timer.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/stl_util.h ortools/port/sysinfo.h ortools/port/utf8.h \
-  ortools/base/encodingutils.h | $(OBJ_DIR)/util
+ ortools/base/macros.h ortools/base/timer.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/stl_util.h ortools/port/sysinfo.h ortools/port/utf8.h \
+ ortools/base/encodingutils.h | $(OBJ_DIR)/util
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Sstats.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Sstats.$O
 
 objs/util/time_limit.$O: ortools/util/time_limit.cc \
-  ortools/util/time_limit.h ortools/base/commandlineflags.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/base/timer.h ortools/base/basictypes.h \
-  ortools/util/running_stat.h | $(OBJ_DIR)/util
+ ortools/util/time_limit.h ortools/base/commandlineflags.h \
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/base/timer.h ortools/base/basictypes.h \
+ ortools/util/running_stat.h | $(OBJ_DIR)/util
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sutil$Stime_limit.cc $(OBJ_OUT)$(OBJ_DIR)$Sutil$Stime_limit.$O
 
 ortools/util/optional_boolean.proto: ;
@@ -278,30 +274,27 @@ DATA_LIB_OBJS = \
  $(OBJ_DIR)/data/rcpsp.pb.$O
 
 objs/data/jobshop_scheduling_parser.$O: \
-  ortools/data/jobshop_scheduling_parser.cc \
-  ortools/data/jobshop_scheduling_parser.h ortools/base/integral_types.h \
-  ortools/gen/ortools/data/jobshop_scheduling.pb.h \
-  ortools/base/commandlineflags.h ortools/base/filelineiter.h \
-  ortools/base/file.h ortools/base/logging.h ortools/base/macros.h \
-  ortools/base/status.h | $(OBJ_DIR)/data
+ ortools/data/jobshop_scheduling_parser.cc \
+ ortools/data/jobshop_scheduling_parser.h ortools/base/integral_types.h \
+ ortools/gen/ortools/data/jobshop_scheduling.pb.h \
+ ortools/base/commandlineflags.h ortools/base/filelineiter.h \
+ ortools/base/file.h ortools/base/logging.h ortools/base/macros.h | $(OBJ_DIR)/data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sdata$Sjobshop_scheduling_parser.cc $(OBJ_OUT)$(OBJ_DIR)$Sdata$Sjobshop_scheduling_parser.$O
 
 objs/data/rcpsp_parser.$O: ortools/data/rcpsp_parser.cc \
-  ortools/data/rcpsp_parser.h ortools/base/integral_types.h \
-  ortools/gen/ortools/data/rcpsp.pb.h ortools/base/filelineiter.h \
-  ortools/base/file.h ortools/base/logging.h ortools/base/macros.h \
-  ortools/base/status.h | $(OBJ_DIR)/data
+ ortools/data/rcpsp_parser.h ortools/base/integral_types.h \
+ ortools/gen/ortools/data/rcpsp.pb.h ortools/base/filelineiter.h \
+ ortools/base/file.h ortools/base/logging.h ortools/base/macros.h | $(OBJ_DIR)/data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sdata$Srcpsp_parser.cc $(OBJ_OUT)$(OBJ_DIR)$Sdata$Srcpsp_parser.$O
 
 objs/data/set_covering_data.$O: ortools/data/set_covering_data.cc \
-  ortools/data/set_covering_data.h ortools/base/integral_types.h | $(OBJ_DIR)/data
+ ortools/data/set_covering_data.h ortools/base/integral_types.h | $(OBJ_DIR)/data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sdata$Sset_covering_data.cc $(OBJ_OUT)$(OBJ_DIR)$Sdata$Sset_covering_data.$O
 
 objs/data/set_covering_parser.$O: ortools/data/set_covering_parser.cc \
-  ortools/data/set_covering_parser.h ortools/base/integral_types.h \
-  ortools/data/set_covering_data.h ortools/base/filelineiter.h \
-  ortools/base/file.h ortools/base/logging.h ortools/base/macros.h \
-  ortools/base/status.h | $(OBJ_DIR)/data
+ ortools/data/set_covering_parser.h ortools/base/integral_types.h \
+ ortools/data/set_covering_data.h ortools/base/filelineiter.h \
+ ortools/base/file.h ortools/base/logging.h ortools/base/macros.h | $(OBJ_DIR)/data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sdata$Sset_covering_parser.cc $(OBJ_OUT)$(OBJ_DIR)$Sdata$Sset_covering_parser.$O
 
 ortools/data/jobshop_scheduling.proto: ;
@@ -346,8 +339,8 @@ LP_DATA_DEPS = \
  $(SRC_DIR)/ortools/lp_data/permutation.h \
  $(SRC_DIR)/ortools/lp_data/proto_utils.h \
  $(SRC_DIR)/ortools/lp_data/scattered_vector.h \
- $(SRC_DIR)/ortools/lp_data/sparse.h \
  $(SRC_DIR)/ortools/lp_data/sparse_column.h \
+ $(SRC_DIR)/ortools/lp_data/sparse.h \
  $(SRC_DIR)/ortools/lp_data/sparse_row.h \
  $(SRC_DIR)/ortools/lp_data/sparse_vector.h
 
@@ -367,192 +360,190 @@ LP_DATA_LIB_OBJS = \
  $(OBJ_DIR)/lp_data/sparse_column.$O
 
 objs/lp_data/lp_data.$O: ortools/lp_data/lp_data.cc \
-  ortools/lp_data/lp_data.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \
-  ortools/util/bitset.h ortools/lp_data/sparse.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/fp_utils.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/lp_data/matrix_utils.h | $(OBJ_DIR)/lp_data
+ ortools/lp_data/lp_data.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \
+ ortools/util/bitset.h ortools/lp_data/sparse.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/util/fp_utils.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/lp_data/matrix_utils.h | $(OBJ_DIR)/lp_data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Slp_data.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_data.$O
 
 objs/lp_data/lp_data_utils.$O: ortools/lp_data/lp_data_utils.cc \
-  ortools/lp_data/lp_data_utils.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_data.h \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/lp_data/lp_types.h \
-  ortools/util/bitset.h ortools/lp_data/sparse.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/fp_utils.h ortools/lp_data/matrix_scaler.h \
-  ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
-  ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
-  ortools/glop/status.h ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
-  ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/glop/reduced_costs.h ortools/util/random_engine.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/running_stat.h | $(OBJ_DIR)/lp_data
+ ortools/lp_data/lp_data_utils.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/lp_data/lp_data.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/lp_data/lp_types.h \
+ ortools/util/bitset.h ortools/lp_data/sparse.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/util/fp_utils.h ortools/lp_data/matrix_scaler.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/glop/status.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h | $(OBJ_DIR)/lp_data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Slp_data_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_data_utils.$O
 
 objs/lp_data/lp_decomposer.$O: ortools/lp_data/lp_decomposer.cc \
-  ortools/lp_data/lp_decomposer.h ortools/lp_data/lp_data.h \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \
-  ortools/util/bitset.h ortools/lp_data/sparse.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/fp_utils.h ortools/algorithms/dynamic_partition.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h | $(OBJ_DIR)/lp_data
+ ortools/lp_data/lp_decomposer.h ortools/lp_data/lp_data.h \
+ ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \
+ ortools/util/bitset.h ortools/lp_data/sparse.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/util/fp_utils.h ortools/algorithms/dynamic_partition.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h | $(OBJ_DIR)/lp_data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Slp_decomposer.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_decomposer.$O
 
 objs/lp_data/lp_print_utils.$O: ortools/lp_data/lp_print_utils.cc \
-  ortools/lp_data/lp_print_utils.h ortools/base/integral_types.h \
-  ortools/lp_data/lp_types.h ortools/base/basictypes.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/util/rational_approximation.h | $(OBJ_DIR)/lp_data
+ ortools/lp_data/lp_print_utils.h ortools/base/integral_types.h \
+ ortools/lp_data/lp_types.h ortools/base/basictypes.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/util/rational_approximation.h | $(OBJ_DIR)/lp_data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Slp_print_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_print_utils.$O
 
 objs/lp_data/lp_types.$O: ortools/lp_data/lp_types.cc \
-  ortools/lp_data/lp_types.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h | $(OBJ_DIR)/lp_data
+ ortools/lp_data/lp_types.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h | $(OBJ_DIR)/lp_data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Slp_types.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_types.$O
 
 objs/lp_data/lp_utils.$O: ortools/lp_data/lp_utils.cc \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/lp_data/lp_types.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h | $(OBJ_DIR)/lp_data
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/lp_data/lp_types.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h | $(OBJ_DIR)/lp_data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Slp_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Slp_utils.$O
 
 objs/lp_data/matrix_scaler.$O: ortools/lp_data/matrix_scaler.cc \
-  ortools/lp_data/matrix_scaler.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/int_type.h ortools/base/macros.h \
-  ortools/base/integral_types.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
-  ortools/base/logging.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/base/basictypes.h \
-  ortools/util/bitset.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
-  ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \
-  ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/glop/reduced_costs.h ortools/util/random_engine.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/running_stat.h | $(OBJ_DIR)/lp_data
+ ortools/lp_data/matrix_scaler.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/int_type.h ortools/base/macros.h \
+ ortools/base/integral_types.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/base/logging.h ortools/glop/lu_factorization.h \
+ ortools/glop/markowitz.h ortools/glop/status.h \
+ ortools/lp_data/lp_types.h ortools/base/basictypes.h \
+ ortools/util/bitset.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/sparse.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/util/stats.h ortools/base/timer.h ortools/glop/rank_one_update.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
+ ortools/base/hash.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h | $(OBJ_DIR)/lp_data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Smatrix_scaler.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Smatrix_scaler.$O
 
 objs/lp_data/matrix_utils.$O: ortools/lp_data/matrix_utils.cc \
-  ortools/lp_data/matrix_utils.h ortools/lp_data/lp_types.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/lp_data/sparse.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/base/hash.h | $(OBJ_DIR)/lp_data
+ ortools/lp_data/matrix_utils.h ortools/lp_data/lp_types.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/lp_data/sparse.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/base/hash.h | $(OBJ_DIR)/lp_data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Smatrix_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Smatrix_utils.$O
 
 objs/lp_data/model_reader.$O: ortools/lp_data/model_reader.cc \
-  ortools/lp_data/model_reader.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/lp_data/lp_data.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \
-  ortools/util/bitset.h ortools/lp_data/sparse.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/fp_utils.h ortools/base/file.h ortools/base/status.h \
-  ortools/lp_data/proto_utils.h ortools/util/file_util.h \
-  ortools/base/recordio.h ortools/base/statusor.h | $(OBJ_DIR)/lp_data
+ ortools/lp_data/model_reader.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h ortools/lp_data/lp_data.h \
+ ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \
+ ortools/util/bitset.h ortools/lp_data/sparse.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/util/fp_utils.h ortools/base/file.h \
+ ortools/lp_data/proto_utils.h ortools/util/file_util.h \
+ ortools/base/recordio.h ortools/base/statusor.h | $(OBJ_DIR)/lp_data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Smodel_reader.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Smodel_reader.$O
 
 objs/lp_data/mps_reader.$O: ortools/lp_data/mps_reader.cc \
-  ortools/lp_data/mps_reader.h ortools/base/protobuf_util.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/base/canonical_errors.h \
-  ortools/base/status.h ortools/base/commandlineflags.h \
-  ortools/base/filelineiter.h ortools/base/file.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
-  ortools/base/status_macros.h ortools/base/statusor.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/lp_data/lp_data.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/lp_data/lp_types.h ortools/util/bitset.h \
-  ortools/lp_data/sparse.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/util/fp_utils.h | $(OBJ_DIR)/lp_data
+ ortools/lp_data/mps_reader.h ortools/base/protobuf_util.h \
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/base/commandlineflags.h \
+ ortools/base/filelineiter.h ortools/base/file.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/base/status_macros.h ortools/base/statusor.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h ortools/lp_data/lp_data.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \
+ ortools/util/bitset.h ortools/lp_data/sparse.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/util/fp_utils.h | $(OBJ_DIR)/lp_data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Smps_reader.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Smps_reader.$O
 
 objs/lp_data/proto_utils.$O: ortools/lp_data/proto_utils.cc \
-  ortools/lp_data/proto_utils.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/lp_data/lp_data.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \
-  ortools/util/bitset.h ortools/lp_data/sparse.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/fp_utils.h | $(OBJ_DIR)/lp_data
+ ortools/lp_data/proto_utils.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h ortools/lp_data/lp_data.h \
+ ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \
+ ortools/util/bitset.h ortools/lp_data/sparse.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/util/fp_utils.h | $(OBJ_DIR)/lp_data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Sproto_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Sproto_utils.$O
 
 objs/lp_data/sparse.$O: ortools/lp_data/sparse.cc ortools/lp_data/sparse.h \
-  ortools/base/integral_types.h ortools/lp_data/lp_types.h \
-  ortools/base/basictypes.h ortools/base/logging.h ortools/base/macros.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/util/bitset.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h | $(OBJ_DIR)/lp_data
+ ortools/base/integral_types.h ortools/lp_data/lp_types.h \
+ ortools/base/basictypes.h ortools/base/logging.h ortools/base/macros.h \
+ ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
+ ortools/util/bitset.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h | $(OBJ_DIR)/lp_data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Ssparse.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Ssparse.$O
 
 objs/lp_data/sparse_column.$O: ortools/lp_data/sparse_column.cc \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/graph/iterators.h \
-  ortools/lp_data/lp_types.h ortools/base/basictypes.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/util/bitset.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h | $(OBJ_DIR)/lp_data
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/graph/iterators.h \
+ ortools/lp_data/lp_types.h ortools/base/basictypes.h \
+ ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
+ ortools/util/bitset.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h | $(OBJ_DIR)/lp_data
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Ssparse_column.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Ssparse_column.$O
 
 GLOP_DEPS = \
@@ -570,8 +561,8 @@ GLOP_DEPS = \
  $(SRC_DIR)/ortools/glop/revised_simplex.h \
  $(SRC_DIR)/ortools/glop/status.h \
  $(SRC_DIR)/ortools/glop/update_row.h \
- $(SRC_DIR)/ortools/glop/variable_values.h \
  $(SRC_DIR)/ortools/glop/variables_info.h \
+ $(SRC_DIR)/ortools/glop/variable_values.h \
  $(GEN_DIR)/ortools/glop/parameters.pb.h
 
 GLOP_LIB_OBJS = \
@@ -593,263 +584,262 @@ GLOP_LIB_OBJS = \
  $(OBJ_DIR)/glop/parameters.pb.$O
 
 objs/glop/basis_representation.$O: ortools/glop/basis_representation.cc \
-  ortools/glop/basis_representation.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/base/basictypes.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/util/bitset.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/base/stl_util.h | $(OBJ_DIR)/glop
+ ortools/glop/basis_representation.h ortools/base/logging.h \
+ ortools/base/integral_types.h ortools/base/macros.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/status.h \
+ ortools/lp_data/lp_types.h ortools/base/basictypes.h \
+ ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
+ ortools/util/bitset.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/sparse.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/util/stats.h ortools/base/timer.h ortools/glop/rank_one_update.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/base/stl_util.h | $(OBJ_DIR)/glop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Sbasis_representation.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sbasis_representation.$O
 
 objs/glop/dual_edge_norms.$O: ortools/glop/dual_edge_norms.cc \
-  ortools/glop/dual_edge_norms.h ortools/glop/basis_representation.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/status.h ortools/lp_data/lp_types.h \
-  ortools/base/basictypes.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/lp_data/lp_data.h \
-  ortools/base/hash.h ortools/util/fp_utils.h | $(OBJ_DIR)/glop
+ ortools/glop/dual_edge_norms.h ortools/glop/basis_representation.h \
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/glop/lu_factorization.h \
+ ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/base/basictypes.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/lp_data/lp_data.h \
+ ortools/base/hash.h ortools/util/fp_utils.h | $(OBJ_DIR)/glop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Sdual_edge_norms.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sdual_edge_norms.$O
 
 objs/glop/entering_variable.$O: ortools/glop/entering_variable.cc \
-  ortools/glop/entering_variable.h ortools/glop/basis_representation.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/status.h ortools/lp_data/lp_types.h \
-  ortools/base/basictypes.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \
-  ortools/glop/reduced_costs.h ortools/util/random_engine.h \
-  ortools/port/proto_utils.h | $(OBJ_DIR)/glop
+ ortools/glop/entering_variable.h ortools/glop/basis_representation.h \
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/glop/lu_factorization.h \
+ ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/base/basictypes.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/port/proto_utils.h | $(OBJ_DIR)/glop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Sentering_variable.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sentering_variable.$O
 
 objs/glop/initial_basis.$O: ortools/glop/initial_basis.cc \
-  ortools/glop/initial_basis.h ortools/lp_data/lp_data.h \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \
-  ortools/util/bitset.h ortools/lp_data/sparse.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/fp_utils.h ortools/glop/markowitz.h ortools/glop/status.h \
-  ortools/util/stats.h ortools/base/timer.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h | $(OBJ_DIR)/glop
+ ortools/glop/initial_basis.h ortools/lp_data/lp_data.h \
+ ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \
+ ortools/util/bitset.h ortools/lp_data/sparse.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/util/fp_utils.h ortools/glop/markowitz.h ortools/glop/status.h \
+ ortools/util/stats.h ortools/base/timer.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h | $(OBJ_DIR)/glop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Sinitial_basis.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sinitial_basis.$O
 
 objs/glop/lp_solver.$O: ortools/glop/lp_solver.cc ortools/glop/lp_solver.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/glop/preprocessor.h \
-  ortools/glop/revised_simplex.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/glop/basis_representation.h \
-  ortools/base/logging.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/base/basictypes.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/util/bitset.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
-  ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \
-  ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/glop/reduced_costs.h ortools/util/random_engine.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/running_stat.h \
-  ortools/lp_data/matrix_scaler.h ortools/lp_data/proto_utils.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/util/file_util.h ortools/base/file.h ortools/base/status.h \
-  ortools/base/recordio.h ortools/base/statusor.h | $(OBJ_DIR)/glop
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/preprocessor.h \
+ ortools/glop/revised_simplex.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/glop/basis_representation.h \
+ ortools/base/logging.h ortools/glop/lu_factorization.h \
+ ortools/glop/markowitz.h ortools/glop/status.h \
+ ortools/lp_data/lp_types.h ortools/base/basictypes.h \
+ ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
+ ortools/util/bitset.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/sparse.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/util/stats.h ortools/base/timer.h ortools/glop/rank_one_update.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
+ ortools/base/hash.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/lp_data/matrix_scaler.h ortools/lp_data/proto_utils.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h ortools/util/file_util.h \
+ ortools/base/file.h ortools/base/recordio.h ortools/base/statusor.h | $(OBJ_DIR)/glop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Slp_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Slp_solver.$O
 
 objs/glop/lu_factorization.$O: ortools/glop/lu_factorization.cc \
-  ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/status.h ortools/lp_data/lp_types.h \
-  ortools/base/basictypes.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h | $(OBJ_DIR)/glop
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/base/basictypes.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h | $(OBJ_DIR)/glop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Slu_factorization.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Slu_factorization.$O
 
 objs/glop/markowitz.$O: ortools/glop/markowitz.cc ortools/glop/markowitz.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/status.h ortools/lp_data/lp_types.h \
-  ortools/base/basictypes.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h | $(OBJ_DIR)/glop
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/base/basictypes.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h | $(OBJ_DIR)/glop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Smarkowitz.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Smarkowitz.$O
 
 objs/glop/preprocessor.$O: ortools/glop/preprocessor.cc \
-  ortools/glop/preprocessor.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/revised_simplex.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/glop/basis_representation.h \
-  ortools/base/logging.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/base/basictypes.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/util/bitset.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
-  ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \
-  ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/glop/reduced_costs.h ortools/util/random_engine.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/running_stat.h \
-  ortools/lp_data/matrix_scaler.h ortools/lp_data/lp_data_utils.h \
-  ortools/lp_data/matrix_utils.h | $(OBJ_DIR)/glop
+ ortools/glop/preprocessor.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/glop/revised_simplex.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/glop/basis_representation.h \
+ ortools/base/logging.h ortools/glop/lu_factorization.h \
+ ortools/glop/markowitz.h ortools/glop/status.h \
+ ortools/lp_data/lp_types.h ortools/base/basictypes.h \
+ ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
+ ortools/util/bitset.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/sparse.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/util/stats.h ortools/base/timer.h ortools/glop/rank_one_update.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
+ ortools/base/hash.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/lp_data/matrix_scaler.h ortools/lp_data/lp_data_utils.h \
+ ortools/lp_data/matrix_utils.h | $(OBJ_DIR)/glop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Spreprocessor.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Spreprocessor.$O
 
 objs/glop/primal_edge_norms.$O: ortools/glop/primal_edge_norms.cc \
-  ortools/glop/primal_edge_norms.h ortools/glop/basis_representation.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/status.h ortools/lp_data/lp_types.h \
-  ortools/base/basictypes.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/update_row.h \
-  ortools/glop/variables_info.h ortools/lp_data/lp_data.h \
-  ortools/base/hash.h ortools/util/fp_utils.h | $(OBJ_DIR)/glop
+ ortools/glop/primal_edge_norms.h ortools/glop/basis_representation.h \
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/glop/lu_factorization.h \
+ ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/base/basictypes.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/update_row.h \
+ ortools/glop/variables_info.h ortools/lp_data/lp_data.h \
+ ortools/base/hash.h ortools/util/fp_utils.h | $(OBJ_DIR)/glop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Sprimal_edge_norms.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sprimal_edge_norms.$O
 
 objs/glop/reduced_costs.$O: ortools/glop/reduced_costs.cc \
-  ortools/glop/reduced_costs.h ortools/glop/basis_representation.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/status.h ortools/lp_data/lp_types.h \
-  ortools/base/basictypes.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \
-  ortools/util/random_engine.h | $(OBJ_DIR)/glop
+ ortools/glop/reduced_costs.h ortools/glop/basis_representation.h \
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/glop/lu_factorization.h \
+ ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/base/basictypes.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \
+ ortools/util/random_engine.h | $(OBJ_DIR)/glop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Sreduced_costs.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sreduced_costs.$O
 
 objs/glop/revised_simplex.$O: ortools/glop/revised_simplex.cc \
-  ortools/glop/revised_simplex.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/glop/basis_representation.h \
-  ortools/base/logging.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/status.h ortools/lp_data/lp_types.h \
-  ortools/base/basictypes.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
-  ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \
-  ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/glop/reduced_costs.h ortools/util/random_engine.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/running_stat.h \
-  ortools/glop/initial_basis.h ortools/lp_data/matrix_utils.h | $(OBJ_DIR)/glop
+ ortools/glop/revised_simplex.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/glop/basis_representation.h \
+ ortools/base/logging.h ortools/glop/lu_factorization.h \
+ ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/base/basictypes.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
+ ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/glop/initial_basis.h ortools/lp_data/matrix_utils.h | $(OBJ_DIR)/glop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Srevised_simplex.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Srevised_simplex.$O
 
 objs/glop/status.$O: ortools/glop/status.cc ortools/glop/status.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h | $(OBJ_DIR)/glop
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h | $(OBJ_DIR)/glop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Sstatus.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Sstatus.$O
 
 objs/glop/update_row.$O: ortools/glop/update_row.cc \
-  ortools/glop/update_row.h ortools/glop/basis_representation.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/status.h ortools/lp_data/lp_types.h \
-  ortools/base/basictypes.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/variables_info.h | $(OBJ_DIR)/glop
+ ortools/glop/update_row.h ortools/glop/basis_representation.h \
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/glop/lu_factorization.h \
+ ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/base/basictypes.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/variables_info.h | $(OBJ_DIR)/glop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Supdate_row.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Supdate_row.$O
 
 objs/glop/variable_values.$O: ortools/glop/variable_values.cc \
-  ortools/glop/variable_values.h ortools/glop/basis_representation.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/status.h ortools/lp_data/lp_types.h \
-  ortools/base/basictypes.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/variables_info.h | $(OBJ_DIR)/glop
+ ortools/glop/variable_values.h ortools/glop/basis_representation.h \
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/glop/lu_factorization.h \
+ ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/base/basictypes.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/variables_info.h | $(OBJ_DIR)/glop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Svariable_values.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Svariable_values.$O
 
 objs/glop/variables_info.$O: ortools/glop/variables_info.cc \
-  ortools/glop/variables_info.h ortools/lp_data/lp_types.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/lp_data/sparse.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h | $(OBJ_DIR)/glop
+ ortools/glop/variables_info.h ortools/lp_data/lp_types.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/lp_data/sparse.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h | $(OBJ_DIR)/glop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sglop$Svariables_info.cc $(OBJ_OUT)$(OBJ_DIR)$Sglop$Svariables_info.$O
 
 ortools/glop/parameters.proto: ;
@@ -906,94 +896,92 @@ GRAPH_LIB_OBJS = \
  $(OBJ_DIR)/graph/flow_problem.pb.$O
 
 objs/graph/assignment.$O: ortools/graph/assignment.cc \
-  ortools/graph/assignment.h ortools/graph/ebert_graph.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/util/permutation.h \
-  ortools/util/zvector.h ortools/base/commandlineflags.h \
-  ortools/graph/linear_assignment.h | $(OBJ_DIR)/graph
+ ortools/graph/assignment.h ortools/graph/ebert_graph.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/util/permutation.h ortools/util/zvector.h \
+ ortools/base/commandlineflags.h ortools/graph/linear_assignment.h | $(OBJ_DIR)/graph
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sassignment.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sassignment.$O
 
 objs/graph/astar.$O: ortools/graph/astar.cc \
-  ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h | $(OBJ_DIR)/graph
+ ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h | $(OBJ_DIR)/graph
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sastar.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sastar.$O
 
 objs/graph/bellman_ford.$O: ortools/graph/bellman_ford.cc \
-  ortools/base/integral_types.h ortools/graph/shortestpaths.h \
-  ortools/base/macros.h | $(OBJ_DIR)/graph
+ ortools/base/integral_types.h ortools/graph/shortestpaths.h \
+ ortools/base/macros.h | $(OBJ_DIR)/graph
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sbellman_ford.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sbellman_ford.$O
 
 objs/graph/cliques.$O: ortools/graph/cliques.cc ortools/graph/cliques.h \
-  ortools/base/int_type.h ortools/base/macros.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/base/timer.h \
-  ortools/base/basictypes.h ortools/util/running_stat.h \
-  ortools/base/hash.h | $(OBJ_DIR)/graph
+ ortools/base/int_type.h ortools/base/macros.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/logging.h \
+ ortools/base/integral_types.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/base/timer.h \
+ ortools/base/basictypes.h ortools/util/running_stat.h \
+ ortools/base/hash.h | $(OBJ_DIR)/graph
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Scliques.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Scliques.$O
 
 objs/graph/connected_components.$O: ortools/graph/connected_components.cc \
-  ortools/graph/connected_components.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/base/map_util.h ortools/base/ptr_util.h | $(OBJ_DIR)/graph
+ ortools/graph/connected_components.h ortools/base/logging.h \
+ ortools/base/integral_types.h ortools/base/macros.h \
+ ortools/base/map_util.h ortools/base/ptr_util.h | $(OBJ_DIR)/graph
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sconnected_components.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sconnected_components.$O
 
 objs/graph/dijkstra.$O: ortools/graph/dijkstra.cc \
-  ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/graph/shortestpaths.h | $(OBJ_DIR)/graph
+ ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/graph/shortestpaths.h | $(OBJ_DIR)/graph
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sdijkstra.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sdijkstra.$O
 
 objs/graph/linear_assignment.$O: ortools/graph/linear_assignment.cc \
-  ortools/graph/linear_assignment.h ortools/base/commandlineflags.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/graph/ebert_graph.h \
-  ortools/util/permutation.h ortools/util/zvector.h | $(OBJ_DIR)/graph
+ ortools/graph/linear_assignment.h ortools/base/commandlineflags.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/graph/ebert_graph.h \
+ ortools/util/permutation.h ortools/util/zvector.h | $(OBJ_DIR)/graph
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Slinear_assignment.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Slinear_assignment.$O
 
 objs/graph/max_flow.$O: ortools/graph/max_flow.cc ortools/graph/max_flow.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/graph/ebert_graph.h \
-  ortools/util/permutation.h ortools/util/zvector.h \
-  ortools/gen/ortools/graph/flow_problem.pb.h ortools/graph/graph.h \
-  ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
-  ortools/base/basictypes.h ortools/graph/graphs.h | $(OBJ_DIR)/graph
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/graph/ebert_graph.h \
+ ortools/util/permutation.h ortools/util/zvector.h \
+ ortools/gen/ortools/graph/flow_problem.pb.h ortools/graph/graph.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/base/basictypes.h ortools/graph/graphs.h | $(OBJ_DIR)/graph
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Smax_flow.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Smax_flow.$O
 
 objs/graph/min_cost_flow.$O: ortools/graph/min_cost_flow.cc \
-  ortools/graph/min_cost_flow.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/graph/ebert_graph.h ortools/util/permutation.h \
-  ortools/util/zvector.h ortools/graph/graph.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/base/timer.h ortools/base/basictypes.h \
-  ortools/base/commandlineflags.h ortools/base/mathutil.h \
-  ortools/graph/graphs.h ortools/graph/max_flow.h \
-  ortools/gen/ortools/graph/flow_problem.pb.h | $(OBJ_DIR)/graph
+ ortools/graph/min_cost_flow.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/graph/ebert_graph.h \
+ ortools/util/permutation.h ortools/util/zvector.h ortools/graph/graph.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/base/basictypes.h ortools/base/commandlineflags.h \
+ ortools/base/mathutil.h ortools/graph/graphs.h ortools/graph/max_flow.h \
+ ortools/gen/ortools/graph/flow_problem.pb.h | $(OBJ_DIR)/graph
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Smin_cost_flow.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Smin_cost_flow.$O
 
 objs/graph/perfect_matching.$O: ortools/graph/perfect_matching.cc \
-  ortools/graph/perfect_matching.h \
-  ortools/base/adjustable_priority_queue-inl.h \
-  ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h | $(OBJ_DIR)/graph
+ ortools/graph/perfect_matching.h \
+ ortools/base/adjustable_priority_queue-inl.h \
+ ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h | $(OBJ_DIR)/graph
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sperfect_matching.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sperfect_matching.$O
 
 objs/graph/shortestpaths.$O: ortools/graph/shortestpaths.cc \
-  ortools/graph/shortestpaths.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/base/commandlineflags.h \
-  ortools/base/logging.h | $(OBJ_DIR)/graph
+ ortools/graph/shortestpaths.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/base/commandlineflags.h \
+ ortools/base/logging.h | $(OBJ_DIR)/graph
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sshortestpaths.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sshortestpaths.$O
 
 objs/graph/util.$O: ortools/graph/util.cc ortools/graph/util.h \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/map_util.h \
-  ortools/graph/connected_components.h ortools/base/ptr_util.h \
-  ortools/graph/graph.h ortools/graph/iterators.h | $(OBJ_DIR)/graph
+ ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/map_util.h \
+ ortools/graph/connected_components.h ortools/base/ptr_util.h \
+ ortools/graph/graph.h ortools/graph/iterators.h | $(OBJ_DIR)/graph
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sgraph$Sutil.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Sutil.$O
 
 ortools/graph/flow_problem.proto: ;
@@ -1016,8 +1004,8 @@ ALGORITHMS_DEPS = \
  $(SRC_DIR)/ortools/algorithms/dynamic_permutation.h \
  $(SRC_DIR)/ortools/algorithms/find_graph_symmetries.h \
  $(SRC_DIR)/ortools/algorithms/hungarian.h \
- $(SRC_DIR)/ortools/algorithms/knapsack_solver.h \
  $(SRC_DIR)/ortools/algorithms/knapsack_solver_for_cuts.h \
+ $(SRC_DIR)/ortools/algorithms/knapsack_solver.h \
  $(SRC_DIR)/ortools/algorithms/sparse_permutation.h
 
 ALGORITHMS_LIB_OBJS = \
@@ -1030,69 +1018,67 @@ ALGORITHMS_LIB_OBJS = \
  $(OBJ_DIR)/algorithms/sparse_permutation.$O
 
 objs/algorithms/dynamic_partition.$O: \
-  ortools/algorithms/dynamic_partition.cc \
-  ortools/algorithms/dynamic_partition.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/base/murmur.h ortools/base/thorough_hash.h | $(OBJ_DIR)/algorithms
+ ortools/algorithms/dynamic_partition.cc \
+ ortools/algorithms/dynamic_partition.h ortools/base/logging.h \
+ ortools/base/integral_types.h ortools/base/macros.h \
+ ortools/base/murmur.h ortools/base/thorough_hash.h | $(OBJ_DIR)/algorithms
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Salgorithms$Sdynamic_partition.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Sdynamic_partition.$O
 
 objs/algorithms/dynamic_permutation.$O: \
-  ortools/algorithms/dynamic_permutation.cc \
-  ortools/algorithms/dynamic_permutation.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/algorithms/sparse_permutation.h | $(OBJ_DIR)/algorithms
+ ortools/algorithms/dynamic_permutation.cc \
+ ortools/algorithms/dynamic_permutation.h ortools/base/logging.h \
+ ortools/base/integral_types.h ortools/base/macros.h \
+ ortools/algorithms/sparse_permutation.h | $(OBJ_DIR)/algorithms
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Salgorithms$Sdynamic_permutation.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Sdynamic_permutation.$O
 
 objs/algorithms/find_graph_symmetries.$O: \
-  ortools/algorithms/find_graph_symmetries.cc \
-  ortools/algorithms/find_graph_symmetries.h \
-  ortools/algorithms/dynamic_partition.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/algorithms/dynamic_permutation.h ortools/base/status.h \
-  ortools/graph/graph.h ortools/graph/iterators.h ortools/util/stats.h \
-  ortools/base/timer.h ortools/base/basictypes.h \
-  ortools/util/time_limit.h ortools/base/commandlineflags.h \
-  ortools/util/running_stat.h \
-  ortools/algorithms/dense_doubly_linked_list.h \
-  ortools/algorithms/sparse_permutation.h \
-  ortools/base/canonical_errors.h ortools/graph/util.h \
-  ortools/base/hash.h ortools/base/map_util.h \
-  ortools/graph/connected_components.h ortools/base/ptr_util.h | $(OBJ_DIR)/algorithms
+ ortools/algorithms/find_graph_symmetries.cc \
+ ortools/algorithms/find_graph_symmetries.h \
+ ortools/algorithms/dynamic_partition.h ortools/base/logging.h \
+ ortools/base/integral_types.h ortools/base/macros.h \
+ ortools/algorithms/dynamic_permutation.h ortools/graph/graph.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/base/basictypes.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/algorithms/dense_doubly_linked_list.h \
+ ortools/algorithms/sparse_permutation.h ortools/graph/util.h \
+ ortools/base/hash.h ortools/base/map_util.h \
+ ortools/graph/connected_components.h ortools/base/ptr_util.h | $(OBJ_DIR)/algorithms
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Salgorithms$Sfind_graph_symmetries.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Sfind_graph_symmetries.$O
 
 objs/algorithms/hungarian.$O: ortools/algorithms/hungarian.cc \
-  ortools/algorithms/hungarian.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h | $(OBJ_DIR)/algorithms
+ ortools/algorithms/hungarian.h ortools/base/logging.h \
+ ortools/base/integral_types.h ortools/base/macros.h | $(OBJ_DIR)/algorithms
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Salgorithms$Shungarian.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Shungarian.$O
 
 objs/algorithms/knapsack_solver.$O: ortools/algorithms/knapsack_solver.cc \
-  ortools/algorithms/knapsack_solver.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/base/timer.h \
-  ortools/util/running_stat.h ortools/base/stl_util.h \
-  ortools/linear_solver/linear_solver.h ortools/base/status.h \
-  ortools/linear_solver/linear_expr.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/linear_solver/linear_solver_callback.h \
-  ortools/port/proto_utils.h ortools/util/bitset.h | $(OBJ_DIR)/algorithms
+ ortools/algorithms/knapsack_solver.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/base/timer.h \
+ ortools/util/running_stat.h ortools/base/stl_util.h \
+ ortools/linear_solver/linear_solver.h \
+ ortools/linear_solver/linear_expr.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h \
+ ortools/linear_solver/linear_solver_callback.h \
+ ortools/port/proto_utils.h ortools/util/bitset.h | $(OBJ_DIR)/algorithms
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Salgorithms$Sknapsack_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Sknapsack_solver.$O
 
 objs/algorithms/knapsack_solver_for_cuts.$O: \
-  ortools/algorithms/knapsack_solver_for_cuts.cc \
-  ortools/algorithms/knapsack_solver_for_cuts.h ortools/base/int_type.h \
-  ortools/base/macros.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/util/time_limit.h ortools/base/commandlineflags.h \
-  ortools/base/timer.h ortools/base/basictypes.h \
-  ortools/util/running_stat.h | $(OBJ_DIR)/algorithms
+ ortools/algorithms/knapsack_solver_for_cuts.cc \
+ ortools/algorithms/knapsack_solver_for_cuts.h ortools/base/int_type.h \
+ ortools/base/macros.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/util/time_limit.h ortools/base/commandlineflags.h \
+ ortools/base/timer.h ortools/base/basictypes.h \
+ ortools/util/running_stat.h | $(OBJ_DIR)/algorithms
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Salgorithms$Sknapsack_solver_for_cuts.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Sknapsack_solver_for_cuts.$O
 
 objs/algorithms/sparse_permutation.$O: \
-  ortools/algorithms/sparse_permutation.cc \
-  ortools/algorithms/sparse_permutation.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h | $(OBJ_DIR)/algorithms
+ ortools/algorithms/sparse_permutation.cc \
+ ortools/algorithms/sparse_permutation.h ortools/base/logging.h \
+ ortools/base/integral_types.h ortools/base/macros.h | $(OBJ_DIR)/algorithms
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Salgorithms$Ssparse_permutation.cc $(OBJ_OUT)$(OBJ_DIR)$Salgorithms$Ssparse_permutation.$O
 
 SAT_DEPS = \
@@ -1101,19 +1087,20 @@ SAT_DEPS = \
  $(SRC_DIR)/ortools/sat/circuit.h \
  $(SRC_DIR)/ortools/sat/clause.h \
  $(SRC_DIR)/ortools/sat/cp_constraints.h \
- $(SRC_DIR)/ortools/sat/cp_model.h \
  $(SRC_DIR)/ortools/sat/cp_model_checker.h \
  $(SRC_DIR)/ortools/sat/cp_model_expand.h \
+ $(SRC_DIR)/ortools/sat/cp_model.h \
  $(SRC_DIR)/ortools/sat/cp_model_lns.h \
  $(SRC_DIR)/ortools/sat/cp_model_loader.h \
  $(SRC_DIR)/ortools/sat/cp_model_objective.h \
+ $(SRC_DIR)/ortools/sat/cp_model_postsolve.h \
  $(SRC_DIR)/ortools/sat/cp_model_presolve.h \
  $(SRC_DIR)/ortools/sat/cp_model_search.h \
  $(SRC_DIR)/ortools/sat/cp_model_solver.h \
  $(SRC_DIR)/ortools/sat/cp_model_symmetries.h \
  $(SRC_DIR)/ortools/sat/cp_model_utils.h \
- $(SRC_DIR)/ortools/sat/cumulative.h \
  $(SRC_DIR)/ortools/sat/cumulative_energy.h \
+ $(SRC_DIR)/ortools/sat/cumulative.h \
  $(SRC_DIR)/ortools/sat/cuts.h \
  $(SRC_DIR)/ortools/sat/diffn.h \
  $(SRC_DIR)/ortools/sat/disjunctive.h \
@@ -1122,8 +1109,8 @@ SAT_DEPS = \
  $(SRC_DIR)/ortools/sat/drat_writer.h \
  $(SRC_DIR)/ortools/sat/encoding.h \
  $(SRC_DIR)/ortools/sat/implied_bounds.h \
- $(SRC_DIR)/ortools/sat/integer.h \
  $(SRC_DIR)/ortools/sat/integer_expr.h \
+ $(SRC_DIR)/ortools/sat/integer.h \
  $(SRC_DIR)/ortools/sat/integer_search.h \
  $(SRC_DIR)/ortools/sat/intervals.h \
  $(SRC_DIR)/ortools/sat/linear_constraint.h \
@@ -1143,6 +1130,7 @@ SAT_DEPS = \
  $(SRC_DIR)/ortools/sat/rins.h \
  $(SRC_DIR)/ortools/sat/sat_base.h \
  $(SRC_DIR)/ortools/sat/sat_decision.h \
+ $(SRC_DIR)/ortools/sat/sat_inprocessing.h \
  $(SRC_DIR)/ortools/sat/sat_solver.h \
  $(SRC_DIR)/ortools/sat/simplification.h \
  $(SRC_DIR)/ortools/sat/subsolver.h \
@@ -1151,8 +1139,8 @@ SAT_DEPS = \
  $(SRC_DIR)/ortools/sat/synchronization.h \
  $(SRC_DIR)/ortools/sat/table.h \
  $(SRC_DIR)/ortools/sat/theta_tree.h \
- $(SRC_DIR)/ortools/sat/timetable.h \
  $(SRC_DIR)/ortools/sat/timetable_edgefinding.h \
+ $(SRC_DIR)/ortools/sat/timetable.h \
  $(SRC_DIR)/ortools/sat/util.h \
  $(GEN_DIR)/ortools/sat/boolean_problem.pb.h \
  $(GEN_DIR)/ortools/sat/cp_model.pb.h \
@@ -1170,6 +1158,7 @@ SAT_LIB_OBJS = \
  $(OBJ_DIR)/sat/cp_model_lns.$O \
  $(OBJ_DIR)/sat/cp_model_loader.$O \
  $(OBJ_DIR)/sat/cp_model_objective.$O \
+ $(OBJ_DIR)/sat/cp_model_postsolve.$O \
  $(OBJ_DIR)/sat/cp_model_presolve.$O \
  $(OBJ_DIR)/sat/cp_model_search.$O \
  $(OBJ_DIR)/sat/cp_model_solver.$O \
@@ -1204,6 +1193,7 @@ SAT_LIB_OBJS = \
  $(OBJ_DIR)/sat/restart.$O \
  $(OBJ_DIR)/sat/rins.$O \
  $(OBJ_DIR)/sat/sat_decision.$O \
+ $(OBJ_DIR)/sat/sat_inprocessing.$O \
  $(OBJ_DIR)/sat/sat_solver.$O \
  $(OBJ_DIR)/sat/simplification.$O \
  $(OBJ_DIR)/sat/subsolver.$O \
@@ -1219,1200 +1209,1166 @@ SAT_LIB_OBJS = \
  $(OBJ_DIR)/sat/sat_parameters.pb.$O
 
 objs/sat/all_different.$O: ortools/sat/all_different.cc \
-  ortools/sat/all_different.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/sat/integer.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/logging.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h \
-  ortools/graph/strongly_connected_components.h ortools/util/sort.h | $(OBJ_DIR)/sat
+ ortools/sat/all_different.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/sat/integer.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/logging.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/graph/strongly_connected_components.h ortools/util/sort.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sall_different.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sall_different.$O
 
 objs/sat/boolean_problem.$O: ortools/sat/boolean_problem.cc \
-  ortools/sat/boolean_problem.h ortools/algorithms/sparse_permutation.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/int_type.h ortools/base/status.h \
-  ortools/gen/ortools/sat/boolean_problem.pb.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
-  ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
-  ortools/base/timer.h ortools/base/basictypes.h \
-  ortools/sat/sat_solver.h ortools/base/hash.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h \
-  ortools/util/random_engine.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/sat/simplification.h \
-  ortools/base/adjustable_priority_queue.h ortools/graph/io.h \
-  ortools/base/filelineiter.h ortools/base/statusor.h \
-  ortools/graph/graph.h ortools/graph/iterators.h \
-  ortools/algorithms/find_graph_symmetries.h \
-  ortools/algorithms/dynamic_partition.h \
-  ortools/algorithms/dynamic_permutation.h ortools/graph/util.h \
-  ortools/graph/connected_components.h ortools/base/ptr_util.h \
-  ortools/port/proto_utils.h | $(OBJ_DIR)/sat
+ ortools/sat/boolean_problem.h ortools/algorithms/sparse_permutation.h \
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/int_type.h ortools/gen/ortools/sat/boolean_problem.pb.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
+ ortools/base/timer.h ortools/base/basictypes.h ortools/sat/sat_solver.h \
+ ortools/base/hash.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/util/random_engine.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/sat/simplification.h \
+ ortools/base/adjustable_priority_queue.h ortools/graph/io.h \
+ ortools/base/filelineiter.h ortools/base/statusor.h \
+ ortools/graph/graph.h ortools/graph/iterators.h \
+ ortools/algorithms/find_graph_symmetries.h \
+ ortools/algorithms/dynamic_partition.h \
+ ortools/algorithms/dynamic_permutation.h ortools/graph/util.h \
+ ortools/graph/connected_components.h ortools/base/ptr_util.h \
+ ortools/port/proto_utils.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sboolean_problem.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sboolean_problem.$O
 
 objs/sat/circuit.$O: ortools/sat/circuit.cc ortools/sat/circuit.h \
-  ortools/base/int_type.h ortools/base/macros.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
+ ortools/base/int_type.h ortools/base/macros.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scircuit.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scircuit.$O
 
 objs/sat/clause.$O: ortools/sat/clause.cc ortools/sat/clause.h \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/sat_base.h ortools/sat/model.h ortools/base/map_util.h \
-  ortools/base/typeid.h ortools/util/bitset.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h ortools/base/timer.h \
-  ortools/base/stl_util.h ortools/graph/strongly_connected_components.h | $(OBJ_DIR)/sat
+ ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/sat_base.h ortools/sat/model.h \
+ ortools/base/map_util.h ortools/base/typeid.h ortools/util/bitset.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/base/timer.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/base/stl_util.h ortools/graph/strongly_connected_components.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sclause.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sclause.$O
 
 objs/sat/cp_constraints.$O: ortools/sat/cp_constraints.cc \
-  ortools/sat/cp_constraints.h ortools/base/int_type.h \
-  ortools/base/macros.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/sat/integer.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/util/sort.h | $(OBJ_DIR)/sat
+ ortools/sat/cp_constraints.h ortools/base/int_type.h \
+ ortools/base/macros.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/sat/integer.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
+ ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/util/sort.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_constraints.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_constraints.$O
 
 objs/sat/cp_model.$O: ortools/sat/cp_model.cc ortools/sat/cp_model.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_solver.h \
-  ortools/base/integral_types.h ortools/sat/model.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
-  ortools/base/typeid.h ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/sat/cp_model_utils.h ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_solver.h \
+ ortools/base/integral_types.h ortools/sat/model.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/cp_model_utils.h \
+ ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_model.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_model.$O
 
 objs/sat/cp_model_checker.$O: ortools/sat/cp_model_checker.cc \
-  ortools/sat/cp_model_checker.h ortools/base/integral_types.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/logging.h ortools/base/macros.h \
-  ortools/base/map_util.h ortools/port/proto_utils.h \
-  ortools/sat/cp_model_utils.h ortools/util/sorted_interval_list.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h | $(OBJ_DIR)/sat
+ ortools/sat/cp_model_checker.h ortools/base/integral_types.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/logging.h ortools/base/macros.h \
+ ortools/base/map_util.h ortools/port/proto_utils.h \
+ ortools/sat/cp_model_utils.h ortools/util/sorted_interval_list.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_model_checker.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_model_checker.$O
 
 objs/sat/cp_model_expand.$O: ortools/sat/cp_model_expand.cc \
-  ortools/sat/cp_model_expand.h ortools/gen/ortools/sat/cp_model.pb.h \
-  ortools/sat/presolve_context.h ortools/sat/cp_model_utils.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/util/sorted_interval_list.h \
-  ortools/sat/presolve_util.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/affine_relation.h ortools/base/iterator_adaptors.h \
-  ortools/util/time_limit.h ortools/base/commandlineflags.h \
-  ortools/base/timer.h ortools/base/basictypes.h \
-  ortools/util/running_stat.h ortools/base/hash.h \
-  ortools/base/map_util.h ortools/base/stl_util.h ortools/sat/util.h \
-  ortools/sat/model.h ortools/base/typeid.h ortools/sat/sat_base.h \
-  ortools/util/random_engine.h ortools/util/saturated_arithmetic.h | $(OBJ_DIR)/sat
+ ortools/sat/cp_model_expand.h ortools/gen/ortools/sat/cp_model.pb.h \
+ ortools/sat/presolve_context.h ortools/sat/cp_model_utils.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/util/sorted_interval_list.h \
+ ortools/sat/presolve_util.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h \
+ ortools/util/affine_relation.h ortools/base/iterator_adaptors.h \
+ ortools/util/time_limit.h ortools/base/commandlineflags.h \
+ ortools/base/timer.h ortools/base/basictypes.h \
+ ortools/util/running_stat.h ortools/base/hash.h ortools/base/map_util.h \
+ ortools/base/stl_util.h ortools/sat/util.h ortools/sat/model.h \
+ ortools/base/typeid.h ortools/sat/sat_base.h \
+ ortools/util/random_engine.h ortools/util/saturated_arithmetic.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_model_expand.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_model_expand.$O
 
 objs/sat/cp_model_lns.$O: ortools/sat/cp_model_lns.cc \
-  ortools/sat/cp_model_lns.h ortools/base/integral_types.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/model.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
-  ortools/base/typeid.h ortools/sat/subsolver.h \
-  ortools/base/threadpool.h ortools/sat/synchronization.h \
-  ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/graph/iterators.h ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h \
-  ortools/util/adaptative_parameter_value.h \
-  ortools/sat/cp_model_loader.h ortools/sat/cp_model_utils.h \
-  ortools/sat/intervals.h ortools/sat/cp_constraints.h \
-  ortools/sat/integer_expr.h ortools/sat/linear_constraint.h \
-  ortools/sat/precedences.h ortools/sat/linear_programming_constraint.h \
-  ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
-  ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/glop/rank_one_update.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
-  ortools/util/fp_utils.h ortools/glop/entering_variable.h \
-  ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
-  ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/lp_data/lp_data_utils.h \
-  ortools/lp_data/matrix_scaler.h ortools/sat/cuts.h \
-  ortools/sat/implied_bounds.h ortools/sat/linear_constraint_manager.h \
-  ortools/sat/util.h ortools/sat/rins.h | $(OBJ_DIR)/sat
+ ortools/sat/cp_model_lns.h ortools/base/integral_types.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/model.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
+ ortools/base/typeid.h ortools/sat/subsolver.h ortools/base/threadpool.h \
+ ortools/sat/synchronization.h ortools/base/stl_util.h \
+ ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
+ ortools/graph/iterators.h ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/util/adaptative_parameter_value.h ortools/sat/cp_model_loader.h \
+ ortools/sat/cp_model_utils.h ortools/sat/intervals.h \
+ ortools/sat/cp_constraints.h ortools/sat/integer_expr.h \
+ ortools/sat/linear_constraint.h ortools/sat/precedences.h \
+ ortools/sat/linear_programming_constraint.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/status.h \
+ ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/sparse.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/glop/rank_one_update.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
+ ortools/util/fp_utils.h ortools/glop/entering_variable.h \
+ ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
+ ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/lp_data/lp_data_utils.h \
+ ortools/lp_data/matrix_scaler.h ortools/sat/cuts.h \
+ ortools/sat/implied_bounds.h ortools/sat/linear_constraint_manager.h \
+ ortools/sat/util.h ortools/sat/rins.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_model_lns.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_model_lns.$O
 
 objs/sat/cp_model_loader.$O: ortools/sat/cp_model_loader.cc \
-  ortools/sat/cp_model_loader.h ortools/base/int_type.h \
-  ortools/base/macros.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/map_util.h ortools/gen/ortools/sat/cp_model.pb.h \
-  ortools/sat/cp_model_utils.h ortools/util/sorted_interval_list.h \
-  ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h ortools/sat/intervals.h \
-  ortools/sat/cp_constraints.h ortools/sat/integer_expr.h \
-  ortools/sat/linear_constraint.h ortools/sat/precedences.h \
-  ortools/base/stl_util.h ortools/sat/all_different.h \
-  ortools/sat/circuit.h ortools/sat/cumulative.h ortools/sat/diffn.h \
-  ortools/sat/disjunctive.h ortools/sat/theta_tree.h \
-  ortools/sat/implied_bounds.h ortools/sat/table.h | $(OBJ_DIR)/sat
+ ortools/sat/cp_model_loader.h ortools/base/int_type.h \
+ ortools/base/macros.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/map_util.h ortools/gen/ortools/sat/cp_model.pb.h \
+ ortools/sat/cp_model_utils.h ortools/util/sorted_interval_list.h \
+ ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/sat/intervals.h \
+ ortools/sat/cp_constraints.h ortools/sat/integer_expr.h \
+ ortools/sat/linear_constraint.h ortools/sat/precedences.h \
+ ortools/base/stl_util.h ortools/sat/all_different.h \
+ ortools/sat/circuit.h ortools/sat/cumulative.h ortools/sat/diffn.h \
+ ortools/sat/disjunctive.h ortools/sat/theta_tree.h \
+ ortools/sat/implied_bounds.h ortools/sat/table.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_model_loader.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_model_loader.$O
 
 objs/sat/cp_model_objective.$O: ortools/sat/cp_model_objective.cc \
-  ortools/sat/cp_model_objective.h ortools/gen/ortools/sat/cp_model.pb.h \
-  ortools/sat/cp_model_utils.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
+ ortools/sat/cp_model_objective.h ortools/gen/ortools/sat/cp_model.pb.h \
+ ortools/sat/cp_model_utils.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_model_objective.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_model_objective.$O
 
+objs/sat/cp_model_postsolve.$O: ortools/sat/cp_model_postsolve.cc \
+ ortools/sat/cp_model_postsolve.h ortools/base/integral_types.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_utils.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
+	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_model_postsolve.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_model_postsolve.$O
+
 objs/sat/cp_model_presolve.$O: ortools/sat/cp_model_presolve.cc \
-  ortools/sat/cp_model_presolve.h ortools/gen/ortools/sat/cp_model.pb.h \
-  ortools/sat/cp_model_utils.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/util/sorted_interval_list.h ortools/sat/presolve_context.h \
-  ortools/sat/presolve_util.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/affine_relation.h ortools/base/iterator_adaptors.h \
-  ortools/util/time_limit.h ortools/base/commandlineflags.h \
-  ortools/base/timer.h ortools/base/basictypes.h \
-  ortools/util/running_stat.h ortools/base/hash.h \
-  ortools/base/map_util.h ortools/base/mathutil.h \
-  ortools/base/stl_util.h ortools/port/proto_utils.h \
-  ortools/sat/cp_model_checker.h ortools/sat/cp_model_expand.h \
-  ortools/sat/cp_model_loader.h ortools/sat/integer.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/sat/sat_solver.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/sat/sat_decision.h ortools/util/integer_pq.h \
-  ortools/util/rev.h ortools/util/saturated_arithmetic.h \
-  ortools/sat/intervals.h ortools/sat/cp_constraints.h \
-  ortools/sat/integer_expr.h ortools/sat/linear_constraint.h \
-  ortools/sat/precedences.h ortools/sat/cp_model_objective.h \
-  ortools/sat/probing.h ortools/sat/simplification.h \
-  ortools/base/adjustable_priority_queue.h | $(OBJ_DIR)/sat
+ ortools/sat/cp_model_presolve.h ortools/gen/ortools/sat/cp_model.pb.h \
+ ortools/sat/cp_model_utils.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/util/sorted_interval_list.h ortools/sat/presolve_context.h \
+ ortools/sat/presolve_util.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h \
+ ortools/util/affine_relation.h ortools/base/iterator_adaptors.h \
+ ortools/util/time_limit.h ortools/base/commandlineflags.h \
+ ortools/base/timer.h ortools/base/basictypes.h \
+ ortools/util/running_stat.h ortools/base/hash.h ortools/base/map_util.h \
+ ortools/base/mathutil.h ortools/base/stl_util.h \
+ ortools/port/proto_utils.h ortools/sat/cp_model_checker.h \
+ ortools/sat/cp_model_expand.h ortools/sat/cp_model_loader.h \
+ ortools/sat/integer.h ortools/graph/iterators.h ortools/sat/model.h \
+ ortools/base/typeid.h ortools/sat/sat_base.h ortools/sat/sat_solver.h \
+ ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/util/random_engine.h ortools/util/stats.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/sat/intervals.h \
+ ortools/sat/cp_constraints.h ortools/sat/integer_expr.h \
+ ortools/sat/linear_constraint.h ortools/sat/precedences.h \
+ ortools/sat/cp_model_objective.h ortools/sat/probing.h \
+ ortools/sat/simplification.h ortools/base/adjustable_priority_queue.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_model_presolve.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_model_presolve.$O
 
 objs/sat/cp_model_search.$O: ortools/sat/cp_model_search.cc \
-  ortools/sat/cp_model_search.h ortools/base/integral_types.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/integer.h \
-  ortools/base/hash.h ortools/base/basictypes.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/integer_search.h \
-  ortools/sat/cp_model_utils.h ortools/sat/util.h | $(OBJ_DIR)/sat
+ ortools/sat/cp_model_search.h ortools/base/integral_types.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/integer.h \
+ ortools/base/hash.h ortools/base/basictypes.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/integer_search.h ortools/sat/cp_model_utils.h \
+ ortools/sat/util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_model_search.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_model_search.$O
 
 objs/sat/cp_model_solver.$O: ortools/sat/cp_model_solver.cc \
-  ortools/sat/cp_model_solver.h ortools/base/integral_types.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/model.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
-  ortools/base/typeid.h ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/base/cleanup.h ortools/base/file.h ortools/base/status.h \
-  ortools/util/sigint.h ortools/base/commandlineflags.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/threadpool.h ortools/base/timer.h \
-  ortools/base/basictypes.h ortools/graph/connectivity.h \
-  ortools/port/proto_utils.h ortools/sat/circuit.h ortools/sat/integer.h \
-  ortools/base/hash.h ortools/graph/iterators.h ortools/sat/sat_base.h \
-  ortools/util/bitset.h ortools/sat/sat_solver.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/util/random_engine.h \
-  ortools/util/stats.h ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/cp_model_checker.h \
-  ortools/sat/cp_model_lns.h ortools/sat/subsolver.h \
-  ortools/sat/synchronization.h \
-  ortools/util/adaptative_parameter_value.h \
-  ortools/sat/cp_model_loader.h ortools/sat/cp_model_utils.h \
-  ortools/sat/intervals.h ortools/sat/cp_constraints.h \
-  ortools/sat/integer_expr.h ortools/sat/linear_constraint.h \
-  ortools/sat/precedences.h ortools/sat/cp_model_presolve.h \
-  ortools/sat/presolve_context.h ortools/sat/presolve_util.h \
-  ortools/util/affine_relation.h ortools/base/iterator_adaptors.h \
-  ortools/sat/cp_model_search.h ortools/sat/integer_search.h \
-  ortools/sat/cuts.h ortools/sat/implied_bounds.h \
-  ortools/sat/linear_constraint_manager.h ortools/glop/revised_simplex.h \
-  ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/status.h ortools/lp_data/lp_types.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
-  ortools/lp_data/lp_data.h ortools/util/fp_utils.h \
-  ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/glop/reduced_costs.h ortools/glop/variable_values.h \
-  ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \
-  ortools/sat/linear_programming_constraint.h \
-  ortools/lp_data/lp_data_utils.h ortools/lp_data/matrix_scaler.h \
-  ortools/sat/util.h ortools/sat/linear_relaxation.h \
-  ortools/sat/optimization.h \
-  ortools/gen/ortools/sat/boolean_problem.pb.h ortools/sat/probing.h \
-  ortools/sat/rins.h ortools/sat/simplification.h \
-  ortools/base/adjustable_priority_queue.h | $(OBJ_DIR)/sat
+ ortools/sat/cp_model_solver.h ortools/base/integral_types.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/model.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
+ ortools/base/typeid.h ortools/gen/ortools/sat/sat_parameters.pb.h \
+ ortools/base/cleanup.h ortools/base/file.h ortools/util/sigint.h \
+ ortools/base/commandlineflags.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/threadpool.h \
+ ortools/base/timer.h ortools/base/basictypes.h \
+ ortools/graph/connectivity.h ortools/port/proto_utils.h \
+ ortools/sat/circuit.h ortools/sat/integer.h ortools/base/hash.h \
+ ortools/graph/iterators.h ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/sat/sat_solver.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/util/running_stat.h ortools/sat/pb_constraint.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/cp_model_checker.h ortools/sat/cp_model_lns.h \
+ ortools/sat/subsolver.h ortools/sat/synchronization.h \
+ ortools/base/stl_util.h ortools/util/adaptative_parameter_value.h \
+ ortools/sat/cp_model_loader.h ortools/sat/cp_model_utils.h \
+ ortools/sat/intervals.h ortools/sat/cp_constraints.h \
+ ortools/sat/integer_expr.h ortools/sat/linear_constraint.h \
+ ortools/sat/precedences.h ortools/sat/cp_model_postsolve.h \
+ ortools/sat/cp_model_presolve.h ortools/sat/presolve_context.h \
+ ortools/sat/presolve_util.h ortools/util/affine_relation.h \
+ ortools/base/iterator_adaptors.h ortools/sat/cp_model_search.h \
+ ortools/sat/integer_search.h ortools/sat/cuts.h \
+ ortools/sat/implied_bounds.h ortools/sat/linear_constraint_manager.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/status.h \
+ ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/sparse.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/glop/rank_one_update.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
+ ortools/util/fp_utils.h ortools/glop/entering_variable.h \
+ ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
+ ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/sat/linear_programming_constraint.h \
+ ortools/lp_data/lp_data_utils.h ortools/lp_data/matrix_scaler.h \
+ ortools/sat/util.h ortools/sat/linear_relaxation.h \
+ ortools/sat/optimization.h ortools/gen/ortools/sat/boolean_problem.pb.h \
+ ortools/sat/probing.h ortools/sat/rins.h ortools/sat/simplification.h \
+ ortools/base/adjustable_priority_queue.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_model_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_model_solver.$O
 
 objs/sat/cp_model_symmetries.$O: ortools/sat/cp_model_symmetries.cc \
-  ortools/sat/cp_model_symmetries.h \
-  ortools/algorithms/sparse_permutation.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/gen/ortools/sat/cp_model.pb.h \
-  ortools/algorithms/find_graph_symmetries.h \
-  ortools/algorithms/dynamic_partition.h \
-  ortools/algorithms/dynamic_permutation.h ortools/base/status.h \
-  ortools/graph/graph.h ortools/graph/iterators.h ortools/util/stats.h \
-  ortools/base/timer.h ortools/base/basictypes.h \
-  ortools/util/time_limit.h ortools/base/commandlineflags.h \
-  ortools/util/running_stat.h ortools/base/hash.h \
-  ortools/base/map_util.h ortools/sat/cp_model_utils.h \
-  ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
+ ortools/sat/cp_model_symmetries.h \
+ ortools/algorithms/sparse_permutation.h ortools/base/logging.h \
+ ortools/base/integral_types.h ortools/base/macros.h \
+ ortools/gen/ortools/sat/cp_model.pb.h \
+ ortools/algorithms/find_graph_symmetries.h \
+ ortools/algorithms/dynamic_partition.h \
+ ortools/algorithms/dynamic_permutation.h ortools/graph/graph.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/base/basictypes.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/base/hash.h ortools/base/map_util.h ortools/sat/cp_model_utils.h \
+ ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_model_symmetries.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_model_symmetries.$O
 
 objs/sat/cp_model_utils.$O: ortools/sat/cp_model_utils.cc \
-  ortools/sat/cp_model_utils.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/gen/ortools/sat/cp_model.pb.h \
-  ortools/util/sorted_interval_list.h ortools/base/stl_util.h | $(OBJ_DIR)/sat
+ ortools/sat/cp_model_utils.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/gen/ortools/sat/cp_model.pb.h \
+ ortools/util/sorted_interval_list.h ortools/base/stl_util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scp_model_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scp_model_utils.$O
 
 objs/sat/cumulative.$O: ortools/sat/cumulative.cc ortools/sat/cumulative.h \
-  ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/intervals.h \
-  ortools/sat/cp_constraints.h ortools/sat/integer_expr.h \
-  ortools/sat/linear_constraint.h ortools/sat/precedences.h \
-  ortools/sat/cumulative_energy.h ortools/sat/theta_tree.h \
-  ortools/sat/disjunctive.h ortools/sat/timetable.h \
-  ortools/sat/timetable_edgefinding.h | $(OBJ_DIR)/sat
+ ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/intervals.h ortools/sat/cp_constraints.h \
+ ortools/sat/integer_expr.h ortools/sat/linear_constraint.h \
+ ortools/sat/precedences.h ortools/sat/cumulative_energy.h \
+ ortools/sat/theta_tree.h ortools/sat/disjunctive.h \
+ ortools/sat/timetable.h ortools/sat/timetable_edgefinding.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scumulative.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scumulative.$O
 
 objs/sat/cumulative_energy.$O: ortools/sat/cumulative_energy.cc \
-  ortools/sat/cumulative_energy.h ortools/sat/integer.h \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/intervals.h \
-  ortools/sat/cp_constraints.h ortools/sat/integer_expr.h \
-  ortools/sat/linear_constraint.h ortools/sat/precedences.h \
-  ortools/sat/theta_tree.h ortools/base/iterator_adaptors.h | $(OBJ_DIR)/sat
+ ortools/sat/cumulative_energy.h ortools/sat/integer.h \
+ ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/intervals.h ortools/sat/cp_constraints.h \
+ ortools/sat/integer_expr.h ortools/sat/linear_constraint.h \
+ ortools/sat/precedences.h ortools/sat/theta_tree.h \
+ ortools/base/iterator_adaptors.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scumulative_energy.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scumulative_energy.$O
 
 objs/sat/cuts.$O: ortools/sat/cuts.cc ortools/sat/cuts.h \
-  ortools/base/int_type.h ortools/base/macros.h \
-  ortools/sat/implied_bounds.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/linear_constraint.h \
-  ortools/sat/linear_constraint_manager.h ortools/glop/revised_simplex.h \
-  ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/status.h ortools/lp_data/lp_types.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
-  ortools/lp_data/lp_data.h ortools/util/fp_utils.h \
-  ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/glop/reduced_costs.h ortools/glop/variable_values.h \
-  ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \
-  ortools/algorithms/knapsack_solver_for_cuts.h ortools/base/stl_util.h | $(OBJ_DIR)/sat
+ ortools/base/int_type.h ortools/base/macros.h \
+ ortools/sat/implied_bounds.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
+ ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/linear_constraint.h ortools/sat/linear_constraint_manager.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/status.h \
+ ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/sparse.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/glop/rank_one_update.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
+ ortools/util/fp_utils.h ortools/glop/entering_variable.h \
+ ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
+ ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h \
+ ortools/algorithms/knapsack_solver_for_cuts.h ortools/base/stl_util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Scuts.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Scuts.$O
 
 objs/sat/diffn.$O: ortools/sat/diffn.cc ortools/sat/diffn.h \
-  ortools/base/int_type.h ortools/base/macros.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/sat/disjunctive.h ortools/sat/integer.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/intervals.h \
-  ortools/sat/cp_constraints.h ortools/sat/integer_expr.h \
-  ortools/sat/linear_constraint.h ortools/sat/precedences.h \
-  ortools/sat/theta_tree.h ortools/base/iterator_adaptors.h \
-  ortools/base/stl_util.h ortools/sat/cumulative.h ortools/util/sort.h | $(OBJ_DIR)/sat
+ ortools/base/int_type.h ortools/base/macros.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/sat/disjunctive.h ortools/sat/integer.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
+ ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/intervals.h ortools/sat/cp_constraints.h \
+ ortools/sat/integer_expr.h ortools/sat/linear_constraint.h \
+ ortools/sat/precedences.h ortools/sat/theta_tree.h \
+ ortools/base/iterator_adaptors.h ortools/base/stl_util.h \
+ ortools/sat/cumulative.h ortools/util/sort.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sdiffn.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sdiffn.$O
 
 objs/sat/disjunctive.$O: ortools/sat/disjunctive.cc \
-  ortools/sat/disjunctive.h ortools/base/int_type.h \
-  ortools/base/macros.h ortools/sat/integer.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/intervals.h \
-  ortools/sat/cp_constraints.h ortools/sat/integer_expr.h \
-  ortools/sat/linear_constraint.h ortools/sat/precedences.h \
-  ortools/sat/theta_tree.h ortools/base/iterator_adaptors.h \
-  ortools/sat/all_different.h ortools/sat/timetable.h \
-  ortools/util/sort.h | $(OBJ_DIR)/sat
+ ortools/sat/disjunctive.h ortools/base/int_type.h ortools/base/macros.h \
+ ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/intervals.h ortools/sat/cp_constraints.h \
+ ortools/sat/integer_expr.h ortools/sat/linear_constraint.h \
+ ortools/sat/precedences.h ortools/sat/theta_tree.h \
+ ortools/base/iterator_adaptors.h ortools/sat/all_different.h \
+ ortools/sat/timetable.h ortools/util/sort.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sdisjunctive.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sdisjunctive.$O
 
 objs/sat/drat_checker.$O: ortools/sat/drat_checker.cc \
-  ortools/sat/drat_checker.h ortools/base/int_type.h \
-  ortools/base/macros.h ortools/base/int_type_indexed_vector.h \
-  ortools/sat/sat_base.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/sat/model.h ortools/base/map_util.h \
-  ortools/base/typeid.h ortools/util/bitset.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/stl_util.h \
-  ortools/util/time_limit.h ortools/base/commandlineflags.h \
-  ortools/base/timer.h ortools/util/running_stat.h | $(OBJ_DIR)/sat
+ ortools/sat/drat_checker.h ortools/base/int_type.h ortools/base/macros.h \
+ ortools/base/int_type_indexed_vector.h ortools/sat/sat_base.h \
+ ortools/base/integral_types.h ortools/base/logging.h ortools/sat/model.h \
+ ortools/base/map_util.h ortools/base/typeid.h ortools/util/bitset.h \
+ ortools/base/hash.h ortools/base/basictypes.h ortools/base/stl_util.h \
+ ortools/util/time_limit.h ortools/base/commandlineflags.h \
+ ortools/base/timer.h ortools/util/running_stat.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sdrat_checker.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sdrat_checker.$O
 
 objs/sat/drat_proof_handler.$O: ortools/sat/drat_proof_handler.cc \
-  ortools/sat/drat_proof_handler.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/int_type.h \
-  ortools/base/macros.h ortools/sat/drat_checker.h \
-  ortools/sat/sat_base.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/sat/model.h ortools/base/map_util.h \
-  ortools/base/typeid.h ortools/util/bitset.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/base/status.h | $(OBJ_DIR)/sat
+ ortools/sat/drat_proof_handler.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/int_type.h ortools/base/macros.h ortools/sat/drat_checker.h \
+ ortools/sat/sat_base.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/sat/model.h ortools/base/map_util.h \
+ ortools/base/typeid.h ortools/util/bitset.h ortools/sat/drat_writer.h \
+ ortools/base/file.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sdrat_proof_handler.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sdrat_proof_handler.$O
 
 objs/sat/drat_writer.$O: ortools/sat/drat_writer.cc \
-  ortools/sat/drat_writer.h ortools/base/file.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/status.h ortools/sat/sat_base.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/util/bitset.h | $(OBJ_DIR)/sat
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/sat/sat_base.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/sat/model.h \
+ ortools/base/map_util.h ortools/base/typeid.h ortools/util/bitset.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sdrat_writer.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sdrat_writer.$O
 
 objs/sat/encoding.$O: ortools/sat/encoding.cc ortools/sat/encoding.h \
-  ortools/base/int_type.h ortools/base/macros.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/gen/ortools/sat/boolean_problem.pb.h \
-  ortools/sat/pb_constraint.h ortools/base/int_type_indexed_vector.h \
-  ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
-  ortools/base/timer.h ortools/base/basictypes.h \
-  ortools/sat/sat_solver.h ortools/base/hash.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/util/random_engine.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h | $(OBJ_DIR)/sat
+ ortools/base/int_type.h ortools/base/macros.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/gen/ortools/sat/boolean_problem.pb.h ortools/sat/pb_constraint.h \
+ ortools/base/int_type_indexed_vector.h ortools/sat/model.h \
+ ortools/base/map_util.h ortools/base/typeid.h ortools/sat/sat_base.h \
+ ortools/util/bitset.h ortools/gen/ortools/sat/sat_parameters.pb.h \
+ ortools/util/stats.h ortools/base/timer.h ortools/base/basictypes.h \
+ ortools/sat/sat_solver.h ortools/base/hash.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/util/random_engine.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sencoding.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sencoding.$O
 
 objs/sat/implied_bounds.$O: ortools/sat/implied_bounds.cc \
-  ortools/sat/implied_bounds.h ortools/base/int_type.h \
-  ortools/base/macros.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
+ ortools/sat/implied_bounds.h ortools/base/int_type.h \
+ ortools/base/macros.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
+ ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Simplied_bounds.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Simplied_bounds.$O
 
 objs/sat/integer.$O: ortools/sat/integer.cc ortools/sat/integer.h \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/base/iterator_adaptors.h \
-  ortools/base/stl_util.h | $(OBJ_DIR)/sat
+ ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/base/iterator_adaptors.h ortools/base/stl_util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sinteger.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sinteger.$O
 
 objs/sat/integer_expr.$O: ortools/sat/integer_expr.cc \
-  ortools/sat/integer_expr.h ortools/base/int_type.h \
-  ortools/base/macros.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/sat/integer.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/linear_constraint.h \
-  ortools/sat/precedences.h ortools/base/stl_util.h | $(OBJ_DIR)/sat
+ ortools/sat/integer_expr.h ortools/base/int_type.h ortools/base/macros.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/linear_constraint.h ortools/sat/precedences.h \
+ ortools/base/stl_util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sinteger_expr.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sinteger_expr.$O
 
 objs/sat/integer_search.$O: ortools/sat/integer_search.cc \
-  ortools/sat/integer_search.h ortools/sat/integer.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/implied_bounds.h \
-  ortools/sat/linear_programming_constraint.h \
-  ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
-  ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/glop/rank_one_update.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
-  ortools/util/fp_utils.h ortools/glop/entering_variable.h \
-  ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
-  ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/lp_data/lp_data_utils.h \
-  ortools/lp_data/matrix_scaler.h ortools/sat/cuts.h \
-  ortools/sat/linear_constraint.h \
-  ortools/sat/linear_constraint_manager.h ortools/sat/integer_expr.h \
-  ortools/sat/precedences.h ortools/sat/util.h ortools/sat/probing.h \
-  ortools/sat/pseudo_costs.h ortools/sat/rins.h | $(OBJ_DIR)/sat
+ ortools/sat/integer_search.h ortools/sat/integer.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/cp_model_loader.h ortools/gen/ortools/sat/cp_model.pb.h \
+ ortools/sat/cp_model_utils.h ortools/sat/intervals.h \
+ ortools/sat/cp_constraints.h ortools/sat/integer_expr.h \
+ ortools/sat/linear_constraint.h ortools/sat/precedences.h \
+ ortools/sat/implied_bounds.h ortools/sat/linear_programming_constraint.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/status.h \
+ ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/sparse.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/glop/rank_one_update.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
+ ortools/util/fp_utils.h ortools/glop/entering_variable.h \
+ ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
+ ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/lp_data/lp_data_utils.h \
+ ortools/lp_data/matrix_scaler.h ortools/sat/cuts.h \
+ ortools/sat/linear_constraint_manager.h ortools/sat/util.h \
+ ortools/sat/probing.h ortools/sat/pseudo_costs.h ortools/sat/rins.h \
+ ortools/sat/synchronization.h ortools/base/stl_util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sinteger_search.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sinteger_search.$O
 
 objs/sat/intervals.$O: ortools/sat/intervals.cc ortools/sat/intervals.h \
-  ortools/base/int_type.h ortools/base/macros.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/sat/cp_constraints.h \
-  ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/integer_expr.h \
-  ortools/sat/linear_constraint.h ortools/sat/precedences.h \
-  ortools/util/sort.h | $(OBJ_DIR)/sat
+ ortools/base/int_type.h ortools/base/macros.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/sat/cp_constraints.h \
+ ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
+ ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/integer_expr.h ortools/sat/linear_constraint.h \
+ ortools/sat/precedences.h ortools/util/sort.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sintervals.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sintervals.$O
 
 objs/sat/linear_constraint.$O: ortools/sat/linear_constraint.cc \
-  ortools/sat/linear_constraint.h ortools/sat/integer.h \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/base/mathutil.h | $(OBJ_DIR)/sat
+ ortools/sat/linear_constraint.h ortools/sat/integer.h \
+ ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/base/mathutil.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Slinear_constraint.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Slinear_constraint.$O
 
 objs/sat/linear_constraint_manager.$O: \
-  ortools/sat/linear_constraint_manager.cc \
-  ortools/sat/linear_constraint_manager.h ortools/glop/revised_simplex.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/glop/basis_representation.h ortools/base/logging.h \
-  ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/base/basictypes.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/util/bitset.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
-  ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \
-  ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/glop/reduced_costs.h ortools/util/random_engine.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/running_stat.h \
-  ortools/sat/linear_constraint.h ortools/sat/integer.h \
-  ortools/base/map_util.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/sat/sat_solver.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/sat/sat_decision.h ortools/util/integer_pq.h \
-  ortools/util/rev.h ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
+ ortools/sat/linear_constraint_manager.cc \
+ ortools/sat/linear_constraint_manager.h ortools/glop/revised_simplex.h \
+ ortools/base/integral_types.h ortools/base/macros.h \
+ ortools/glop/basis_representation.h ortools/base/logging.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/status.h \
+ ortools/lp_data/lp_types.h ortools/base/basictypes.h \
+ ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
+ ortools/util/bitset.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/sparse.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/util/stats.h ortools/base/timer.h ortools/glop/rank_one_update.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
+ ortools/base/hash.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/linear_constraint.h ortools/sat/integer.h \
+ ortools/base/map_util.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/sat/sat_solver.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Slinear_constraint_manager.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Slinear_constraint_manager.$O
 
 objs/sat/linear_programming_constraint.$O: \
-  ortools/sat/linear_programming_constraint.cc \
-  ortools/sat/linear_programming_constraint.h ortools/base/int_type.h \
-  ortools/base/macros.h ortools/glop/revised_simplex.h \
-  ortools/base/integral_types.h ortools/glop/basis_representation.h \
-  ortools/base/logging.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/status.h ortools/lp_data/lp_types.h \
-  ortools/base/basictypes.h ortools/base/int_type_indexed_vector.h \
-  ortools/util/bitset.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
-  ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \
-  ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/glop/reduced_costs.h ortools/util/random_engine.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/running_stat.h \
-  ortools/lp_data/lp_data_utils.h ortools/lp_data/matrix_scaler.h \
-  ortools/sat/cuts.h ortools/sat/implied_bounds.h ortools/sat/integer.h \
-  ortools/base/map_util.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/sat/sat_solver.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/sat/sat_decision.h ortools/util/integer_pq.h \
-  ortools/util/rev.h ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/linear_constraint.h \
-  ortools/sat/linear_constraint_manager.h ortools/sat/integer_expr.h \
-  ortools/sat/precedences.h ortools/sat/util.h ortools/base/mathutil.h \
-  ortools/base/stl_util.h ortools/glop/preprocessor.h \
-  ortools/graph/strongly_connected_components.h | $(OBJ_DIR)/sat
+ ortools/sat/linear_programming_constraint.cc \
+ ortools/sat/linear_programming_constraint.h ortools/base/int_type.h \
+ ortools/base/macros.h ortools/glop/revised_simplex.h \
+ ortools/base/integral_types.h ortools/glop/basis_representation.h \
+ ortools/base/logging.h ortools/glop/lu_factorization.h \
+ ortools/glop/markowitz.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/base/basictypes.h ortools/base/int_type_indexed_vector.h \
+ ortools/util/bitset.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/sparse.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/util/stats.h ortools/base/timer.h ortools/glop/rank_one_update.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
+ ortools/base/hash.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/lp_data/lp_data_utils.h ortools/lp_data/matrix_scaler.h \
+ ortools/sat/cuts.h ortools/sat/implied_bounds.h ortools/sat/integer.h \
+ ortools/base/map_util.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/sat/sat_solver.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/linear_constraint.h ortools/sat/linear_constraint_manager.h \
+ ortools/sat/integer_expr.h ortools/sat/precedences.h ortools/sat/util.h \
+ ortools/base/mathutil.h ortools/base/stl_util.h \
+ ortools/glop/preprocessor.h \
+ ortools/graph/strongly_connected_components.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Slinear_programming_constraint.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Slinear_programming_constraint.$O
 
 objs/sat/linear_relaxation.$O: ortools/sat/linear_relaxation.cc \
-  ortools/sat/linear_relaxation.h ortools/sat/cp_model_loader.h \
-  ortools/base/int_type.h ortools/base/macros.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/map_util.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_utils.h \
-  ortools/util/sorted_interval_list.h ortools/sat/integer.h \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h ortools/sat/intervals.h \
-  ortools/sat/cp_constraints.h ortools/sat/integer_expr.h \
-  ortools/sat/linear_constraint.h ortools/sat/precedences.h \
-  ortools/sat/linear_programming_constraint.h \
-  ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
-  ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/glop/rank_one_update.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
-  ortools/util/fp_utils.h ortools/glop/entering_variable.h \
-  ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
-  ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/lp_data/lp_data_utils.h \
-  ortools/lp_data/matrix_scaler.h ortools/sat/cuts.h \
-  ortools/sat/implied_bounds.h ortools/sat/linear_constraint_manager.h \
-  ortools/sat/util.h ortools/base/iterator_adaptors.h \
-  ortools/base/stl_util.h | $(OBJ_DIR)/sat
+ ortools/sat/linear_relaxation.h ortools/sat/cp_model_loader.h \
+ ortools/base/int_type.h ortools/base/macros.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/map_util.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_utils.h \
+ ortools/util/sorted_interval_list.h ortools/sat/integer.h \
+ ortools/base/hash.h ortools/base/basictypes.h ortools/graph/iterators.h \
+ ortools/sat/model.h ortools/base/typeid.h ortools/sat/sat_base.h \
+ ortools/util/bitset.h ortools/sat/sat_solver.h ortools/base/timer.h \
+ ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/sat/intervals.h \
+ ortools/sat/cp_constraints.h ortools/sat/integer_expr.h \
+ ortools/sat/linear_constraint.h ortools/sat/precedences.h \
+ ortools/sat/linear_programming_constraint.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/status.h \
+ ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/sparse.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/glop/rank_one_update.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
+ ortools/util/fp_utils.h ortools/glop/entering_variable.h \
+ ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
+ ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/lp_data/lp_data_utils.h \
+ ortools/lp_data/matrix_scaler.h ortools/sat/cuts.h \
+ ortools/sat/implied_bounds.h ortools/sat/linear_constraint_manager.h \
+ ortools/sat/util.h ortools/base/iterator_adaptors.h \
+ ortools/base/stl_util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Slinear_relaxation.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Slinear_relaxation.$O
 
 objs/sat/lp_utils.$O: ortools/sat/lp_utils.cc ortools/sat/lp_utils.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/lp_data/lp_data.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \
-  ortools/util/bitset.h ortools/lp_data/sparse.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/fp_utils.h ortools/gen/ortools/sat/boolean_problem.pb.h \
-  ortools/gen/ortools/sat/cp_model.pb.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/sat_base.h ortools/sat/model.h ortools/base/map_util.h \
-  ortools/base/typeid.h ortools/sat/drat_writer.h ortools/base/file.h \
-  ortools/base/status.h ortools/util/random_engine.h \
-  ortools/util/stats.h ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/glop/lp_solver.h \
-  ortools/glop/preprocessor.h ortools/glop/revised_simplex.h \
-  ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/glop/status.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
-  ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/glop/reduced_costs.h ortools/glop/variable_values.h \
-  ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \
-  ortools/lp_data/matrix_scaler.h ortools/sat/boolean_problem.h \
-  ortools/algorithms/sparse_permutation.h ortools/sat/simplification.h \
-  ortools/base/adjustable_priority_queue.h ortools/sat/cp_model_utils.h \
-  ortools/util/sorted_interval_list.h ortools/sat/integer.h \
-  ortools/util/rev.h ortools/util/saturated_arithmetic.h | $(OBJ_DIR)/sat
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h ortools/lp_data/lp_data.h \
+ ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \
+ ortools/util/bitset.h ortools/lp_data/sparse.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/util/fp_utils.h ortools/gen/ortools/sat/boolean_problem.pb.h \
+ ortools/gen/ortools/sat/cp_model.pb.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/sat_base.h ortools/sat/model.h ortools/base/map_util.h \
+ ortools/base/typeid.h ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/util/random_engine.h ortools/util/stats.h \
+ ortools/util/time_limit.h ortools/base/commandlineflags.h \
+ ortools/util/running_stat.h ortools/sat/pb_constraint.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/glop/lp_solver.h \
+ ortools/glop/preprocessor.h ortools/glop/revised_simplex.h \
+ ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \
+ ortools/glop/markowitz.h ortools/glop/status.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/glop/variable_values.h \
+ ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \
+ ortools/lp_data/matrix_scaler.h ortools/sat/boolean_problem.h \
+ ortools/algorithms/sparse_permutation.h ortools/sat/simplification.h \
+ ortools/base/adjustable_priority_queue.h ortools/sat/cp_model_utils.h \
+ ortools/util/sorted_interval_list.h ortools/sat/integer.h \
+ ortools/util/rev.h ortools/util/saturated_arithmetic.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Slp_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Slp_utils.$O
 
 objs/sat/optimization.$O: ortools/sat/optimization.cc \
-  ortools/sat/optimization.h \
-  ortools/gen/ortools/sat/boolean_problem.pb.h ortools/sat/integer.h \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/integer_search.h \
-  ortools/base/cleanup.h ortools/base/stl_util.h \
-  ortools/linear_solver/linear_solver.h \
-  ortools/linear_solver/linear_expr.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/linear_solver/linear_solver_callback.h \
-  ortools/port/proto_utils.h ortools/base/random.h \
-  ortools/sat/boolean_problem.h ortools/algorithms/sparse_permutation.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/simplification.h \
-  ortools/base/adjustable_priority_queue.h ortools/sat/encoding.h \
-  ortools/sat/integer_expr.h ortools/sat/linear_constraint.h \
-  ortools/sat/precedences.h ortools/sat/util.h | $(OBJ_DIR)/sat
+ ortools/sat/optimization.h ortools/gen/ortools/sat/boolean_problem.pb.h \
+ ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/integer_search.h ortools/base/cleanup.h \
+ ortools/base/stl_util.h ortools/linear_solver/linear_solver.h \
+ ortools/linear_solver/linear_expr.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h \
+ ortools/linear_solver/linear_solver_callback.h \
+ ortools/port/proto_utils.h ortools/base/random.h \
+ ortools/sat/boolean_problem.h ortools/algorithms/sparse_permutation.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/simplification.h \
+ ortools/base/adjustable_priority_queue.h ortools/sat/encoding.h \
+ ortools/sat/integer_expr.h ortools/sat/linear_constraint.h \
+ ortools/sat/precedences.h ortools/sat/util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Soptimization.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Soptimization.$O
 
 objs/sat/pb_constraint.$O: ortools/sat/pb_constraint.cc \
-  ortools/sat/pb_constraint.h ortools/base/int_type.h \
-  ortools/base/macros.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
-  ortools/base/timer.h ortools/base/basictypes.h \
-  ortools/base/thorough_hash.h ortools/util/saturated_arithmetic.h | $(OBJ_DIR)/sat
+ ortools/sat/pb_constraint.h ortools/base/int_type.h \
+ ortools/base/macros.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/integral_types.h ortools/base/logging.h ortools/sat/model.h \
+ ortools/base/map_util.h ortools/base/typeid.h ortools/sat/sat_base.h \
+ ortools/util/bitset.h ortools/gen/ortools/sat/sat_parameters.pb.h \
+ ortools/util/stats.h ortools/base/timer.h ortools/base/basictypes.h \
+ ortools/base/thorough_hash.h ortools/util/saturated_arithmetic.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Spb_constraint.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Spb_constraint.$O
 
 objs/sat/precedences.$O: ortools/sat/precedences.cc \
-  ortools/sat/precedences.h ortools/base/int_type.h \
-  ortools/base/macros.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/integral_types.h ortools/sat/integer.h \
-  ortools/base/hash.h ortools/base/basictypes.h ortools/base/logging.h \
-  ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/base/cleanup.h \
-  ortools/base/stl_util.h ortools/sat/cp_constraints.h | $(OBJ_DIR)/sat
+ ortools/sat/precedences.h ortools/base/int_type.h ortools/base/macros.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/integral_types.h \
+ ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/logging.h ortools/base/map_util.h ortools/graph/iterators.h \
+ ortools/sat/model.h ortools/base/typeid.h ortools/sat/sat_base.h \
+ ortools/util/bitset.h ortools/sat/sat_solver.h ortools/base/timer.h \
+ ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/base/cleanup.h ortools/base/stl_util.h \
+ ortools/sat/cp_constraints.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sprecedences.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sprecedences.$O
 
 objs/sat/presolve_context.$O: ortools/sat/presolve_context.cc \
-  ortools/sat/presolve_context.h ortools/gen/ortools/sat/cp_model.pb.h \
-  ortools/sat/cp_model_utils.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/util/sorted_interval_list.h ortools/sat/presolve_util.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/util/bitset.h ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/affine_relation.h ortools/base/iterator_adaptors.h \
-  ortools/util/time_limit.h ortools/base/commandlineflags.h \
-  ortools/base/timer.h ortools/base/basictypes.h \
-  ortools/util/running_stat.h ortools/base/map_util.h \
-  ortools/base/mathutil.h ortools/port/proto_utils.h | $(OBJ_DIR)/sat
+ ortools/sat/presolve_context.h ortools/gen/ortools/sat/cp_model.pb.h \
+ ortools/sat/cp_model_utils.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/util/sorted_interval_list.h ortools/sat/presolve_util.h \
+ ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
+ ortools/util/bitset.h ortools/gen/ortools/sat/sat_parameters.pb.h \
+ ortools/util/affine_relation.h ortools/base/iterator_adaptors.h \
+ ortools/util/time_limit.h ortools/base/commandlineflags.h \
+ ortools/base/timer.h ortools/base/basictypes.h \
+ ortools/util/running_stat.h ortools/base/map_util.h \
+ ortools/base/mathutil.h ortools/port/proto_utils.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Spresolve_context.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Spresolve_context.$O
 
 objs/sat/presolve_util.$O: ortools/sat/presolve_util.cc \
-  ortools/sat/presolve_util.h ortools/base/int_type.h \
-  ortools/base/macros.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_utils.h \
-  ortools/util/sorted_interval_list.h ortools/util/bitset.h \
-  ortools/base/map_util.h | $(OBJ_DIR)/sat
+ ortools/sat/presolve_util.h ortools/base/int_type.h \
+ ortools/base/macros.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_utils.h \
+ ortools/util/sorted_interval_list.h ortools/util/bitset.h \
+ ortools/base/map_util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Spresolve_util.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Spresolve_util.$O
 
 objs/sat/probing.$O: ortools/sat/probing.cc ortools/sat/probing.h \
-  ortools/sat/model.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/base/map_util.h ortools/base/typeid.h ortools/sat/sat_base.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/util/bitset.h ortools/base/timer.h ortools/base/basictypes.h \
-  ortools/sat/clause.h ortools/base/hash.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/implied_bounds.h ortools/sat/integer.h \
-  ortools/graph/iterators.h ortools/sat/sat_solver.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
+ ortools/sat/model.h ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/base/iterator_adaptors.h ortools/base/timer.h \
+ ortools/base/basictypes.h ortools/sat/clause.h ortools/base/hash.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/implied_bounds.h ortools/sat/integer.h \
+ ortools/graph/iterators.h ortools/sat/sat_solver.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sprobing.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sprobing.$O
 
 objs/sat/pseudo_costs.$O: ortools/sat/pseudo_costs.cc \
-  ortools/sat/pseudo_costs.h ortools/sat/integer.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/util.h | $(OBJ_DIR)/sat
+ ortools/sat/pseudo_costs.h ortools/sat/integer.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Spseudo_costs.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Spseudo_costs.$O
 
 objs/sat/restart.$O: ortools/sat/restart.cc ortools/sat/restart.h \
-  ortools/sat/model.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/bitset.h \
-  ortools/util/running_stat.h ortools/port/proto_utils.h | $(OBJ_DIR)/sat
+ ortools/sat/model.h ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/bitset.h \
+ ortools/util/running_stat.h ortools/port/proto_utils.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Srestart.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Srestart.$O
 
 objs/sat/rins.$O: ortools/sat/rins.cc ortools/sat/rins.h \
-  ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h \
-  ortools/sat/linear_programming_constraint.h \
-  ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
-  ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/glop/rank_one_update.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
-  ortools/util/fp_utils.h ortools/glop/entering_variable.h \
-  ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
-  ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/lp_data/lp_data_utils.h \
-  ortools/lp_data/matrix_scaler.h ortools/sat/cuts.h \
-  ortools/sat/implied_bounds.h ortools/sat/linear_constraint.h \
-  ortools/sat/linear_constraint_manager.h ortools/sat/integer_expr.h \
-  ortools/sat/precedences.h ortools/sat/util.h \
-  ortools/sat/cp_model_loader.h ortools/gen/ortools/sat/cp_model.pb.h \
-  ortools/sat/cp_model_utils.h ortools/sat/intervals.h \
-  ortools/sat/cp_constraints.h | $(OBJ_DIR)/sat
+ ortools/sat/integer.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/linear_programming_constraint.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/status.h \
+ ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/sparse.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/glop/rank_one_update.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
+ ortools/util/fp_utils.h ortools/glop/entering_variable.h \
+ ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
+ ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/lp_data/lp_data_utils.h \
+ ortools/lp_data/matrix_scaler.h ortools/sat/cuts.h \
+ ortools/sat/implied_bounds.h ortools/sat/linear_constraint.h \
+ ortools/sat/linear_constraint_manager.h ortools/sat/integer_expr.h \
+ ortools/sat/precedences.h ortools/sat/util.h \
+ ortools/sat/cp_model_loader.h ortools/gen/ortools/sat/cp_model.pb.h \
+ ortools/sat/cp_model_utils.h ortools/sat/intervals.h \
+ ortools/sat/cp_constraints.h ortools/sat/synchronization.h \
+ ortools/base/stl_util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Srins.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Srins.$O
 
 objs/sat/sat_decision.$O: ortools/sat/sat_decision.cc \
-  ortools/sat/sat_decision.h ortools/base/integral_types.h \
-  ortools/sat/model.h ortools/base/logging.h ortools/base/macros.h \
-  ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/sat/pb_constraint.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/sat/sat_base.h \
-  ortools/util/bitset.h ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/stats.h ortools/base/timer.h ortools/base/basictypes.h \
-  ortools/util/integer_pq.h ortools/util/random_engine.h \
-  ortools/sat/util.h | $(OBJ_DIR)/sat
+ ortools/sat/sat_decision.h ortools/base/integral_types.h \
+ ortools/sat/model.h ortools/base/logging.h ortools/base/macros.h \
+ ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/sat/pb_constraint.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/sat/sat_base.h \
+ ortools/util/bitset.h ortools/gen/ortools/sat/sat_parameters.pb.h \
+ ortools/util/stats.h ortools/base/timer.h ortools/base/basictypes.h \
+ ortools/util/integer_pq.h ortools/util/random_engine.h \
+ ortools/sat/util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Ssat_decision.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssat_decision.$O
 
+objs/sat/sat_inprocessing.$O: ortools/sat/sat_inprocessing.cc \
+ ortools/sat/sat_inprocessing.h ortools/sat/clause.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/sat_base.h ortools/sat/model.h \
+ ortools/base/map_util.h ortools/base/typeid.h ortools/util/bitset.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/base/timer.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/sat_solver.h ortools/sat/pb_constraint.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/sat/probing.h | $(OBJ_DIR)/sat
+	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Ssat_inprocessing.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssat_inprocessing.$O
+
 objs/sat/sat_solver.$O: ortools/sat/sat_solver.cc ortools/sat/sat_solver.h \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/timer.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/sat_base.h ortools/sat/model.h \
-  ortools/base/map_util.h ortools/base/typeid.h ortools/util/bitset.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/base/stl_util.h \
-  ortools/port/proto_utils.h ortools/port/sysinfo.h ortools/sat/util.h \
-  ortools/util/saturated_arithmetic.h | $(OBJ_DIR)/sat
+ ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/timer.h \
+ ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/sat_base.h ortools/sat/model.h \
+ ortools/base/map_util.h ortools/base/typeid.h ortools/util/bitset.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h \
+ ortools/base/stl_util.h ortools/port/proto_utils.h \
+ ortools/port/sysinfo.h ortools/sat/util.h \
+ ortools/util/saturated_arithmetic.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Ssat_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssat_solver.$O
 
 objs/sat/simplification.$O: ortools/sat/simplification.cc \
-  ortools/sat/simplification.h ortools/base/adjustable_priority_queue.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/sat_base.h ortools/sat/model.h ortools/base/map_util.h \
-  ortools/base/typeid.h ortools/util/bitset.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/sat_solver.h \
-  ortools/base/hash.h ortools/base/timer.h ortools/sat/clause.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/algorithms/dynamic_partition.h \
-  ortools/base/adjustable_priority_queue-inl.h ortools/base/random.h \
-  ortools/base/stl_util.h ortools/graph/strongly_connected_components.h \
-  ortools/sat/util.h | $(OBJ_DIR)/sat
+ ortools/sat/simplification.h ortools/base/adjustable_priority_queue.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/sat_base.h ortools/sat/model.h \
+ ortools/base/map_util.h ortools/base/typeid.h ortools/util/bitset.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/sat_solver.h \
+ ortools/base/hash.h ortools/base/timer.h ortools/sat/clause.h \
+ ortools/util/random_engine.h ortools/util/stats.h \
+ ortools/util/time_limit.h ortools/base/commandlineflags.h \
+ ortools/util/running_stat.h ortools/sat/pb_constraint.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/algorithms/dynamic_partition.h \
+ ortools/base/adjustable_priority_queue-inl.h ortools/base/random.h \
+ ortools/base/stl_util.h ortools/graph/strongly_connected_components.h \
+ ortools/sat/probing.h ortools/sat/sat_inprocessing.h ortools/sat/util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Ssimplification.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssimplification.$O
 
 objs/sat/subsolver.$O: ortools/sat/subsolver.cc ortools/sat/subsolver.h \
-  ortools/base/integral_types.h ortools/base/threadpool.h \
-  ortools/base/logging.h ortools/base/macros.h | $(OBJ_DIR)/sat
+ ortools/base/integral_types.h ortools/base/threadpool.h \
+ ortools/base/logging.h ortools/base/macros.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Ssubsolver.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssubsolver.$O
 
 objs/sat/symmetry.$O: ortools/sat/symmetry.cc ortools/sat/symmetry.h \
-  ortools/algorithms/sparse_permutation.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/int_type.h \
-  ortools/sat/sat_base.h ortools/sat/model.h ortools/base/map_util.h \
-  ortools/base/typeid.h ortools/util/bitset.h ortools/util/stats.h \
-  ortools/base/timer.h ortools/base/basictypes.h | $(OBJ_DIR)/sat
+ ortools/algorithms/sparse_permutation.h ortools/base/logging.h \
+ ortools/base/integral_types.h ortools/base/macros.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/int_type.h \
+ ortools/sat/sat_base.h ortools/sat/model.h ortools/base/map_util.h \
+ ortools/base/typeid.h ortools/util/bitset.h ortools/util/stats.h \
+ ortools/base/timer.h ortools/base/basictypes.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Ssymmetry.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssymmetry.$O
 
 objs/sat/synchronization.$O: ortools/sat/synchronization.cc \
-  ortools/sat/synchronization.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/integer.h \
-  ortools/base/hash.h ortools/base/basictypes.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/cp_model_loader.h \
-  ortools/sat/cp_model_utils.h ortools/sat/intervals.h \
-  ortools/sat/cp_constraints.h ortools/sat/integer_expr.h \
-  ortools/sat/linear_constraint.h ortools/sat/precedences.h \
-  ortools/base/stl_util.h ortools/sat/cp_model_search.h \
-  ortools/sat/integer_search.h | $(OBJ_DIR)/sat
+ ortools/sat/synchronization.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/stl_util.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/integer.h \
+ ortools/base/hash.h ortools/base/basictypes.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/cp_model_loader.h ortools/sat/cp_model_utils.h \
+ ortools/sat/intervals.h ortools/sat/cp_constraints.h \
+ ortools/sat/integer_expr.h ortools/sat/linear_constraint.h \
+ ortools/sat/precedences.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Ssynchronization.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Ssynchronization.$O
 
 objs/sat/table.$O: ortools/sat/table.cc ortools/sat/table.h \
-  ortools/base/integral_types.h ortools/sat/integer.h \
-  ortools/base/hash.h ortools/base/basictypes.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/base/stl_util.h \
-  ortools/sat/util.h | $(OBJ_DIR)/sat
+ ortools/base/integral_types.h ortools/sat/integer.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/logging.h ortools/base/macros.h \
+ ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
+ ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/base/stl_util.h ortools/sat/util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Stable.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Stable.$O
 
 objs/sat/theta_tree.$O: ortools/sat/theta_tree.cc ortools/sat/theta_tree.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/sat/integer.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/sat/integer.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Stheta_tree.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Stheta_tree.$O
 
 objs/sat/timetable.$O: ortools/sat/timetable.cc ortools/sat/timetable.h \
-  ortools/base/macros.h ortools/sat/integer.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
-  ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
-  ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/intervals.h \
-  ortools/sat/cp_constraints.h ortools/sat/integer_expr.h \
-  ortools/sat/linear_constraint.h ortools/sat/precedences.h \
-  ortools/util/sort.h | $(OBJ_DIR)/sat
+ ortools/base/macros.h ortools/sat/integer.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/map_util.h \
+ ortools/graph/iterators.h ortools/sat/model.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h ortools/sat/sat_solver.h \
+ ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/intervals.h ortools/sat/cp_constraints.h \
+ ortools/sat/integer_expr.h ortools/sat/linear_constraint.h \
+ ortools/sat/precedences.h ortools/util/sort.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Stimetable.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Stimetable.$O
 
 objs/sat/timetable_edgefinding.$O: ortools/sat/timetable_edgefinding.cc \
-  ortools/sat/timetable_edgefinding.h ortools/base/int_type.h \
-  ortools/base/macros.h ortools/sat/integer.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/intervals.h \
-  ortools/sat/cp_constraints.h ortools/sat/integer_expr.h \
-  ortools/sat/linear_constraint.h ortools/sat/precedences.h \
-  ortools/base/iterator_adaptors.h ortools/util/sort.h | $(OBJ_DIR)/sat
+ ortools/sat/timetable_edgefinding.h ortools/base/int_type.h \
+ ortools/base/macros.h ortools/sat/integer.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/map_util.h ortools/graph/iterators.h ortools/sat/model.h \
+ ortools/base/typeid.h ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/sat/sat_solver.h ortools/base/timer.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/util/stats.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/intervals.h ortools/sat/cp_constraints.h \
+ ortools/sat/integer_expr.h ortools/sat/linear_constraint.h \
+ ortools/sat/precedences.h ortools/base/iterator_adaptors.h \
+ ortools/util/sort.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Stimetable_edgefinding.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Stimetable_edgefinding.$O
 
 objs/sat/util.$O: ortools/sat/util.cc ortools/sat/util.h \
-  ortools/sat/model.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/base/map_util.h ortools/base/typeid.h ortools/sat/sat_base.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/util/bitset.h ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/random_engine.h ortools/base/stl_util.h | $(OBJ_DIR)/sat
+ ortools/sat/model.h ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/random_engine.h \
+ ortools/base/stl_util.h | $(OBJ_DIR)/sat
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Ssat$Sutil.cc $(OBJ_OUT)$(OBJ_DIR)$Ssat$Sutil.$O
 
 ortools/sat/boolean_problem.proto: ;
@@ -2485,328 +2441,327 @@ BOP_LIB_OBJS = \
  $(OBJ_DIR)/bop/bop_parameters.pb.$O
 
 objs/bop/bop_base.$O: ortools/bop/bop_base.cc ortools/bop/bop_base.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/gen/ortools/bop/bop_parameters.pb.h ortools/bop/bop_solution.h \
-  ortools/bop/bop_types.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/sat/boolean_problem.h \
-  ortools/algorithms/sparse_permutation.h ortools/base/status.h \
-  ortools/gen/ortools/sat/boolean_problem.pb.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
-  ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
-  ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/util/random_engine.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/sat/simplification.h \
-  ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h | $(OBJ_DIR)/bop
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/gen/ortools/bop/bop_parameters.pb.h ortools/bop/bop_solution.h \
+ ortools/bop/bop_types.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/sat/boolean_problem.h \
+ ortools/algorithms/sparse_permutation.h \
+ ortools/gen/ortools/sat/boolean_problem.pb.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
+ ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
+ ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/util/random_engine.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/sat/simplification.h \
+ ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h | $(OBJ_DIR)/bop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_base.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_base.$O
 
 objs/bop/bop_fs.$O: ortools/bop/bop_fs.cc ortools/bop/bop_fs.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/random.h \
-  ortools/bop/bop_base.h ortools/gen/ortools/bop/bop_parameters.pb.h \
-  ortools/bop/bop_solution.h ortools/bop/bop_types.h \
-  ortools/sat/boolean_problem.h ortools/algorithms/sparse_permutation.h \
-  ortools/base/status.h ortools/gen/ortools/sat/boolean_problem.pb.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
-  ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
-  ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/util/random_engine.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/sat/simplification.h \
-  ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h \
-  ortools/bop/bop_util.h ortools/glop/lp_solver.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/glop/preprocessor.h \
-  ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
-  ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
-  ortools/glop/status.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
-  ortools/lp_data/lp_data.h ortools/util/fp_utils.h \
-  ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/glop/reduced_costs.h ortools/glop/variable_values.h \
-  ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \
-  ortools/lp_data/matrix_scaler.h ortools/base/stl_util.h \
-  ortools/sat/lp_utils.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h ortools/sat/symmetry.h \
-  ortools/sat/util.h | $(OBJ_DIR)/bop
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/random.h \
+ ortools/bop/bop_base.h ortools/gen/ortools/bop/bop_parameters.pb.h \
+ ortools/bop/bop_solution.h ortools/bop/bop_types.h \
+ ortools/sat/boolean_problem.h ortools/algorithms/sparse_permutation.h \
+ ortools/gen/ortools/sat/boolean_problem.pb.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
+ ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
+ ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/util/random_engine.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/sat/simplification.h \
+ ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h \
+ ortools/bop/bop_util.h ortools/glop/lp_solver.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/preprocessor.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/glop/status.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/sparse.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
+ ortools/lp_data/lp_data.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/glop/variable_values.h \
+ ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \
+ ortools/lp_data/matrix_scaler.h ortools/base/stl_util.h \
+ ortools/sat/lp_utils.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h ortools/sat/symmetry.h \
+ ortools/sat/util.h | $(OBJ_DIR)/bop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_fs.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_fs.$O
 
 objs/bop/bop_lns.$O: ortools/bop/bop_lns.cc ortools/bop/bop_lns.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/random.h \
-  ortools/bop/bop_base.h ortools/gen/ortools/bop/bop_parameters.pb.h \
-  ortools/bop/bop_solution.h ortools/bop/bop_types.h \
-  ortools/sat/boolean_problem.h ortools/algorithms/sparse_permutation.h \
-  ortools/base/status.h ortools/gen/ortools/sat/boolean_problem.pb.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
-  ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
-  ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/util/random_engine.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/sat/simplification.h \
-  ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h \
-  ortools/bop/bop_util.h ortools/glop/lp_solver.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/glop/preprocessor.h \
-  ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
-  ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
-  ortools/glop/status.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
-  ortools/lp_data/lp_data.h ortools/util/fp_utils.h \
-  ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/glop/reduced_costs.h ortools/glop/variable_values.h \
-  ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \
-  ortools/lp_data/matrix_scaler.h ortools/base/cleanup.h \
-  ortools/base/stl_util.h ortools/sat/lp_utils.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h | $(OBJ_DIR)/bop
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/random.h \
+ ortools/bop/bop_base.h ortools/gen/ortools/bop/bop_parameters.pb.h \
+ ortools/bop/bop_solution.h ortools/bop/bop_types.h \
+ ortools/sat/boolean_problem.h ortools/algorithms/sparse_permutation.h \
+ ortools/gen/ortools/sat/boolean_problem.pb.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
+ ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
+ ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/util/random_engine.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/sat/simplification.h \
+ ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h \
+ ortools/bop/bop_util.h ortools/glop/lp_solver.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/preprocessor.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/glop/status.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/sparse.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
+ ortools/lp_data/lp_data.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/glop/variable_values.h \
+ ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \
+ ortools/lp_data/matrix_scaler.h ortools/base/cleanup.h \
+ ortools/base/stl_util.h ortools/sat/lp_utils.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h | $(OBJ_DIR)/bop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_lns.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_lns.$O
 
 objs/bop/bop_ls.$O: ortools/bop/bop_ls.cc ortools/bop/bop_ls.h \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/random.h ortools/bop/bop_base.h \
-  ortools/gen/ortools/bop/bop_parameters.pb.h ortools/bop/bop_solution.h \
-  ortools/bop/bop_types.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/sat/boolean_problem.h \
-  ortools/algorithms/sparse_permutation.h ortools/base/status.h \
-  ortools/gen/ortools/sat/boolean_problem.pb.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
-  ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
-  ortools/base/timer.h ortools/sat/sat_solver.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h \
-  ortools/util/random_engine.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/sat/simplification.h \
-  ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h \
-  ortools/bop/bop_util.h | $(OBJ_DIR)/bop
+ ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/random.h ortools/bop/bop_base.h \
+ ortools/gen/ortools/bop/bop_parameters.pb.h ortools/bop/bop_solution.h \
+ ortools/bop/bop_types.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/sat/boolean_problem.h \
+ ortools/algorithms/sparse_permutation.h \
+ ortools/gen/ortools/sat/boolean_problem.pb.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
+ ortools/base/timer.h ortools/sat/sat_solver.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/util/random_engine.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/sat/simplification.h \
+ ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h \
+ ortools/bop/bop_util.h | $(OBJ_DIR)/bop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_ls.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_ls.$O
 
 objs/bop/bop_portfolio.$O: ortools/bop/bop_portfolio.cc \
-  ortools/bop/bop_portfolio.h ortools/bop/bop_base.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/gen/ortools/bop/bop_parameters.pb.h ortools/bop/bop_solution.h \
-  ortools/bop/bop_types.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/sat/boolean_problem.h \
-  ortools/algorithms/sparse_permutation.h ortools/base/status.h \
-  ortools/gen/ortools/sat/boolean_problem.pb.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
-  ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
-  ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/util/random_engine.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/sat/simplification.h \
-  ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h \
-  ortools/bop/bop_lns.h ortools/base/random.h ortools/bop/bop_util.h \
-  ortools/glop/lp_solver.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/preprocessor.h ortools/glop/revised_simplex.h \
-  ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/glop/status.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/glop/rank_one_update.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
-  ortools/util/fp_utils.h ortools/glop/entering_variable.h \
-  ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
-  ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/lp_data/matrix_scaler.h \
-  ortools/base/stl_util.h ortools/bop/bop_fs.h ortools/bop/bop_ls.h \
-  ortools/bop/complete_optimizer.h ortools/sat/encoding.h \
-  ortools/sat/symmetry.h | $(OBJ_DIR)/bop
+ ortools/bop/bop_portfolio.h ortools/bop/bop_base.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/gen/ortools/bop/bop_parameters.pb.h ortools/bop/bop_solution.h \
+ ortools/bop/bop_types.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/sat/boolean_problem.h \
+ ortools/algorithms/sparse_permutation.h \
+ ortools/gen/ortools/sat/boolean_problem.pb.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
+ ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
+ ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/util/random_engine.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/sat/simplification.h \
+ ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h \
+ ortools/bop/bop_lns.h ortools/base/random.h ortools/bop/bop_util.h \
+ ortools/glop/lp_solver.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/glop/preprocessor.h ortools/glop/revised_simplex.h \
+ ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \
+ ortools/glop/markowitz.h ortools/glop/status.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/glop/rank_one_update.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
+ ortools/util/fp_utils.h ortools/glop/entering_variable.h \
+ ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
+ ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/lp_data/matrix_scaler.h \
+ ortools/base/stl_util.h ortools/bop/bop_fs.h ortools/bop/bop_ls.h \
+ ortools/bop/complete_optimizer.h ortools/sat/encoding.h \
+ ortools/sat/symmetry.h | $(OBJ_DIR)/bop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_portfolio.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_portfolio.$O
 
 objs/bop/bop_solution.$O: ortools/bop/bop_solution.cc \
-  ortools/bop/bop_solution.h ortools/bop/bop_types.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/sat/boolean_problem.h \
-  ortools/algorithms/sparse_permutation.h ortools/base/status.h \
-  ortools/gen/ortools/sat/boolean_problem.pb.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
-  ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
-  ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/util/random_engine.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/sat/simplification.h \
-  ortools/base/adjustable_priority_queue.h | $(OBJ_DIR)/bop
+ ortools/bop/bop_solution.h ortools/bop/bop_types.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/sat/boolean_problem.h \
+ ortools/algorithms/sparse_permutation.h \
+ ortools/gen/ortools/sat/boolean_problem.pb.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
+ ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
+ ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/util/random_engine.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/sat/simplification.h \
+ ortools/base/adjustable_priority_queue.h | $(OBJ_DIR)/bop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_solution.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_solution.$O
 
 objs/bop/bop_solver.$O: ortools/bop/bop_solver.cc ortools/bop/bop_solver.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/bop/bop_base.h \
-  ortools/gen/ortools/bop/bop_parameters.pb.h ortools/bop/bop_solution.h \
-  ortools/bop/bop_types.h ortools/sat/boolean_problem.h \
-  ortools/algorithms/sparse_permutation.h ortools/base/status.h \
-  ortools/gen/ortools/sat/boolean_problem.pb.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
-  ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
-  ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/util/random_engine.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/sat/simplification.h \
-  ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h \
-  ortools/glop/lp_solver.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/preprocessor.h ortools/glop/revised_simplex.h \
-  ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/glop/status.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/glop/rank_one_update.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
-  ortools/util/fp_utils.h ortools/glop/entering_variable.h \
-  ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
-  ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/lp_data/matrix_scaler.h \
-  ortools/base/stl_util.h ortools/bop/bop_fs.h ortools/base/random.h \
-  ortools/bop/bop_util.h ortools/bop/bop_lns.h ortools/bop/bop_ls.h \
-  ortools/bop/bop_portfolio.h ortools/bop/complete_optimizer.h \
-  ortools/sat/encoding.h ortools/sat/lp_utils.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h | $(OBJ_DIR)/bop
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/bop/bop_base.h \
+ ortools/gen/ortools/bop/bop_parameters.pb.h ortools/bop/bop_solution.h \
+ ortools/bop/bop_types.h ortools/sat/boolean_problem.h \
+ ortools/algorithms/sparse_permutation.h \
+ ortools/gen/ortools/sat/boolean_problem.pb.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
+ ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
+ ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/util/random_engine.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/sat/simplification.h \
+ ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h \
+ ortools/glop/lp_solver.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/glop/preprocessor.h ortools/glop/revised_simplex.h \
+ ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \
+ ortools/glop/markowitz.h ortools/glop/status.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/glop/rank_one_update.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
+ ortools/util/fp_utils.h ortools/glop/entering_variable.h \
+ ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
+ ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/lp_data/matrix_scaler.h \
+ ortools/base/stl_util.h ortools/bop/bop_fs.h ortools/base/random.h \
+ ortools/bop/bop_util.h ortools/bop/bop_lns.h ortools/bop/bop_ls.h \
+ ortools/bop/bop_portfolio.h ortools/bop/complete_optimizer.h \
+ ortools/sat/encoding.h ortools/sat/lp_utils.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h | $(OBJ_DIR)/bop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_solver.$O
 
 objs/bop/bop_util.$O: ortools/bop/bop_util.cc ortools/bop/bop_util.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/bop/bop_base.h \
-  ortools/gen/ortools/bop/bop_parameters.pb.h ortools/bop/bop_solution.h \
-  ortools/bop/bop_types.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/sat/boolean_problem.h \
-  ortools/algorithms/sparse_permutation.h ortools/base/status.h \
-  ortools/gen/ortools/sat/boolean_problem.pb.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
-  ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
-  ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/util/random_engine.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/sat/simplification.h \
-  ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h | $(OBJ_DIR)/bop
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/bop/bop_base.h \
+ ortools/gen/ortools/bop/bop_parameters.pb.h ortools/bop/bop_solution.h \
+ ortools/bop/bop_types.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/sat/boolean_problem.h \
+ ortools/algorithms/sparse_permutation.h \
+ ortools/gen/ortools/sat/boolean_problem.pb.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
+ ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
+ ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/util/random_engine.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/sat/simplification.h \
+ ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h | $(OBJ_DIR)/bop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sbop_util.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sbop_util.$O
 
 objs/bop/complete_optimizer.$O: ortools/bop/complete_optimizer.cc \
-  ortools/bop/complete_optimizer.h ortools/bop/bop_base.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/gen/ortools/bop/bop_parameters.pb.h ortools/bop/bop_solution.h \
-  ortools/bop/bop_types.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/sat/boolean_problem.h \
-  ortools/algorithms/sparse_permutation.h ortools/base/status.h \
-  ortools/gen/ortools/sat/boolean_problem.pb.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
-  ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/util/bitset.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
-  ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/util/random_engine.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/sat/simplification.h \
-  ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h \
-  ortools/sat/encoding.h ortools/bop/bop_util.h \
-  ortools/sat/optimization.h ortools/sat/integer.h \
-  ortools/graph/iterators.h ortools/util/rev.h \
-  ortools/util/saturated_arithmetic.h \
-  ortools/util/sorted_interval_list.h ortools/sat/integer_search.h | $(OBJ_DIR)/bop
+ ortools/bop/complete_optimizer.h ortools/bop/bop_base.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/gen/ortools/bop/bop_parameters.pb.h ortools/bop/bop_solution.h \
+ ortools/bop/bop_types.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/sat/boolean_problem.h \
+ ortools/algorithms/sparse_permutation.h \
+ ortools/gen/ortools/sat/boolean_problem.pb.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/util/bitset.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/util/stats.h \
+ ortools/base/timer.h ortools/sat/sat_solver.h ortools/base/hash.h \
+ ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/util/random_engine.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/sat/simplification.h \
+ ortools/base/adjustable_priority_queue.h ortools/lp_data/lp_types.h \
+ ortools/sat/encoding.h ortools/bop/bop_util.h ortools/sat/optimization.h \
+ ortools/sat/integer.h ortools/graph/iterators.h ortools/util/rev.h \
+ ortools/util/saturated_arithmetic.h ortools/util/sorted_interval_list.h \
+ ortools/sat/integer_search.h | $(OBJ_DIR)/bop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Scomplete_optimizer.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Scomplete_optimizer.$O
 
 objs/bop/integral_solver.$O: ortools/bop/integral_solver.cc \
-  ortools/bop/integral_solver.h \
-  ortools/gen/ortools/bop/bop_parameters.pb.h ortools/bop/bop_types.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/lp_data/lp_data.h \
-  ortools/base/hash.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/lp_data/lp_types.h ortools/util/bitset.h \
-  ortools/lp_data/sparse.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/util/fp_utils.h \
-  ortools/util/time_limit.h ortools/base/commandlineflags.h \
-  ortools/base/timer.h ortools/util/running_stat.h \
-  ortools/bop/bop_solver.h ortools/bop/bop_base.h \
-  ortools/bop/bop_solution.h ortools/sat/boolean_problem.h \
-  ortools/algorithms/sparse_permutation.h ortools/base/status.h \
-  ortools/gen/ortools/sat/boolean_problem.pb.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
-  ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/sat/sat_base.h ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/util/stats.h ortools/sat/sat_solver.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/drat_writer.h ortools/base/file.h \
-  ortools/util/random_engine.h ortools/sat/restart.h \
-  ortools/sat/sat_decision.h ortools/util/integer_pq.h \
-  ortools/sat/simplification.h ortools/base/adjustable_priority_queue.h \
-  ortools/glop/lp_solver.h ortools/glop/preprocessor.h \
-  ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
-  ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
-  ortools/glop/status.h ortools/glop/rank_one_update.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/glop/dual_edge_norms.h ortools/glop/entering_variable.h \
-  ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
-  ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/lp_data/matrix_scaler.h \
-  ortools/lp_data/lp_decomposer.h | $(OBJ_DIR)/bop
+ ortools/bop/integral_solver.h \
+ ortools/gen/ortools/bop/bop_parameters.pb.h ortools/bop/bop_types.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/lp_data/lp_data.h \
+ ortools/base/hash.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/lp_data/lp_types.h ortools/util/bitset.h \
+ ortools/lp_data/sparse.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/fp_utils.h \
+ ortools/util/time_limit.h ortools/base/commandlineflags.h \
+ ortools/base/timer.h ortools/util/running_stat.h \
+ ortools/bop/bop_solver.h ortools/bop/bop_base.h \
+ ortools/bop/bop_solution.h ortools/sat/boolean_problem.h \
+ ortools/algorithms/sparse_permutation.h \
+ ortools/gen/ortools/sat/boolean_problem.pb.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/sat/sat_base.h ortools/gen/ortools/sat/sat_parameters.pb.h \
+ ortools/util/stats.h ortools/sat/sat_solver.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/util/random_engine.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h \
+ ortools/sat/simplification.h ortools/base/adjustable_priority_queue.h \
+ ortools/glop/lp_solver.h ortools/glop/preprocessor.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/glop/status.h ortools/glop/rank_one_update.h \
+ ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
+ ortools/glop/dual_edge_norms.h ortools/glop/entering_variable.h \
+ ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
+ ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/lp_data/matrix_scaler.h \
+ ortools/lp_data/lp_decomposer.h | $(OBJ_DIR)/bop
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sbop$Sintegral_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Sbop$Sintegral_solver.$O
 
 ortools/bop/bop_parameters.proto: ;
@@ -2828,8 +2783,8 @@ LP_DEPS = \
  $(SRC_DIR)/ortools/linear_solver/gurobi_environment.h \
  $(SRC_DIR)/ortools/linear_solver/gurobi_proto_solver.h \
  $(SRC_DIR)/ortools/linear_solver/linear_expr.h \
- $(SRC_DIR)/ortools/linear_solver/linear_solver.h \
  $(SRC_DIR)/ortools/linear_solver/linear_solver_callback.h \
+ $(SRC_DIR)/ortools/linear_solver/linear_solver.h \
  $(SRC_DIR)/ortools/linear_solver/model_exporter.h \
  $(SRC_DIR)/ortools/linear_solver/model_exporter_swig_helper.h \
  $(SRC_DIR)/ortools/linear_solver/model_validator.h \
@@ -2864,301 +2819,291 @@ LP_LIB_OBJS = \
  $(OBJ_DIR)/linear_solver/linear_solver.pb.$O
 
 objs/linear_solver/bop_interface.$O: \
-  ortools/linear_solver/bop_interface.cc ortools/base/commandlineflags.h \
-  ortools/base/file.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/status.h \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/gen/ortools/bop/bop_parameters.pb.h \
-  ortools/bop/integral_solver.h ortools/bop/bop_types.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/lp_data/lp_data.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/lp_data/lp_types.h ortools/util/bitset.h \
-  ortools/lp_data/sparse.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/util/fp_utils.h \
-  ortools/util/time_limit.h ortools/base/timer.h \
-  ortools/util/running_stat.h ortools/linear_solver/linear_solver.h \
-  ortools/linear_solver/linear_expr.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/linear_solver/linear_solver_callback.h \
-  ortools/port/proto_utils.h | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/bop_interface.cc ortools/base/commandlineflags.h \
+ ortools/base/file.h ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/gen/ortools/bop/bop_parameters.pb.h \
+ ortools/bop/integral_solver.h ortools/bop/bop_types.h \
+ ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
+ ortools/lp_data/lp_data.h ortools/gen/ortools/glop/parameters.pb.h \
+ ortools/lp_data/lp_types.h ortools/util/bitset.h \
+ ortools/lp_data/sparse.h ortools/lp_data/permutation.h \
+ ortools/util/return_macros.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/fp_utils.h \
+ ortools/util/time_limit.h ortools/base/timer.h \
+ ortools/util/running_stat.h ortools/linear_solver/linear_solver.h \
+ ortools/linear_solver/linear_expr.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h \
+ ortools/linear_solver/linear_solver_callback.h \
+ ortools/port/proto_utils.h | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sbop_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sbop_interface.$O
 
 objs/linear_solver/cbc_interface.$O: \
-  ortools/linear_solver/cbc_interface.cc ortools/base/commandlineflags.h \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/timer.h \
-  ortools/linear_solver/linear_solver.h ortools/base/status.h \
-  ortools/linear_solver/linear_expr.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/linear_solver/linear_solver_callback.h \
-  ortools/port/proto_utils.h | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/cbc_interface.cc ortools/base/commandlineflags.h \
+ ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/timer.h \
+ ortools/linear_solver/linear_solver.h \
+ ortools/linear_solver/linear_expr.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h \
+ ortools/linear_solver/linear_solver_callback.h \
+ ortools/port/proto_utils.h | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Scbc_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Scbc_interface.$O
 
 objs/linear_solver/clp_interface.$O: \
-  ortools/linear_solver/clp_interface.cc ortools/base/commandlineflags.h \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/timer.h \
-  ortools/linear_solver/linear_solver.h ortools/base/status.h \
-  ortools/linear_solver/linear_expr.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/linear_solver/linear_solver_callback.h \
-  ortools/port/proto_utils.h | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/clp_interface.cc ortools/base/commandlineflags.h \
+ ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/timer.h \
+ ortools/linear_solver/linear_solver.h \
+ ortools/linear_solver/linear_expr.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h \
+ ortools/linear_solver/linear_solver_callback.h \
+ ortools/port/proto_utils.h | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sclp_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sclp_interface.$O
 
 objs/linear_solver/cplex_interface.$O: \
-  ortools/linear_solver/cplex_interface.cc ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/timer.h \
-  ortools/base/basictypes.h ortools/linear_solver/linear_solver.h \
-  ortools/base/commandlineflags.h ortools/base/status.h \
-  ortools/linear_solver/linear_expr.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/linear_solver/linear_solver_callback.h \
-  ortools/port/proto_utils.h | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/cplex_interface.cc ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/timer.h \
+ ortools/base/basictypes.h ortools/linear_solver/linear_solver.h \
+ ortools/base/commandlineflags.h ortools/linear_solver/linear_expr.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h \
+ ortools/linear_solver/linear_solver_callback.h \
+ ortools/port/proto_utils.h | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Scplex_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Scplex_interface.$O
 
 objs/linear_solver/glop_interface.$O: \
-  ortools/linear_solver/glop_interface.cc ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/glop/lp_solver.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/glop/preprocessor.h \
-  ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
-  ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
-  ortools/glop/status.h ortools/lp_data/lp_types.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/util/bitset.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
-  ortools/lp_data/lp_data.h ortools/util/fp_utils.h \
-  ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/glop/reduced_costs.h ortools/util/random_engine.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/running_stat.h \
-  ortools/lp_data/matrix_scaler.h ortools/linear_solver/glop_utils.h \
-  ortools/linear_solver/linear_solver.h ortools/base/status.h \
-  ortools/linear_solver/linear_expr.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/linear_solver/linear_solver_callback.h \
-  ortools/port/proto_utils.h | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/glop_interface.cc ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/glop/lp_solver.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/preprocessor.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
+ ortools/lp_data/lp_data.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/lp_data/matrix_scaler.h ortools/linear_solver/glop_utils.h \
+ ortools/linear_solver/linear_solver.h \
+ ortools/linear_solver/linear_expr.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h \
+ ortools/linear_solver/linear_solver_callback.h \
+ ortools/port/proto_utils.h | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sglop_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sglop_interface.$O
 
 objs/linear_solver/glop_utils.$O: ortools/linear_solver/glop_utils.cc \
-  ortools/linear_solver/glop_utils.h \
-  ortools/linear_solver/linear_solver.h ortools/base/commandlineflags.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/status.h ortools/base/timer.h \
-  ortools/base/basictypes.h ortools/linear_solver/linear_expr.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/linear_solver/linear_solver_callback.h \
-  ortools/port/proto_utils.h ortools/lp_data/lp_types.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/util/bitset.h | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/glop_utils.h ortools/linear_solver/linear_solver.h \
+ ortools/base/commandlineflags.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/timer.h \
+ ortools/base/basictypes.h ortools/linear_solver/linear_expr.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h \
+ ortools/linear_solver/linear_solver_callback.h \
+ ortools/port/proto_utils.h ortools/lp_data/lp_types.h \
+ ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
+ ortools/util/bitset.h | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sglop_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sglop_utils.$O
 
 objs/linear_solver/glpk_interface.$O: \
-  ortools/linear_solver/glpk_interface.cc | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/glpk_interface.cc | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sglpk_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sglpk_interface.$O
 
 objs/linear_solver/gurobi_environment.$O: \
-  ortools/linear_solver/gurobi_environment.cc | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/gurobi_environment.cc | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sgurobi_environment.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sgurobi_environment.$O
 
 objs/linear_solver/gurobi_interface.$O: \
-  ortools/linear_solver/gurobi_interface.cc | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/gurobi_interface.cc | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sgurobi_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sgurobi_interface.$O
 
 objs/linear_solver/gurobi_proto_solver.$O: \
-  ortools/linear_solver/gurobi_proto_solver.cc | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/gurobi_proto_solver.cc | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sgurobi_proto_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sgurobi_proto_solver.$O
 
 objs/linear_solver/linear_expr.$O: ortools/linear_solver/linear_expr.cc \
-  ortools/linear_solver/linear_expr.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/linear_solver/linear_solver.h ortools/base/commandlineflags.h \
-  ortools/base/status.h ortools/base/timer.h ortools/base/basictypes.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/linear_solver/linear_solver_callback.h \
-  ortools/port/proto_utils.h | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/linear_expr.h ortools/base/logging.h \
+ ortools/base/integral_types.h ortools/base/macros.h \
+ ortools/linear_solver/linear_solver.h ortools/base/commandlineflags.h \
+ ortools/base/timer.h ortools/base/basictypes.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h \
+ ortools/linear_solver/linear_solver_callback.h \
+ ortools/port/proto_utils.h | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Slinear_expr.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Slinear_expr.$O
 
 objs/linear_solver/linear_solver.$O: \
-  ortools/linear_solver/linear_solver.cc \
-  ortools/linear_solver/linear_solver.h ortools/base/commandlineflags.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/status.h ortools/base/timer.h \
-  ortools/base/basictypes.h ortools/linear_solver/linear_expr.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/linear_solver/linear_solver_callback.h \
-  ortools/port/proto_utils.h ortools/base/accurate_sum.h \
-  ortools/base/canonical_errors.h ortools/base/map_util.h \
-  ortools/base/status_macros.h ortools/base/statusor.h \
-  ortools/base/stl_util.h ortools/linear_solver/model_exporter.h \
-  ortools/base/hash.h ortools/linear_solver/model_validator.h \
-  ortools/util/lazy_mutable_copy.h ortools/port/file.h \
-  ortools/util/fp_utils.h | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/linear_solver.cc \
+ ortools/linear_solver/linear_solver.h ortools/base/commandlineflags.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/timer.h ortools/base/basictypes.h \
+ ortools/linear_solver/linear_expr.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h \
+ ortools/linear_solver/linear_solver_callback.h \
+ ortools/port/proto_utils.h ortools/base/accurate_sum.h \
+ ortools/base/map_util.h ortools/base/status_macros.h \
+ ortools/base/statusor.h ortools/base/stl_util.h \
+ ortools/linear_solver/model_exporter.h ortools/base/hash.h \
+ ortools/linear_solver/model_validator.h ortools/util/lazy_mutable_copy.h \
+ ortools/port/file.h ortools/util/fp_utils.h | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Slinear_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Slinear_solver.$O
 
 objs/linear_solver/linear_solver_callback.$O: \
-  ortools/linear_solver/linear_solver_callback.cc \
-  ortools/linear_solver/linear_solver_callback.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/linear_solver_callback.cc \
+ ortools/linear_solver/linear_solver_callback.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Slinear_solver_callback.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Slinear_solver_callback.$O
 
 objs/linear_solver/model_exporter.$O: \
-  ortools/linear_solver/model_exporter.cc \
-  ortools/linear_solver/model_exporter.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/statusor.h \
-  ortools/base/status.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/base/canonical_errors.h ortools/base/commandlineflags.h \
-  ortools/base/map_util.h ortools/util/fp_utils.h | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/model_exporter.cc \
+ ortools/linear_solver/model_exporter.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/statusor.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h \
+ ortools/base/commandlineflags.h ortools/base/map_util.h \
+ ortools/util/fp_utils.h | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Smodel_exporter.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Smodel_exporter.$O
 
 objs/linear_solver/model_validator.$O: \
-  ortools/linear_solver/model_validator.cc \
-  ortools/linear_solver/model_validator.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/util/lazy_mutable_copy.h ortools/base/accurate_sum.h \
-  ortools/base/commandlineflags.h ortools/base/status.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/port/file.h ortools/port/proto_utils.h \
-  ortools/util/fp_utils.h | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/model_validator.cc \
+ ortools/linear_solver/model_validator.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h \
+ ortools/util/lazy_mutable_copy.h ortools/base/accurate_sum.h \
+ ortools/base/commandlineflags.h ortools/port/file.h \
+ ortools/port/proto_utils.h ortools/util/fp_utils.h \
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Smodel_validator.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Smodel_validator.$O
 
 objs/linear_solver/sat_interface.$O: \
-  ortools/linear_solver/sat_interface.cc ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/linear_solver/linear_solver.h ortools/base/commandlineflags.h \
-  ortools/base/status.h ortools/base/timer.h \
-  ortools/linear_solver/linear_expr.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/linear_solver/linear_solver_callback.h \
-  ortools/port/proto_utils.h ortools/linear_solver/sat_proto_solver.h \
-  ortools/base/statusor.h ortools/gen/ortools/sat/cp_model.pb.h \
-  ortools/sat/cp_model_solver.h ortools/sat/model.h \
-  ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/lp_utils.h \
-  ortools/lp_data/lp_data.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h \
-  ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \
-  ortools/util/bitset.h ortools/lp_data/sparse.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/fp_utils.h ortools/gen/ortools/sat/boolean_problem.pb.h \
-  ortools/sat/sat_solver.h ortools/sat/clause.h \
-  ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
-  ortools/sat/sat_base.h ortools/sat/drat_writer.h ortools/base/file.h \
-  ortools/util/random_engine.h ortools/util/stats.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/util/running_stat.h ortools/sat/sat_decision.h \
-  ortools/util/integer_pq.h ortools/util/time_limit.h | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/sat_interface.cc ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/linear_solver/linear_solver.h ortools/base/commandlineflags.h \
+ ortools/base/timer.h ortools/linear_solver/linear_expr.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h \
+ ortools/linear_solver/linear_solver_callback.h \
+ ortools/port/proto_utils.h ortools/linear_solver/sat_proto_solver.h \
+ ortools/base/statusor.h ortools/gen/ortools/sat/cp_model.pb.h \
+ ortools/sat/cp_model_solver.h ortools/sat/model.h \
+ ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/lp_utils.h \
+ ortools/lp_data/lp_data.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/lp_data/lp_types.h \
+ ortools/util/bitset.h ortools/lp_data/sparse.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
+ ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
+ ortools/util/fp_utils.h ortools/gen/ortools/sat/boolean_problem.pb.h \
+ ortools/sat/sat_solver.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/sat_base.h ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/util/random_engine.h ortools/util/stats.h \
+ ortools/util/time_limit.h ortools/util/running_stat.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Ssat_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Ssat_interface.$O
 
 objs/linear_solver/sat_proto_solver.$O: \
-  ortools/linear_solver/sat_proto_solver.cc \
-  ortools/linear_solver/sat_proto_solver.h ortools/base/statusor.h \
-  ortools/base/status.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/linear_solver/model_validator.h \
-  ortools/util/lazy_mutable_copy.h \
-  ortools/linear_solver/sat_solver_utils.h ortools/glop/preprocessor.h \
-  ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
-  ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
-  ortools/glop/status.h ortools/lp_data/lp_types.h \
-  ortools/base/basictypes.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
-  ortools/lp_data/permutation.h ortools/util/return_macros.h \
-  ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
-  ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
-  ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
-  ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \
-  ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/glop/reduced_costs.h ortools/util/random_engine.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/running_stat.h \
-  ortools/lp_data/matrix_scaler.h ortools/port/proto_utils.h \
-  ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_solver.h \
-  ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/lp_utils.h \
-  ortools/gen/ortools/sat/boolean_problem.pb.h ortools/sat/sat_solver.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/sat_base.h \
-  ortools/sat/drat_writer.h ortools/base/file.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/sat/sat_decision.h ortools/util/integer_pq.h | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/sat_proto_solver.cc \
+ ortools/linear_solver/sat_proto_solver.h ortools/base/statusor.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h \
+ ortools/linear_solver/model_validator.h ortools/util/lazy_mutable_copy.h \
+ ortools/linear_solver/sat_solver_utils.h ortools/glop/preprocessor.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/revised_simplex.h \
+ ortools/base/integral_types.h ortools/base/macros.h \
+ ortools/glop/basis_representation.h ortools/base/logging.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/base/basictypes.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
+ ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/lp_data/matrix_scaler.h ortools/port/proto_utils.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_solver.h \
+ ortools/sat/model.h ortools/base/map_util.h ortools/base/typeid.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/lp_utils.h \
+ ortools/gen/ortools/sat/boolean_problem.pb.h ortools/sat/sat_solver.h \
+ ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
+ ortools/sat/drat_checker.h ortools/sat/sat_base.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/sat/pb_constraint.h ortools/sat/restart.h \
+ ortools/sat/sat_decision.h ortools/util/integer_pq.h | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Ssat_proto_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Ssat_proto_solver.$O
 
 objs/linear_solver/sat_solver_utils.$O: \
-  ortools/linear_solver/sat_solver_utils.cc \
-  ortools/linear_solver/sat_solver_utils.h ortools/glop/preprocessor.h \
-  ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/revised_simplex.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/glop/basis_representation.h \
-  ortools/base/logging.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/base/basictypes.h \
-  ortools/base/int_type.h ortools/base/int_type_indexed_vector.h \
-  ortools/util/bitset.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/base/timer.h \
-  ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
-  ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
-  ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \
-  ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
-  ortools/glop/update_row.h ortools/glop/variables_info.h \
-  ortools/glop/reduced_costs.h ortools/util/random_engine.h \
-  ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
-  ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
-  ortools/base/commandlineflags.h ortools/util/running_stat.h \
-  ortools/lp_data/matrix_scaler.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/lp_data/proto_utils.h | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/sat_solver_utils.cc \
+ ortools/linear_solver/sat_solver_utils.h ortools/glop/preprocessor.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/revised_simplex.h \
+ ortools/base/integral_types.h ortools/base/macros.h \
+ ortools/glop/basis_representation.h ortools/base/logging.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/base/basictypes.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h ortools/util/bitset.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h ortools/base/timer.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
+ ortools/lp_data/lp_data.h ortools/base/hash.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/base/commandlineflags.h ortools/util/running_stat.h \
+ ortools/lp_data/matrix_scaler.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h \
+ ortools/lp_data/proto_utils.h | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Ssat_solver_utils.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Ssat_solver_utils.$O
 
 objs/linear_solver/scip_interface.$O: \
-  ortools/linear_solver/scip_interface.cc | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/scip_interface.cc | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sscip_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sscip_interface.$O
 
 objs/linear_solver/scip_proto_solver.$O: \
-  ortools/linear_solver/scip_proto_solver.cc | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/scip_proto_solver.cc | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sscip_proto_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sscip_proto_solver.$O
 
 objs/linear_solver/xpress_interface.$O: \
-  ortools/linear_solver/xpress_interface.cc | $(OBJ_DIR)/linear_solver
+ ortools/linear_solver/xpress_interface.cc | $(OBJ_DIR)/linear_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slinear_solver$Sxpress_interface.cc $(OBJ_OUT)$(OBJ_DIR)$Slinear_solver$Sxpress_interface.$O
 
 ortools/linear_solver/linear_solver.proto: ;
@@ -3179,8 +3124,8 @@ $(OBJ_DIR)/linear_solver/linear_solver.pb.$O: \
 CP_DEPS = \
  $(SRC_DIR)/ortools/constraint_solver/constraint_solver.h \
  $(SRC_DIR)/ortools/constraint_solver/constraint_solveri.h \
- $(SRC_DIR)/ortools/constraint_solver/routing.h \
  $(SRC_DIR)/ortools/constraint_solver/routing_flags.h \
+ $(SRC_DIR)/ortools/constraint_solver/routing.h \
  $(SRC_DIR)/ortools/constraint_solver/routing_index_manager.h \
  $(SRC_DIR)/ortools/constraint_solver/routing_lp_scheduling.h \
  $(SRC_DIR)/ortools/constraint_solver/routing_neighborhoods.h \
@@ -3241,867 +3186,832 @@ CP_LIB_OBJS = \
  $(OBJ_DIR)/constraint_solver/solver_parameters.pb.$O
 
 objs/constraint_solver/alldiff_cst.$O: \
-  ortools/constraint_solver/alldiff_cst.cc ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/alldiff_cst.cc ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Salldiff_cst.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Salldiff_cst.$O
 
 objs/constraint_solver/assignment.$O: \
-  ortools/constraint_solver/assignment.cc ortools/base/file.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/status.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/recordio.h \
-  ortools/gen/ortools/constraint_solver/assignment.pb.h \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/sysinfo.h \
-  ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/assignment.cc ortools/base/file.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/map_util.h ortools/base/recordio.h \
+ ortools/gen/ortools/constraint_solver/assignment.pb.h \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sassignment.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sassignment.$O
 
 objs/constraint_solver/constraint_solver.$O: \
-  ortools/constraint_solver/constraint_solver.cc \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/base/file.h ortools/base/status.h ortools/base/recordio.h \
-  ortools/base/stl_util.h ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/constraint_solver.cc \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
+ ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/base/file.h ortools/base/recordio.h ortools/base/stl_util.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sconstraint_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sconstraint_solver.$O
 
 objs/constraint_solver/constraints.$O: \
-  ortools/constraint_solver/constraints.cc ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/constraints.cc ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sconstraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sconstraints.$O
 
 objs/constraint_solver/count_cst.$O: \
-  ortools/constraint_solver/count_cst.cc ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/count_cst.cc ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Scount_cst.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Scount_cst.$O
 
 objs/constraint_solver/default_search.$O: \
-  ortools/constraint_solver/default_search.cc \
-  ortools/base/commandlineflags.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/stl_util.h \
-  ortools/constraint_solver/constraint_solver.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h ortools/util/cached_log.h \
-  ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/default_search.cc \
+ ortools/base/commandlineflags.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/stl_util.h \
+ ortools/constraint_solver/constraint_solver.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/util/cached_log.h ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sdefault_search.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sdefault_search.$O
 
 objs/constraint_solver/demon_profiler.$O: \
-  ortools/constraint_solver/demon_profiler.cc ortools/base/file.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/status.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/mathutil.h \
-  ortools/base/stl_util.h ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h \
-  ortools/gen/ortools/constraint_solver/demon_profiler.pb.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/demon_profiler.cc ortools/base/file.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/mathutil.h ortools/base/stl_util.h \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/map_util.h \
+ ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/gen/ortools/constraint_solver/demon_profiler.pb.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sdemon_profiler.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sdemon_profiler.$O
 
 objs/constraint_solver/deviation.$O: \
-  ortools/constraint_solver/deviation.cc ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/mathutil.h \
-  ortools/base/basictypes.h \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/deviation.cc ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/mathutil.h \
+ ortools/base/basictypes.h ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sdeviation.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sdeviation.$O
 
 objs/constraint_solver/diffn.$O: ortools/constraint_solver/diffn.cc \
-  ortools/base/hash.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/int_type.h \
-  ortools/base/int_type_indexed_vector.h \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
+ ortools/base/hash.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/int_type.h \
+ ortools/base/int_type_indexed_vector.h \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/map_util.h \
+ ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sdiffn.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sdiffn.$O
 
 objs/constraint_solver/element.$O: ortools/constraint_solver/element.cc \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h ortools/util/range_minimum_query.h \
-  ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/util/range_minimum_query.h ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Selement.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Selement.$O
 
 objs/constraint_solver/expr_array.$O: \
-  ortools/constraint_solver/expr_array.cc ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/mathutil.h \
-  ortools/base/basictypes.h \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/expr_array.cc ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/mathutil.h \
+ ortools/base/basictypes.h ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sexpr_array.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sexpr_array.$O
 
 objs/constraint_solver/expr_cst.$O: ortools/constraint_solver/expr_cst.cc \
-  ortools/base/commandlineflags.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/stl_util.h \
-  ortools/constraint_solver/constraint_solver.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
+ ortools/base/commandlineflags.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/stl_util.h \
+ ortools/constraint_solver/constraint_solver.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sexpr_cst.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sexpr_cst.$O
 
 objs/constraint_solver/expressions.$O: \
-  ortools/constraint_solver/expressions.cc \
-  ortools/base/commandlineflags.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
-  ortools/base/mathutil.h ortools/base/basictypes.h \
-  ortools/base/stl_util.h ortools/constraint_solver/constraint_solver.h \
-  ortools/base/hash.h ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/expressions.cc ortools/base/commandlineflags.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/map_util.h ortools/base/mathutil.h \
+ ortools/base/basictypes.h ortools/base/stl_util.h \
+ ortools/constraint_solver/constraint_solver.h ortools/base/hash.h \
+ ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sexpressions.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sexpressions.$O
 
 objs/constraint_solver/graph_constraints.$O: \
-  ortools/constraint_solver/graph_constraints.cc \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/graph_constraints.cc \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sgraph_constraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sgraph_constraints.$O
 
 objs/constraint_solver/interval.$O: ortools/constraint_solver/interval.cc \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sinterval.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sinterval.$O
 
 objs/constraint_solver/local_search.$O: \
-  ortools/constraint_solver/local_search.cc \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/base/iterator_adaptors.h ortools/base/map_util.h \
-  ortools/constraint_solver/constraint_solver.h ortools/base/sysinfo.h \
-  ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h ortools/graph/hamiltonian_path.h \
-  ortools/util/vector_or_function.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/local_search.cc \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/base/iterator_adaptors.h ortools/base/map_util.h \
+ ortools/constraint_solver/constraint_solver.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/graph/hamiltonian_path.h ortools/util/vector_or_function.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Slocal_search.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Slocal_search.$O
 
 objs/constraint_solver/model_cache.$O: \
-  ortools/constraint_solver/model_cache.cc \
-  ortools/base/commandlineflags.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/stl_util.h \
-  ortools/constraint_solver/constraint_solver.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/model_cache.cc ortools/base/commandlineflags.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/stl_util.h \
+ ortools/constraint_solver/constraint_solver.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Smodel_cache.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Smodel_cache.$O
 
 objs/constraint_solver/pack.$O: ortools/constraint_solver/pack.cc \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Spack.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Spack.$O
 
 objs/constraint_solver/range_cst.$O: \
-  ortools/constraint_solver/range_cst.cc ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/range_cst.cc ortools/base/logging.h \
+ ortools/base/integral_types.h ortools/base/macros.h \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srange_cst.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srange_cst.$O
 
 objs/constraint_solver/resource.$O: ortools/constraint_solver/resource.cc \
-  ortools/base/commandlineflags.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/mathutil.h \
-  ortools/base/basictypes.h ortools/base/stl_util.h \
-  ortools/constraint_solver/constraint_solver.h ortools/base/hash.h \
-  ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h ortools/util/monoid_operation_tree.h \
-  ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
+ ortools/base/commandlineflags.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/mathutil.h \
+ ortools/base/basictypes.h ortools/base/stl_util.h \
+ ortools/constraint_solver/constraint_solver.h ortools/base/hash.h \
+ ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/util/monoid_operation_tree.h ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sresource.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sresource.$O
 
 objs/constraint_solver/routing.$O: ortools/constraint_solver/routing.cc \
-  ortools/constraint_solver/routing.h \
-  ortools/base/adjustable_priority_queue-inl.h \
-  ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/commandlineflags.h \
-  ortools/base/hash.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/int_type.h ortools/constraint_solver/constraint_solver.h \
-  ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h \
-  ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
-  ortools/constraint_solver/routing_index_manager.h \
-  ortools/constraint_solver/routing_types.h \
-  ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/glop/lp_solver.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/preprocessor.h ortools/glop/revised_simplex.h \
-  ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/glop/rank_one_update.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
-  ortools/util/fp_utils.h ortools/glop/entering_variable.h \
-  ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
-  ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
-  ortools/util/random_engine.h ortools/glop/variable_values.h \
-  ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \
-  ortools/util/time_limit.h ortools/util/running_stat.h \
-  ortools/lp_data/matrix_scaler.h ortools/graph/graph.h \
-  ortools/sat/theta_tree.h ortools/sat/integer.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/sat/sat_solver.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/sat/sat_decision.h ortools/util/integer_pq.h \
-  ortools/util/rev.h ortools/util/range_query_function.h \
-  ortools/base/mathutil.h ortools/base/protoutil.h \
-  ortools/base/statusor.h ortools/base/stl_util.h \
-  ortools/base/thorough_hash.h \
-  ortools/constraint_solver/routing_lp_scheduling.h \
-  ortools/sat/cp_model.h ortools/gen/ortools/sat/cp_model.pb.h \
-  ortools/sat/cp_model_solver.h ortools/sat/cp_model_utils.h \
-  ortools/constraint_solver/routing_neighborhoods.h \
-  ortools/constraint_solver/routing_parameters.h \
-  ortools/graph/connectivity.h ortools/graph/linear_assignment.h \
-  ortools/graph/ebert_graph.h ortools/util/permutation.h \
-  ortools/util/zvector.h ortools/graph/min_cost_flow.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/routing.h \
+ ortools/base/adjustable_priority_queue-inl.h \
+ ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/commandlineflags.h \
+ ortools/base/hash.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/int_type.h ortools/constraint_solver/constraint_solver.h \
+ ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
+ ortools/constraint_solver/routing_index_manager.h \
+ ortools/constraint_solver/routing_types.h \
+ ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h ortools/glop/lp_solver.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/preprocessor.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
+ ortools/lp_data/lp_data.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/util/running_stat.h ortools/lp_data/matrix_scaler.h \
+ ortools/graph/graph.h ortools/sat/theta_tree.h ortools/sat/integer.h \
+ ortools/sat/model.h ortools/base/typeid.h ortools/sat/sat_base.h \
+ ortools/sat/sat_solver.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/range_query_function.h ortools/base/mathutil.h \
+ ortools/base/protoutil.h ortools/base/statusor.h ortools/base/stl_util.h \
+ ortools/base/thorough_hash.h \
+ ortools/constraint_solver/routing_lp_scheduling.h ortools/sat/cp_model.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_solver.h \
+ ortools/sat/cp_model_utils.h \
+ ortools/constraint_solver/routing_neighborhoods.h \
+ ortools/constraint_solver/routing_parameters.h \
+ ortools/graph/connectivity.h ortools/graph/linear_assignment.h \
+ ortools/graph/ebert_graph.h ortools/util/permutation.h \
+ ortools/util/zvector.h ortools/graph/min_cost_flow.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting.$O
 
 objs/constraint_solver/routing_breaks.$O: \
-  ortools/constraint_solver/routing_breaks.cc \
-  ortools/constraint_solver/routing.h \
-  ortools/base/adjustable_priority_queue-inl.h \
-  ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/commandlineflags.h \
-  ortools/base/hash.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/int_type.h ortools/constraint_solver/constraint_solver.h \
-  ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h \
-  ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
-  ortools/constraint_solver/routing_index_manager.h \
-  ortools/constraint_solver/routing_types.h \
-  ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/glop/lp_solver.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/preprocessor.h ortools/glop/revised_simplex.h \
-  ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/glop/rank_one_update.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
-  ortools/util/fp_utils.h ortools/glop/entering_variable.h \
-  ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
-  ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
-  ortools/util/random_engine.h ortools/glop/variable_values.h \
-  ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \
-  ortools/util/time_limit.h ortools/util/running_stat.h \
-  ortools/lp_data/matrix_scaler.h ortools/graph/graph.h \
-  ortools/sat/theta_tree.h ortools/sat/integer.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/sat/sat_solver.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/sat/sat_decision.h ortools/util/integer_pq.h \
-  ortools/util/rev.h ortools/util/range_query_function.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/routing_breaks.cc \
+ ortools/constraint_solver/routing.h \
+ ortools/base/adjustable_priority_queue-inl.h \
+ ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/commandlineflags.h \
+ ortools/base/hash.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/int_type.h ortools/constraint_solver/constraint_solver.h \
+ ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
+ ortools/constraint_solver/routing_index_manager.h \
+ ortools/constraint_solver/routing_types.h \
+ ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h ortools/glop/lp_solver.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/preprocessor.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
+ ortools/lp_data/lp_data.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/util/running_stat.h ortools/lp_data/matrix_scaler.h \
+ ortools/graph/graph.h ortools/sat/theta_tree.h ortools/sat/integer.h \
+ ortools/sat/model.h ortools/base/typeid.h ortools/sat/sat_base.h \
+ ortools/sat/sat_solver.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/range_query_function.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_breaks.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_breaks.$O
 
 objs/constraint_solver/routing_flags.$O: \
-  ortools/constraint_solver/routing_flags.cc \
-  ortools/constraint_solver/routing_flags.h \
-  ortools/base/commandlineflags.h \
-  ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
-  ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h ortools/base/map_util.h \
-  ortools/base/logging.h ortools/base/integral_types.h \
-  ortools/base/macros.h ortools/base/protoutil.h ortools/base/status.h \
-  ortools/base/statusor.h ortools/constraint_solver/constraint_solver.h \
-  ortools/base/hash.h ortools/base/basictypes.h ortools/base/sysinfo.h \
-  ortools/base/timer.h ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/routing_parameters.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/routing_flags.cc \
+ ortools/constraint_solver/routing_flags.h \
+ ortools/base/commandlineflags.h \
+ ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
+ ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h ortools/base/map_util.h \
+ ortools/base/logging.h ortools/base/integral_types.h \
+ ortools/base/macros.h ortools/base/protoutil.h ortools/base/statusor.h \
+ ortools/constraint_solver/constraint_solver.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/routing_parameters.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_flags.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_flags.$O
 
 objs/constraint_solver/routing_flow.$O: \
-  ortools/constraint_solver/routing_flow.cc \
-  ortools/constraint_solver/routing.h \
-  ortools/base/adjustable_priority_queue-inl.h \
-  ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/commandlineflags.h \
-  ortools/base/hash.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/int_type.h ortools/constraint_solver/constraint_solver.h \
-  ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h \
-  ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
-  ortools/constraint_solver/routing_index_manager.h \
-  ortools/constraint_solver/routing_types.h \
-  ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/glop/lp_solver.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/preprocessor.h ortools/glop/revised_simplex.h \
-  ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/glop/rank_one_update.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
-  ortools/util/fp_utils.h ortools/glop/entering_variable.h \
-  ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
-  ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
-  ortools/util/random_engine.h ortools/glop/variable_values.h \
-  ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \
-  ortools/util/time_limit.h ortools/util/running_stat.h \
-  ortools/lp_data/matrix_scaler.h ortools/graph/graph.h \
-  ortools/sat/theta_tree.h ortools/sat/integer.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/sat/sat_solver.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/sat/sat_decision.h ortools/util/integer_pq.h \
-  ortools/util/rev.h ortools/util/range_query_function.h \
-  ortools/constraint_solver/routing_lp_scheduling.h \
-  ortools/sat/cp_model.h ortools/gen/ortools/sat/cp_model.pb.h \
-  ortools/sat/cp_model_solver.h ortools/sat/cp_model_utils.h \
-  ortools/graph/min_cost_flow.h ortools/graph/ebert_graph.h \
-  ortools/util/permutation.h ortools/util/zvector.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/routing_flow.cc \
+ ortools/constraint_solver/routing.h \
+ ortools/base/adjustable_priority_queue-inl.h \
+ ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/commandlineflags.h \
+ ortools/base/hash.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/int_type.h ortools/constraint_solver/constraint_solver.h \
+ ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
+ ortools/constraint_solver/routing_index_manager.h \
+ ortools/constraint_solver/routing_types.h \
+ ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h ortools/glop/lp_solver.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/preprocessor.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
+ ortools/lp_data/lp_data.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/util/running_stat.h ortools/lp_data/matrix_scaler.h \
+ ortools/graph/graph.h ortools/sat/theta_tree.h ortools/sat/integer.h \
+ ortools/sat/model.h ortools/base/typeid.h ortools/sat/sat_base.h \
+ ortools/sat/sat_solver.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/range_query_function.h \
+ ortools/constraint_solver/routing_lp_scheduling.h ortools/sat/cp_model.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_solver.h \
+ ortools/sat/cp_model_utils.h ortools/graph/min_cost_flow.h \
+ ortools/graph/ebert_graph.h ortools/util/permutation.h \
+ ortools/util/zvector.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_flow.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_flow.$O
 
 objs/constraint_solver/routing_index_manager.$O: \
-  ortools/constraint_solver/routing_index_manager.cc \
-  ortools/constraint_solver/routing_index_manager.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/int_type.h \
-  ortools/base/macros.h ortools/base/logging.h \
-  ortools/base/integral_types.h \
-  ortools/constraint_solver/routing_types.h ortools/base/map_util.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/routing_index_manager.cc \
+ ortools/constraint_solver/routing_index_manager.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/int_type.h \
+ ortools/base/macros.h ortools/base/logging.h \
+ ortools/base/integral_types.h ortools/constraint_solver/routing_types.h \
+ ortools/base/map_util.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_index_manager.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_index_manager.$O
 
 objs/constraint_solver/routing_lp_scheduling.$O: \
-  ortools/constraint_solver/routing_lp_scheduling.cc \
-  ortools/constraint_solver/routing_lp_scheduling.h \
-  ortools/constraint_solver/routing.h \
-  ortools/base/adjustable_priority_queue-inl.h \
-  ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/commandlineflags.h \
-  ortools/base/hash.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/int_type.h ortools/constraint_solver/constraint_solver.h \
-  ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h \
-  ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
-  ortools/constraint_solver/routing_index_manager.h \
-  ortools/constraint_solver/routing_types.h \
-  ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/glop/lp_solver.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/preprocessor.h ortools/glop/revised_simplex.h \
-  ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/glop/rank_one_update.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
-  ortools/util/fp_utils.h ortools/glop/entering_variable.h \
-  ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
-  ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
-  ortools/util/random_engine.h ortools/glop/variable_values.h \
-  ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \
-  ortools/util/time_limit.h ortools/util/running_stat.h \
-  ortools/lp_data/matrix_scaler.h ortools/graph/graph.h \
-  ortools/sat/theta_tree.h ortools/sat/integer.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/sat/sat_solver.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/sat/sat_decision.h ortools/util/integer_pq.h \
-  ortools/util/rev.h ortools/util/range_query_function.h \
-  ortools/sat/cp_model.h ortools/gen/ortools/sat/cp_model.pb.h \
-  ortools/sat/cp_model_solver.h ortools/sat/cp_model_utils.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/routing_lp_scheduling.cc \
+ ortools/constraint_solver/routing_lp_scheduling.h \
+ ortools/constraint_solver/routing.h \
+ ortools/base/adjustable_priority_queue-inl.h \
+ ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/commandlineflags.h \
+ ortools/base/hash.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/int_type.h ortools/constraint_solver/constraint_solver.h \
+ ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
+ ortools/constraint_solver/routing_index_manager.h \
+ ortools/constraint_solver/routing_types.h \
+ ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h ortools/glop/lp_solver.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/preprocessor.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
+ ortools/lp_data/lp_data.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/util/running_stat.h ortools/lp_data/matrix_scaler.h \
+ ortools/graph/graph.h ortools/sat/theta_tree.h ortools/sat/integer.h \
+ ortools/sat/model.h ortools/base/typeid.h ortools/sat/sat_base.h \
+ ortools/sat/sat_solver.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/range_query_function.h ortools/sat/cp_model.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_solver.h \
+ ortools/sat/cp_model_utils.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_lp_scheduling.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_lp_scheduling.$O
 
 objs/constraint_solver/routing_neighborhoods.$O: \
-  ortools/constraint_solver/routing_neighborhoods.cc \
-  ortools/constraint_solver/routing_neighborhoods.h \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h ortools/constraint_solver/routing.h \
-  ortools/base/adjustable_priority_queue-inl.h \
-  ortools/base/adjustable_priority_queue.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/int_type.h \
-  ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
-  ortools/constraint_solver/routing_index_manager.h \
-  ortools/constraint_solver/routing_types.h \
-  ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/glop/lp_solver.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/preprocessor.h ortools/glop/revised_simplex.h \
-  ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/glop/rank_one_update.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
-  ortools/util/fp_utils.h ortools/glop/entering_variable.h \
-  ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
-  ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
-  ortools/util/random_engine.h ortools/glop/variable_values.h \
-  ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \
-  ortools/util/time_limit.h ortools/util/running_stat.h \
-  ortools/lp_data/matrix_scaler.h ortools/graph/graph.h \
-  ortools/sat/theta_tree.h ortools/sat/integer.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/sat/sat_solver.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/sat/sat_decision.h ortools/util/integer_pq.h \
-  ortools/util/rev.h ortools/util/range_query_function.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/routing_neighborhoods.cc \
+ ortools/constraint_solver/routing_neighborhoods.h \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
+ ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/constraint_solver/routing.h \
+ ortools/base/adjustable_priority_queue-inl.h \
+ ortools/base/adjustable_priority_queue.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/int_type.h \
+ ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
+ ortools/constraint_solver/routing_index_manager.h \
+ ortools/constraint_solver/routing_types.h \
+ ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h ortools/glop/lp_solver.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/preprocessor.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
+ ortools/lp_data/lp_data.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/util/running_stat.h ortools/lp_data/matrix_scaler.h \
+ ortools/graph/graph.h ortools/sat/theta_tree.h ortools/sat/integer.h \
+ ortools/sat/model.h ortools/base/typeid.h ortools/sat/sat_base.h \
+ ortools/sat/sat_solver.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/range_query_function.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_neighborhoods.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_neighborhoods.$O
 
 objs/constraint_solver/routing_parameters.$O: \
-  ortools/constraint_solver/routing_parameters.cc \
-  ortools/constraint_solver/routing_parameters.h \
-  ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
-  ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h ortools/base/logging.h \
-  ortools/base/integral_types.h ortools/base/macros.h \
-  ortools/base/protoutil.h ortools/base/status.h ortools/base/statusor.h \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/routing_parameters.cc \
+ ortools/constraint_solver/routing_parameters.h \
+ ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
+ ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h ortools/base/logging.h \
+ ortools/base/integral_types.h ortools/base/macros.h \
+ ortools/base/protoutil.h ortools/base/statusor.h \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_parameters.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_parameters.$O
 
 objs/constraint_solver/routing_sat.$O: \
-  ortools/constraint_solver/routing_sat.cc \
-  ortools/constraint_solver/routing.h \
-  ortools/base/adjustable_priority_queue-inl.h \
-  ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/commandlineflags.h \
-  ortools/base/hash.h ortools/base/int_type_indexed_vector.h \
-  ortools/base/int_type.h ortools/constraint_solver/constraint_solver.h \
-  ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h \
-  ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
-  ortools/constraint_solver/routing_index_manager.h \
-  ortools/constraint_solver/routing_types.h \
-  ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/glop/lp_solver.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/preprocessor.h ortools/glop/revised_simplex.h \
-  ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/glop/rank_one_update.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
-  ortools/util/fp_utils.h ortools/glop/entering_variable.h \
-  ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
-  ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
-  ortools/util/random_engine.h ortools/glop/variable_values.h \
-  ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \
-  ortools/util/time_limit.h ortools/util/running_stat.h \
-  ortools/lp_data/matrix_scaler.h ortools/graph/graph.h \
-  ortools/sat/theta_tree.h ortools/sat/integer.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/sat/sat_solver.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/sat/sat_decision.h ortools/util/integer_pq.h \
-  ortools/util/rev.h ortools/util/range_query_function.h \
-  ortools/sat/cp_model.h ortools/gen/ortools/sat/cp_model.pb.h \
-  ortools/sat/cp_model_solver.h ortools/sat/cp_model_utils.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/routing_sat.cc \
+ ortools/constraint_solver/routing.h \
+ ortools/base/adjustable_priority_queue-inl.h \
+ ortools/base/adjustable_priority_queue.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/commandlineflags.h \
+ ortools/base/hash.h ortools/base/int_type_indexed_vector.h \
+ ortools/base/int_type.h ortools/constraint_solver/constraint_solver.h \
+ ortools/base/map_util.h ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
+ ortools/constraint_solver/routing_index_manager.h \
+ ortools/constraint_solver/routing_types.h \
+ ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h ortools/glop/lp_solver.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/preprocessor.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
+ ortools/lp_data/lp_data.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/util/running_stat.h ortools/lp_data/matrix_scaler.h \
+ ortools/graph/graph.h ortools/sat/theta_tree.h ortools/sat/integer.h \
+ ortools/sat/model.h ortools/base/typeid.h ortools/sat/sat_base.h \
+ ortools/sat/sat_solver.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/range_query_function.h ortools/sat/cp_model.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_solver.h \
+ ortools/sat/cp_model_utils.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_sat.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_sat.$O
 
 objs/constraint_solver/routing_search.$O: \
-  ortools/constraint_solver/routing_search.cc \
-  ortools/base/integral_types.h ortools/base/iterator_adaptors.h \
-  ortools/base/map_util.h ortools/base/logging.h ortools/base/macros.h \
-  ortools/base/small_map.h ortools/base/small_ordered_set.h \
-  ortools/base/stl_util.h ortools/constraint_solver/constraint_solveri.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/util/vector_map.h ortools/constraint_solver/routing.h \
-  ortools/base/adjustable_priority_queue-inl.h \
-  ortools/base/adjustable_priority_queue.h \
-  ortools/base/int_type_indexed_vector.h ortools/base/int_type.h \
-  ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
-  ortools/constraint_solver/routing_index_manager.h \
-  ortools/constraint_solver/routing_types.h \
-  ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
-  ortools/gen/ortools/util/optional_boolean.pb.h \
-  ortools/glop/lp_solver.h ortools/gen/ortools/glop/parameters.pb.h \
-  ortools/glop/preprocessor.h ortools/glop/revised_simplex.h \
-  ortools/glop/basis_representation.h ortools/glop/lu_factorization.h \
-  ortools/glop/markowitz.h ortools/glop/status.h \
-  ortools/lp_data/lp_types.h ortools/lp_data/permutation.h \
-  ortools/util/return_macros.h ortools/lp_data/sparse.h \
-  ortools/lp_data/scattered_vector.h ortools/lp_data/sparse_column.h \
-  ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
-  ortools/util/stats.h ortools/glop/rank_one_update.h \
-  ortools/lp_data/lp_utils.h ortools/base/accurate_sum.h \
-  ortools/glop/dual_edge_norms.h ortools/lp_data/lp_data.h \
-  ortools/util/fp_utils.h ortools/glop/entering_variable.h \
-  ortools/glop/primal_edge_norms.h ortools/glop/update_row.h \
-  ortools/glop/variables_info.h ortools/glop/reduced_costs.h \
-  ortools/util/random_engine.h ortools/glop/variable_values.h \
-  ortools/lp_data/lp_print_utils.h ortools/lp_data/sparse_row.h \
-  ortools/util/time_limit.h ortools/util/running_stat.h \
-  ortools/lp_data/matrix_scaler.h ortools/graph/graph.h \
-  ortools/sat/theta_tree.h ortools/sat/integer.h ortools/sat/model.h \
-  ortools/base/typeid.h ortools/sat/sat_base.h ortools/sat/sat_solver.h \
-  ortools/sat/clause.h ortools/sat/drat_proof_handler.h \
-  ortools/sat/drat_checker.h ortools/sat/drat_writer.h \
-  ortools/base/file.h ortools/base/status.h \
-  ortools/gen/ortools/sat/sat_parameters.pb.h \
-  ortools/sat/pb_constraint.h ortools/sat/restart.h \
-  ortools/sat/sat_decision.h ortools/util/integer_pq.h \
-  ortools/util/rev.h ortools/util/range_query_function.h \
-  ortools/constraint_solver/routing_lp_scheduling.h \
-  ortools/sat/cp_model.h ortools/gen/ortools/sat/cp_model.pb.h \
-  ortools/sat/cp_model_solver.h ortools/sat/cp_model_utils.h \
-  ortools/graph/christofides.h ortools/graph/eulerian_path.h \
-  ortools/graph/minimum_spanning_tree.h ortools/graph/connectivity.h \
-  ortools/util/vector_or_function.h ortools/graph/perfect_matching.h \
-  ortools/linear_solver/linear_solver.h \
-  ortools/linear_solver/linear_expr.h \
-  ortools/gen/ortools/linear_solver/linear_solver.pb.h \
-  ortools/linear_solver/linear_solver_callback.h \
-  ortools/port/proto_utils.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/routing_search.cc \
+ ortools/base/integral_types.h ortools/base/iterator_adaptors.h \
+ ortools/base/map_util.h ortools/base/logging.h ortools/base/macros.h \
+ ortools/base/small_map.h ortools/base/small_ordered_set.h \
+ ortools/base/stl_util.h ortools/constraint_solver/constraint_solveri.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/util/vector_map.h ortools/constraint_solver/routing.h \
+ ortools/base/adjustable_priority_queue-inl.h \
+ ortools/base/adjustable_priority_queue.h \
+ ortools/base/int_type_indexed_vector.h ortools/base/int_type.h \
+ ortools/gen/ortools/constraint_solver/routing_enums.pb.h \
+ ortools/constraint_solver/routing_index_manager.h \
+ ortools/constraint_solver/routing_types.h \
+ ortools/gen/ortools/constraint_solver/routing_parameters.pb.h \
+ ortools/gen/ortools/util/optional_boolean.pb.h ortools/glop/lp_solver.h \
+ ortools/gen/ortools/glop/parameters.pb.h ortools/glop/preprocessor.h \
+ ortools/glop/revised_simplex.h ortools/glop/basis_representation.h \
+ ortools/glop/lu_factorization.h ortools/glop/markowitz.h \
+ ortools/glop/status.h ortools/lp_data/lp_types.h \
+ ortools/lp_data/permutation.h ortools/util/return_macros.h \
+ ortools/lp_data/sparse.h ortools/lp_data/scattered_vector.h \
+ ortools/lp_data/sparse_column.h ortools/lp_data/sparse_vector.h \
+ ortools/graph/iterators.h ortools/util/stats.h \
+ ortools/glop/rank_one_update.h ortools/lp_data/lp_utils.h \
+ ortools/base/accurate_sum.h ortools/glop/dual_edge_norms.h \
+ ortools/lp_data/lp_data.h ortools/util/fp_utils.h \
+ ortools/glop/entering_variable.h ortools/glop/primal_edge_norms.h \
+ ortools/glop/update_row.h ortools/glop/variables_info.h \
+ ortools/glop/reduced_costs.h ortools/util/random_engine.h \
+ ortools/glop/variable_values.h ortools/lp_data/lp_print_utils.h \
+ ortools/lp_data/sparse_row.h ortools/util/time_limit.h \
+ ortools/util/running_stat.h ortools/lp_data/matrix_scaler.h \
+ ortools/graph/graph.h ortools/sat/theta_tree.h ortools/sat/integer.h \
+ ortools/sat/model.h ortools/base/typeid.h ortools/sat/sat_base.h \
+ ortools/sat/sat_solver.h ortools/sat/clause.h \
+ ortools/sat/drat_proof_handler.h ortools/sat/drat_checker.h \
+ ortools/sat/drat_writer.h ortools/base/file.h \
+ ortools/gen/ortools/sat/sat_parameters.pb.h ortools/sat/pb_constraint.h \
+ ortools/sat/restart.h ortools/sat/sat_decision.h \
+ ortools/util/integer_pq.h ortools/util/rev.h \
+ ortools/util/range_query_function.h \
+ ortools/constraint_solver/routing_lp_scheduling.h ortools/sat/cp_model.h \
+ ortools/gen/ortools/sat/cp_model.pb.h ortools/sat/cp_model_solver.h \
+ ortools/sat/cp_model_utils.h ortools/graph/christofides.h \
+ ortools/graph/eulerian_path.h ortools/graph/minimum_spanning_tree.h \
+ ortools/graph/connectivity.h ortools/util/vector_or_function.h \
+ ortools/graph/perfect_matching.h ortools/linear_solver/linear_solver.h \
+ ortools/linear_solver/linear_expr.h \
+ ortools/gen/ortools/linear_solver/linear_solver.pb.h \
+ ortools/linear_solver/linear_solver_callback.h \
+ ortools/port/proto_utils.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Srouting_search.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Srouting_search.$O
 
 objs/constraint_solver/sched_constraints.$O: \
-  ortools/constraint_solver/sched_constraints.cc \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/sched_constraints.cc \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Ssched_constraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssched_constraints.$O
 
 objs/constraint_solver/sched_expr.$O: \
-  ortools/constraint_solver/sched_expr.cc ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/sched_expr.cc ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Ssched_expr.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssched_expr.$O
 
 objs/constraint_solver/sched_search.$O: \
-  ortools/constraint_solver/sched_search.cc \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/sched_search.cc ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Ssched_search.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssched_search.$O
 
 objs/constraint_solver/search.$O: ortools/constraint_solver/search.cc \
-  ortools/base/bitmap.h ortools/base/basictypes.h \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/commandlineflags.h \
-  ortools/base/hash.h ortools/base/map_util.h ortools/base/mathutil.h \
-  ortools/base/stl_util.h ortools/base/timer.h \
-  ortools/constraint_solver/constraint_solver.h ortools/base/sysinfo.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h \
-  ortools/gen/ortools/constraint_solver/search_limit.pb.h \
-  ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
+ ortools/base/bitmap.h ortools/base/basictypes.h \
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/commandlineflags.h \
+ ortools/base/hash.h ortools/base/map_util.h ortools/base/mathutil.h \
+ ortools/base/stl_util.h ortools/base/timer.h \
+ ortools/constraint_solver/constraint_solver.h ortools/base/sysinfo.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/gen/ortools/constraint_solver/search_limit.pb.h \
+ ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Ssearch.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Ssearch.$O
 
 objs/constraint_solver/table.$O: ortools/constraint_solver/table.cc \
-  ortools/base/commandlineflags.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
-  ortools/constraint_solver/constraint_solver.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
+ ortools/base/commandlineflags.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
+ ortools/constraint_solver/constraint_solver.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h \
+ ortools/util/string_array.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Stable.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Stable.$O
 
 objs/constraint_solver/timetabling.$O: \
-  ortools/constraint_solver/timetabling.cc ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/map_util.h \
-  ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/timetabling.cc ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/map_util.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Stimetabling.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Stimetabling.$O
 
 objs/constraint_solver/trace.$O: ortools/constraint_solver/trace.cc \
-  ortools/base/commandlineflags.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
-  ortools/constraint_solver/constraint_solver.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
+ ortools/base/commandlineflags.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
+ ortools/constraint_solver/constraint_solver.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Strace.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Strace.$O
 
 objs/constraint_solver/utilities.$O: \
-  ortools/constraint_solver/utilities.cc ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/integral_types.h \
-  ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/sysinfo.h \
-  ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
+ ortools/constraint_solver/utilities.cc ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/integral_types.h \
+ ortools/base/logging.h ortools/base/macros.h ortools/base/map_util.h \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/sysinfo.h \
+ ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Sutilities.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sutilities.$O
 
 objs/constraint_solver/visitor.$O: ortools/constraint_solver/visitor.cc \
-  ortools/base/integral_types.h ortools/base/logging.h \
-  ortools/base/macros.h ortools/base/map_util.h ortools/base/stl_util.h \
-  ortools/constraint_solver/constraint_solver.h \
-  ortools/base/commandlineflags.h ortools/base/hash.h \
-  ortools/base/basictypes.h ortools/base/sysinfo.h ortools/base/timer.h \
-  ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
-  ortools/util/piecewise_linear_function.h \
-  ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
-  ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
-  ortools/constraint_solver/constraint_solveri.h \
-  ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
+ ortools/base/integral_types.h ortools/base/logging.h \
+ ortools/base/macros.h ortools/base/map_util.h ortools/base/stl_util.h \
+ ortools/constraint_solver/constraint_solver.h \
+ ortools/base/commandlineflags.h ortools/base/hash.h \
+ ortools/base/basictypes.h ortools/base/sysinfo.h ortools/base/timer.h \
+ ortools/gen/ortools/constraint_solver/solver_parameters.pb.h \
+ ortools/util/piecewise_linear_function.h \
+ ortools/util/saturated_arithmetic.h ortools/util/bitset.h \
+ ortools/util/sorted_interval_list.h ortools/util/tuple_set.h \
+ ortools/constraint_solver/constraint_solveri.h ortools/util/vector_map.h | $(OBJ_DIR)/constraint_solver
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Sconstraint_solver$Svisitor.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Svisitor.$O
 
 ortools/constraint_solver/assignment.proto: ;
diff --git a/makefiles/Makefile.third_party.unix.mk b/makefiles/Makefile.third_party.unix.mk
index 85e8f6c53a..e5f207b1b8 100644
--- a/makefiles/Makefile.third_party.unix.mk
+++ b/makefiles/Makefile.third_party.unix.mk
@@ -370,6 +370,7 @@ $(_ABSL_STATIC_LIB_DIR)libabsl_bad_variant_access.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_city.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_civil_time.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_examine_stack.a \
+$(_ABSL_STATIC_LIB_DIR)libabsl_cord.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_failure_signal_handler.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_flags.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_flags_config.a \
@@ -403,6 +404,7 @@ $(_ABSL_STATIC_LIB_DIR)libabsl_raw_logging_internal.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_scoped_set_env.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_spinlock_wait.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_stacktrace.a \
+$(_ABSL_STATIC_LIB_DIR)libabsl_status.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_str_format_internal.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_strings.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_strings_internal.a \
diff --git a/makefiles/Makefile.unix.mk b/makefiles/Makefile.unix.mk
index c9286f0982..76a88a78e8 100644
--- a/makefiles/Makefile.unix.mk
+++ b/makefiles/Makefile.unix.mk
@@ -198,7 +198,7 @@ ifeq ($(PLATFORM),MACOSX)
     GLPK_LNK = $(UNIX_GLPK_DIR)/lib/libglpk.a
   endif
   ifdef UNIX_SCIP_DIR
-    SCIP_LNK = -force_load $(UNIX_SCIP_DIR)/lib/libscipopt.a $(UNIX_SCIP_DIR)/lib/libsoplex-pic.a
+    SCIP_LNK = -force_load $(UNIX_SCIP_DIR)/lib/libscipopt.a $(UNIX_SCIP_DIR)/lib/libsoplex.a
   endif
   ifdef UNIX_GUROBI_DIR
     GUROBI_LNK = \