remove inclusion from current dir, doesn't work for included files
Merge topic 'cxx-flags' into next

a7f3675 remove inclusion from current dir, doesn't work for included files