Really remove double declaration

typedef also matters.