Remove more uses of typedefs.h