diff --git a/upb/message/BUILD b/upb/message/BUILD
index d7b83a10c6..0089596af5 100644
--- a/upb/message/BUILD
+++ b/upb/message/BUILD
@@ -381,6 +381,7 @@ cc_test(
         "//upb:eps_copy_input_stream",
         "//upb:json",
         "//upb:mem",
+        "//upb:message_compare",
         "//upb:mini_table",
         "//upb:reflection",
         "//upb:wire",
diff --git a/upb/message/test.cc b/upb/message/test.cc
index 7ee644248a..041a82d374 100644
--- a/upb/message/test.cc
+++ b/upb/message/test.cc
@@ -7,8 +7,10 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <optional>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 #include <gmock/gmock.h>
@@ -22,6 +24,7 @@
 #include "upb/mem/arena.h"
 #include "upb/mem/arena.hpp"
 #include "upb/message/array.h"
+#include "upb/message/compare.h"
 #include "upb/message/map.h"
 #include "upb/message/message.h"
 #include "upb/message/test.upb.h"