more refactoring of includes2