Finally got rid of typedefs.h