diff --git a/BUILD b/BUILD
index 2b99cf7c24..436b845007 100644
--- a/BUILD
+++ b/BUILD
@@ -247,6 +247,7 @@ cc_test(
     ],
     copts = COPTS,
     deps = [
+        ":upb",
         ":upb_pb",
         ":upb_test",
     ],
diff --git a/upb/handlers-inl.h b/upb/handlers-inl.h
index 40a0047c13..8f8634bfaa 100644
--- a/upb/handlers-inl.h
+++ b/upb/handlers-inl.h
@@ -10,6 +10,8 @@
 #include <stddef.h>
 #include "upb/handlers.h"
 
+#include "upb/port_def.inc"
+
 #ifdef __cplusplus
 
 /* Type detection and typedefs for integer types.
@@ -916,4 +918,6 @@ inline void Handler<T>::AddCleanup(upb_handlers* h) const {
 #undef UPB_INT64ALT_T
 #undef UPB_UINT64ALT_T
 
+#include "upb/port_undef.inc"
+
 #endif  /* UPB_HANDLERS_INL_H_ */
diff --git a/upb/handlers.h b/upb/handlers.h
index 856be31392..2d2380b634 100644
--- a/upb/handlers.h
+++ b/upb/handlers.h
@@ -725,8 +725,8 @@ bool upb_msg_getscalarhandlerdata(const upb_handlers *h,
 }  /* extern "C" */
 #endif
 
-#include "upb/handlers-inl.h"
-
 #include "upb/port_undef.inc"
 
+#include "upb/handlers-inl.h"
+
 #endif  /* UPB_HANDLERS_H */