Bug#1074775:

[Andreas Hasenack]

I have a salsa branch, including a DEP8 test to exercise the new
includedir functionality. I'll propose it soon, I think there is one
or two extra commits from upstream we would want.