Reduced usage of typdefs.h