Change some more includes