fix nested include issue part 2