Fix for GCC moaning about typedefs