Remove conflicting typedef