clean up include and add function declaration