Fix some definition and declaration