Updated file additionws and changes for clang.