diff --git a/rust/upb_kernel/BUILD b/rust/upb_kernel/BUILD
index b06f182117..3c373323e0 100644
--- a/rust/upb_kernel/BUILD
+++ b/rust/upb_kernel/BUILD
@@ -8,7 +8,7 @@ cc_library(
         "//rust:__subpackages__",
     ],
     deps = [
-        "//upb:collections",
         "//upb:mem",
+        "//upb:message",
     ],
 )
diff --git a/rust/upb_kernel/upb_api.c b/rust/upb_kernel/upb_api.c
index e2a67ebb86..7de8d0bd4d 100644
--- a/rust/upb_kernel/upb_api.c
+++ b/rust/upb_kernel/upb_api.c
@@ -8,6 +8,6 @@
 
 #define UPB_BUILD_API
 
-#include "upb/collections/map.h"  // IWYU pragma: keep
-#include "upb/collections/array.h"  // IWYU pragma: keep
-#include "upb/mem/arena.h"          // IWYU pragma: keep
+#include "upb/mem/arena.h"      // IWYU pragma: keep
+#include "upb/message/array.h"  // IWYU pragma: keep
+#include "upb/message/map.h"    // IWYU pragma: keep