Try including typedefs