diff --git a/examples/circle_fit.cc b/examples/circle_fit.cc
index 45cf5e3e0..7605604c7 100644
--- a/examples/circle_fit.cc
+++ b/examples/circle_fit.cc
@@ -50,14 +50,14 @@
 //
 //   [1] http://www.mathworks.com/matlabcentral/fileexchange/5557-circle-fit/content/circfit.m  // NOLINT
 
+#include <cmath>
 #include <cstdio>
+#include <iostream>
 #include <vector>
 
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
-#include "absl/log/check.h"
 #include "absl/log/initialize.h"
-#include "absl/log/log.h"
 #include "ceres/ceres.h"
 
 ABSL_FLAG(double,
@@ -122,7 +122,7 @@ int main(int argc, char** argv) {
   double initial_r = r;
 
   // Parameterize r as m^2 so that it can't be negative.
-  double m = sqrt(r);
+  double m = std::sqrt(r);
 
   ceres::Problem problem;
 
diff --git a/examples/powell.cc b/examples/powell.cc
index c46cff7e7..8b2ab05c7 100644
--- a/examples/powell.cc
+++ b/examples/powell.cc
@@ -44,7 +44,8 @@
 // Garbow and Kenneth E. Hillstrom in ACM Transactions on Mathematical Software,
 // Vol 7(1), March 1981.
 
-#include <vector>
+#include <iostream>
+#include <string>
 
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
diff --git a/examples/rosenbrock_analytic_diff.cc b/examples/rosenbrock_analytic_diff.cc
index 5b7c30d6c..fb1856e40 100644
--- a/examples/rosenbrock_analytic_diff.cc
+++ b/examples/rosenbrock_analytic_diff.cc
@@ -32,6 +32,8 @@
 // (https://en.wikipedia.org/wiki/Rosenbrock_function) using
 // GradientProblemSolver using analytic derivatives.
 
+#include <iostream>
+
 #include "absl/log/initialize.h"
 #include "ceres/ceres.h"
 
diff --git a/examples/slam/pose_graph_3d/pose_graph_3d.cc b/examples/slam/pose_graph_3d/pose_graph_3d.cc
index 783f685fe..8a58315b3 100644
--- a/examples/slam/pose_graph_3d/pose_graph_3d.cc
+++ b/examples/slam/pose_graph_3d/pose_graph_3d.cc
@@ -32,6 +32,7 @@
 #include <iostream>
 #include <string>
 
+#include "Eigen/Core"
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/log/check.h"
diff --git a/internal/ceres/array_selector_test.cc b/internal/ceres/array_selector_test.cc
index ff1bcd772..36155f13e 100644
--- a/internal/ceres/array_selector_test.cc
+++ b/internal/ceres/array_selector_test.cc
@@ -31,6 +31,12 @@
 
 #include "ceres/internal/array_selector.h"
 
+#include <array>
+#include <type_traits>
+#include <vector>
+
+#include "ceres/internal/fixed_array.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
 namespace ceres::internal {
diff --git a/internal/ceres/autodiff_manifold_test.cc b/internal/ceres/autodiff_manifold_test.cc
index c687719d5..e691da6b0 100644
--- a/internal/ceres/autodiff_manifold_test.cc
+++ b/internal/ceres/autodiff_manifold_test.cc
@@ -31,11 +31,13 @@
 #include "ceres/autodiff_manifold.h"
 
 #include <cmath>
+#include <limits>
 
 #include "ceres/constants.h"
-#include "ceres/manifold.h"
+#include "ceres/internal/eigen.h"
 #include "ceres/manifold_test_utils.h"
 #include "ceres/rotation.h"
+#include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
 namespace ceres::internal {
diff --git a/internal/ceres/block_random_access_diagonal_matrix_test.cc b/internal/ceres/block_random_access_diagonal_matrix_test.cc
index 9590d1ba7..f765ed11a 100644
--- a/internal/ceres/block_random_access_diagonal_matrix_test.cc
+++ b/internal/ceres/block_random_access_diagonal_matrix_test.cc
@@ -30,11 +30,14 @@
 
 #include "ceres/block_random_access_diagonal_matrix.h"
 
-#include <limits>
+#include <cmath>
 #include <memory>
 #include <vector>
 
 #include "Eigen/Cholesky"
+#include "ceres/block_random_access_matrix.h"
+#include "ceres/block_structure.h"
+#include "ceres/context_impl.h"
 #include "ceres/internal/eigen.h"
 #include "gtest/gtest.h"
 
@@ -133,10 +136,10 @@ TEST_F(BlockRandomAccessDiagonalMatrixTest, MatrixContents) {
               kTolerance);
 
   // There is nothing else in the matrix besides these four blocks.
-  EXPECT_NEAR(
-      dense.norm(),
-      sqrt(6 * 1.0 + 3 * 4.0 + 12 * 16.0 + 4 * 25.0 + 20 * 81.0 + 5 * 100.0),
-      kTolerance);
+  EXPECT_NEAR(dense.norm(),
+              std::sqrt(6 * 1.0 + 3 * 4.0 + 12 * 16.0 + 4 * 25.0 + 20 * 81.0 +
+                        5 * 100.0),
+              kTolerance);
 }
 
 TEST_F(BlockRandomAccessDiagonalMatrixTest, RightMultiplyAndAccumulate) {
diff --git a/internal/ceres/block_sparse_matrix_test.cc b/internal/ceres/block_sparse_matrix_test.cc
index c27146d28..cd15efd20 100644
--- a/internal/ceres/block_sparse_matrix_test.cc
+++ b/internal/ceres/block_sparse_matrix_test.cc
@@ -31,13 +31,13 @@
 #include "ceres/block_sparse_matrix.h"
 
 #include <algorithm>
+#include <limits>
 #include <memory>
 #include <random>
-#include <string>
 #include <vector>
 
+#include "ceres/block_structure.h"
 #include "ceres/casts.h"
-#include "ceres/crs_matrix.h"
 #include "ceres/internal/eigen.h"
 #include "ceres/linear_least_squares_problems.h"
 #include "ceres/triplet_sparse_matrix.h"
diff --git a/internal/ceres/cost_function_to_functor_test.cc b/internal/ceres/cost_function_to_functor_test.cc
index bc081f433..7072d4b24 100644
--- a/internal/ceres/cost_function_to_functor_test.cc
+++ b/internal/ceres/cost_function_to_functor_test.cc
@@ -36,8 +36,10 @@
 #include <vector>
 
 #include "ceres/autodiff_cost_function.h"
+#include "ceres/cost_function.h"
 #include "ceres/dynamic_autodiff_cost_function.h"
 #include "ceres/dynamic_cost_function_to_functor.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
 namespace ceres::internal {
diff --git a/internal/ceres/covariance_test.cc b/internal/ceres/covariance_test.cc
index 49e5d6f78..024d30231 100644
--- a/internal/ceres/covariance_test.cc
+++ b/internal/ceres/covariance_test.cc
@@ -31,7 +31,6 @@
 #include "ceres/covariance.h"
 
 #include <algorithm>
-#include <cmath>
 #include <cstdint>
 #include <map>
 #include <memory>
@@ -44,6 +43,7 @@
 #include "ceres/cost_function.h"
 #include "ceres/covariance_impl.h"
 #include "ceres/internal/config.h"
+#include "ceres/internal/eigen.h"
 #include "ceres/manifold.h"
 #include "ceres/map_util.h"
 #include "ceres/problem_impl.h"
diff --git a/internal/ceres/cuda_vector_test.cc b/internal/ceres/cuda_vector_test.cc
index 0ea4703dd..9da89f0ce 100644
--- a/internal/ceres/cuda_vector_test.cc
+++ b/internal/ceres/cuda_vector_test.cc
@@ -30,10 +30,10 @@
 
 #include "ceres/cuda_vector.h"
 
-#include <string>
-
+#include "ceres/context_impl.h"
 #include "ceres/internal/config.h"
 #include "ceres/internal/eigen.h"
+#include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
 namespace ceres {
diff --git a/internal/ceres/dense_cholesky_test.cc b/internal/ceres/dense_cholesky_test.cc
index b5972effd..6f5b7f24b 100644
--- a/internal/ceres/dense_cholesky_test.cc
+++ b/internal/ceres/dense_cholesky_test.cc
@@ -30,18 +30,19 @@
 
 #include "ceres/dense_cholesky.h"
 
+#include <limits>
 #include <memory>
-#include <numeric>
 #include <sstream>
 #include <string>
 #include <utility>
-#include <vector>
 
 #include "Eigen/Dense"
+#include "ceres/context_impl.h"
 #include "ceres/internal/config.h"
 #include "ceres/internal/eigen.h"
 #include "ceres/iterative_refiner.h"
 #include "ceres/linear_solver.h"
+#include "ceres/types.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/internal/ceres/dense_linear_solver_test.cc b/internal/ceres/dense_linear_solver_test.cc
index 9cece5604..f764713b6 100644
--- a/internal/ceres/dense_linear_solver_test.cc
+++ b/internal/ceres/dense_linear_solver_test.cc
@@ -28,11 +28,16 @@
 //
 // Author: sameeragarwal@google.com (Sameer Agarwal)
 
+#include <limits>
 #include <memory>
+#include <sstream>
+#include <string>
 
 #include "ceres/casts.h"
 #include "ceres/context_impl.h"
+#include "ceres/dense_sparse_matrix.h"
 #include "ceres/internal/config.h"
+#include "ceres/internal/eigen.h"
 #include "ceres/linear_least_squares_problems.h"
 #include "ceres/linear_solver.h"
 #include "ceres/triplet_sparse_matrix.h"
diff --git a/internal/ceres/dynamic_autodiff_cost_function_test.cc b/internal/ceres/dynamic_autodiff_cost_function_test.cc
index 51366c66c..5b7261ce0 100644
--- a/internal/ceres/dynamic_autodiff_cost_function_test.cc
+++ b/internal/ceres/dynamic_autodiff_cost_function_test.cc
@@ -32,10 +32,11 @@
 
 #include "ceres/dynamic_autodiff_cost_function.h"
 
-#include <cstddef>
 #include <memory>
+#include <utility>
 #include <vector>
 
+#include "ceres/cost_function.h"
 #include "ceres/types.h"
 #include "gtest/gtest.h"
 
diff --git a/internal/ceres/dynamic_sparse_normal_cholesky_solver_test.cc b/internal/ceres/dynamic_sparse_normal_cholesky_solver_test.cc
index 100d5741b..4d9f2bfa9 100644
--- a/internal/ceres/dynamic_sparse_normal_cholesky_solver_test.cc
+++ b/internal/ceres/dynamic_sparse_normal_cholesky_solver_test.cc
@@ -29,12 +29,14 @@
 // Author: sameeragarwal@google.com (Sameer Agarwal)
 
 #include <memory>
+#include <utility>
 
 #include "Eigen/Cholesky"
 #include "ceres/casts.h"
 #include "ceres/compressed_row_sparse_matrix.h"
 #include "ceres/context_impl.h"
 #include "ceres/internal/config.h"
+#include "ceres/internal/eigen.h"
 #include "ceres/linear_least_squares_problems.h"
 #include "ceres/linear_solver.h"
 #include "ceres/triplet_sparse_matrix.h"
diff --git a/internal/ceres/generate_bundle_adjustment_tests.py b/internal/ceres/generate_bundle_adjustment_tests.py
index 0359b4038..d8d164653 100644
--- a/internal/ceres/generate_bundle_adjustment_tests.py
+++ b/internal/ceres/generate_bundle_adjustment_tests.py
@@ -140,7 +140,11 @@ BUNDLE_ADJUSTMENT_TEST_TEMPLATE = (COPYRIGHT_HEADER + """
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
+
 %(preprocessor_conditions_begin)s
 namespace ceres::internal {
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_auto_test.cc
index e48f64699..0186836e5 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_auto_threads_test.cc
index 336066ebe..5d9d9f340 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_user_test.cc
index 86df64d42..a34eaa18a 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_user_threads_test.cc
index 5e752e43b..dbe88d1c7 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_cuda_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_auto_test.cc
index faca44ea3..ce594988f 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_auto_threads_test.cc
index c4db182a2..8086c67d0 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_user_test.cc
index 7fe05d1fa..fc0e80430 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_user_threads_test.cc
index 7c34e20e8..87f71eb02 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_eigen_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_auto_test.cc
index 79ec5ceab..143238e3b 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_LAPACK
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_auto_threads_test.cc
index ee7442026..3ba12f1de 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_LAPACK
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_user_test.cc
index 205de874a..852a88fd6 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_LAPACK
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_user_threads_test.cc
index 03a0a7313..32a71ae70 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_denseschur_lapack_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_LAPACK
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_test.cc
index 8ab6a9b29..1873fcf68 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_threads_test.cc
index cf6be8d77..f97cf6584 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_test.cc
index b6ca30f95..83011b521 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_threads_test.cc
index 2ef6aa1a0..4b287bfe1 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clustjacobi_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_test.cc
index ea249550c..572bc6445 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_threads_test.cc
index 217edc396..2aa0ba76b 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_test.cc
index 4b66d1784..a2c60f0cf 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_threads_test.cc
index 3e8473495..c5d1e8515 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_acceleratesparse_clusttri_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_auto_test.cc
index 1719aeed3..d9a2ee291 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_auto_threads_test.cc
index c0c348945..4d8d3f782 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_user_test.cc
index 554a43254..05c0531a7 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_user_threads_test.cc
index 1e39f65b8..10b0b6495 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clustjacobi_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_auto_test.cc
index 6addad5d7..12f14ce2a 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_auto_threads_test.cc
index d2fefb8ae..2b213f745 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_user_test.cc
index ae04eec23..3db8dcd58 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_user_threads_test.cc
index cad205186..46ab7f72e 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_cudasparse_clusttri_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_test.cc
index c1ceb9f32..acb4d85d8 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_threads_test.cc
index 35760db91..c69ffcfa9 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_test.cc
index 6b35e6b06..2664f45e3 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_threads_test.cc
index 9b36562a2..dafafa1ff 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clustjacobi_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_test.cc
index a62c8ba70..f88b45abc 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_threads_test.cc
index f306f812e..434813a3b 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_test.cc
index 62d60b125..7b275cc61 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_threads_test.cc
index 223a76a80..47675dc1c 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_eigensparse_clusttri_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_test.cc
index 8e9afa1f0..2e2290b0f 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_threads_test.cc
index 433bf7690..9082bdb5c 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_test.cc
index 8e740dab3..725d41a35 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_threads_test.cc
index 705bfe266..bbe812389 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_jacobi_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_test.cc
index 6b46f3db2..5a0296b88 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_threads_test.cc
index a74efa819..6ae03cc36 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_test.cc
index d0fa244a6..2367b160e 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_threads_test.cc
index e5418c90a..d8fdf3cb8 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_schurjacobi_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_auto_test.cc
index 1287a6192..3dc3310c9 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_auto_threads_test.cc
index 739d7bfb3..3d123a34b 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_user_test.cc
index 38b8d36f2..43a1bb9ee 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_user_threads_test.cc
index 2a715ccb5..82b9db8ab 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_spse_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 namespace ceres::internal {
 
 TEST_F(BundleAdjustmentTest,
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_test.cc
index d25a7e7df..73d2828d0 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_threads_test.cc
index 38d65b14c..e6282b2a3 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_test.cc
index 40b745130..bb7d059c0 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_threads_test.cc
index d12b524df..cb8052c78 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clustjacobi_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_test.cc
index 720613232..b17656efd 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_threads_test.cc
index 61efa204d..dbce75235 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_test.cc
index b750cbbef..7b725fdb5 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_threads_test.cc
index f704e323a..49ddbd3fb 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_iterschur_suitesparse_clusttri_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_test.cc
index 05caf3caa..efa7e27d8 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_threads_test.cc
index bfd1d4b73..2d27f5833 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_test.cc
index 0017874d2..5364911a7 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_threads_test.cc
index 7bb7f0b1e..673f505bf 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_acceleratesparse_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_auto_test.cc
index 77f2fc164..592d471b5 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_auto_threads_test.cc
index f43654487..8aa6441b8 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_user_test.cc
index dea6202c2..f79c732e5 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_user_threads_test.cc
index 90a69e8aa..9a2dc3789 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_cudasparse_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_test.cc
index a15553cbd..a8e2e9a6b 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_threads_test.cc
index 213429571..e44fab142 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_test.cc
index de00ccbe7..353fb44a3 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_threads_test.cc
index f4ad5e00d..61b75027a 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_eigensparse_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_test.cc
index f72ca557a..266f708f4 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_threads_test.cc
index d301e5eb3..ad07bf30a 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_test.cc
index db22d6cda..2322b5f15 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_threads_test.cc
index 8b9782079..e2acfe9a2 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparsecholesky_suitesparse_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_test.cc
index d4b8dd205..6e0c67011 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_threads_test.cc
index 8f7aacf81..4b0345648 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_test.cc
index 257cf0d85..ff4ca8ccd 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_threads_test.cc
index dea1a2836..edd28a4f3 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_acceleratesparse_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_ACCELERATE_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_auto_test.cc
index 5c459775c..3a46a0de1 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_auto_threads_test.cc
index b866acb8f..a3cce4638 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_user_test.cc
index a7e5e1406..ab3caae89 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_user_threads_test.cc
index 7319b2869..e37c3f8ef 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_cudasparse_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_CUDA
 #ifndef CERES_NO_CUDSS
 
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_test.cc
index bcc2cc4a2..8d77860cb 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_threads_test.cc
index e70f9eec0..6385b5ed7 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_test.cc
index cb408af3b..0fb935e45 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_threads_test.cc
index 890214624..49dd00ac0 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_eigensparse_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifdef CERES_USE_EIGEN_SPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_test.cc
index aaa38c03f..7bcb69880 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_threads_test.cc
index a3f4ad061..e28dc99c1 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_auto_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_test.cc
index 53cad2d26..6ae607991 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {
diff --git a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_threads_test.cc b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_threads_test.cc
index d23a277a8..2340943a2 100644
--- a/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_threads_test.cc
+++ b/internal/ceres/generated_bundle_adjustment_tests/ba_sparseschur_suitesparse_user_threads_test.cc
@@ -37,8 +37,12 @@
 
 #include "ceres/bundle_adjustment_test_util.h"
 #include "ceres/internal/config.h"
+#include "ceres/problem.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
 #include "gtest/gtest.h"
 
+
 #ifndef CERES_NO_SUITESPARSE
 
 namespace ceres::internal {