remove an obsolete dependency on :message from :collections

PiperOrigin-RevId: 491197910

BUILD

@@ -467,7 +467,6 @@ cc_library(
         ":base",
         ":hash",
         ":mem",
-        ":message_internal",
         ":mini_table_internal",
         ":port",
     ],
@@ -1038,7 +1037,7 @@ cc_library(
     deps = [
         ":mem",
         ":message_internal",
-        ":mini_table",
+        ":mini_table_internal",
         ":port",
         ":wire_internal",
     ],

upb/collections/map.c

@@ -31,7 +31,6 @@
 
 #include "upb/collections/map_internal.h"
 #include "upb/mem/arena.h"
-#include "upb/message/message.h"
 
 // Must be last.
 #include "upb/port/def.inc"

upb/collections/map_sorter_internal.h

@@ -30,8 +30,10 @@
 #ifndef UPB_COLLECTIONS_MAP_SORTER_INTERNAL_H_
 #define UPB_COLLECTIONS_MAP_SORTER_INTERNAL_H_
 
+#include <stdlib.h>
+
 #include "upb/collections/map_internal.h"
-#include "upb/message/internal.h"
+#include "upb/mini_table/message_internal.h"
 
 // Must be last.
 #include "upb/port/def.inc"

upb/wire/encode.c

@@ -33,6 +33,8 @@
 
 #include "upb/collections/array_internal.h"
 #include "upb/collections/map_sorter_internal.h"
+#include "upb/message/extension_internal.h"
+#include "upb/mini_table/sub_internal.h"
 #include "upb/wire/common_internal.h"
 #include "upb/wire/swap_internal.h"
 #include "upb/wire/types.h"