r14111: Work around additional typedefs in the gamin implementation