summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Checker/AdjustedReturnValueChecker.cpp4
-rw-r--r--clang/lib/Checker/ArrayBoundChecker.cpp4
-rw-r--r--clang/lib/Checker/AttrNonNullChecker.cpp4
-rw-r--r--clang/lib/Checker/BasicObjCFoundationChecks.cpp3
-rw-r--r--clang/lib/Checker/BugReporter.cpp1
-rw-r--r--clang/lib/Checker/BugReporterVisitors.cpp1
-rw-r--r--clang/lib/Checker/CFRefCount.cpp3
-rw-r--r--clang/lib/Checker/CallAndMessageChecker.cpp6
-rw-r--r--clang/lib/Checker/CastToStructChecker.cpp1
-rw-r--r--clang/lib/Checker/DereferenceChecker.cpp4
-rw-r--r--clang/lib/Checker/DivZeroChecker.cpp3
-rw-r--r--clang/lib/Checker/Environment.cpp5
-rw-r--r--clang/lib/Checker/FixedAddressChecker.cpp3
-rw-r--r--clang/lib/Checker/GRExprEngine.cpp2
-rw-r--r--clang/lib/Checker/GRState.cpp2
-rw-r--r--clang/lib/Checker/MacOSXAPIChecker.cpp2
-rw-r--r--clang/lib/Checker/MallocChecker.cpp1
-rw-r--r--clang/lib/Checker/MemRegion.cpp4
-rw-r--r--clang/lib/Checker/NSErrorChecker.cpp2
-rw-r--r--clang/lib/Checker/PointerArithChecker.cpp3
-rw-r--r--clang/lib/Checker/PointerSubChecker.cpp3
-rw-r--r--clang/lib/Checker/ReturnPointerRangeChecker.cpp4
-rw-r--r--clang/lib/Checker/ReturnStackAddressChecker.cpp2
-rw-r--r--clang/lib/Checker/ReturnUndefChecker.cpp5
-rw-r--r--clang/lib/Checker/SymbolManager.cpp2
-rw-r--r--clang/lib/Checker/UndefBranchChecker.cpp1
-rw-r--r--clang/lib/Checker/UndefCapturedBlockVarChecker.cpp2
-rw-r--r--clang/lib/Checker/UndefResultChecker.cpp2
-rw-r--r--clang/lib/Checker/UndefinedArraySubscriptChecker.cpp4
-rw-r--r--clang/lib/Checker/UndefinedAssignmentChecker.cpp2
-rw-r--r--clang/lib/Checker/UnixAPIChecker.cpp5
-rw-r--r--clang/lib/Checker/VLASizeChecker.cpp2
32 files changed, 49 insertions, 43 deletions
diff --git a/clang/lib/Checker/AdjustedReturnValueChecker.cpp b/clang/lib/Checker/AdjustedReturnValueChecker.cpp
index e95a86b838b..b92f2e70562 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 74fb06f4556..746b3f95d41 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 83dc13e92b6..309a74ce544 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 d6c09a2e04a..810d0fbb997 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 856b05ff2dc..12e61afa101 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 1d6994b94b4..06cee5bcd1b 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 9a76f6a2a3a..3c4a27cc07f 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 32cf7534c8f..dd1856c9d2d 100644
--- a/clang/lib/Checker/CallAndMessageChecker.cpp
+++ b/clang/lib/Checker/CallAndMessageChecker.cpp
@@ -12,11 +12,11 @@
//
//===----------------------------------------------------------------------===//
+#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"
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "clang/AST/ParentMap.h"
-#include "GRExprEngineInternalChecks.h"
using namespace clang;
diff --git a/clang/lib/Checker/CastToStructChecker.cpp b/clang/lib/Checker/CastToStructChecker.cpp
index bef5bc285ee..2c16f890581 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 dfd3b61b0ac..af74c79558d 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 e1346e11b6f..e09a87149f5 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 671cf89119f..cc71f8569c6 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 04c17d6d7ab..4fce45bd35e 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 6a8466d1d7b..ae4c5fe3c12 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 f2952bc9bea..f68e10b0cbc 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 9621e853bc4..bcd96e73305 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 a08afc4b795..a22df304692 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 9a26988fcf1..9f12ab622fb 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 e428e2e83f2..9130bfad840 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 3d62d0c7b9d..ed60c42613f 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 acc848ac8ed..bc0fd24d19b 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 949ded507c5..14edf566898 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 9cbabba4a5f..35b1cdebf62 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 ee259883e48..52a0b3076b6 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 65a46e31fef..f3a803c57d3 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 e047b187b10..90883456b17 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 a8d7284b40a..b1010c9c489 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 fb2283a6204..8b07aed10e3 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 a2792ad17ba..148629e0093 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 9f17ef126da..6cef60eaee2 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 7ff817ae767..d75e5d25c49 100644
--- a/clang/lib/Checker/UnixAPIChecker.cpp
+++ b/clang/lib/Checker/UnixAPIChecker.cpp
@@ -12,11 +12,10 @@
//
//===----------------------------------------------------------------------===//
+#include "GRExprEngineInternalChecks.h"
#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "clang/Checker/PathSensitive/GRStateTrait.h"
+#include "clang/Checker/BugReporter/BugType.h"
#include "llvm/ADT/StringSwitch.h"
-#include "GRExprEngineInternalChecks.h"
#include <fcntl.h>
using namespace clang;
diff --git a/clang/lib/Checker/VLASizeChecker.cpp b/clang/lib/Checker/VLASizeChecker.cpp
index 51ad1e2daf5..cea9d191aa7 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;
OpenPOWER on IntegriCloud