More Blaze fixes.

BUILD

@@ -247,6 +247,7 @@ cc_test(
     ],
     copts = COPTS,
     deps = [
+        ":upb",
         ":upb_pb",
         ":upb_test",
     ],

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_ */

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 */