Merge "Add missing typedefs for C compat." into main