Refactor includes