commented out unused typedefs (warning on gcc 4.8