COMP: Removed dangling include directives.
Merge branch 'bug-14866-Fix3'