Cleanup by clang.
Changed to use @import