diff --git a/internal/ceres/compressed_row_sparse_matrix.cc b/internal/ceres/compressed_row_sparse_matrix.cc
index 9fb7bd7bf..e200c9285 100644
--- a/internal/ceres/compressed_row_sparse_matrix.cc
+++ b/internal/ceres/compressed_row_sparse_matrix.cc
@@ -275,7 +275,7 @@ void CompressedRowSparseMatrix::SolveLowerTriangularInPlace(
     }
     solution[r] /=  values_[rows_[r + 1] - 1];
   }
-};
+}
 
 void CompressedRowSparseMatrix::SolveLowerTriangularTransposeInPlace(
     double* solution) const {
@@ -285,7 +285,7 @@ void CompressedRowSparseMatrix::SolveLowerTriangularTransposeInPlace(
       solution[cols_[idx]] -= values_[idx] * solution[r];
     }
   }
-};
+}
 
 CompressedRowSparseMatrix* CompressedRowSparseMatrix::CreateBlockDiagonalMatrix(
     const double* diagonal,
diff --git a/internal/ceres/compressed_row_sparse_matrix.h b/internal/ceres/compressed_row_sparse_matrix.h
index 7da723c17..c5721eb88 100644
--- a/internal/ceres/compressed_row_sparse_matrix.h
+++ b/internal/ceres/compressed_row_sparse_matrix.h
@@ -116,8 +116,8 @@ class CompressedRowSparseMatrix : public SparseMatrix {
   vector<int>* mutable_col_blocks() { return &col_blocks_; }
 
   // Non-destructive array resizing method.
-  void set_num_rows(const int num_rows) { num_rows_ = num_rows; };
-  void set_num_cols(const int num_cols) { num_cols_ = num_cols; };
+  void set_num_rows(const int num_rows) { num_rows_ = num_rows; }
+  void set_num_cols(const int num_cols) { num_cols_ = num_cols; }
 
   void SolveLowerTriangularInPlace(double* solution) const;
   void SolveLowerTriangularTransposeInPlace(double* solution) const;
diff --git a/internal/ceres/compressed_row_sparse_matrix_test.cc b/internal/ceres/compressed_row_sparse_matrix_test.cc
index 63b66a0a8..02109cc2e 100644
--- a/internal/ceres/compressed_row_sparse_matrix_test.cc
+++ b/internal/ceres/compressed_row_sparse_matrix_test.cc
@@ -210,7 +210,7 @@ TEST(CompressedRowSparseMatrix, CreateBlockDiagonalMatrix) {
   matrix->LeftMultiply(x.data(), y.data());
   for (int i = 0; i < diagonal.size(); ++i) {
     EXPECT_EQ(y[i], diagonal[i]);
-  };
+  }
 
   Matrix dense;
   matrix->ToDenseMatrix(&dense);
diff --git a/internal/ceres/coordinate_descent_minimizer.h b/internal/ceres/coordinate_descent_minimizer.h
index 3dcf8faee..424acda94 100644
--- a/internal/ceres/coordinate_descent_minimizer.h
+++ b/internal/ceres/coordinate_descent_minimizer.h
@@ -31,6 +31,7 @@
 #ifndef CERES_INTERNAL_COORDINATE_DESCENT_MINIMIZER_H_
 #define CERES_INTERNAL_COORDINATE_DESCENT_MINIMIZER_H_
 
+#include <string>
 #include <vector>
 
 #include "ceres/evaluator.h"
diff --git a/internal/ceres/dynamic_autodiff_cost_function_test.cc b/internal/ceres/dynamic_autodiff_cost_function_test.cc
index a42a37441..42d6ab706 100644
--- a/internal/ceres/dynamic_autodiff_cost_function_test.cc
+++ b/internal/ceres/dynamic_autodiff_cost_function_test.cc
@@ -30,11 +30,10 @@
 //         mierle@gmail.com (Keir Mierle)
 //         sameeragarwal@google.com (Sameer Agarwal)
 
-#include "ceres/dynamic_autodiff_cost_function.h"
-#include "ceres/internal/scoped_ptr.h"
-
 #include <cstddef>
 
+#include "ceres/dynamic_autodiff_cost_function.h"
+#include "ceres/internal/scoped_ptr.h"
 #include "gtest/gtest.h"
 
 namespace ceres {
diff --git a/internal/ceres/incomplete_lq_factorization.cc b/internal/ceres/incomplete_lq_factorization.cc
index 0d51f9a7e..6ba38ec8e 100644
--- a/internal/ceres/incomplete_lq_factorization.cc
+++ b/internal/ceres/incomplete_lq_factorization.cc
@@ -230,7 +230,7 @@ CompressedRowSparseMatrix* IncompleteLQFactorization(
     l_cols[l->num_nonzeros()] = i;
     l_values[l->num_nonzeros()] = NormalizeRow(i, &q);
     l_rows[l->num_rows()] += 1;
-  };
+  }
 
   return l;
 }
diff --git a/internal/ceres/incomplete_lq_factorization.h b/internal/ceres/incomplete_lq_factorization.h
index 4f3da3c03..e678463cf 100644
--- a/internal/ceres/incomplete_lq_factorization.h
+++ b/internal/ceres/incomplete_lq_factorization.h
@@ -28,6 +28,11 @@
 //
 // Author: sameeragarwal@google.com (Sameer Agarwal)
 
+#ifndef CERES_INTERNAL_INCOMPLETE_LQ_FACTORIZATION_H_
+#define CERES_INTERNAL_INCOMPLETE_LQ_FACTORIZATION_H_
+
+#include <vector>
+#include <utility>
 #include "ceres/compressed_row_sparse_matrix.h"
 
 namespace ceres {
@@ -81,3 +86,5 @@ void DropEntriesAndAddRow(const Vector& dense_row,
 
 }  // namespace internal
 }  // namespace ceres
+
+#endif  // CERES_INTERNAL_INCOMPLETE_LQ_FACTORIZATION_H_
diff --git a/internal/ceres/incomplete_lq_factorization_test.cc b/internal/ceres/incomplete_lq_factorization_test.cc
index 0a43f02a6..1ed181f58 100644
--- a/internal/ceres/incomplete_lq_factorization_test.cc
+++ b/internal/ceres/incomplete_lq_factorization_test.cc
@@ -110,14 +110,16 @@ TEST(IncompleteLQFactorization, CompleteFactorization) {
   lmatrix->ToDenseMatrix(&actual_l_matrix);
 
   EXPECT_NEAR((expected_l_matrix * expected_l_matrix.transpose() -
-               actual_l_matrix * actual_l_matrix.transpose()).norm(), 0.0, 1e-10)
+               actual_l_matrix * actual_l_matrix.transpose()).norm(),
+              0.0,
+              1e-10)
       << "expected: \n" << expected_l_matrix
       << "\actual: \n" << actual_l_matrix;
 }
 
 TEST(IncompleteLQFactorization, DropEntriesAndAddRow) {
   // Allocate space and then make it a zero sized matrix.
-  CompressedRowSparseMatrix matrix(10,10, 100);
+  CompressedRowSparseMatrix matrix(10, 10, 100);
   matrix.set_num_rows(0);
 
   vector<pair<int, double> > scratch(10);
diff --git a/internal/ceres/linear_solver.h b/internal/ceres/linear_solver.h
index bdf7b5698..67bebe05a 100644
--- a/internal/ceres/linear_solver.h
+++ b/internal/ceres/linear_solver.h
@@ -36,6 +36,7 @@
 
 #include <cstddef>
 #include <map>
+#include <string>
 #include <vector>
 #include "ceres/block_sparse_matrix.h"
 #include "ceres/casts.h"
diff --git a/internal/ceres/minimizer.h b/internal/ceres/minimizer.h
index a2ebe2f1b..f8f8a968d 100644
--- a/internal/ceres/minimizer.h
+++ b/internal/ceres/minimizer.h
@@ -31,6 +31,7 @@
 #ifndef CERES_INTERNAL_MINIMIZER_H_
 #define CERES_INTERNAL_MINIMIZER_H_
 
+#include <string>
 #include <vector>
 #include "ceres/internal/port.h"
 #include "ceres/iteration_callback.h"
diff --git a/internal/ceres/problem_impl.cc b/internal/ceres/problem_impl.cc
index 89e939faa..830270269 100644
--- a/internal/ceres/problem_impl.cc
+++ b/internal/ceres/problem_impl.cc
@@ -717,8 +717,8 @@ int ProblemImpl::ParameterBlockSize(const double* parameter_block) const {
 };
 
 int ProblemImpl::ParameterBlockLocalSize(const double* parameter_block) const {
-  return FindParameterBlockOrDie(parameter_block_map_,
-                                 const_cast<double*>(parameter_block))->LocalSize();
+  return FindParameterBlockOrDie(
+      parameter_block_map_, const_cast<double*>(parameter_block))->LocalSize();
 };
 
 void ProblemImpl::GetParameterBlocks(vector<double*>* parameter_blocks) const {
diff --git a/internal/ceres/program_evaluator.h b/internal/ceres/program_evaluator.h
index 1f7fc0f8f..19c7541d2 100644
--- a/internal/ceres/program_evaluator.h
+++ b/internal/ceres/program_evaluator.h
@@ -84,6 +84,7 @@
 #endif
 
 #include <map>
+#include <string>
 #include <vector>
 #include "ceres/blas.h"
 #include "ceres/execution_summary.h"
diff --git a/internal/ceres/solver_impl.cc b/internal/ceres/solver_impl.cc
index 3d48700c6..8b8395cd8 100644
--- a/internal/ceres/solver_impl.cc
+++ b/internal/ceres/solver_impl.cc
@@ -1457,8 +1457,8 @@ bool SolverImpl::ReorderProgramForSchurTypeLinearSolver(
     // this means that the user wishes for Ceres to identify the
     // e_blocks, which we do by computing a maximal independent set.
     vector<ParameterBlock*> schur_ordering;
-    const int num_eliminate_blocks = ComputeStableSchurOrdering(*program,
-                                                                &schur_ordering);
+    const int num_eliminate_blocks =
+        ComputeStableSchurOrdering(*program, &schur_ordering);
 
     CHECK_EQ(schur_ordering.size(), program->NumParameterBlocks())
         << "Congratulations, you found a Ceres bug! Please report this error "
diff --git a/internal/ceres/visibility_based_preconditioner_test.cc b/internal/ceres/visibility_based_preconditioner_test.cc
index 82aaac6fc..53d10e1ff 100644
--- a/internal/ceres/visibility_based_preconditioner_test.cc
+++ b/internal/ceres/visibility_based_preconditioner_test.cc
@@ -129,7 +129,7 @@ namespace internal {
 //         } else {
 //           if (IsBlockPairInPreconditioner(i, j)) {
 //             return AssertionFailure()
-//                 << "block pair (" << i << "," << j << "should not be present";
+//                << "block pair (" << i << "," << j << "should not be present";
 //           }
 //         }
 //       }
diff --git a/internal/ceres/wall_time.h b/internal/ceres/wall_time.h
index 45f65ca1a..37f5568a1 100644
--- a/internal/ceres/wall_time.h
+++ b/internal/ceres/wall_time.h
@@ -32,7 +32,7 @@
 #define CERES_INTERNAL_WALL_TIME_H_
 
 #include <map>
-
+#include <string>
 #include "ceres/internal/port.h"
 #include "ceres/stringprintf.h"
 #include "glog/logging.h"