more refactoring of includes