[Olena-patches] 507: Fix missing typedefs and handle types without category.