diff --git a/clang/include/clang/Checker/BugReporter/BugReporter.h b/clang/include/clang/Checker/BugReporter/BugReporter.h
index 2c15f2a40576..617034292638 100644
--- a/clang/include/clang/Checker/BugReporter/BugReporter.h
+++ b/clang/include/clang/Checker/BugReporter/BugReporter.h
@@ -15,17 +15,12 @@
 #ifndef LLVM_CLANG_ANALYSIS_BUGREPORTER
 #define LLVM_CLANG_ANALYSIS_BUGREPORTER
 
-#include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/SourceLocation.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/ExplodedGraph.h"
 #include "clang/Checker/PathSensitive/GRState.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/ImmutableList.h"
 #include "llvm/ADT/ImmutableSet.h"
-#include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallSet.h"
-#include "llvm/ADT/SmallString.h"
 #include <list>
 
 namespace clang {
@@ -35,6 +30,8 @@ class PathDiagnosticPiece;
 class PathDiagnosticClient;
 class ASTContext;
 class Diagnostic;
+class ExplodedNode;
+class ExplodedGraph;
 class BugReporter;
 class BugReporterContext;
 class GRExprEngine;
diff --git a/clang/include/clang/Checker/BugReporter/BugType.h b/clang/include/clang/Checker/BugReporter/BugType.h
index 4f1523a5440d..afc07c89e86f 100644
--- a/clang/include/clang/Checker/BugReporter/BugType.h
+++ b/clang/include/clang/Checker/BugReporter/BugType.h
@@ -14,15 +14,12 @@
 #ifndef LLVM_CLANG_ANALYSIS_BUGTYPE
 #define LLVM_CLANG_ANALYSIS_BUGTYPE
 
-#include <llvm/ADT/FoldingSet.h>
+#include "clang/Checker/BugReporter/BugReporter.h"
+#include "llvm/ADT/FoldingSet.h"
 #include <string>
 
 namespace clang {
 
-class BugReportEquivClass;
-class BugReporter;
-class BuiltinBugReport;
-class BugReporterContext;
 class ExplodedNode;
 class GRExprEngine;
 
diff --git a/clang/include/clang/Checker/DomainSpecific/CocoaConventions.h b/clang/include/clang/Checker/DomainSpecific/CocoaConventions.h
index ee3d648b8608..4bbdab0e7fe1 100644
--- a/clang/include/clang/Checker/DomainSpecific/CocoaConventions.h
+++ b/clang/include/clang/Checker/DomainSpecific/CocoaConventions.h
@@ -14,7 +14,6 @@
 #ifndef LLVM_CLANG_CHECKER_DS_COCOA
 #define LLVM_CLANG_CHECKER_DS_COCOA
 
-#include "clang/Basic/IdentifierTable.h"
 #include "clang/AST/Type.h"
 
 namespace clang {
diff --git a/clang/include/clang/Checker/PathSensitive/BasicValueFactory.h b/clang/include/clang/Checker/PathSensitive/BasicValueFactory.h
index 2f0b6c2a0348..59dd9190d25e 100644
--- a/clang/include/clang/Checker/PathSensitive/BasicValueFactory.h
+++ b/clang/include/clang/Checker/PathSensitive/BasicValueFactory.h
@@ -16,7 +16,6 @@
 #ifndef LLVM_CLANG_ANALYSIS_BASICVALUEFACTORY_H
 #define LLVM_CLANG_ANALYSIS_BASICVALUEFACTORY_H
 
-#include "clang/Checker/PathSensitive/SymbolManager.h"
 #include "clang/Checker/PathSensitive/SVals.h"
 #include "clang/AST/ASTContext.h"
 #include "llvm/ADT/FoldingSet.h"
diff --git a/clang/include/clang/Checker/PathSensitive/Checker.h b/clang/include/clang/Checker/PathSensitive/Checker.h
index 2401a72741b2..8cb9cc8337c6 100644
--- a/clang/include/clang/Checker/PathSensitive/Checker.h
+++ b/clang/include/clang/Checker/PathSensitive/Checker.h
@@ -14,21 +14,15 @@
 
 #ifndef LLVM_CLANG_ANALYSIS_CHECKER
 #define LLVM_CLANG_ANALYSIS_CHECKER
+
 #include "clang/Analysis/Support/SaveAndRestore.h"
-#include "clang/Checker/PathSensitive/GRCoreEngine.h"
-#include "clang/Checker/PathSensitive/GRState.h"
 #include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/ExprObjC.h"
-#include "clang/AST/StmtCXX.h"
-#include "clang/AST/StmtObjC.h"
 
 //===----------------------------------------------------------------------===//
 // Checker interface.
 //===----------------------------------------------------------------------===//
 
 namespace clang {
-  class GRExprEngine;
 
 class CheckerContext {
   ExplodedNodeSet &Dst;
diff --git a/clang/include/clang/Checker/PathSensitive/Environment.h b/clang/include/clang/Checker/PathSensitive/Environment.h
index 6051654f4855..b9bbebc652f2 100644
--- a/clang/include/clang/Checker/PathSensitive/Environment.h
+++ b/clang/include/clang/Checker/PathSensitive/Environment.h
@@ -18,11 +18,8 @@
 // typedefs.
 #include "clang/Checker/PathSensitive/Store.h"
 
-#include "llvm/ADT/ImmutableMap.h"
-#include "llvm/ADT/SmallVector.h"
 #include "clang/Checker/PathSensitive/SVals.h"
-#include "llvm/Support/Allocator.h"
-#include "llvm/ADT/FoldingSet.h"
+#include "llvm/ADT/ImmutableMap.h"
 
 namespace clang {
 
diff --git a/clang/include/clang/Checker/PathSensitive/GRExprEngine.h b/clang/include/clang/Checker/PathSensitive/GRExprEngine.h
index 2b5feddf5855..97f6d70f575a 100644
--- a/clang/include/clang/Checker/PathSensitive/GRExprEngine.h
+++ b/clang/include/clang/Checker/PathSensitive/GRExprEngine.h
@@ -16,7 +16,6 @@
 #ifndef LLVM_CLANG_ANALYSIS_GREXPRENGINE
 #define LLVM_CLANG_ANALYSIS_GREXPRENGINE
 
-#include "clang/Checker/PathSensitive/AnalysisManager.h"
 #include "clang/Checker/PathSensitive/GRSubEngine.h"
 #include "clang/Checker/PathSensitive/GRCoreEngine.h"
 #include "clang/Checker/PathSensitive/GRState.h"
@@ -28,11 +27,9 @@
 #include "clang/AST/ExprCXX.h"
 
 namespace clang {
-
-  class PathDiagnosticClient;
-  class Diagnostic;
-  class ObjCForCollectionStmt;
-  class Checker;
+class AnalysisManager;
+class Checker;
+class ObjCForCollectionStmt;
 
 class GRExprEngine : public GRSubEngine {
   AnalysisManager &AMgr;
diff --git a/clang/include/clang/Checker/PathSensitive/GRSimpleAPICheck.h b/clang/include/clang/Checker/PathSensitive/GRSimpleAPICheck.h
index 383463b822cb..6d85e5fe6a90 100644
--- a/clang/include/clang/Checker/PathSensitive/GRSimpleAPICheck.h
+++ b/clang/include/clang/Checker/PathSensitive/GRSimpleAPICheck.h
@@ -17,18 +17,9 @@
 #define LLVM_CLANG_ANALYSIS_GRAPICHECKS
 
 #include "clang/Checker/PathSensitive/GRAuditor.h"
-#include "clang/Checker/PathSensitive/GRState.h"
 
 namespace clang {
 
-class Diagnostic;
-class BugReporter;
-class ASTContext;
-class GRExprEngine;
-class PathDiagnosticClient;
-class ExplodedGraph;
-
-
 class GRSimpleAPICheck : public GRAuditor {
 public:
   GRSimpleAPICheck() {}
diff --git a/clang/include/clang/Checker/PathSensitive/GRState.h b/clang/include/clang/Checker/PathSensitive/GRState.h
index 04ff424255e7..25ba1f85fdff 100644
--- a/clang/include/clang/Checker/PathSensitive/GRState.h
+++ b/clang/include/clang/Checker/PathSensitive/GRState.h
@@ -14,30 +14,22 @@
 #ifndef LLVM_CLANG_ANALYSIS_VALUESTATE_H
 #define LLVM_CLANG_ANALYSIS_VALUESTATE_H
 
-// FIXME: Reduce the number of includes.
-
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/Expr.h"
-#include "clang/Analysis/Analyses/LiveVariables.h"
 #include "clang/Checker/PathSensitive/ConstraintManager.h"
 #include "clang/Checker/PathSensitive/Environment.h"
-#include "clang/Checker/PathSensitive/GRCoreEngine.h"
 #include "clang/Checker/PathSensitive/Store.h"
 #include "clang/Checker/PathSensitive/ValueManager.h"
-#include "llvm/ADT/APSInt.h"
-#include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/ImmutableMap.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/Support/Allocator.h"
 #include "llvm/Support/Casting.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/DataTypes.h"
-#include <functional>
+
+namespace llvm {
+class APSInt;
+class BumpPtrAllocator;
+class raw_ostream;
+}
 
 namespace clang {
-
+class ASTContext;
 class GRStateManager;
 class Checker;
 
diff --git a/clang/include/clang/Checker/PathSensitive/GRSubEngine.h b/clang/include/clang/Checker/PathSensitive/GRSubEngine.h
index 93f9e846ab77..d2e7457ea93d 100644
--- a/clang/include/clang/Checker/PathSensitive/GRSubEngine.h
+++ b/clang/include/clang/Checker/PathSensitive/GRSubEngine.h
@@ -20,6 +20,7 @@ namespace clang {
 class Stmt;
 class CFGBlock;
 class CFGElement;
+class ExplodedNode;
 class GRState;
 class GRStateManager;
 class GRBlockCounter;
diff --git a/clang/include/clang/Checker/PathSensitive/GRTransferFuncs.h b/clang/include/clang/Checker/PathSensitive/GRTransferFuncs.h
index 04634effd587..13325edea778 100644
--- a/clang/include/clang/Checker/PathSensitive/GRTransferFuncs.h
+++ b/clang/include/clang/Checker/PathSensitive/GRTransferFuncs.h
@@ -15,16 +15,18 @@
 #ifndef LLVM_CLANG_ANALYSIS_GRTF
 #define LLVM_CLANG_ANALYSIS_GRTF
 
-#include "clang/Checker/PathSensitive/SVals.h"
-#include "clang/Checker/PathSensitive/GRCoreEngine.h"
 #include "clang/Checker/PathSensitive/GRState.h"
+#include "clang/Checker/PathSensitive/SVals.h"
 #include <vector>
 
 namespace clang {
-
+class ExplodedNode;
+class ExplodedNodeSet;
+class GREndPathNodeBuilder;
 class GRExprEngine;
-class ObjCMessageExpr;
+class GRStmtNodeBuilder;
 class GRStmtNodeBuilderRef;
+class ObjCMessageExpr;
 
 class GRTransferFuncs {
 public:
diff --git a/clang/include/clang/Checker/PathSensitive/MemRegion.h b/clang/include/clang/Checker/PathSensitive/MemRegion.h
index be89d2a3eb88..57ea8a3f6d9d 100644
--- a/clang/include/clang/Checker/PathSensitive/MemRegion.h
+++ b/clang/include/clang/Checker/PathSensitive/MemRegion.h
@@ -18,17 +18,15 @@
 
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclObjC.h"
-#include "clang/Checker/PathSensitive/SymbolManager.h"
 #include "clang/Checker/PathSensitive/SVals.h"
-#include "clang/AST/ASTContext.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/ADT/FoldingSet.h"
-#include "llvm/ADT/ImmutableList.h"
-#include "llvm/ADT/ImmutableMap.h"
-#include "llvm/Support/Allocator.h"
 #include <string>
 
-namespace llvm { class raw_ostream; }
+namespace llvm {
+class BumpPtrAllocator;
+class raw_ostream;
+}
 
 namespace clang {
 
diff --git a/clang/include/clang/Checker/PathSensitive/Store.h b/clang/include/clang/Checker/PathSensitive/Store.h
index edc338012ada..72565f4d740d 100644
--- a/clang/include/clang/Checker/PathSensitive/Store.h
+++ b/clang/include/clang/Checker/PathSensitive/Store.h
@@ -18,9 +18,6 @@
 #include "clang/Checker/PathSensitive/SVals.h"
 #include "clang/Checker/PathSensitive/ValueManager.h"
 #include "llvm/ADT/DenseSet.h"
-#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/ADT/SmallSet.h"
-#include "llvm/ADT/SmallVector.h"
 
 namespace clang {
 
diff --git a/clang/include/clang/Checker/PathSensitive/SymbolManager.h b/clang/include/clang/Checker/PathSensitive/SymbolManager.h
index 70e9ce6ba239..dea877c0657f 100644
--- a/clang/include/clang/Checker/PathSensitive/SymbolManager.h
+++ b/clang/include/clang/Checker/PathSensitive/SymbolManager.h
@@ -17,14 +17,14 @@
 
 #include "clang/AST/Decl.h"
 #include "clang/AST/Expr.h"
-#include "clang/Analysis/Analyses/LiveVariables.h"
+#include "clang/Analysis/AnalysisContext.h"
 #include "llvm/System/DataTypes.h"
-#include "llvm/Support/Allocator.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/DenseSet.h"
 
 namespace llvm {
-  class raw_ostream;
+class BumpPtrAllocator;
+class raw_ostream;
 }
 
 namespace clang {
@@ -34,9 +34,6 @@ namespace clang {
   class TypedRegion;
   class VarRegion;
   class StackFrameContext;
-}
-
-namespace clang {
 
 class SymExpr : public llvm::FoldingSetNode {
 public:
diff --git a/clang/lib/Checker/AdjustedReturnValueChecker.cpp b/clang/lib/Checker/AdjustedReturnValueChecker.cpp
index e95a86b838b6..b92f2e705625 100644
--- a/clang/lib/Checker/AdjustedReturnValueChecker.cpp
+++ b/clang/lib/Checker/AdjustedReturnValueChecker.cpp
@@ -14,11 +14,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
 #include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/Checker/PathSensitive/GRExprEngine.h"
 #include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Basic/SourceManager.h"
-#include "llvm/ADT/SmallString.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Checker/ArrayBoundChecker.cpp b/clang/lib/Checker/ArrayBoundChecker.cpp
index 74fb06f45564..746b3f95d41e 100644
--- a/clang/lib/Checker/ArrayBoundChecker.cpp
+++ b/clang/lib/Checker/ArrayBoundChecker.cpp
@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/Checker/PathSensitive/GRExprEngine.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Checker/AttrNonNullChecker.cpp b/clang/lib/Checker/AttrNonNullChecker.cpp
index 83dc13e92b63..309a74ce544b 100644
--- a/clang/lib/Checker/AttrNonNullChecker.cpp
+++ b/clang/lib/Checker/AttrNonNullChecker.cpp
@@ -12,9 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
 #include "GRExprEngineInternalChecks.h"
+#include "clang/Checker/BugReporter/BugType.h"
+#include "clang/Checker/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Checker/BasicObjCFoundationChecks.cpp b/clang/lib/Checker/BasicObjCFoundationChecks.cpp
index d6c09a2e04a6..810d0fbb997a 100644
--- a/clang/lib/Checker/BasicObjCFoundationChecks.cpp
+++ b/clang/lib/Checker/BasicObjCFoundationChecks.cpp
@@ -19,9 +19,8 @@
 #include "clang/Checker/PathSensitive/GRSimpleAPICheck.h"
 #include "clang/Checker/PathSensitive/GRExprEngine.h"
 #include "clang/Checker/PathSensitive/GRState.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/PathSensitive/MemRegion.h"
-#include "clang/Checker/BugReporter/PathDiagnostic.h"
 #include "clang/Checker/PathSensitive/CheckerVisitor.h"
 #include "clang/Checker/Checkers/LocalCheckers.h"
 #include "clang/AST/DeclObjC.h"
diff --git a/clang/lib/Checker/BugReporter.cpp b/clang/lib/Checker/BugReporter.cpp
index 856b05ff2dc4..12e61afa1010 100644
--- a/clang/lib/Checker/BugReporter.cpp
+++ b/clang/lib/Checker/BugReporter.cpp
@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/PathSensitive/GRExprEngine.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/Analysis/CFG.h"
diff --git a/clang/lib/Checker/BugReporterVisitors.cpp b/clang/lib/Checker/BugReporterVisitors.cpp
index 1d6994b94b4b..06cee5bcd1bc 100644
--- a/clang/lib/Checker/BugReporterVisitors.cpp
+++ b/clang/lib/Checker/BugReporterVisitors.cpp
@@ -16,6 +16,7 @@
 #include "clang/AST/ExprObjC.h"
 #include "clang/Checker/BugReporter/BugReporter.h"
 #include "clang/Checker/BugReporter/PathDiagnostic.h"
+#include "clang/Checker/PathSensitive/ExplodedGraph.h"
 #include "clang/Checker/PathSensitive/GRState.h"
 
 using namespace clang;
diff --git a/clang/lib/Checker/CFRefCount.cpp b/clang/lib/Checker/CFRefCount.cpp
index 9a76f6a2a3ad..3c4a27cc07f4 100644
--- a/clang/lib/Checker/CFRefCount.cpp
+++ b/clang/lib/Checker/CFRefCount.cpp
@@ -16,8 +16,7 @@
 #include "clang/AST/StmtVisitor.h"
 #include "clang/Basic/LangOptions.h"
 #include "clang/Basic/SourceManager.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "clang/Checker/BugReporter/PathDiagnostic.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/BugReporter/PathDiagnostic.h"
 #include "clang/Checker/Checkers/LocalCheckers.h"
 #include "clang/Checker/DomainSpecific/CocoaConventions.h"
diff --git a/clang/lib/Checker/CallAndMessageChecker.cpp b/clang/lib/Checker/CallAndMessageChecker.cpp
index 32cf7534c8f6..dd1856c9d2d6 100644
--- a/clang/lib/Checker/CallAndMessageChecker.cpp
+++ b/clang/lib/Checker/CallAndMessageChecker.cpp
@@ -12,11 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Basic/TargetInfo.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "clang/AST/ParentMap.h"
 #include "GRExprEngineInternalChecks.h"
+#include "clang/AST/ParentMap.h"
+#include "clang/Basic/TargetInfo.h"
+#include "clang/Checker/BugReporter/BugType.h"
+#include "clang/Checker/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Checker/CastToStructChecker.cpp b/clang/lib/Checker/CastToStructChecker.cpp
index bef5bc285ee2..2c16f8905811 100644
--- a/clang/lib/Checker/CastToStructChecker.cpp
+++ b/clang/lib/Checker/CastToStructChecker.cpp
@@ -13,6 +13,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/PathSensitive/CheckerVisitor.h"
 #include "GRExprEngineInternalChecks.h"
 
diff --git a/clang/lib/Checker/DereferenceChecker.cpp b/clang/lib/Checker/DereferenceChecker.cpp
index dfd3b61b0aca..af74c79558d5 100644
--- a/clang/lib/Checker/DereferenceChecker.cpp
+++ b/clang/lib/Checker/DereferenceChecker.cpp
@@ -12,11 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "GRExprEngineInternalChecks.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/Checkers/DereferenceChecker.h"
 #include "clang/Checker/PathSensitive/Checker.h"
 #include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "GRExprEngineInternalChecks.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Checker/DivZeroChecker.cpp b/clang/lib/Checker/DivZeroChecker.cpp
index e1346e11b6fd..e09a87149f5c 100644
--- a/clang/lib/Checker/DivZeroChecker.cpp
+++ b/clang/lib/Checker/DivZeroChecker.cpp
@@ -12,8 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
 #include "GRExprEngineInternalChecks.h"
+#include "clang/Checker/BugReporter/BugType.h"
+#include "clang/Checker/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Checker/Environment.cpp b/clang/lib/Checker/Environment.cpp
index 671cf89119f3..cc71f8569c62 100644
--- a/clang/lib/Checker/Environment.cpp
+++ b/clang/lib/Checker/Environment.cpp
@@ -10,9 +10,10 @@
 //  This file defined the Environment and EnvironmentManager classes.
 //
 //===----------------------------------------------------------------------===//
+
+#include "clang/Analysis/AnalysisContext.h"
+#include "clang/Analysis/CFG.h"
 #include "clang/Checker/PathSensitive/GRState.h"
-#include "clang/Analysis/Analyses/LiveVariables.h"
-#include "llvm/ADT/ImmutableMap.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Checker/FixedAddressChecker.cpp b/clang/lib/Checker/FixedAddressChecker.cpp
index 04c17d6d7abb..4fce45bd35e8 100644
--- a/clang/lib/Checker/FixedAddressChecker.cpp
+++ b/clang/lib/Checker/FixedAddressChecker.cpp
@@ -13,8 +13,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
 #include "GRExprEngineInternalChecks.h"
+#include "clang/Checker/BugReporter/BugType.h"
+#include "clang/Checker/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Checker/GRExprEngine.cpp b/clang/lib/Checker/GRExprEngine.cpp
index 6a8466d1d7b0..ae4c5fe3c121 100644
--- a/clang/lib/Checker/GRExprEngine.cpp
+++ b/clang/lib/Checker/GRExprEngine.cpp
@@ -13,6 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 #include "GRExprEngineInternalChecks.h"
+#include "clang/Checker/BugReporter/BugType.h"
+#include "clang/Checker/PathSensitive/AnalysisManager.h"
 #include "clang/Checker/PathSensitive/GRExprEngine.h"
 #include "clang/Checker/PathSensitive/GRExprEngineBuilders.h"
 #include "clang/Checker/PathSensitive/Checker.h"
diff --git a/clang/lib/Checker/GRState.cpp b/clang/lib/Checker/GRState.cpp
index f2952bc9bead..f68e10b0cbc9 100644
--- a/clang/lib/Checker/GRState.cpp
+++ b/clang/lib/Checker/GRState.cpp
@@ -11,10 +11,10 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "clang/Analysis/CFG.h"
 #include "clang/Checker/PathSensitive/GRStateTrait.h"
 #include "clang/Checker/PathSensitive/GRState.h"
 #include "clang/Checker/PathSensitive/GRTransferFuncs.h"
-#include "llvm/ADT/SmallSet.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
diff --git a/clang/lib/Checker/MacOSXAPIChecker.cpp b/clang/lib/Checker/MacOSXAPIChecker.cpp
index 9621e853bc48..bcd96e73305e 100644
--- a/clang/lib/Checker/MacOSXAPIChecker.cpp
+++ b/clang/lib/Checker/MacOSXAPIChecker.cpp
@@ -17,7 +17,7 @@
 
 #include "GRExprEngineInternalChecks.h"
 #include "clang/Basic/TargetInfo.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/PathSensitive/CheckerVisitor.h"
 #include "clang/Checker/PathSensitive/GRStateTrait.h"
 #include "llvm/ADT/SmallString.h"
diff --git a/clang/lib/Checker/MallocChecker.cpp b/clang/lib/Checker/MallocChecker.cpp
index a08afc4b7959..a22df3046920 100644
--- a/clang/lib/Checker/MallocChecker.cpp
+++ b/clang/lib/Checker/MallocChecker.cpp
@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "GRExprEngineExperimentalChecks.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/PathSensitive/CheckerVisitor.h"
 #include "clang/Checker/PathSensitive/GRState.h"
 #include "clang/Checker/PathSensitive/GRStateTrait.h"
diff --git a/clang/lib/Checker/MemRegion.cpp b/clang/lib/Checker/MemRegion.cpp
index 9a26988fcf1d..9f12ab622fbf 100644
--- a/clang/lib/Checker/MemRegion.cpp
+++ b/clang/lib/Checker/MemRegion.cpp
@@ -13,10 +13,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Analysis/AnalysisContext.h"
 #include "clang/Checker/PathSensitive/MemRegion.h"
+#include "clang/Analysis/AnalysisContext.h"
+#include "clang/Analysis/Support/BumpVector.h"
 #include "clang/AST/CharUnits.h"
-#include "clang/AST/StmtVisitor.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
diff --git a/clang/lib/Checker/NSErrorChecker.cpp b/clang/lib/Checker/NSErrorChecker.cpp
index e428e2e83f2a..9130bfad8407 100644
--- a/clang/lib/Checker/NSErrorChecker.cpp
+++ b/clang/lib/Checker/NSErrorChecker.cpp
@@ -16,7 +16,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Checker/Checkers/LocalCheckers.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/PathSensitive/GRExprEngine.h"
 #include "clang/Checker/Checkers/DereferenceChecker.h"
 #include "BasicObjCFoundationChecks.h"
diff --git a/clang/lib/Checker/PointerArithChecker.cpp b/clang/lib/Checker/PointerArithChecker.cpp
index 3d62d0c7b9d7..ed60c42613fe 100644
--- a/clang/lib/Checker/PointerArithChecker.cpp
+++ b/clang/lib/Checker/PointerArithChecker.cpp
@@ -12,8 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
 #include "GRExprEngineInternalChecks.h"
+#include "clang/Checker/BugReporter/BugType.h"
+#include "clang/Checker/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Checker/PointerSubChecker.cpp b/clang/lib/Checker/PointerSubChecker.cpp
index acc848ac8edb..bc0fd24d19b4 100644
--- a/clang/lib/Checker/PointerSubChecker.cpp
+++ b/clang/lib/Checker/PointerSubChecker.cpp
@@ -13,8 +13,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
 #include "GRExprEngineInternalChecks.h"
+#include "clang/Checker/BugReporter/BugType.h"
+#include "clang/Checker/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Checker/ReturnPointerRangeChecker.cpp b/clang/lib/Checker/ReturnPointerRangeChecker.cpp
index 949ded507c5b..14edf5668983 100644
--- a/clang/lib/Checker/ReturnPointerRangeChecker.cpp
+++ b/clang/lib/Checker/ReturnPointerRangeChecker.cpp
@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/Checker/PathSensitive/GRExprEngine.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Checker/ReturnStackAddressChecker.cpp b/clang/lib/Checker/ReturnStackAddressChecker.cpp
index 9cbabba4a5f5..35b1cdebf620 100644
--- a/clang/lib/Checker/ReturnStackAddressChecker.cpp
+++ b/clang/lib/Checker/ReturnStackAddressChecker.cpp
@@ -14,8 +14,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "GRExprEngineInternalChecks.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
 #include "clang/Checker/PathSensitive/CheckerVisitor.h"
 #include "clang/Basic/SourceManager.h"
 #include "llvm/ADT/SmallString.h"
diff --git a/clang/lib/Checker/ReturnUndefChecker.cpp b/clang/lib/Checker/ReturnUndefChecker.cpp
index ee259883e48c..52a0b3076b6a 100644
--- a/clang/lib/Checker/ReturnUndefChecker.cpp
+++ b/clang/lib/Checker/ReturnUndefChecker.cpp
@@ -14,10 +14,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "llvm/ADT/SmallString.h"
+#include "clang/Checker/PathSensitive/GRExprEngine.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Checker/SymbolManager.cpp b/clang/lib/Checker/SymbolManager.cpp
index 65a46e31fefa..f3a803c57d32 100644
--- a/clang/lib/Checker/SymbolManager.cpp
+++ b/clang/lib/Checker/SymbolManager.cpp
@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Checker/PathSensitive/SymbolManager.h"
+#include "clang/Analysis/Analyses/LiveVariables.h"
 #include "clang/Checker/PathSensitive/MemRegion.h"
-#include "clang/Analysis/AnalysisContext.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
diff --git a/clang/lib/Checker/UndefBranchChecker.cpp b/clang/lib/Checker/UndefBranchChecker.cpp
index e047b187b108..90883456b17c 100644
--- a/clang/lib/Checker/UndefBranchChecker.cpp
+++ b/clang/lib/Checker/UndefBranchChecker.cpp
@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "GRExprEngineInternalChecks.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/PathSensitive/Checker.h"
 
 using namespace clang;
diff --git a/clang/lib/Checker/UndefCapturedBlockVarChecker.cpp b/clang/lib/Checker/UndefCapturedBlockVarChecker.cpp
index a8d7284b40ac..b1010c9c4892 100644
--- a/clang/lib/Checker/UndefCapturedBlockVarChecker.cpp
+++ b/clang/lib/Checker/UndefCapturedBlockVarChecker.cpp
@@ -14,7 +14,7 @@
 #include "GRExprEngineInternalChecks.h"
 #include "clang/Checker/PathSensitive/CheckerVisitor.h"
 #include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
diff --git a/clang/lib/Checker/UndefResultChecker.cpp b/clang/lib/Checker/UndefResultChecker.cpp
index fb2283a62044..8b07aed10e30 100644
--- a/clang/lib/Checker/UndefResultChecker.cpp
+++ b/clang/lib/Checker/UndefResultChecker.cpp
@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "GRExprEngineInternalChecks.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/PathSensitive/CheckerVisitor.h"
 #include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Checker/UndefinedArraySubscriptChecker.cpp b/clang/lib/Checker/UndefinedArraySubscriptChecker.cpp
index a2792ad17ba1..148629e0093f 100644
--- a/clang/lib/Checker/UndefinedArraySubscriptChecker.cpp
+++ b/clang/lib/Checker/UndefinedArraySubscriptChecker.cpp
@@ -12,9 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
 #include "GRExprEngineInternalChecks.h"
+#include "clang/Checker/BugReporter/BugType.h"
+#include "clang/Checker/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Checker/UndefinedAssignmentChecker.cpp b/clang/lib/Checker/UndefinedAssignmentChecker.cpp
index 9f17ef126da3..6cef60eaee29 100644
--- a/clang/lib/Checker/UndefinedAssignmentChecker.cpp
+++ b/clang/lib/Checker/UndefinedAssignmentChecker.cpp
@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "GRExprEngineInternalChecks.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Checker/UnixAPIChecker.cpp b/clang/lib/Checker/UnixAPIChecker.cpp
index 7ff817ae7677..d75e5d25c49d 100644
--- a/clang/lib/Checker/UnixAPIChecker.cpp
+++ b/clang/lib/Checker/UnixAPIChecker.cpp
@@ -12,11 +12,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "clang/Checker/PathSensitive/GRStateTrait.h"
-#include "llvm/ADT/StringSwitch.h"
 #include "GRExprEngineInternalChecks.h"
+#include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/Checker/BugReporter/BugType.h"
+#include "llvm/ADT/StringSwitch.h"
 #include <fcntl.h>
 
 using namespace clang;
diff --git a/clang/lib/Checker/VLASizeChecker.cpp b/clang/lib/Checker/VLASizeChecker.cpp
index 51ad1e2daf5e..cea9d191aa77 100644
--- a/clang/lib/Checker/VLASizeChecker.cpp
+++ b/clang/lib/Checker/VLASizeChecker.cpp
@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "GRExprEngineInternalChecks.h"
+#include "clang/Checker/BugReporter/BugType.h"
 #include "clang/Checker/PathSensitive/CheckerVisitor.h"
 #include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
 
 using namespace clang;