remove unused #includes from reflection.h

The functions declared in reflection.h use neither arrays nor maps, so (a) stop including the array and map definitions, and (b) update the handful of other source files which were relying on that transitivity.

PiperOrigin-RevId: 472627278

BUILD

@@ -412,10 +412,10 @@ cc_library(
     copts = UPB_DEFAULT_COPTS,
     visibility = ["//visibility:public"],
     deps = [
+        ":collections",
         ":encode_internal",
         ":port",
         ":reflection",
-        ":table_internal",
     ],
 )
 
@@ -433,6 +433,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":atoi_internal",
+        ":collections",
         ":encode_internal",
         ":port",
         ":reflection",

python/convert.c

@@ -29,6 +29,7 @@
 
 #include "python/message.h"
 #include "python/protobuf.h"
+#include "upb/map.h"
 #include "upb/reflection.h"
 #include "upb/util/compare.h"
 

upb/bindings/lua/msg.c

@@ -41,6 +41,7 @@
 #include "upb/bindings/lua/upb.h"
 #include "upb/json_decode.h"
 #include "upb/json_encode.h"
+#include "upb/map.h"
 #include "upb/port_def.inc"
 #include "upb/reflection.h"
 #include "upb/text_encode.h"

upb/json_decode.c

@@ -38,6 +38,7 @@
 #include "upb/encode.h"
 #include "upb/internal/atoi.h"
 #include "upb/internal/unicode.h"
+#include "upb/map.h"
 #include "upb/reflection.h"
 
 // Must be last.

upb/json_encode.c

@@ -38,6 +38,7 @@
 #include "upb/decode.h"
 #include "upb/internal/encode.h"
 #include "upb/internal/vsnprintf_compat.h"
+#include "upb/map.h"
 #include "upb/reflection.h"
 
 // Must be last.

upb/reflection.c

@@ -30,6 +30,7 @@
 #include <string.h>
 
 #include "upb/internal/table.h"
+#include "upb/map.h"
 #include "upb/msg.h"
 #include "upb/port_def.inc"
 

upb/reflection.h

@@ -28,9 +28,8 @@
 #ifndef UPB_REFLECTION_H_
 #define UPB_REFLECTION_H_
 
-#include "upb/array.h"
 #include "upb/def.h"
-#include "upb/map.h"
+#include "upb/message_value.h"
 #include "upb/msg.h"
 #include "upb/upb.h"
 

upb/text_encode.c

@@ -36,6 +36,7 @@
 
 #include "upb/internal/encode.h"
 #include "upb/internal/vsnprintf_compat.h"
+#include "upb/map.h"
 #include "upb/reflection.h"
 
 // Must be last.

upb/util/BUILD

@@ -62,6 +62,7 @@ cc_library(
     hdrs = ["required_fields.h"],
     visibility = ["//visibility:public"],
     deps = [
+        "//:collections",
         "//:port",
         "//:reflection",
     ],

upb/util/required_fields.c

@@ -33,6 +33,7 @@
 #include <stdio.h>
 
 #include "upb/internal/vsnprintf_compat.h"
+#include "upb/map.h"
 #include "upb/reflection.h"
 
 // Must be last.