refactor inclusion processing+*self

Rules