Remove some typedefs.h dependencies