diff --git a/clang/Analysis/GRSimpleVals.cpp b/clang/Analysis/GRSimpleVals.cpp
index 75dc256d7970..558a87625efa 100644
--- a/clang/Analysis/GRSimpleVals.cpp
+++ b/clang/Analysis/GRSimpleVals.cpp
@@ -38,9 +38,9 @@ namespace clang {
          E=CheckerState->null_end(); I!=E; ++I) {
       
       const PostStmt& L = cast<PostStmt>((*I)->getLocation());
-      Expr* E = cast<Expr>(L.getStmt());
+      Expr* Exp = cast<Expr>(L.getStmt());
       
-      Diag.Report(FullSourceLoc(E->getExprLoc(), Ctx.getSourceManager()),
+      Diag.Report(FullSourceLoc(Exp->getExprLoc(), Ctx.getSourceManager()),
                   diag::chkr_null_deref_after_check);
     }
         
diff --git a/clang/Driver/ASTConsumers.h b/clang/Driver/ASTConsumers.h
index 08d226816227..1ea8b1490b51 100644
--- a/clang/Driver/ASTConsumers.h
+++ b/clang/Driver/ASTConsumers.h
@@ -14,6 +14,7 @@
 #ifndef DRIVER_ASTCONSUMERS_H
 #define DRIVER_ASTCONSUMERS_H
 
+#include <string>
 #include <iosfwd>
 
 namespace llvm {