refactor inclusion processing+todo