fix a number of warnings about unused typedefs