fix typedef re-define issue