diff --git a/internal/ceres/miniglog/glog/logging.h b/internal/ceres/miniglog/glog/logging.h
index b442d0835..98d2b687d 100644
--- a/internal/ceres/miniglog/glog/logging.h
+++ b/internal/ceres/miniglog/glog/logging.h
@@ -106,8 +106,11 @@
 #include <vector>
 
 // For appropriate definition of CERES_EXPORT macro.
-#include "ceres/internal/disable_warnings.h"
+// clang-format off
 #include "ceres/internal/port.h"
+// clang-format on
+
+#include "ceres/internal/disable_warnings.h"
 
 // Log severity level constants.
 // clang-format off
diff --git a/internal/ceres/solver_utils.cc b/internal/ceres/solver_utils.cc
index b6faa2ae8..eb5aafa06 100644
--- a/internal/ceres/solver_utils.cc
+++ b/internal/ceres/solver_utils.cc
@@ -40,10 +40,12 @@
 namespace ceres {
 namespace internal {
 
-#define CERES_EIGEN_VERSION                                     \
-  CERES_TO_STRING(EIGEN_WORLD_VERSION)                          \
-  "." CERES_TO_STRING(EIGEN_MAJOR_VERSION) "." CERES_TO_STRING( \
-      EIGEN_MINOR_VERSION)
+// clang-format off
+#define CERES_EIGEN_VERSION                 \
+  CERES_TO_STRING(EIGEN_WORLD_VERSION) "."  \
+  CERES_TO_STRING(EIGEN_MAJOR_VERSION) "."  \
+  CERES_TO_STRING(EIGEN_MINOR_VERSION)
+// clang-format on
 
 std::string VersionString() {
   std::string value = std::string(CERES_VERSION_STRING);