diff --git a/csharp/CHANGES.txt b/csharp/CHANGES.txt
index 8574b7c4a35d..4edc569aff65 100644
--- a/csharp/CHANGES.txt
+++ b/csharp/CHANGES.txt
@@ -72,7 +72,7 @@ Features:
   custom implementation of writers with both speed and size optimizations.
 - Addition of the "Google.ProtoBuffers.Serialization" assembly to support
   reading and writing messages to/from XML, JSON, IDictionary<,> and others.
-- Several performance related fixes and tweeks
+- Several performance related fixes and tweaks
 - Issue 3:	Add option to mark generated code with attribute
 - Issue 20:	Support for decorating classes [Serializable]
 - Issue 21:	Decorate fields with [deprecated=true] as [System.Obsolete]
@@ -145,4 +145,4 @@ RELEASE NOTES - Version 0.9.0
 
 - Initial release
 
-===============================================================================
\ No newline at end of file
+===============================================================================
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index 644bb87e0111..8ea7f8fe14d9 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -1010,6 +1010,10 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 // This error has been generally flaky, but we need to disable it specifically
 // to fix https://github.com/protocolbuffers/protobuf/issues/12313
 #pragma clang diagnostic ignored "-Wunused-parameter"
+// -Wshadow means that declaration shadows a variable.
+// for (int i = 0; i < file_->public_dependency_count(); ++i) 
+//   for (int i = 0; i < public_dep->message_type_count(); ++i)
+#pragma clang diagnostic ignored "-Wshadow"
 #endif
 #ifdef __GNUC__
 #pragma GCC diagnostic push
@@ -1033,6 +1037,10 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 // This error has been generally flaky, but we need to disable it specifically
 // to fix https://github.com/protocolbuffers/protobuf/issues/12313
 #pragma GCC diagnostic ignored "-Wunused-parameter"
+// -Wshadow means that declaration shadows a variable.
+// for (int i = 0; i < file_->public_dependency_count(); ++i) 
+//   for (int i = 0; i < public_dep->message_type_count(); ++i)
+#pragma GCC diagnostic ignored "-Wshadow"
 #ifndef __clang__
 // This causes spurious warnings in GCC 13.
 #pragma GCC diagnostic ignored "-Wstringop-overflow"