diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc
index 20b0ef59e31e..42f0768a61cc 100644
--- a/src/google/protobuf/any.pb.cc
+++ b/src/google/protobuf/any.pb.cc
@@ -116,15 +116,12 @@ bool Any::GetAnyFieldDescriptors(
     const ::google::protobuf::Message& message,
     const ::google::protobuf::FieldDescriptor** type_url_field,
     const ::google::protobuf::FieldDescriptor** value_field) {
-  return ::_pbi::GetAnyFieldDescriptors(
-      message, type_url_field, value_field);
+  return ::_pbi::GetAnyFieldDescriptors(message, type_url_field, value_field);
 }
-bool Any::ParseAnyTypeUrl(
-    ::absl::string_view type_url,
-    std::string* full_type_name) {
+bool Any::ParseAnyTypeUrl(::absl::string_view type_url,
+                                  std::string* full_type_name) {
   return ::_pbi::ParseAnyTypeUrl(type_url, full_type_name);
 }
-
 class Any::_Internal {
  public:
 };
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
index e60cc01bbc69..551d05f5314c 100644
--- a/src/google/protobuf/api.pb.cc
+++ b/src/google/protobuf/api.pb.cc
@@ -228,9 +228,10 @@ namespace protobuf {
 
 class Api::_Internal {
  public:
-  using HasBits = decltype(std::declval<Api>()._impl_._has_bits_);
+  using HasBits =
+      decltype(std::declval<Api>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(Api, _impl_._has_bits_);
+      8 * PROTOBUF_FIELD_OFFSET(Api, _impl_._has_bits_);
 };
 
 void Api::clear_options() {
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
index feba7fd2dd4b..783fc1891a9a 100644
--- a/src/google/protobuf/struct.pb.cc
+++ b/src/google/protobuf/struct.pb.cc
@@ -213,8 +213,7 @@ bool NullValue_IsValid(int value) {
 // ===================================================================
 
 Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse() {}
-Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse(::google::protobuf::Arena* arena)
-    : SuperType(arena) {}
+Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse(::google::protobuf::Arena* arena) : SuperType(arena) {}
 const ::google::protobuf::MessageLite::ClassData*
 Struct_FieldsEntry_DoNotUse::GetClassData() const {
   PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
@@ -450,7 +449,7 @@ ::google::protobuf::Metadata Struct::GetMetadata() const {
 class Value::_Internal {
  public:
   static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::google::protobuf::Value, _impl_._oneof_case_);
+      PROTOBUF_FIELD_OFFSET(::google::protobuf::Value, _impl_._oneof_case_);
 };
 
 void Value::set_allocated_struct_value(::google::protobuf::Struct* struct_value) {
diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc
index 447b8d3b781e..98ff9fad474f 100644
--- a/src/google/protobuf/type.pb.cc
+++ b/src/google/protobuf/type.pb.cc
@@ -412,9 +412,10 @@ bool Syntax_IsValid(int value) {
 
 class Type::_Internal {
  public:
-  using HasBits = decltype(std::declval<Type>()._impl_._has_bits_);
+  using HasBits =
+      decltype(std::declval<Type>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(Type, _impl_._has_bits_);
+      8 * PROTOBUF_FIELD_OFFSET(Type, _impl_._has_bits_);
 };
 
 void Type::clear_source_context() {
@@ -1253,9 +1254,10 @@ ::google::protobuf::Metadata Field::GetMetadata() const {
 
 class Enum::_Internal {
  public:
-  using HasBits = decltype(std::declval<Enum>()._impl_._has_bits_);
+  using HasBits =
+      decltype(std::declval<Enum>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(Enum, _impl_._has_bits_);
+      8 * PROTOBUF_FIELD_OFFSET(Enum, _impl_._has_bits_);
 };
 
 void Enum::clear_source_context() {
@@ -1872,9 +1874,10 @@ ::google::protobuf::Metadata EnumValue::GetMetadata() const {
 
 class Option::_Internal {
  public:
-  using HasBits = decltype(std::declval<Option>()._impl_._has_bits_);
+  using HasBits =
+      decltype(std::declval<Option>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(Option, _impl_._has_bits_);
+      8 * PROTOBUF_FIELD_OFFSET(Option, _impl_._has_bits_);
 };
 
 void Option::clear_value() {