Merge "Fix for issue 3385135 "source code cleanup" engine part - remove the unused header files"