Issue with includes after migrating from 4.18 to 4.25

That was the first thing I tried. Unfortunately, to no avail.