Comment 1 for bug 319809

Actually we can skip the flavour in the new include directory, since the header files are flavour-independent.