diff --git a/upb_generator/BUILD b/upb_generator/BUILD
index 67dae452dc..c63b22ba93 100644
--- a/upb_generator/BUILD
+++ b/upb_generator/BUILD
@@ -239,12 +239,12 @@ cc_library(
         "//upb:descriptor_upb_proto",
         "//upb:json",
         "//upb:mem",
+        "//upb:message",
         "//upb:mini_descriptor",
         "//upb:mini_table",
         "//upb:port",
         "//upb:reflection",
         "//upb:wire",
-        "//upb/reflection:internal",
     ],
 )
 
diff --git a/upb_generator/get_used_fields.c b/upb_generator/get_used_fields.c
index 1478df7d23..5743f05534 100644
--- a/upb_generator/get_used_fields.c
+++ b/upb_generator/get_used_fields.c
@@ -7,12 +7,22 @@
 
 #include "upb_generator/get_used_fields.h"
 
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "google/protobuf/descriptor.upb.h"
 #include "google/protobuf/compiler/plugin.upb.h"
-#include "upb/reflection/def_pool.h"
-#include "upb/reflection/field_def.h"
+#include "upb/base/descriptor_constants.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.h"
+#include "upb/message/array.h"
+#include "upb/message/map.h"
+#include "upb/message/message.h"
+#include "upb/mini_table/message.h"
+#include "upb/reflection/def.h"
 #include "upb/reflection/message.h"
-#include "upb/reflection/message_def.h"
 #include "upb/wire/decode.h"
 
 // Must be last.