diff --git a/BUILD b/BUILD
index e4384a1822..cf5206fe8d 100644
--- a/BUILD
+++ b/BUILD
@@ -304,6 +304,16 @@ upb_proto_reflection_library(
     deps = ["test_cpp_proto"],
 )
 
+upb_proto_library(
+    name = "timestamp_upb_proto",
+    deps = ["@com_google_protobuf//:timestamp_proto"],
+)
+
+upb_proto_reflection_library(
+    name = "timestamp_upb_proto_reflection",
+    deps = ["@com_google_protobuf//:timestamp_proto"],
+)
+
 cc_test(
     name = "test_cpp",
     srcs = ["upb/test_cpp.cc"],
@@ -311,6 +321,8 @@ cc_test(
     deps = [
         ":test_cpp_upb_proto",
         ":test_cpp_upb_proto_reflection",
+        ":timestamp_upb_proto",
+        ":timestamp_upb_proto_reflection",
         "//:json",
         "//:port",
         "//:reflection",
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 83e0c1b562..7a961b3468 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -112,6 +112,7 @@ target_link_libraries(reflection
   upb)
 add_library(textformat
   ../upb/text_encode.c
+  ../upb/upb_internal.h
   ../upb/text_encode.h)
 target_link_libraries(textformat
   port
@@ -119,6 +120,7 @@ target_link_libraries(textformat
 add_library(json
   ../upb/json_decode.c
   ../upb/json_encode.c
+  ../upb/upb_internal.h
   ../upb/json_decode.h
   ../upb/json_encode.h)
 target_link_libraries(json
diff --git a/upb/test_generated_code.cc b/upb/test_generated_code.cc
index 86d8fe8edc..a3835d6ee5 100644
--- a/upb/test_generated_code.cc
+++ b/upb/test_generated_code.cc
@@ -35,7 +35,9 @@
 #include "upb/test.upb.h"
 #include "upb/upb.hpp"
 
+#if !defined(MIN)
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
+#endif
 
 const char test_str[] = "abcdefg";
 const char test_str2[] = "12345678910";