Fixed include scenarios for llvm 3.3 & 3.2