--- ./cmake/install.cmake_orig	2026-06-02 11:00:30.759754882 -0500
+++ ./cmake/install.cmake	2026-06-02 11:00:30.414692796 -0500
@@ -42,7 +42,12 @@
 endif ()
 
 foreach(_library ${_protobuf_libraries})
-  if (UNIX AND NOT APPLE)
+  if (CMAKE_SYSTEM_NAME MATCHES "AIX")
+    if (DEFINED CMAKE_INSTALL_RPATH)
+      set_property(TARGET ${_library}
+        PROPERTY INSTALL_RPATH "${CMAKE_INSTALL_RPATH}")
+    endif()
+  elseif (UNIX AND NOT APPLE)
     set_property(TARGET ${_library}
       PROPERTY INSTALL_RPATH "$ORIGIN")
   elseif (APPLE)
@@ -69,7 +74,12 @@
     endforeach ()
   endif ()
   foreach (binary IN LISTS _protobuf_binaries)
-    if (UNIX AND NOT APPLE)
+    if (CMAKE_SYSTEM_NAME MATCHES "AIX")
+      if (DEFINED CMAKE_INSTALL_RPATH)
+        set_property(TARGET protoc
+          PROPERTY INSTALL_RPATH "${CMAKE_INSTALL_RPATH}")
+       endif()
+    elseif (UNIX AND NOT APPLE)
       set_property(TARGET ${binary}
         PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
     elseif (APPLE)
--- ./src/file_lists.cmake_orig	2026-06-02 11:01:25.855815976 -0500
+++ ./src/file_lists.cmake	2026-06-02 11:01:10.688733919 -0500
@@ -359,6 +359,7 @@
 
 # @//pkg:protoc
 set(libprotoc_srcs
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/arena.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator_lite.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface.cc
@@ -500,6 +501,7 @@
 
 # @//pkg:protoc
 set(libprotoc_hdrs
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/arena.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator_lite.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface.h
@@ -1245,6 +1247,7 @@
 
 # @//src/google/protobuf:full_test_srcs
 set(protobuf_test_files
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/arena.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/any_test.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_align_test.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_unittest.cc
@@ -1282,6 +1285,7 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/raw_ptr_test.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/redaction_metric_test.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_mode_test.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_mode.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_ops_unittest.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_visit_fields_test.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_field_reflection_unittest.cc
@@ -1358,6 +1362,7 @@
 
 # @//src/google/protobuf:lite_test_srcs
 set(protobuf_lite_test_files
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/arena.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/lite_arena_unittest.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/lite_unittest.cc
 )
@@ -1423,6 +1428,7 @@
 
 # @//src/google/protobuf/compiler:test_plugin_srcs
 set(test_plugin_files
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/arena.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/test_plugin.cc
 )
 
--- ./src/google/protobuf/io/zero_copy_stream_unittest.cc_orig	2026-06-02 11:01:22.697362280 -0500
+++ ./src/google/protobuf/io/zero_copy_stream_unittest.cc	2026-06-02 11:01:22.497500910 -0500
@@ -41,6 +41,7 @@
 #include <thread>
 #include <utility>
 #include <vector>
+#include <mutex>
 
 #include "google/protobuf/stubs/common.h"
 #include "google/protobuf/testing/file.h"