ISTL still does not compile with the new version though. The correct
headers must still be chosen.

[[Imported from SVN: r5056]]