Added current version of multicompiler changes for clang.
Removed unnecessary include.
Merge remote-tracking branch 'trunk/master'