diff --git a/protos/BUILD b/protos/BUILD
index 477738eb35..44ee58633a 100644
--- a/protos/BUILD
+++ b/protos/BUILD
@@ -58,10 +58,8 @@ cc_library(
         "//upb:message_copy",
         "//upb:message_promote",
         "//upb:mini_table",
-        "//upb:port",
         "//upb:wire",
         "//upb:wire_reader",
-        "//upb/message:internal",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
diff --git a/protos/protos.cc b/protos/protos.cc
index db814f3603..644b09c491 100644
--- a/protos/protos.cc
+++ b/protos/protos.cc
@@ -16,8 +16,8 @@
 #include "absl/strings/string_view.h"
 #include "protos/protos_extension_lock.h"
 #include "upb/mem/arena.h"
+#include "upb/message/accessors.h"
 #include "upb/message/copy.h"
-#include "upb/message/internal/extension.h"
 #include "upb/message/message.h"
 #include "upb/message/promote.h"
 #include "upb/message/value.h"
@@ -27,9 +27,6 @@
 #include "upb/wire/decode.h"
 #include "upb/wire/encode.h"
 
-// Must be last.
-#include "upb/port/def.inc"
-
 namespace protos {
 
 // begin:google_only
@@ -118,9 +115,10 @@ class MessageLock {
 bool HasExtensionOrUnknown(const upb_Message* msg,
                            const upb_MiniTableExtension* eid) {
   MessageLock msg_lock(msg);
-  return UPB_PRIVATE(_upb_Message_Getext)(msg, eid) != nullptr ||
-         upb_Message_FindUnknown(msg, upb_MiniTableExtension_Number(eid), 0)
-                 .status == kUpb_FindUnknown_Ok;
+  if (upb_Message_HasExtension(msg, eid)) return true;
+
+  const int number = upb_MiniTableExtension_Number(eid);
+  return upb_Message_FindUnknown(msg, number, 0).status == kUpb_FindUnknown_Ok;
 }
 
 bool GetOrPromoteExtension(upb_Message* msg, const upb_MiniTableExtension* eid,
diff --git a/protos/protos.h b/protos/protos.h
index 208d7c17fb..5c57aae163 100644
--- a/protos/protos.h
+++ b/protos/protos.h
@@ -16,8 +16,6 @@
 #include "upb/base/status.hpp"
 #include "upb/mem/arena.hpp"
 #include "upb/message/copy.h"
-#include "upb/message/internal/accessors.h"
-#include "upb/message/internal/extension.h"
 #include "upb/mini_table/extension.h"
 #include "upb/wire/decode.h"
 #include "upb/wire/encode.h"