Move includes inside conditionals