Remove crappy #define logic, change typedef type