diff --git a/upb/extension_registry.h b/upb/extension_registry.h
index 1301564070..10d6ad52cb 100644
--- a/upb/extension_registry.h
+++ b/upb/extension_registry.h
@@ -28,6 +28,7 @@
 #ifndef UPB_EXTENSION_REGISTRY_H_
 #define UPB_EXTENSION_REGISTRY_H_
 
+#include "upb/msg.h"
 #include "upb/upb.h"
 
 // Must be last.
@@ -79,7 +80,6 @@ upb_ExtensionRegistry* upb_ExtensionRegistry_New(upb_Arena* arena);
 
 // EVERYTHING BELOW THIS LINE IS INTERNAL - DO NOT USE /////////////////////////
 
-typedef struct upb_MiniTable upb_MiniTable;
 typedef struct upb_MiniTable_Extension upb_MiniTable_Extension;
 
 // Adds the given extension info for message type |l| and field number |num|
diff --git a/upb/msg_internal.h b/upb/msg_internal.h
index ccf44ac113..4fed823df9 100644
--- a/upb/msg_internal.h
+++ b/upb/msg_internal.h
@@ -226,8 +226,6 @@ struct upb_MiniTable {
   _upb_FastTable_Entry fasttable[];
 };
 
-typedef struct upb_MiniTable_Extension upb_MiniTable_Extension;
-
 struct upb_MiniTable_Extension {
   upb_MiniTable_Field field;
   const upb_MiniTable* extendee;