diff --git a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_helpers.cc b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_helpers.cc
index fe646b7776..340aec83eb 100644
--- a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_helpers.cc
+++ b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_helpers.cc
@@ -85,8 +85,10 @@ const std::set<absl::string_view> kKeywords = {
     "accessibilityLabel",
     "and",
     "auto",
+    "bool",
     "break",
     "case",
+    "char",
     "class",
     "concept",
     "const",
@@ -122,6 +124,7 @@ const std::set<absl::string_view> kKeywords = {
     "return",
     "self",
     "shared",
+    "short",
     "signed",
     "static",
     "struct",