Fixes #2 Swap #define for typedef