COMP: Fix "unused-local-typedefs" warnings