* fix 5466: explicity including a file causes a build break * fix failing unit tests * Add unit tests and apply fix also to includeFiles * apply review feedback