diff --git a/ci/push_auto_update.sh b/ci/push_auto_update.sh
index 259a663730193..8af9756c59eb9 100755
--- a/ci/push_auto_update.sh
+++ b/ci/push_auto_update.sh
@@ -19,9 +19,10 @@ if (echo "$previous_commit_title" | grep -q "^Auto-generate files"); then
   exit 0
 fi
 
-BAZEL=bazelisk
-USE_BAZEL_VERSION=7.2.1
-source regenerate_stale_files.sh
+export BAZEL=bazelisk
+export USE_BAZEL_VERSION=7.2.1
+
+./regenerate_stale_files.sh
 
 # Try to determine the most recent CL or pull request.
 pr_from_merge=$(echo "$previous_commit_title" | sed -n 's/^Merge pull request #\([0-9]\+\).*/\1/p')
diff --git a/src/google/protobuf/generated_message_bases.cc b/src/google/protobuf/generated_message_bases.cc
index ad26a8ae42bb0..2c9c1d642cc9c 100644
--- a/src/google/protobuf/generated_message_bases.cc
+++ b/src/google/protobuf/generated_message_bases.cc
@@ -8,15 +8,16 @@
 #include "google/protobuf/generated_message_bases.h"
 
 #include <cstddef>
+#include <cstdint>
 
+#include "absl/base/optimization.h"
+#include "absl/log/absl_check.h"
 #include "google/protobuf/generated_message_reflection.h"
 #include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/io/zero_copy_stream_impl.h"
 #include "google/protobuf/message_lite.h"
 #include "google/protobuf/parse_context.h"
 #include "google/protobuf/unknown_field_set.h"
 #include "google/protobuf/wire_format.h"
-#include "google/protobuf/wire_format_lite.h"
 
 // Must be last:
 #include "google/protobuf/port_def.inc"
diff --git a/src/google/protobuf/generated_message_bases.h b/src/google/protobuf/generated_message_bases.h
index 3adc381613fe1..ac53fcc1ca9fd 100644
--- a/src/google/protobuf/generated_message_bases.h
+++ b/src/google/protobuf/generated_message_bases.h
@@ -12,11 +12,13 @@
 #ifndef GOOGLE_PROTOBUF_GENERATED_MESSAGE_BASES_H__
 #define GOOGLE_PROTOBUF_GENERATED_MESSAGE_BASES_H__
 
+#include <cstddef>
+#include <cstdint>
+
+#include "absl/base/attributes.h"
 #include "google/protobuf/arena.h"
 #include "google/protobuf/generated_message_util.h"
-#include "google/protobuf/io/zero_copy_stream_impl.h"
 #include "google/protobuf/message.h"
-#include "google/protobuf/parse_context.h"
 
 // Must come last:
 #include "google/protobuf/port_def.inc"
@@ -46,14 +48,15 @@ class PROTOBUF_EXPORT ZeroFieldsBase : public Message {
   static void CopyImpl(Message& to, const Message& from);
   void InternalSwap(ZeroFieldsBase* other);
   static void Clear(MessageLite& msg);
-  static size_t ByteSizeLong(const MessageLite& msg);
+  static size_t ByteSizeLong(const MessageLite& base);
   static ::uint8_t* _InternalSerialize(const MessageLite& msg,
                                        ::uint8_t* target,
                                        io::EpsCopyOutputStream* stream);
 
+  // The following naming is required to match protobuf naming conventions.
   struct {
-    internal::CachedSize _cached_size_;
-  } _impl_;
+    internal::CachedSize _cached_size_;  // NOLINT
+  } _impl_;                              // NOLINT
 };
 
 }  // namespace internal