Elminated dependency on gcc/tools/types.h/