Convert more includes