Further rationalisation of include names.