add typedefs for forward compat