Removed unnecessary includes.
Merge branch 'bug-14866-FixingOclFilterHeader'