diff --git a/ortools/glop/primal_edge_norms.cc b/ortools/glop/primal_edge_norms.cc
index dfa9b23579..a73d60e6b5 100644
--- a/ortools/glop/primal_edge_norms.cc
+++ b/ortools/glop/primal_edge_norms.cc
@@ -16,8 +16,17 @@
 #include <algorithm>
 #include <cstdlib>
 
-#include "ortools/base/timer.h"
+#include "absl/log/check.h"
+#include "ortools/base/logging.h"
+#include "ortools/glop/basis_representation.h"
+#include "ortools/glop/parameters.pb.h"
+#include "ortools/glop/update_row.h"
+#include "ortools/glop/variables_info.h"
+#include "ortools/lp_data/lp_types.h"
 #include "ortools/lp_data/lp_utils.h"
+#include "ortools/lp_data/scattered_vector.h"
+#include "ortools/lp_data/sparse.h"
+#include "ortools/util/stats.h"
 
 namespace operations_research {
 namespace glop {
diff --git a/ortools/glop/primal_edge_norms.h b/ortools/glop/primal_edge_norms.h
index 4d68c80870..8351b1542b 100644
--- a/ortools/glop/primal_edge_norms.h
+++ b/ortools/glop/primal_edge_norms.h
@@ -25,6 +25,7 @@
 #include "ortools/lp_data/lp_data.h"
 #include "ortools/lp_data/lp_types.h"
 #include "ortools/lp_data/scattered_vector.h"
+#include "ortools/lp_data/sparse.h"
 #include "ortools/util/stats.h"
 
 namespace operations_research {
diff --git a/ortools/glop/reduced_costs.cc b/ortools/glop/reduced_costs.cc
index 781a14a721..3224ce9ccd 100644
--- a/ortools/glop/reduced_costs.cc
+++ b/ortools/glop/reduced_costs.cc
@@ -17,6 +17,20 @@
 #include <cstdlib>
 #include <random>
 
+#include "absl/log/check.h"
+#include "absl/random/bit_gen_ref.h"
+#include "ortools/base/logging.h"
+#include "ortools/glop/basis_representation.h"
+#include "ortools/glop/parameters.pb.h"
+#include "ortools/glop/primal_edge_norms.h"
+#include "ortools/glop/update_row.h"
+#include "ortools/glop/variables_info.h"
+#include "ortools/lp_data/lp_types.h"
+#include "ortools/lp_data/scattered_vector.h"
+#include "ortools/lp_data/sparse.h"
+#include "ortools/util/bitset.h"
+#include "ortools/util/stats.h"
+
 #ifdef OMP
 #include <omp.h>
 #endif
diff --git a/ortools/glop/reduced_costs.h b/ortools/glop/reduced_costs.h
index 33f7187420..8e22c1854e 100644
--- a/ortools/glop/reduced_costs.h
+++ b/ortools/glop/reduced_costs.h
@@ -28,6 +28,7 @@
 #include "ortools/lp_data/lp_data.h"
 #include "ortools/lp_data/lp_types.h"
 #include "ortools/lp_data/scattered_vector.h"
+#include "ortools/lp_data/sparse.h"
 #include "ortools/util/stats.h"
 
 namespace operations_research {
diff --git a/ortools/glop/revised_simplex.cc b/ortools/glop/revised_simplex.cc
index 2122101011..ac4ead7c5c 100644
--- a/ortools/glop/revised_simplex.cc
+++ b/ortools/glop/revised_simplex.cc
@@ -23,22 +23,35 @@
 #include <utility>
 #include <vector>
 
+#include "absl/flags/flag.h"
+#include "absl/log/check.h"
+#include "absl/random/bit_gen_ref.h"
+#include "absl/random/random.h"
+#include "absl/random/seed_sequences.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-#include "ortools/base/commandlineflags.h"
 #include "ortools/base/logging.h"
 #include "ortools/base/strong_vector.h"
-#include "ortools/base/types.h"
+#include "ortools/glop/basis_representation.h"
 #include "ortools/glop/initial_basis.h"
 #include "ortools/glop/parameters.pb.h"
+#include "ortools/glop/status.h"
+#include "ortools/glop/variables_info.h"
+#include "ortools/graph/iterators.h"
 #include "ortools/lp_data/lp_data.h"
 #include "ortools/lp_data/lp_print_utils.h"
 #include "ortools/lp_data/lp_types.h"
 #include "ortools/lp_data/lp_utils.h"
 #include "ortools/lp_data/matrix_utils.h"
 #include "ortools/lp_data/permutation.h"
-#include "ortools/util/fp_utils.h"
+#include "ortools/lp_data/sparse.h"
+#include "ortools/lp_data/sparse_column.h"
+#include "ortools/lp_data/sparse_row.h"
+#include "ortools/util/logging.h"
+#include "ortools/util/return_macros.h"
+#include "ortools/util/stats.h"
+#include "ortools/util/time_limit.h"
 
 ABSL_FLAG(bool, simplex_display_numbers_as_fractions, false,
           "Display numbers as fractions.");
diff --git a/ortools/glop/revised_simplex.h b/ortools/glop/revised_simplex.h
index a69562e291..f3cd68dba4 100644
--- a/ortools/glop/revised_simplex.h
+++ b/ortools/glop/revised_simplex.h
@@ -95,11 +95,15 @@
 #include <string>
 #include <vector>
 
+#include "absl/base/attributes.h"
+#include "absl/log/die_if_null.h"
 #include "absl/random/bit_gen_ref.h"
+#include "absl/random/random.h"
 #include "ortools/base/types.h"
 #include "ortools/glop/basis_representation.h"
 #include "ortools/glop/dual_edge_norms.h"
 #include "ortools/glop/entering_variable.h"
+#include "ortools/glop/lu_factorization.h"
 #include "ortools/glop/parameters.pb.h"
 #include "ortools/glop/pricing.h"
 #include "ortools/glop/primal_edge_norms.h"
@@ -112,9 +116,12 @@
 #include "ortools/lp_data/lp_print_utils.h"
 #include "ortools/lp_data/lp_types.h"
 #include "ortools/lp_data/scattered_vector.h"
+#include "ortools/lp_data/sparse.h"
+#include "ortools/lp_data/sparse_column.h"
 #include "ortools/lp_data/sparse_row.h"
 #include "ortools/util/logging.h"
 #include "ortools/util/random_engine.h"
+#include "ortools/util/stats.h"
 #include "ortools/util/time_limit.h"
 
 namespace operations_research {
diff --git a/ortools/glop/update_row.cc b/ortools/glop/update_row.cc
index 739c3fc33f..83a6a1e6ce 100644
--- a/ortools/glop/update_row.cc
+++ b/ortools/glop/update_row.cc
@@ -16,8 +16,17 @@
 #include <cstdlib>
 #include <string>
 
+#include "absl/log/check.h"
 #include "absl/types/span.h"
+#include "ortools/base/logging.h"
+#include "ortools/glop/basis_representation.h"
+#include "ortools/glop/parameters.pb.h"
+#include "ortools/glop/variables_info.h"
+#include "ortools/lp_data/lp_types.h"
 #include "ortools/lp_data/lp_utils.h"
+#include "ortools/lp_data/scattered_vector.h"
+#include "ortools/lp_data/sparse.h"
+#include "ortools/util/stats.h"
 
 namespace operations_research {
 namespace glop {
diff --git a/ortools/glop/update_row.h b/ortools/glop/update_row.h
index 78174400cb..f82d914507 100644
--- a/ortools/glop/update_row.h
+++ b/ortools/glop/update_row.h
@@ -18,11 +18,13 @@
 #include <string>
 #include <vector>
 
+#include "absl/types/span.h"
 #include "ortools/glop/basis_representation.h"
 #include "ortools/glop/parameters.pb.h"
 #include "ortools/glop/variables_info.h"
 #include "ortools/lp_data/lp_types.h"
 #include "ortools/lp_data/scattered_vector.h"
+#include "ortools/lp_data/sparse.h"
 #include "ortools/util/stats.h"
 
 namespace operations_research {
diff --git a/ortools/glop/variable_values.cc b/ortools/glop/variable_values.cc
index cffd3bb242..1700bcad93 100644
--- a/ortools/glop/variable_values.cc
+++ b/ortools/glop/variable_values.cc
@@ -17,9 +17,20 @@
 #include <cstdlib>
 #include <vector>
 
-#include "ortools/graph/iterators.h"
+#include "absl/base/attributes.h"
+#include "absl/log/check.h"
+#include "absl/types/span.h"
+#include "ortools/base/logging.h"
+#include "ortools/glop/basis_representation.h"
+#include "ortools/glop/dual_edge_norms.h"
+#include "ortools/glop/parameters.pb.h"
+#include "ortools/glop/pricing.h"
+#include "ortools/glop/variables_info.h"
 #include "ortools/lp_data/lp_types.h"
 #include "ortools/lp_data/lp_utils.h"
+#include "ortools/lp_data/scattered_vector.h"
+#include "ortools/lp_data/sparse.h"
+#include "ortools/util/stats.h"
 
 namespace operations_research {
 namespace glop {
diff --git a/ortools/glop/variable_values.h b/ortools/glop/variable_values.h
index 04b2f11d96..ffdc40e36f 100644
--- a/ortools/glop/variable_values.h
+++ b/ortools/glop/variable_values.h
@@ -18,12 +18,15 @@
 #include <string>
 #include <vector>
 
+#include "absl/types/span.h"
 #include "ortools/glop/basis_representation.h"
 #include "ortools/glop/dual_edge_norms.h"
+#include "ortools/glop/parameters.pb.h"
 #include "ortools/glop/pricing.h"
 #include "ortools/glop/variables_info.h"
 #include "ortools/lp_data/lp_types.h"
 #include "ortools/lp_data/scattered_vector.h"
+#include "ortools/lp_data/sparse.h"
 #include "ortools/util/stats.h"
 
 namespace operations_research {
diff --git a/ortools/glop/variables_info.cc b/ortools/glop/variables_info.cc
index 1fe5b31903..3830178e80 100644
--- a/ortools/glop/variables_info.cc
+++ b/ortools/glop/variables_info.cc
@@ -16,6 +16,10 @@
 #include <cstdlib>
 #include <utility>
 
+#include "absl/log/check.h"
+#include "ortools/lp_data/lp_types.h"
+#include "ortools/lp_data/sparse.h"
+
 namespace operations_research {
 namespace glop {