COMP: Removed even more dangling include directives.
Merge branch 'bug-14866-Fix4'