Namespace cleaning & include paths for llvm 3.2