flatzinc: export from google3

ortools/flatzinc/checker.cc

@@ -24,6 +24,8 @@
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
+#include "absl/log/check.h"
+#include "ortools/base/logging.h"
 #include "ortools/flatzinc/model.h"
 #include "ortools/util/logging.h"
 

ortools/flatzinc/cp_model_fz_solver.cc

@@ -38,6 +38,7 @@
 #include "ortools/sat/cp_model_solver.h"
 #include "ortools/sat/cp_model_utils.h"
 #include "ortools/sat/model.h"
+#include "ortools/sat/sat_parameters.pb.h"
 #include "ortools/util/logging.h"
 #include "ortools/util/sorted_interval_list.h"
 

ortools/flatzinc/model.cc

@@ -22,13 +22,16 @@
 #include <vector>
 
 #include "absl/container/flat_hash_set.h"
+#include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
+#include "ortools/base/logging.h"
 #include "ortools/base/stl_util.h"
 #include "ortools/util/logging.h"
+#include "ortools/util/string_array.h"
 
 namespace operations_research {
 namespace fz {

ortools/flatzinc/parser.cc

@@ -16,7 +16,10 @@
 #include <cstdio>
 #include <string>
 
+#include "ortools/base/logging.h"
+#include "ortools/flatzinc/model.h"
 #include "ortools/flatzinc/parser.tab.hh"
+#include "ortools/flatzinc/parser_util.h"
 
 // Declare external functions in the flatzinc.tab.cc generated file.
 extern int orfz_parse(operations_research::fz::ParserContext* parser,

ortools/flatzinc/parser_main.cc

@@ -18,8 +18,10 @@
 #include <string>
 
 #include "absl/flags/flag.h"
-#include "ortools/base/commandlineflags.h"
+#include "absl/log/check.h"
+#include "absl/strings/match.h"
 #include "ortools/base/init_google.h"
+#include "ortools/base/logging.h"
 #include "ortools/base/timer.h"
 #include "ortools/flatzinc/model.h"
 #include "ortools/flatzinc/parser.h"

ortools/flatzinc/presolve.cc

@@ -19,14 +19,12 @@
 #include <string>
 #include <vector>
 
-#include "absl/strings/match.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_join.h"
+#include "absl/container/flat_hash_set.h"
+#include "absl/flags/flag.h"
+#include "absl/log/check.h"
 #include "absl/strings/string_view.h"
 #include "ortools/flatzinc/model.h"
-#include "ortools/graph/cliques.h"
-#include "ortools/util/saturated_arithmetic.h"
-#include "ortools/util/vector_map.h"
+#include "ortools/util/logging.h"
 
 ABSL_FLAG(bool, fz_floats_are_ints, false,
           "Interpret floats as integers in all variables and constraints.");