Reorder includes

- local includes first - Use <> for clang/llvm includes - system includes last
author: Sergio Martins <smartins@kde.org> 2018-10-19 13:00:58 +0100
committer: Sergio Martins <smartins@kde.org> 2018-10-19 13:03:33 +0100
commit: b581ae7074e588f158339be8aee5391901bf7558 (patch)
tree: 72137521cfc572d83e380cfccf62c526f521c94b /src
parent: 0f6468877b329c3c14e7287134e53c0d3992e93e (diff)
192 files changed, 1202 insertions, 1182 deletions
diff --git a/src/AccessSpecifierManager.cpp b/src/AccessSpecifierManager.cpp
index 7949412d..11f2ef56 100644
--- a/src/AccessSpecifierManager.cpp
+++ b/src/AccessSpecifierManager.cpp
@@ -21,26 +21,26 @@
 */
 
 #include "AccessSpecifierManager.h"
+#include "QtUtils.h"
+#include "SourceCompatibilityHelpers.h"
+#include "Utils.h"
 
 #include <clang/Basic/SourceManager.h>
 #include <clang/AST/DeclCXX.h>
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/DeclTemplate.h>
+#include <clang/Basic/IdentifierTable.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Frontend/CompilerInstance.h>
+#include <clang/Lex/PPCallbacks.h>
+#include <clang/Lex/Preprocessor.h>
+#include <clang/Lex/Token.h>
+#include <llvm/Support/Casting.h>
+
 #include <algorithm>
 #include <memory>
 #include <utility>
 
-#include "QtUtils.h"
-#include "SourceCompatibilityHelpers.h"
-#include "Utils.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/DeclTemplate.h"
-#include "clang/Basic/IdentifierTable.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Lex/PPCallbacks.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Lex/Token.h"
-#include "llvm/Support/Casting.h"
-
 namespace clang {
 class MacroArgs;
 class MacroDefinition;
diff --git a/src/AccessSpecifierManager.h b/src/AccessSpecifierManager.h
index c877b3d6..17b0db70 100644
--- a/src/AccessSpecifierManager.h
+++ b/src/AccessSpecifierManager.h
@@ -28,10 +28,11 @@
 # include <vector>
 
 #include "checkbase.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/Specifiers.h"
 #include "clazy_export.h"
-#include "llvm/ADT/StringRef.h"
+
+#include <clang/Basic/SourceLocation.h>
+#include <clang/Basic/Specifiers.h>
+#include <llvm/ADT/StringRef.h>
 
 /*
    clang supports "public", "private" and "protected"
diff --git a/src/Clazy.cpp b/src/Clazy.cpp
index 55b19ff1..0751a18f 100644
--- a/src/Clazy.cpp
+++ b/src/Clazy.cpp
@@ -22,32 +22,33 @@
   Boston, MA 02110-1301, USA.
 */
 
-#include <stdlib.h>
-#include <mutex>
-
 #include "Utils.h"
 #include "Clazy.h"
 #include "clazy_stl.h"
 #include "checkbase.h"
 #include "AccessSpecifierManager.h"
-#include "clang/Frontend/FrontendPluginRegistry.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "llvm/Support/raw_ostream.h"
-#include "clang/AST/ParentMap.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/StmtCXX.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Frontend/FrontendAction.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/Frontend/FrontendPluginRegistry.h>
+#include <clang/Frontend/CompilerInstance.h>
+#include <clang/AST/ParentMap.h>
+#include <clang/AST/ASTConsumer.h>
+#include <clang/AST/ASTContext.h>
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/StmtCXX.h>
+#include <clang/Basic/Diagnostic.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceLocation.h>
+#include <clang/Basic/SourceManager.h>
+#include <clang/Frontend/FrontendAction.h>
+#include <llvm/Support/raw_ostream.h>
+#include <llvm/Support/Casting.h>
+
+#include <stdlib.h>
+#include <mutex>
 
 using namespace clang;
 using namespace std;
diff --git a/src/Clazy.h b/src/Clazy.h
index 55670f95..afbc8551 100644
--- a/src/Clazy.h
+++ b/src/Clazy.h
@@ -25,19 +25,20 @@
 #ifndef CLAZY_AST_ACTION_H
 #define CLAZY_AST_ACTION_H
 
+#include "checkmanager.h"
+#include "ClazyContext.h"
+#include "checkbase.h"
+
 #include <clang/AST/ASTConsumer.h>
 #include <clang/Frontend/FrontendAction.h>
+#include <clang/AST/RecursiveASTVisitor.h>
+#include <llvm/ADT/StringRef.h>
+
 #include <memory>
 #include <vector>
 #include <string>
 #include <utility>
 
-#include "checkmanager.h"
-#include "ClazyContext.h"
-#include "clang/AST/RecursiveASTVisitor.h"
-#include "checkbase.h"
-#include "llvm/ADT/StringRef.h"
-
 namespace llvm {
 class raw_ostream;
 }  // namespace llvm
diff --git a/src/ClazyContext.cpp b/src/ClazyContext.cpp
index 4ab59ab2..85580222 100644
--- a/src/ClazyContext.cpp
+++ b/src/ClazyContext.cpp
@@ -19,16 +19,17 @@
   Boston, MA 02110-1301, USA.
 */
 
-#include <clang/AST/ParentMap.h>
-#include <stdlib.h>
-
 #include "AccessSpecifierManager.h"
 #include "PreProcessorVisitor.h"
 #include "ClazyContext.h"
-#include "clang/Rewrite/Frontend/FixItRewriter.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "llvm/Support/Regex.h"
+
+#include <clang/AST/ParentMap.h>
+#include <clang/Rewrite/Frontend/FixItRewriter.h>
+#include <clang/Frontend/CompilerInstance.h>
+#include <clang/Lex/PreprocessorOptions.h>
+#include <llvm/Support/Regex.h>
+
+#include <stdlib.h>
 
 using namespace std;
 using namespace clang;
diff --git a/src/ClazyContext.h b/src/ClazyContext.h
index 08e02ddb..1e1ed527 100644
--- a/src/ClazyContext.h
+++ b/src/ClazyContext.h
@@ -22,21 +22,22 @@
 #ifndef CLAZY_CONTEXT_H
 #define CLAZY_CONTEXT_H
 
+#include "SuppressionManager.h"
+#include "clazy_stl.h"
+
 #include <clang/Frontend/CompilerInstance.h>
 #include <clang/Lex/PreprocessorOptions.h>
 #include <clang/Basic/FileManager.h>
+#include <clang/Basic/SourceLocation.h>
+#include <clang/Basic/SourceManager.h>
 #include <llvm/Support/Regex.h>
+#include <llvm/ADT/StringRef.h>
+
 #include <string>
 #include <vector>
 #include <memory>
 #include <utility>
 
-#include "SuppressionManager.h"
-#include "clazy_stl.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/SourceManager.h"
-#include "llvm/ADT/StringRef.h"
-
 // ClazyContext is just a struct to share data and code between all checks
 
 namespace clang {
diff --git a/src/ClazyStandaloneMain.cpp b/src/ClazyStandaloneMain.cpp
index 5eaa56e1..62111e17 100644
--- a/src/ClazyStandaloneMain.cpp
+++ b/src/ClazyStandaloneMain.cpp
@@ -21,15 +21,16 @@
 
 // clazy:excludeall=non-pod-global-static
 
+#include "Clazy.h"
+#include "ClazyContext.h"
+
 #include <clang/Tooling/CommonOptionsParser.h>
 #include <clang/Tooling/Tooling.h>
 #include <llvm/Support/CommandLine.h>
-#include <string>
+#include <llvm/ADT/ArrayRef.h>
+#include <llvm/ADT/StringRef.h>
 
-#include "Clazy.h"
-#include "ClazyContext.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
+#include <string>
 
 namespace clang {
 class FrontendAction;
diff --git a/src/ContextUtils.cpp b/src/ContextUtils.cpp
index aa9224f0..0833ed22 100644
--- a/src/ContextUtils.cpp
+++ b/src/ContextUtils.cpp
@@ -20,20 +20,19 @@
 */
 
 #include "ContextUtils.h"
+#include "clazy_stl.h"
+#include "TypeUtils.h"
+#include "SourceCompatibilityHelpers.h"
 
 #include <clang/Basic/SourceLocation.h>
 #include <clang/Basic/SourceManager.h>
 #include <clang/AST/DeclCXX.h>
 #include <clang/AST/DeclFriend.h>
-
-#include "clazy_stl.h"
-#include "TypeUtils.h"
-#include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/Specifiers.h"
-#include "llvm/Support/raw_ostream.h"
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclBase.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/Specifiers.h>
+#include <llvm/Support/raw_ostream.h>
 
 using namespace clang;
 using namespace std;
diff --git a/src/ContextUtils.h b/src/ContextUtils.h
index 15f8e7a8..21450124 100644
--- a/src/ContextUtils.h
+++ b/src/ContextUtils.h
@@ -22,18 +22,19 @@
 #ifndef CLAZY_CONTEXT_UTILS_H
 #define CLAZY_CONTEXT_UTILS_H
 
+#include "clazy_export.h"
+#include "TypeUtils.h"
+
 #include <clang/AST/DeclBase.h>
 #include <clang/AST/Decl.h>
 #include <clang/AST/DeclCXX.h>
 #include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <llvm/Support/Casting.h>
+
 #include <vector>
 #include <string>
 
-#include "clazy_export.h"
-#include "TypeUtils.h"
-#include "clang/AST/Type.h"
-#include "llvm/Support/Casting.h"
-
 namespace clang {
 class ValueDecl;
 class DeclContext;
diff --git a/src/FixItUtils.cpp b/src/FixItUtils.cpp
index 0af52267..06e50b97 100644
--- a/src/FixItUtils.cpp
+++ b/src/FixItUtils.cpp
@@ -21,19 +21,18 @@
 */
 
 #include "FixItUtils.h"
+#include "StringUtils.h"
+#include "SourceCompatibilityHelpers.h"
 
 #include <clang/AST/Expr.h>
 #include <clang/AST/ExprCXX.h>
 #include <clang/Basic/Diagnostic.h>
 #include <clang/Lex/Lexer.h>
-#include <StringUtils.h>
-
-#include "SourceCompatibilityHelpers.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Lex/Token.h"
+#include <clang/AST/ASTContext.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/SourceLocation.h>
+#include <clang/Basic/SourceManager.h>
+#include <clang/Lex/Token.h>
 
 using namespace clazy;
 using namespace clang;
diff --git a/src/FixItUtils.h b/src/FixItUtils.h
index fa96b1a6..29d3f05e 100644
--- a/src/FixItUtils.h
+++ b/src/FixItUtils.h
@@ -22,13 +22,14 @@
 
 #ifndef CLAZY_FIXIT_UTILS_H
 #define CLAZY_FIXIT_UTILS_H
+#include "clazy_export.h"
+
 #include <clang/Parse/Parser.h>
+#include <clang/Basic/TokenKinds.h>
+
 #include <string>
 #include <vector>
 
-#include "clazy_export.h"
-#include "clang/Basic/TokenKinds.h"
-
 namespace clang {
 class ASTContext;
 class FixItHint;
diff --git a/src/FunctionUtils.h b/src/FunctionUtils.h
index 4b84fe4f..16f0f61d 100644
--- a/src/FunctionUtils.h
+++ b/src/FunctionUtils.h
@@ -32,6 +32,7 @@
 #include "StringUtils.h"
 
 #include <clang/AST/Decl.h>
+
 #include <string>
 
 namespace clazy {
diff --git a/src/HierarchyUtils.h b/src/HierarchyUtils.h
index a616a9a8..a08a4399 100644
--- a/src/HierarchyUtils.h
+++ b/src/HierarchyUtils.h
@@ -36,7 +36,6 @@
 #include <clang/AST/ExprCXX.h>
 #include <clang/AST/ParentMap.h>
 
-
 namespace clazy {
 
 enum IgnoreStmt {
diff --git a/src/LoopUtils.cpp b/src/LoopUtils.cpp
index a9c6e49d..e63b6293 100644
--- a/src/LoopUtils.cpp
+++ b/src/LoopUtils.cpp
@@ -23,19 +23,18 @@
 */
 
 #include "LoopUtils.h"
+#include "StringUtils.h"
+#include "clazy_stl.h"
+#include "SourceCompatibilityHelpers.h"
 
 #include <clang/AST/ParentMap.h>
 #include <clang/Basic/SourceLocation.h>
 #include <clang/AST/ExprCXX.h>
-
-#include "StringUtils.h"
-#include "clazy_stl.h"
-#include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/StmtCXX.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/StringRef.h"
+#include <clang/AST/Decl.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/StmtCXX.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
 
 namespace clang {
 class CXXConstructorDecl;
diff --git a/src/LoopUtils.h b/src/LoopUtils.h
index a63f58c0..1c5cb5bd 100644
--- a/src/LoopUtils.h
+++ b/src/LoopUtils.h
@@ -25,12 +25,12 @@
 #ifndef CLAZY_LOOP_UTILS_H
 #define CLAZY_LOOP_UTILS_H
 
-#include <clang/AST/StmtCXX.h>
-
 #include "clazy_stl.h"
 #include "clazy_export.h"
-#include "clang/AST/Stmt.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/StmtCXX.h>
+#include <clang/AST/Stmt.h>
+#include <llvm/Support/Casting.h>
 
 namespace clang {
 class Stmt;
diff --git a/src/PreProcessorVisitor.cpp b/src/PreProcessorVisitor.cpp
index c8bfb096..a1e9ff13 100644
--- a/src/PreProcessorVisitor.cpp
+++ b/src/PreProcessorVisitor.cpp
@@ -20,21 +20,21 @@
 */
 
 #include "PreProcessorVisitor.h"
+#include "MacroUtils.h"
 
 #include <clang/Frontend/CompilerInstance.h>
 #include <clang/Lex/Preprocessor.h>
 #include <clang/Lex/MacroInfo.h>
+#include <clang/Basic/IdentifierTable.h>
+#include <clang/Basic/SourceLocation.h>
+#include <clang/Basic/SourceManager.h>
+#include <clang/Lex/PPCallbacks.h>
+#include <clang/Lex/Token.h>
+#include <llvm/ADT/ArrayRef.h>
+
 #include <stdlib.h>
 #include <memory>
 
-#include "MacroUtils.h"
-#include "clang/Basic/IdentifierTable.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Lex/PPCallbacks.h"
-#include "clang/Lex/Token.h"
-#include "llvm/ADT/ArrayRef.h"
-
 using namespace clang;
 using namespace std;
 
diff --git a/src/PreProcessorVisitor.h b/src/PreProcessorVisitor.h
index 6c543475..6443eae3 100644
--- a/src/PreProcessorVisitor.h
+++ b/src/PreProcessorVisitor.h
@@ -27,14 +27,15 @@
 // For example, getting the Qt version can be done once and the result shared
 // with all checks
 
+#include "checkbase.h"
+
 #include <clang/Lex/PPCallbacks.h>
+#include <llvm/ADT/StringRef.h>
+
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include "checkbase.h"
-#include "llvm/ADT/StringRef.h"
-
 namespace clang {
     class CompilerInstance;
     class SourceManager;
diff --git a/src/QtUtils.cpp b/src/QtUtils.cpp
index 9551b97e..cd22e1bc 100644
--- a/src/QtUtils.cpp
+++ b/src/QtUtils.cpp
@@ -25,10 +25,11 @@
 #include "TypeUtils.h"
 #include "StmtBodyRange.h"
 #include "StringUtils.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/Support/raw_ostream.h"
+
+#include <clang/AST/ExprCXX.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/ArrayRef.h>
+#include <llvm/Support/raw_ostream.h>
 
 using namespace std;
 using namespace clang;
diff --git a/src/QtUtils.h b/src/QtUtils.h
index 9a616e8b..5aa6ce88 100644
--- a/src/QtUtils.h
+++ b/src/QtUtils.h
@@ -22,29 +22,30 @@
 #ifndef CLAZY_QT_UTILS_H
 #define CLAZY_QT_UTILS_H
 
-#include <clang/AST/ASTContext.h>
-#include <string>
-#include <vector>
-#include <unordered_map>
-
 #include "clazy_export.h"
 #include "TypeUtils.h"
 #include "MacroUtils.h"
 #include "FunctionUtils.h"
 #include "StringUtils.h"
 #include "Utils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/DeclTemplate.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/OperationKinds.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/TemplateBase.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/SourceLocation.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/ASTContext.h>
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/DeclTemplate.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/OperationKinds.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/TemplateBase.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/SourceLocation.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <string>
+#include <vector>
+#include <unordered_map>
 
 namespace clang {
 class CXXRecordDecl;
diff --git a/src/StringUtils.h b/src/StringUtils.h
index 640c5198..bb7b314f 100644
--- a/src/StringUtils.h
+++ b/src/StringUtils.h
@@ -25,31 +25,32 @@
 #ifndef CLANG_LAZY_STRING_UTILS_H
 #define CLANG_LAZY_STRING_UTILS_H
 
+#include "clazy_export.h"
+#include "Utils.h"
+#include "clazy_stl.h"
+#include "SourceCompatibilityHelpers.h"
+
 #include <clang/Basic/LangOptions.h>
 #include <clang/AST/ExprCXX.h>
 #include <clang/AST/DeclCXX.h>
+#include <clang/AST/PrettyPrinter.h>
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclarationName.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/OperatorKinds.h>
+#include <clang/Basic/SourceLocation.h>
+#include <clang/Basic/Specifiers.h>
+#include <llvm/ADT/ArrayRef.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+#include <llvm/Support/raw_ostream.h>
+
 #include <string>
 #include <vector>
 
-#include "clazy_export.h"
-#include "Utils.h"
-#include "clazy_stl.h"
-#include "clang/AST/PrettyPrinter.h"
-#include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclarationName.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/OperatorKinds.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/Specifiers.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/raw_ostream.h"
-
 namespace clang {
 class LangOpts;
 class SourceManager;
diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
index b439d7b8..0967bf57 100644
--- a/src/SuppressionManager.cpp
+++ b/src/SuppressionManager.cpp
@@ -20,17 +20,17 @@
 */
 
 #include "SuppressionManager.h"
+#include "clazy_stl.h"
 
 #include <clang/Basic/SourceManager.h>
 #include <clang/Lex/Lexer.h>
-#include <vector>
+#include <clang/Basic/SourceLocation.h>
+#include <clang/Basic/TokenKinds.h>
+#include <clang/Lex/Token.h>
+#include <llvm/Support/MemoryBuffer.h>
+#include <llvm/Support/raw_ostream.h>
 
-#include "clazy_stl.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/TokenKinds.h"
-#include "clang/Lex/Token.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/raw_ostream.h"
+#include <vector>
 
 #ifndef NO_STD_REGEX
 # include <regex>
diff --git a/src/SuppressionManager.h b/src/SuppressionManager.h
index 7c3f88ed..64535012 100644
--- a/src/SuppressionManager.h
+++ b/src/SuppressionManager.h
@@ -22,14 +22,13 @@
 #ifndef CLAZY_SUPPRESSION_MANAGER_H
 #define CLAZY_SUPPRESSION_MANAGER_H
 
+#include "clazy_export.h"
+
 #include <set>
 #include <string>
 #include <unordered_map>
 #include <utility>
 
-#include "clazy_export.h"
-
-
 namespace clang {
 class SourceLocation;
 class LangOptions;
diff --git a/src/TemplateUtils.cpp b/src/TemplateUtils.cpp
index b460b8c7..137c582f 100644
--- a/src/TemplateUtils.cpp
+++ b/src/TemplateUtils.cpp
@@ -20,16 +20,15 @@
 */
 
 #include "TemplateUtils.h"
+#include "StringUtils.h"
 
 #include <clang/AST/DeclCXX.h>
 #include <clang/AST/DeclTemplate.h>
-
-#include "StringUtils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/TemplateBase.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+#include <clang/AST/Decl.h>
+#include <clang/AST/TemplateBase.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
 
 namespace clang {
 class LangOptions;
diff --git a/src/TemplateUtils.h b/src/TemplateUtils.h
index 31658f17..0d3e8655 100644
--- a/src/TemplateUtils.h
+++ b/src/TemplateUtils.h
@@ -19,12 +19,13 @@
   Boston, MA 02110-1301, USA.
 */
 
+#include "clazy_export.h"
+
 #include <clang/AST/Type.h>
+
 #include <vector>
 #include <string>
 
-#include "clazy_export.h"
-
 namespace clang {
     class CXXMethodDecl;
     class CXXRecordDecl;
diff --git a/src/TypeUtils.cpp b/src/TypeUtils.cpp
index ba1787ce..87cbbcb6 100644
--- a/src/TypeUtils.cpp
+++ b/src/TypeUtils.cpp
@@ -20,20 +20,19 @@
 */
 
 #include "TypeUtils.h"
-
-#include <HierarchyUtils.h>
-#include <StringUtils.h>
-#include <clang/AST/ASTContext.h>
-
+#include "HierarchyUtils.h"
+#include "StringUtils.h"
 #include "Utils.h"
 #include "StmtBodyRange.h"
 #include "ClazyContext.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
+
+#include <clang/AST/ASTContext.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
 
 using namespace clang;
 
diff --git a/src/TypeUtils.h b/src/TypeUtils.h
index e86cacf8..b008428c 100644
--- a/src/TypeUtils.h
+++ b/src/TypeUtils.h
@@ -22,18 +22,19 @@
 #ifndef CLAZY_TYPE_UTILS_H
 #define CLAZY_TYPE_UTILS_H
 
+#include "clazy_export.h"
+
 #include <clang/AST/Type.h>
 #include <clang/AST/Expr.h>
 #include <clang/AST/StmtCXX.h>
 #include <clang/AST/DeclCXX.h>
 #include <clang/AST/ASTContext.h>
+#include <clang/AST/Decl.h>
+#include <llvm/Support/Casting.h>
+
 #include <string>
 #include <vector>
 
-#include "clazy_export.h"
-#include "clang/AST/Decl.h"
-#include "llvm/Support/Casting.h"
-
 namespace clang {
 class CompilerInstance;
 class Expr;
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 1de3e8e4..b0d413af 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -23,6 +23,10 @@
 */
 
 #include "Utils.h"
+#include "StringUtils.h"
+#include "HierarchyUtils.h"
+#include "StmtBodyRange.h"
+#include "clazy_stl.h"
 
 #include <clang/AST/Expr.h>
 #include <clang/AST/DeclCXX.h>
@@ -30,28 +34,24 @@
 #include <clang/AST/ExprCXX.h>
 #include <clang/Basic/SourceLocation.h>
 #include <clang/Lex/Lexer.h>
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/DeclGroup.h>
+#include <clang/AST/OperationKinds.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/StmtIterator.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/CharInfo.h>
+#include <clang/Basic/IdentifierTable.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceManager.h>
+#include <clang/Lex/Token.h>
+#include <llvm/Support/Casting.h>
+
 #include <cctype>
 #include <iterator>
 #include <utility>
 
-#include "StringUtils.h"
-#include "HierarchyUtils.h"
-#include "StmtBodyRange.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/DeclGroup.h"
-#include "clang/AST/OperationKinds.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/StmtIterator.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/CharInfo.h"
-#include "clang/Basic/IdentifierTable.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Lex/Token.h"
-#include "clazy_stl.h"
-#include "llvm/Support/Casting.h"
-
 namespace clang {
 class LangOptions;
 }  // namespace clang
diff --git a/src/Utils.h b/src/Utils.h
index 0541d401..dd74238e 100644
--- a/src/Utils.h
+++ b/src/Utils.h
@@ -25,23 +25,24 @@
 #ifndef MOREWARNINGS_UTILS_H
 #define MOREWARNINGS_UTILS_H
 
+#include "clazy_export.h"
+#include "SourceCompatibilityHelpers.h"
+
 #include <clang/Basic/SourceManager.h>
 #include <clang/AST/DeclCXX.h>
 #include <clang/AST/Expr.h>
 #include <clang/AST/ExprCXX.h>
 #include <clang/AST/Stmt.h>
 #include <clang/AST/DeclTemplate.h>
+#include <clang/Basic/SourceLocation.h>
+#include <llvm/ADT/ArrayRef.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Config/llvm-config.h>
+
 #include <string>
 #include <vector>
 #include <map>
 
-#include "clazy_export.h"
-#include "SourceCompatibilityHelpers.h"
-#include "clang/Basic/SourceLocation.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Config/llvm-config.h"
-
 // TODO: this is a dumping ground, most of these functions should be moved to the other *Utils classes
 
 namespace clang {
diff --git a/src/checkbase.cpp b/src/checkbase.cpp
index 6092924b..b44e1573 100644
--- a/src/checkbase.cpp
+++ b/src/checkbase.cpp
@@ -23,26 +23,26 @@
 */
 
 #include "checkbase.h"
-
-#include <vector>
-#include <memory>
-
 #include "ClazyContext.h"
 #include "SourceCompatibilityHelpers.h"
 #include "SuppressionManager.h"
 #include "Utils.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticIDs.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Lex/MacroInfo.h"
-#include "clang/Lex/Preprocessor.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/IntrusiveRefCntPtr.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/raw_ostream.h"
+
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/Diagnostic.h>
+#include <clang/Basic/DiagnosticIDs.h>
+#include <clang/Basic/SourceManager.h>
+#include <clang/Frontend/CompilerInstance.h>
+#include <clang/Lex/MacroInfo.h>
+#include <clang/Lex/Preprocessor.h>
+#include <llvm/ADT/IntrusiveRefCntPtr.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/raw_ostream.h>
+
+#include <vector>
+#include <memory>
 
 namespace clang {
 class MacroArgs;
diff --git a/src/checkbase.h b/src/checkbase.h
index 40b3eeb0..c5953a5f 100644
--- a/src/checkbase.h
+++ b/src/checkbase.h
@@ -25,23 +25,24 @@
 #ifndef CHECK_BASE_H
 #define CHECK_BASE_H
 
+#include "clazy_export.h"
+#include "clazy_stl.h"
+#include "SourceCompatibilityHelpers.h"
+
 #include <clang/Basic/SourceManager.h>
 #include <clang/Frontend/CompilerInstance.h>
 #include <clang/Parse/Parser.h>
+#include <clang/ASTMatchers/ASTMatchers.h>
+#include <clang/ASTMatchers/ASTMatchFinder.h>
+#include <clang/AST/ASTContext.h>
+#include <clang/Basic/SourceLocation.h>
+#include <clang/Lex/PPCallbacks.h>
 #include <llvm/Config/llvm-config.h>
+
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "clazy_export.h"
-#include "clazy_stl.h"
-#include "SourceCompatibilityHelpers.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Lex/PPCallbacks.h"
-
 namespace clang {
 class CXXMethodDecl;
 class Stmt;
diff --git a/src/checkmanager.cpp b/src/checkmanager.cpp
index 30cc31d2..53bb1f36 100644
--- a/src/checkmanager.cpp
+++ b/src/checkmanager.cpp
@@ -23,6 +23,11 @@
 */
 
 #include "checkmanager.h"
+#include "clazy_stl.h"
+#include "ClazyContext.h"
+#include "Checks.h"
+
+#include <llvm/Support/raw_ostream.h>
 
 #include <stdlib.h>
 #include <assert.h>
@@ -31,11 +36,6 @@
 #include <iterator>
 #include <memory>
 
-#include "clazy_stl.h"
-#include "ClazyContext.h"
-#include "Checks.h"
-#include "llvm/Support/raw_ostream.h"
-
 using namespace clang;
 using namespace std;
 
diff --git a/src/checkmanager.h b/src/checkmanager.h
index 6d59bb41..5d5eb6be 100644
--- a/src/checkmanager.h
+++ b/src/checkmanager.h
@@ -25,7 +25,11 @@
 #ifndef CLANG_LAZY_CHECK_MANAGER_H
 #define CLANG_LAZY_CHECK_MANAGER_H
 
+#include "clazy_export.h"
+#include "checkbase.h"
+
 #include <clang/Lex/PreprocessorOptions.h>
+
 #include <functional>
 #include <mutex>
 #include <unordered_map>
@@ -33,9 +37,6 @@
 #include <utility>
 #include <string>
 
-#include "clazy_export.h"
-#include "checkbase.h"
-
 class ClazyContext;
 
 struct CLAZYLIB_EXPORT RegisteredFixIt {
diff --git a/src/checks/detachingbase.cpp b/src/checks/detachingbase.cpp
index 3293e566..1f8cb381 100644
--- a/src/checks/detachingbase.cpp
+++ b/src/checks/detachingbase.cpp
@@ -23,17 +23,17 @@
 */
 
 #include "detachingbase.h"
+#include "StringUtils.h"
+#include "QtUtils.h"
+#include "clazy_stl.h"
 
 #include <clang/AST/DeclCXX.h>
+#include <llvm/ADT/StringRef.h>
+
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "StringUtils.h"
-#include "QtUtils.h"
-#include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
-
 class ClazyContext;
 
 using namespace clang;
diff --git a/src/checks/detachingbase.h b/src/checks/detachingbase.h
index 0aa06643..e0451e1c 100644
--- a/src/checks/detachingbase.h
+++ b/src/checks/detachingbase.h
@@ -25,12 +25,12 @@
 #ifndef DETACHING_BASE_H
 #define DETACHING_BASE_H
 
+#include "checkbase.h"
+
 #include <map>
 #include <vector>
 #include <string>
 
-#include "checkbase.h"
-
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/inefficientqlistbase.cpp b/src/checks/inefficientqlistbase.cpp
index 446ac8a1..b8892d48 100644
--- a/src/checks/inefficientqlistbase.cpp
+++ b/src/checks/inefficientqlistbase.cpp
@@ -23,23 +23,23 @@
 */
 
 #include "inefficientqlistbase.h"
-
-#include <clang/AST/Decl.h>
-#include <clang/AST/DeclCXX.h>
-#include <vector>
-
 #include "Utils.h"
 #include "TypeUtils.h"
 #include "ContextUtils.h"
 #include "TemplateUtils.h"
 #include "StmtBodyRange.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/ASTContext.h>
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 class ClazyContext;
 namespace clang {
diff --git a/src/checks/inefficientqlistbase.h b/src/checks/inefficientqlistbase.h
index 050c1bdc..795fed50 100644
--- a/src/checks/inefficientqlistbase.h
+++ b/src/checks/inefficientqlistbase.h
@@ -25,10 +25,10 @@
 #ifndef INEFFICIENT_QLIST_BASE_H
 #define INEFFICIENT_QLIST_BASE_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level0/connect-by-name.cpp b/src/checks/level0/connect-by-name.cpp
index 3b8ff61a..4eb6b87a 100644
--- a/src/checks/level0/connect-by-name.cpp
+++ b/src/checks/level0/connect-by-name.cpp
@@ -20,15 +20,15 @@
 */
 
 #include "connect-by-name.h"
-
-#include <vector>
-
 #include "ClazyContext.h"
 #include "AccessSpecifierManager.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/Basic/LLVM.h"
 #include "clazy_stl.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 namespace clang {
 class Decl;
diff --git a/src/checks/level0/connect-by-name.h b/src/checks/level0/connect-by-name.h
index 1f8f7803..45ae1e89 100644
--- a/src/checks/level0/connect-by-name.h
+++ b/src/checks/level0/connect-by-name.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_CONNECT_BY_NAME_H
 #define CLAZY_CONNECT_BY_NAME_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Decl;
diff --git a/src/checks/level0/connect-non-signal.cpp b/src/checks/level0/connect-non-signal.cpp
index f018f855..f06b6a07 100644
--- a/src/checks/level0/connect-non-signal.cpp
+++ b/src/checks/level0/connect-non-signal.cpp
@@ -21,17 +21,17 @@
 */
 
 #include "connect-non-signal.h"
-
 #include "ClazyContext.h"
 #include "AccessSpecifierManager.h"
 #include "QtUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
 
 using namespace clang;
 using namespace std;
diff --git a/src/checks/level0/connect-non-signal.h b/src/checks/level0/connect-non-signal.h
index 8afec7aa..3fc0660f 100644
--- a/src/checks/level0/connect-non-signal.h
+++ b/src/checks/level0/connect-non-signal.h
@@ -23,10 +23,10 @@
 #ifndef CLAZY_CONNECT_NON_SIGNAL_H
 #define CLAZY_CONNECT_NON_SIGNAL_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/level0/connect-not-normalized.cpp b/src/checks/level0/connect-not-normalized.cpp
index 62869e32..58d7bde6 100644
--- a/src/checks/level0/connect-not-normalized.cpp
+++ b/src/checks/level0/connect-not-normalized.cpp
@@ -21,21 +21,21 @@
 */
 
 #include "connect-not-normalized.h"
-
 #include "ClazyContext.h"
 #include "HierarchyUtils.h"
 #include "NormalizedSignatureUtils.h"
 #include "SourceCompatibilityHelpers.h"
 #include "StringUtils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/ParentMap.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/ParentMap.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
 
 using namespace clang;
 using namespace std;
diff --git a/src/checks/level0/connect-not-normalized.h b/src/checks/level0/connect-not-normalized.h
index a09e7514..9db4ac6a 100644
--- a/src/checks/level0/connect-not-normalized.h
+++ b/src/checks/level0/connect-not-normalized.h
@@ -23,10 +23,10 @@
 #ifndef CLAZY_CONNECT_NOT_NORMALIZED_H
 #define CLAZY_CONNECT_NOT_NORMALIZED_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level0/container-anti-pattern.cpp b/src/checks/level0/container-anti-pattern.cpp
index f828a288..d738f9ef 100644
--- a/src/checks/level0/container-anti-pattern.cpp
+++ b/src/checks/level0/container-anti-pattern.cpp
@@ -20,22 +20,22 @@
 */
 
 #include "container-anti-pattern.h"
-
-#include <vector>
-
 #include "Utils.h"
 #include "StringUtils.h"
 #include "LoopUtils.h"
 #include "HierarchyUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
 #include "clazy_stl.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level0/container-anti-pattern.h b/src/checks/level0/container-anti-pattern.h
index fca31cac..c419d656 100644
--- a/src/checks/level0/container-anti-pattern.h
+++ b/src/checks/level0/container-anti-pattern.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_CONTAINER_ANTI_PATTERN_H
 #define CLAZY_CONTAINER_ANTI_PATTERN_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level0/empty-qstringliteral.cpp b/src/checks/level0/empty-qstringliteral.cpp
index 917147a3..46a2e774 100644
--- a/src/checks/level0/empty-qstringliteral.cpp
+++ b/src/checks/level0/empty-qstringliteral.cpp
@@ -20,18 +20,18 @@
 */
 
 #include "empty-qstringliteral.h"
-
 #include "QtUtils.h"
 #include "SourceCompatibilityHelpers.h"
 #include "PreProcessorVisitor.h"
 #include "ClazyContext.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceLocation.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceLocation.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
 
 using namespace clang;
 using namespace std;
diff --git a/src/checks/level0/empty-qstringliteral.h b/src/checks/level0/empty-qstringliteral.h
index 746b6e6a..f9f12c8e 100644
--- a/src/checks/level0/empty-qstringliteral.h
+++ b/src/checks/level0/empty-qstringliteral.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_EMPTY_QSTRINGLITERAL_H
 #define CLAZY_EMPTY_QSTRINGLITERAL_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class SourceLocation;
diff --git a/src/checks/level0/fully-qualified-moc-types.cpp b/src/checks/level0/fully-qualified-moc-types.cpp
index 2ced17ad..11b8ab11 100644
--- a/src/checks/level0/fully-qualified-moc-types.cpp
+++ b/src/checks/level0/fully-qualified-moc-types.cpp
@@ -20,26 +20,26 @@
 */
 
 #include "fully-qualified-moc-types.h"
-
 #include "HierarchyUtils.h"
 #include "TypeUtils.h"
 #include "ClazyContext.h"
 #include "AccessSpecifierManager.h"
 #include "SourceCompatibilityHelpers.h"
 #include "StringUtils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/IdentifierTable.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Lex/Token.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/IdentifierTable.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceManager.h>
+#include <clang/Lex/Token.h>
+#include <llvm/ADT/ArrayRef.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
 
 namespace clang {
 class Decl;
diff --git a/src/checks/level0/fully-qualified-moc-types.h b/src/checks/level0/fully-qualified-moc-types.h
index f6e2eb20..870f8a4a 100644
--- a/src/checks/level0/fully-qualified-moc-types.h
+++ b/src/checks/level0/fully-qualified-moc-types.h
@@ -22,12 +22,13 @@
 #ifndef CLAZY_FULLY_QUALIFIED_MOC_TYPES_H
 #define CLAZY_FULLY_QUALIFIED_MOC_TYPES_H
 
+#include "checkbase.h"
+
+#include <clang/Basic/SourceLocation.h>
+
 #include <vector>
 #include <string>
 
-#include "checkbase.h"
-#include "clang/Basic/SourceLocation.h"
-
 class ClazyContext;
 namespace clang {
 class CXXMethodDecl;
diff --git a/src/checks/level0/lambda-in-connect.cpp b/src/checks/level0/lambda-in-connect.cpp
index 9a80e486..41b786bd 100644
--- a/src/checks/level0/lambda-in-connect.cpp
+++ b/src/checks/level0/lambda-in-connect.cpp
@@ -20,22 +20,22 @@
 */
 
 #include "lambda-in-connect.h"
-
 #include "ClazyContext.h"
 #include "StringUtils.h"
 #include "HierarchyUtils.h"
 #include "ContextUtils.h"
 #include "QtUtils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/LambdaCapture.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/Lambda.h"
-#include "llvm/ADT/iterator_range.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/LambdaCapture.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/Lambda.h>
+#include <llvm/ADT/iterator_range.h>
+#include <llvm/Support/Casting.h>
 
 using namespace clang;
 using namespace std;
diff --git a/src/checks/level0/lambda-in-connect.h b/src/checks/level0/lambda-in-connect.h
index b576218e..ea18e8a4 100644
--- a/src/checks/level0/lambda-in-connect.h
+++ b/src/checks/level0/lambda-in-connect.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_LAMBDA_IN_CONNECT_H
 #define CLAZY_LAMBDA_IN_CONNECT_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level0/lambda-unique-connection.cpp b/src/checks/level0/lambda-unique-connection.cpp
index 4f051a29..a54ca98f 100644
--- a/src/checks/level0/lambda-unique-connection.cpp
+++ b/src/checks/level0/lambda-unique-connection.cpp
@@ -20,18 +20,18 @@
 */
 
 #include "lambda-unique-connection.h"
-
-#include <vector>
-
 #include "HierarchyUtils.h"
 #include "QtUtils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclTemplate.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclTemplate.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 class ClazyContext;
 namespace clang {
diff --git a/src/checks/level0/lambda-unique-connection.h b/src/checks/level0/lambda-unique-connection.h
index f685447e..579539e0 100644
--- a/src/checks/level0/lambda-unique-connection.h
+++ b/src/checks/level0/lambda-unique-connection.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_LAMBDA_UNIQUE_CONNECTION_H
 #define CLAZY_LAMBDA_UNIQUE_CONNECTION_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/level0/mutable-container-key.cpp b/src/checks/level0/mutable-container-key.cpp
index 11932f27..a4c17679 100644
--- a/src/checks/level0/mutable-container-key.cpp
+++ b/src/checks/level0/mutable-container-key.cpp
@@ -20,18 +20,18 @@
 */
 
 #include "mutable-container-key.h"
-
-#include <vector>
-
 #include "Utils.h"
 #include "StringUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/DeclTemplate.h"
-#include "clang/AST/TemplateBase.h"
-#include "clang/AST/Type.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
+
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/DeclTemplate.h>
+#include <clang/AST/TemplateBase.h>
+#include <clang/AST/Type.h>
+#include <llvm/ADT/StringRef.h>
+
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level0/mutable-container-key.h b/src/checks/level0/mutable-container-key.h
index 7211ee46..c9915db5 100644
--- a/src/checks/level0/mutable-container-key.h
+++ b/src/checks/level0/mutable-container-key.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_MUTABLE_CONTAINER_KEY_H
 #define CLAZY_MUTABLE_CONTAINER_KEY_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Decl;
diff --git a/src/checks/level0/qcolor-from-literal.cpp b/src/checks/level0/qcolor-from-literal.cpp
index 576446a1..13b271c9 100644
--- a/src/checks/level0/qcolor-from-literal.cpp
+++ b/src/checks/level0/qcolor-from-literal.cpp
@@ -22,15 +22,16 @@
 #include "StringUtils.h"
 #include "HierarchyUtils.h"
 #include "qcolor-from-literal.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/ASTMatchers/ASTMatchersInternal.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/ASTMatchers/ASTMatchFinder.h>
+#include <clang/ASTMatchers/ASTMatchers.h>
+#include <clang/ASTMatchers/ASTMatchersInternal.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 
diff --git a/src/checks/level0/qcolor-from-literal.h b/src/checks/level0/qcolor-from-literal.h
index 978426d3..c72d6259 100644
--- a/src/checks/level0/qcolor-from-literal.h
+++ b/src/checks/level0/qcolor-from-literal.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_QCOLOR_FROM_LITERAL_H
 #define CLAZY_QCOLOR_FROM_LITERAL_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class QColorFromLiteral_Callback;
 class ClazyContext;
 namespace clang {
diff --git a/src/checks/level0/qdatetime-utc.cpp b/src/checks/level0/qdatetime-utc.cpp
index 9fee256a..6b495e82 100644
--- a/src/checks/level0/qdatetime-utc.cpp
+++ b/src/checks/level0/qdatetime-utc.cpp
@@ -23,20 +23,20 @@
 */
 
 #include "qdatetime-utc.h"
-
-#include <vector>
-
 #include "Utils.h"
 #include "FixItUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/Diagnostic.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level0/qdatetime-utc.h b/src/checks/level0/qdatetime-utc.h
index 36443968..9a15a9d2 100644
--- a/src/checks/level0/qdatetime-utc.h
+++ b/src/checks/level0/qdatetime-utc.h
@@ -25,10 +25,10 @@
 #ifndef CLANG_LAZY_QDATETIME_UTC_H
 #define CLANG_LAZY_QDATETIME_UTC_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level0/qenums.cpp b/src/checks/level0/qenums.cpp
index 9c55e745..ba41b171 100644
--- a/src/checks/level0/qenums.cpp
+++ b/src/checks/level0/qenums.cpp
@@ -20,16 +20,15 @@
 */
 
 #include "qenums.h"
-
-#include <clang/Lex/Token.h>
-
 #include "ClazyContext.h"
 #include "PreProcessorVisitor.h"
-#include "clang/Basic/IdentifierTable.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Lex/Lexer.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
+
+#include <clang/Lex/Token.h>
+#include <clang/Basic/IdentifierTable.h>
+#include <clang/Basic/SourceManager.h>
+#include <clang/Lex/Lexer.h>
+#include <llvm/ADT/StringRef.h>
 
 namespace clang {
 class MacroInfo;
diff --git a/src/checks/level0/qenums.h b/src/checks/level0/qenums.h
index dd7358de..63d78d05 100644
--- a/src/checks/level0/qenums.h
+++ b/src/checks/level0/qenums.h
@@ -22,10 +22,11 @@
 #ifndef CLAZY_QENUMS_H
 #define CLAZY_QENUMS_H
 
-#include <string>
-
 #include "checkbase.h"
-#include "clang/Basic/SourceLocation.h"
+
+#include <clang/Basic/SourceLocation.h>
+
+#include <string>
 
 class ClazyContext;
 namespace clang {
diff --git a/src/checks/level0/qfileinfo-exists.cpp b/src/checks/level0/qfileinfo-exists.cpp
index 92c4aced..ba2e4f6e 100644
--- a/src/checks/level0/qfileinfo-exists.cpp
+++ b/src/checks/level0/qfileinfo-exists.cpp
@@ -20,15 +20,15 @@
 */
 
 #include "qfileinfo-exists.h"
-
 #include "StringUtils.h"
 #include "HierarchyUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 
diff --git a/src/checks/level0/qfileinfo-exists.h b/src/checks/level0/qfileinfo-exists.h
index 4085e681..d1eb42fd 100644
--- a/src/checks/level0/qfileinfo-exists.h
+++ b/src/checks/level0/qfileinfo-exists.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_QFILEINFO_EXISTS_H
 #define CLAZY_QFILEINFO_EXISTS_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level0/qgetenv.cpp b/src/checks/level0/qgetenv.cpp
index dd7df807..24289250 100644
--- a/src/checks/level0/qgetenv.cpp
+++ b/src/checks/level0/qgetenv.cpp
@@ -23,22 +23,22 @@
 */
 
 #include "qgetenv.h"
-
-#include <vector>
-
 #include "Utils.h"
 #include "StringUtils.h"
 #include "FixItUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/Diagnostic.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level0/qgetenv.h b/src/checks/level0/qgetenv.h
index a25be1b3..92479ebc 100644
--- a/src/checks/level0/qgetenv.h
+++ b/src/checks/level0/qgetenv.h
@@ -25,10 +25,10 @@
 #ifndef CLANG_LAZY_QGETENV_H
 #define CLANG_LAZY_QGETENV_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level0/qmap-with-pointer-key.cpp b/src/checks/level0/qmap-with-pointer-key.cpp
index 0d6541ae..afbe83f0 100644
--- a/src/checks/level0/qmap-with-pointer-key.cpp
+++ b/src/checks/level0/qmap-with-pointer-key.cpp
@@ -23,14 +23,14 @@
 */
 
 #include "qmap-with-pointer-key.h"
-
 #include "Utils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/DeclTemplate.h"
-#include "clang/AST/TemplateBase.h"
-#include "clang/AST/Type.h"
-#include "llvm/ADT/StringRef.h"
+
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/DeclTemplate.h>
+#include <clang/AST/TemplateBase.h>
+#include <clang/AST/Type.h>
+#include <llvm/ADT/StringRef.h>
 
 class ClazyContext;
 
diff --git a/src/checks/level0/qmap-with-pointer-key.h b/src/checks/level0/qmap-with-pointer-key.h
index a9e2c9ea..a950314c 100644
--- a/src/checks/level0/qmap-with-pointer-key.h
+++ b/src/checks/level0/qmap-with-pointer-key.h
@@ -25,10 +25,10 @@
 #ifndef QMAP_WITH_POINTER_KEY_H
 #define QMAP_WITH_POINTER_KEY_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Decl;
diff --git a/src/checks/level0/qstring-arg.cpp b/src/checks/level0/qstring-arg.cpp
index f3e5a840..b654ebe0 100644
--- a/src/checks/level0/qstring-arg.cpp
+++ b/src/checks/level0/qstring-arg.cpp
@@ -20,24 +20,24 @@
 */
 
 #include "qstring-arg.h"
-
-#include <vector>
-
 #include "Utils.h"
 #include "StringUtils.h"
 #include "HierarchyUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Lex/Lexer.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceLocation.h>
+#include <clang/Lex/Lexer.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level0/qstring-arg.h b/src/checks/level0/qstring-arg.h
index c61d124a..a2939b1c 100644
--- a/src/checks/level0/qstring-arg.h
+++ b/src/checks/level0/qstring-arg.h
@@ -22,11 +22,11 @@
 #ifndef QSTRING_ARG_H
 #define QSTRING_ARG_H
 
+#include "checkbase.h"
+
 #include <string>
 #include <vector>
 
-#include "checkbase.h"
-
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level0/qstring-insensitive-allocation.cpp b/src/checks/level0/qstring-insensitive-allocation.cpp
index 9c9f3260..0ee14317 100644
--- a/src/checks/level0/qstring-insensitive-allocation.cpp
+++ b/src/checks/level0/qstring-insensitive-allocation.cpp
@@ -20,17 +20,17 @@
 */
 
 #include "qstring-insensitive-allocation.h"
-
-#include <vector>
-
 #include "Utils.h"
 #include "StringUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
 #include "clazy_stl.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 class ClazyContext;
 namespace clang {
diff --git a/src/checks/level0/qstring-insensitive-allocation.h b/src/checks/level0/qstring-insensitive-allocation.h
index 4b3739e9..c4361825 100644
--- a/src/checks/level0/qstring-insensitive-allocation.h
+++ b/src/checks/level0/qstring-insensitive-allocation.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_QSTRING_INSENSITIVE_ALLOCATION_H
 #define CLAZY_QSTRING_INSENSITIVE_ALLOCATION_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level0/qstring-ref.cpp b/src/checks/level0/qstring-ref.cpp
index 2e6f3ad0..e688ec3e 100644
--- a/src/checks/level0/qstring-ref.cpp
+++ b/src/checks/level0/qstring-ref.cpp
@@ -20,29 +20,29 @@
 */
 
 #include "qstring-ref.h"
-
-#include <clang/Lex/Lexer.h>
-#include <array>
-#include <vector>
-
 #include "ClazyContext.h"
 #include "Utils.h"
 #include "HierarchyUtils.h"
 #include "StringUtils.h"
 #include "FixItUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/IdentifierTable.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceLocation.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/Lex/Lexer.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/Diagnostic.h>
+#include <clang/Basic/IdentifierTable.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceLocation.h>
+#include <llvm/ADT/SmallVector.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <array>
+#include <vector>
 
 namespace clang {
 class Decl;
diff --git a/src/checks/level0/qstring-ref.h b/src/checks/level0/qstring-ref.h
index a7548aa7..1e994517 100644
--- a/src/checks/level0/qstring-ref.h
+++ b/src/checks/level0/qstring-ref.h
@@ -22,11 +22,11 @@
 #ifndef QSTRING_REF_H
 #define QSTRING_REF_H
 
+#include "checkbase.h"
+
 #include <string>
 #include <vector>
 
-#include "checkbase.h"
-
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level0/qt-macros.cpp b/src/checks/level0/qt-macros.cpp
index 385e3cf2..ac393043 100644
--- a/src/checks/level0/qt-macros.cpp
+++ b/src/checks/level0/qt-macros.cpp
@@ -20,12 +20,12 @@
 */
 
 #include "qt-macros.h"
-
 #include "ClazyContext.h"
-#include "clang/Basic/IdentifierTable.h"
-#include "clang/Lex/Token.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
+
+#include <clang/Basic/IdentifierTable.h>
+#include <clang/Lex/Token.h>
+#include <llvm/ADT/StringRef.h>
 
 using namespace clang;
 using namespace std;
diff --git a/src/checks/level0/qt-macros.h b/src/checks/level0/qt-macros.h
index 4b930cfd..ad7c16d3 100644
--- a/src/checks/level0/qt-macros.h
+++ b/src/checks/level0/qt-macros.h
@@ -22,10 +22,11 @@
 #ifndef CLAZY_QT_MACROS_H
 #define CLAZY_QT_MACROS_H
 
-#include <string>
-
 #include "checkbase.h"
-#include "clang/Basic/SourceLocation.h"
+
+#include <clang/Basic/SourceLocation.h>
+
+#include <string>
 
 class QtMacrosPreprocessorCallbacks;
 class ClazyContext;
diff --git a/src/checks/level0/qvariant-template-instantiation.cpp b/src/checks/level0/qvariant-template-instantiation.cpp
index 485e72ef..f27aff22 100644
--- a/src/checks/level0/qvariant-template-instantiation.cpp
+++ b/src/checks/level0/qvariant-template-instantiation.cpp
@@ -23,22 +23,22 @@
 */
 
 #include "qvariant-template-instantiation.h"
-
-#include <ctype.h>
-#include <memory>
-#include <vector>
-
 #include "TemplateUtils.h"
 #include "StringUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <ctype.h>
+#include <memory>
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level0/qvariant-template-instantiation.h b/src/checks/level0/qvariant-template-instantiation.h
index 442a86c5..74fb4bc0 100644
--- a/src/checks/level0/qvariant-template-instantiation.h
+++ b/src/checks/level0/qvariant-template-instantiation.h
@@ -25,10 +25,10 @@
 #ifndef VARIANT_SANITIZER_H
 #define VARIANT_SANITIZER_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/level0/strict-iterators.cpp b/src/checks/level0/strict-iterators.cpp
index afdaa031..53c4d8a0 100644
--- a/src/checks/level0/strict-iterators.cpp
+++ b/src/checks/level0/strict-iterators.cpp
@@ -20,28 +20,28 @@
 */
 
 #include "strict-iterators.h"
-
-#include <assert.h>
-
 #include "ClazyContext.h"
 #include "QtUtils.h"
 #include "StringUtils.h"
 #include "TypeUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/OperationKinds.h"
-#include "clang/AST/ParentMap.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Frontend/CompilerInstance.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/OperationKinds.h>
+#include <clang/AST/ParentMap.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceManager.h>
+#include <clang/Frontend/CompilerInstance.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <assert.h>
 
 using namespace clang;
 using namespace std;
diff --git a/src/checks/level0/strict-iterators.h b/src/checks/level0/strict-iterators.h
index 79ff79a1..b98b3715 100644
--- a/src/checks/level0/strict-iterators.h
+++ b/src/checks/level0/strict-iterators.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_STRICT_ITERATORS_H
 #define CLAZY_STRICT_ITERATORS_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level0/temporary-iterator.cpp b/src/checks/level0/temporary-iterator.cpp
index 413b7e3e..b3097b86 100644
--- a/src/checks/level0/temporary-iterator.cpp
+++ b/src/checks/level0/temporary-iterator.cpp
@@ -24,25 +24,26 @@
 */
 
 
-#include <clang/AST/ParentMap.h>
-#include <clang/AST/DeclCXX.h>
-#include <clang/AST/Expr.h>
-#include <clang/AST/ExprCXX.h>
-#include <utility>
-
 #include "ClazyContext.h"
 #include "temporary-iterator.h"
 #include "Utils.h"
 #include "HierarchyUtils.h"
 #include "StringUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/OperationKinds.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
 #include "clazy_stl.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/ParentMap.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Decl.h>
+#include <clang/AST/OperationKinds.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
+
+#include <utility>
 
 using namespace clang;
 using namespace std;
diff --git a/src/checks/level0/temporary-iterator.h b/src/checks/level0/temporary-iterator.h
index 84e8c9da..907f3e88 100644
--- a/src/checks/level0/temporary-iterator.h
+++ b/src/checks/level0/temporary-iterator.h
@@ -25,13 +25,14 @@
 #ifndef TEMPORARY_ITERATOR_H
 #define TEMPORARY_ITERATOR_H
 
+#include "checkbase.h"
+
+#include <llvm/ADT/StringRef.h>
+
 #include <map>
 #include <vector>
 #include <string>
 
-#include "checkbase.h"
-#include "llvm/ADT/StringRef.h"
-
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/level0/unused-non-trivial-variable.cpp b/src/checks/level0/unused-non-trivial-variable.cpp
index 267399dd..31bf3dce 100644
--- a/src/checks/level0/unused-non-trivial-variable.cpp
+++ b/src/checks/level0/unused-non-trivial-variable.cpp
@@ -20,11 +20,6 @@
 */
 
 #include "unused-non-trivial-variable.h"
-
-#include <stdlib.h>
-#include <vector>
-#include <string>
-
 #include "StringUtils.h"
 #include "HierarchyUtils.h"
 #include "ContextUtils.h"
@@ -32,16 +27,21 @@
 #include "clazy_stl.h"
 #include "SourceCompatibilityHelpers.h"
 #include "TypeUtils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/SourceManager.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceLocation.h>
+#include <clang/Basic/SourceManager.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <stdlib.h>
+#include <vector>
+#include <string>
 
 class ClazyContext;
 
diff --git a/src/checks/level0/unused-non-trivial-variable.h b/src/checks/level0/unused-non-trivial-variable.h
index f7446354..392e7f9d 100644
--- a/src/checks/level0/unused-non-trivial-variable.h
+++ b/src/checks/level0/unused-non-trivial-variable.h
@@ -22,11 +22,11 @@
 #ifndef CLAZY_UNUSED_NON_TRIVIAL_VARIABLE_H
 #define CLAZY_UNUSED_NON_TRIVIAL_VARIABLE_H
 
+#include "checkbase.h"
+
 #include <string>
 #include <vector>
 
-#include "checkbase.h"
-
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level0/writing-to-temporary.cpp b/src/checks/level0/writing-to-temporary.cpp
index 4001d670..22fccf37 100644
--- a/src/checks/level0/writing-to-temporary.cpp
+++ b/src/checks/level0/writing-to-temporary.cpp
@@ -23,19 +23,19 @@
 */
 
 #include "writing-to-temporary.h"
-
-#include <vector>
-
 #include "Utils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
 #include "clazy_stl.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level0/writing-to-temporary.h b/src/checks/level0/writing-to-temporary.h
index 58eae89c..f7143cdb 100644
--- a/src/checks/level0/writing-to-temporary.h
+++ b/src/checks/level0/writing-to-temporary.h
@@ -25,10 +25,10 @@
 #ifndef CLANG_WRITING_TO_TEMPORARY_H
 #define CLANG_WRITING_TO_TEMPORARY_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level0/wrong-qevent-cast.cpp b/src/checks/level0/wrong-qevent-cast.cpp
index f21b9100..60a89a06 100644
--- a/src/checks/level0/wrong-qevent-cast.cpp
+++ b/src/checks/level0/wrong-qevent-cast.cpp
@@ -20,28 +20,28 @@
 */
 
 #include "wrong-qevent-cast.h"
-
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
 #include "Utils.h"
 #include "HierarchyUtils.h"
 #include "TypeUtils.h"
 #include "ClazyContext.h"
 #include "StringUtils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/ParentMap.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/APSInt.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/ParentMap.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/APSInt.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 using namespace clang;
 using namespace std;
diff --git a/src/checks/level0/wrong-qevent-cast.h b/src/checks/level0/wrong-qevent-cast.h
index 6cfbfbb7..3ca35741 100644
--- a/src/checks/level0/wrong-qevent-cast.h
+++ b/src/checks/level0/wrong-qevent-cast.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_WRONG_QEVENT_CAST_H
 #define CLAZY_WRONG_QEVENT_CAST_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/level0/wrong-qglobalstatic.cpp b/src/checks/level0/wrong-qglobalstatic.cpp
index 06890bea..0170a14a 100644
--- a/src/checks/level0/wrong-qglobalstatic.cpp
+++ b/src/checks/level0/wrong-qglobalstatic.cpp
@@ -20,22 +20,22 @@
 */
 
 #include "wrong-qglobalstatic.h"
-
-#include <memory>
-#include <vector>
-
 #include "TemplateUtils.h"
 #include "MacroUtils.h"
 #include "StringUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceLocation.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceLocation.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <memory>
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level0/wrong-qglobalstatic.h b/src/checks/level0/wrong-qglobalstatic.h
index cebfe05f..edf199b0 100644
--- a/src/checks/level0/wrong-qglobalstatic.h
+++ b/src/checks/level0/wrong-qglobalstatic.h
@@ -23,10 +23,10 @@
 #ifndef CLAZY_WRONG_QGLOBALSTATIC_H
 #define CLAZY_WRONG_QGLOBALSTATIC_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level1/auto-unexpected-qstringbuilder.cpp b/src/checks/level1/auto-unexpected-qstringbuilder.cpp
index 303f52b6..a2e29dfc 100644
--- a/src/checks/level1/auto-unexpected-qstringbuilder.cpp
+++ b/src/checks/level1/auto-unexpected-qstringbuilder.cpp
@@ -21,23 +21,23 @@
 */
 
 #include "auto-unexpected-qstringbuilder.h"
-
-#include <vector>
-
 #include "FixItUtils.h"
 #include "TypeUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceLocation.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/Diagnostic.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceLocation.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level1/auto-unexpected-qstringbuilder.h b/src/checks/level1/auto-unexpected-qstringbuilder.h
index fa5d1d9d..716dc972 100644
--- a/src/checks/level1/auto-unexpected-qstringbuilder.h
+++ b/src/checks/level1/auto-unexpected-qstringbuilder.h
@@ -22,10 +22,10 @@
 #ifndef CLANG_LAZY_AUTO_UNEXPECTED_QSTRING_BUILDER_H
 #define CLANG_LAZY_AUTO_UNEXPECTED_QSTRING_BUILDER_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level1/child-event-qobject-cast.cpp b/src/checks/level1/child-event-qobject-cast.cpp
index b2a1e7a2..ec804f0c 100644
--- a/src/checks/level1/child-event-qobject-cast.cpp
+++ b/src/checks/level1/child-event-qobject-cast.cpp
@@ -20,22 +20,22 @@
 */
 
 #include "child-event-qobject-cast.h"
-
-#include <clang/AST/DeclCXX.h>
-#include <vector>
-
 #include "HierarchyUtils.h"
 #include "QtUtils.h"
 #include "StringUtils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level1/child-event-qobject-cast.h b/src/checks/level1/child-event-qobject-cast.h
index a97606fa..0faa3300 100644
--- a/src/checks/level1/child-event-qobject-cast.h
+++ b/src/checks/level1/child-event-qobject-cast.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_CHILD_EVENT_QOBJECT_CAST_H
 #define CLAZY_CHILD_EVENT_QOBJECT_CAST_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Decl;
diff --git a/src/checks/level1/connect-3arg-lambda.cpp b/src/checks/level1/connect-3arg-lambda.cpp
index 1165e5bd..5d8593b0 100644
--- a/src/checks/level1/connect-3arg-lambda.cpp
+++ b/src/checks/level1/connect-3arg-lambda.cpp
@@ -20,17 +20,17 @@
 */
 
 #include "connect-3arg-lambda.h"
-
-#include <vector>
-
 #include "HierarchyUtils.h"
 #include "QtUtils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level1/connect-3arg-lambda.h b/src/checks/level1/connect-3arg-lambda.h
index 012b747e..49305ec2 100644
--- a/src/checks/level1/connect-3arg-lambda.h
+++ b/src/checks/level1/connect-3arg-lambda.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_CONNECT_3ARG_LAMBDA_H
 #define CLAZY_CONNECT_3ARG_LAMBDA_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class FunctionDecl;
diff --git a/src/checks/level1/const-signal-or-slot.cpp b/src/checks/level1/const-signal-or-slot.cpp
index 8b9238d5..4ed126f1 100644
--- a/src/checks/level1/const-signal-or-slot.cpp
+++ b/src/checks/level1/const-signal-or-slot.cpp
@@ -20,17 +20,17 @@
 */
 
 #include "const-signal-or-slot.h"
-
 #include "QtUtils.h"
 #include "TypeUtils.h"
 #include "ClazyContext.h"
 #include "AccessSpecifierManager.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
 
 namespace clang {
 class Decl;
diff --git a/src/checks/level1/const-signal-or-slot.h b/src/checks/level1/const-signal-or-slot.h
index 668ed945..e377044b 100644
--- a/src/checks/level1/const-signal-or-slot.h
+++ b/src/checks/level1/const-signal-or-slot.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_CONST_SIGNAL_OR_SLOT_H
 #define CLAZY_CONST_SIGNAL_OR_SLOT_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Decl;
diff --git a/src/checks/level1/detaching-temporary.cpp b/src/checks/level1/detaching-temporary.cpp
index 6dd3f30a..c32b50ab 100644
--- a/src/checks/level1/detaching-temporary.cpp
+++ b/src/checks/level1/detaching-temporary.cpp
@@ -24,23 +24,23 @@
 
 
 #include "detaching-temporary.h"
-
-#include <clang/AST/DeclCXX.h>
-#include <clang/AST/Expr.h>
-#include <unordered_map>
-#include <utility>
-
 #include "Utils.h"
 #include "StringUtils.h"
 #include "QtUtils.h"
 #include "SourceCompatibilityHelpers.h"
 #include "checkbase.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
 #include "clazy_stl.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/Decl.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
+
+#include <unordered_map>
+#include <utility>
 
 class ClazyContext;
 
diff --git a/src/checks/level1/detaching-temporary.h b/src/checks/level1/detaching-temporary.h
index d81b73b6..7949bbca 100644
--- a/src/checks/level1/detaching-temporary.h
+++ b/src/checks/level1/detaching-temporary.h
@@ -25,13 +25,14 @@
 #ifndef DETACHING_TEMPORARIES_H
 #define DETACHING_TEMPORARIES_H
 
+#include "checks/detachingbase.h"
+
+#include <llvm/ADT/StringRef.h>
+
 #include <map>
 #include <string>
 #include <vector>
 
-#include "checks/detachingbase.h"
-#include "llvm/ADT/StringRef.h"
-
 class ClazyContext;
 namespace clang {
 class CXXMethodDecl;
diff --git a/src/checks/level1/foreach.cpp b/src/checks/level1/foreach.cpp
index 18febf29..7d47d68f 100644
--- a/src/checks/level1/foreach.cpp
+++ b/src/checks/level1/foreach.cpp
@@ -23,10 +23,6 @@
 */
 
 #include "foreach.h"
-
-#include <unordered_map>
-#include <vector>
-
 #include "ClazyContext.h"
 #include "Utils.h"
 #include "HierarchyUtils.h"
@@ -35,16 +31,20 @@
 #include "PreProcessorVisitor.h"
 #include "StringUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <unordered_map>
+#include <vector>
 
 namespace clang {
 class Decl;
diff --git a/src/checks/level1/foreach.h b/src/checks/level1/foreach.h
index d225def4..0c7ef573 100644
--- a/src/checks/level1/foreach.h
+++ b/src/checks/level1/foreach.h
@@ -25,10 +25,10 @@
 #ifndef FOREACH_DETACHMENTS_H
 #define FOREACH_DETACHMENTS_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level1/incorrect-emit.cpp b/src/checks/level1/incorrect-emit.cpp
index 3e46efef..1b6bbcdb 100644
--- a/src/checks/level1/incorrect-emit.cpp
+++ b/src/checks/level1/incorrect-emit.cpp
@@ -20,24 +20,24 @@
 */
 
 #include "incorrect-emit.h"
-
-#include <clang/AST/DeclCXX.h>
-#include <clang/AST/ExprCXX.h>
-#include <utility>
-
 #include "AccessSpecifierManager.h"
 #include "ClazyContext.h"
 #include "Utils.h"
 #include "HierarchyUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/IdentifierTable.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Lex/Token.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/IdentifierTable.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceManager.h>
+#include <clang/Lex/Token.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <utility>
 
 namespace clang {
 class MacroInfo;
diff --git a/src/checks/level1/incorrect-emit.h b/src/checks/level1/incorrect-emit.h
index 6cfca549..868b2619 100644
--- a/src/checks/level1/incorrect-emit.h
+++ b/src/checks/level1/incorrect-emit.h
@@ -22,13 +22,14 @@
 #ifndef CLAZY_INCORRECT_EMIT_H
 #define CLAZY_INCORRECT_EMIT_H
 
+#include "checkbase.h"
+
+#include <clang/Basic/SourceLocation.h>
+
 #include <unordered_map>
 #include <string>
 #include <vector>
 
-#include "checkbase.h"
-#include "clang/Basic/SourceLocation.h"
-
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level1/inefficient-qlist-soft.h b/src/checks/level1/inefficient-qlist-soft.h
index cc67c2d0..2cad7aa4 100644
--- a/src/checks/level1/inefficient-qlist-soft.h
+++ b/src/checks/level1/inefficient-qlist-soft.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_INEFFICIENT_QLIST_SOFT_H
 #define CLAZY_INEFFICIENT_QLIST_SOFT_H
 
-#include <string>
-
 #include "checks/inefficientqlistbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level1/install-event-filter.cpp b/src/checks/level1/install-event-filter.cpp
index dbeb48e7..d4f1bb39 100644
--- a/src/checks/level1/install-event-filter.cpp
+++ b/src/checks/level1/install-event-filter.cpp
@@ -20,19 +20,19 @@
 */
 
 #include "install-event-filter.h"
-
-#include <vector>
-
 #include "Utils.h"
 #include "HierarchyUtils.h"
 #include "TypeUtils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level1/install-event-filter.h b/src/checks/level1/install-event-filter.h
index 26bb053a..cba57d05 100644
--- a/src/checks/level1/install-event-filter.h
+++ b/src/checks/level1/install-event-filter.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_INSTALL_EVENT_FILTER_H
 #define CLAZY_INSTALL_EVENT_FILTER_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/level1/non-pod-global-static.cpp b/src/checks/level1/non-pod-global-static.cpp
index f1ad3c69..065da2bc 100644
--- a/src/checks/level1/non-pod-global-static.cpp
+++ b/src/checks/level1/non-pod-global-static.cpp
@@ -23,24 +23,24 @@
 */
 
 #include "non-pod-global-static.h"
-
-#include <clang/AST/DeclCXX.h>
-#include <clang/Lex/Lexer.h>
-#include <vector>
-
 #include "QtUtils.h"
 #include "ClazyContext.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/Specifiers.h"
-#include "clang/Frontend/CompilerInstance.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/Lex/Lexer.h>
+#include <clang/AST/Decl.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceLocation.h>
+#include <clang/Basic/Specifiers.h>
+#include <clang/Frontend/CompilerInstance.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 using namespace clang;
 using namespace std;
diff --git a/src/checks/level1/non-pod-global-static.h b/src/checks/level1/non-pod-global-static.h
index ebc0614c..7f574451 100644
--- a/src/checks/level1/non-pod-global-static.h
+++ b/src/checks/level1/non-pod-global-static.h
@@ -25,10 +25,10 @@
 #ifndef NON_POD_STATIC_H
 #define NON_POD_STATIC_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/level1/overridden-signal.cpp b/src/checks/level1/overridden-signal.cpp
index 710772ef..d44d9005 100644
--- a/src/checks/level1/overridden-signal.cpp
+++ b/src/checks/level1/overridden-signal.cpp
@@ -20,16 +20,16 @@
 */
 
 #include "overridden-signal.h"
-
 #include "QtUtils.h"
 #include "AccessSpecifierManager.h"
 #include "ClazyContext.h"
 #include "FunctionUtils.h"
 #include "StringUtils.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
 
 namespace clang {
 class Decl;
diff --git a/src/checks/level1/overridden-signal.h b/src/checks/level1/overridden-signal.h
index 57f0fdcb..c00541ad 100644
--- a/src/checks/level1/overridden-signal.h
+++ b/src/checks/level1/overridden-signal.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_OVERRIDDEN_SIGNAL_H
 #define CLAZY_OVERRIDDEN_SIGNAL_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Decl;
diff --git a/src/checks/level1/post-event.cpp b/src/checks/level1/post-event.cpp
index f8c9a3f7..92ca1b33 100644
--- a/src/checks/level1/post-event.cpp
+++ b/src/checks/level1/post-event.cpp
@@ -20,13 +20,13 @@
 */
 
 #include "post-event.h"
-
 #include "TypeUtils.h"
 #include "StringUtils.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 
diff --git a/src/checks/level1/post-event.h b/src/checks/level1/post-event.h
index cb3b2113..e029f143 100644
--- a/src/checks/level1/post-event.h
+++ b/src/checks/level1/post-event.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_POST_EVENT_H
 #define CLAZY_POST_EVENT_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/level1/qdeleteall.cpp b/src/checks/level1/qdeleteall.cpp
index e3a6f9d7..035a8a84 100644
--- a/src/checks/level1/qdeleteall.cpp
+++ b/src/checks/level1/qdeleteall.cpp
@@ -20,20 +20,20 @@
 */
 
 #include "qdeleteall.h"
-
 #include "ClazyContext.h"
 #include "HierarchyUtils.h"
 #include "QtUtils.h"
 #include "SourceCompatibilityHelpers.h"
 #include "StringUtils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
 
 using namespace clang;
 using namespace std;
diff --git a/src/checks/level1/qdeleteall.h b/src/checks/level1/qdeleteall.h
index 5c635f84..e20726a5 100644
--- a/src/checks/level1/qdeleteall.h
+++ b/src/checks/level1/qdeleteall.h
@@ -22,10 +22,10 @@
 #ifndef QDELETEALL_H
 #define QDELETEALL_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/level1/qhash-namespace.cpp b/src/checks/level1/qhash-namespace.cpp
index 065019e9..e38c7bda 100644
--- a/src/checks/level1/qhash-namespace.cpp
+++ b/src/checks/level1/qhash-namespace.cpp
@@ -20,17 +20,17 @@
 */
 
 #include "qhash-namespace.h"
-
 #include "ContextUtils.h"
 #include "StringUtils.h"
 #include "ClazyContext.h"
 #include "PreProcessorVisitor.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
 
 namespace clang {
 class Decl;
diff --git a/src/checks/level1/qhash-namespace.h b/src/checks/level1/qhash-namespace.h
index 08ef5aa2..f19dc360 100644
--- a/src/checks/level1/qhash-namespace.h
+++ b/src/checks/level1/qhash-namespace.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_QHASH_NAMESPACE_H
 #define CLAZY_QHASH_NAMESPACE_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Decl;
diff --git a/src/checks/level1/qlatin1string-non-ascii.cpp b/src/checks/level1/qlatin1string-non-ascii.cpp
index 3e714410..7d59c85f 100644
--- a/src/checks/level1/qlatin1string-non-ascii.cpp
+++ b/src/checks/level1/qlatin1string-non-ascii.cpp
@@ -21,15 +21,15 @@
 */
 
 #include "qlatin1string-non-ascii.h"
-
 #include "Utils.h"
 #include "HierarchyUtils.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 
diff --git a/src/checks/level1/qlatin1string-non-ascii.h b/src/checks/level1/qlatin1string-non-ascii.h
index 95d29648..c3c29936 100644
--- a/src/checks/level1/qlatin1string-non-ascii.h
+++ b/src/checks/level1/qlatin1string-non-ascii.h
@@ -23,10 +23,10 @@
 #ifndef CLAZY_QLATIN1STRING_ENCODING_H
 #define CLAZY_QLATIN1STRING_ENCODING_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/level1/qproperty-without-notify.cpp b/src/checks/level1/qproperty-without-notify.cpp
index 35fd176a..297cb28b 100644
--- a/src/checks/level1/qproperty-without-notify.cpp
+++ b/src/checks/level1/qproperty-without-notify.cpp
@@ -20,15 +20,15 @@
 */
 
 #include "qproperty-without-notify.h"
+#include "clazy_stl.h"
 
-#include <vector>
+#include <clang/Basic/IdentifierTable.h>
+#include <clang/Basic/SourceManager.h>
+#include <clang/Lex/Lexer.h>
+#include <clang/Lex/Token.h>
+#include <llvm/ADT/StringRef.h>
 
-#include "clang/Basic/IdentifierTable.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Lex/Lexer.h"
-#include "clang/Lex/Token.h"
-#include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
+#include <vector>
 
 class ClazyContext;
 namespace clang {
diff --git a/src/checks/level1/qproperty-without-notify.h b/src/checks/level1/qproperty-without-notify.h
index 8e1b9836..f93860fa 100644
--- a/src/checks/level1/qproperty-without-notify.h
+++ b/src/checks/level1/qproperty-without-notify.h
@@ -22,10 +22,11 @@
 #ifndef CLAZY_QPROPERTY_WITHOUT_NOTIFY_H
 #define CLAZY_QPROPERTY_WITHOUT_NOTIFY_H
 
-#include <string>
-
 #include "checkbase.h"
-#include "clang/Basic/SourceLocation.h"
+
+#include <clang/Basic/SourceLocation.h>
+
+#include <string>
 
 class ClazyContext;
 namespace clang {
diff --git a/src/checks/level1/qstring-left.cpp b/src/checks/level1/qstring-left.cpp
index 0c7a8ea1..335beb8d 100644
--- a/src/checks/level1/qstring-left.cpp
+++ b/src/checks/level1/qstring-left.cpp
@@ -20,14 +20,14 @@
 */
 
 #include "qstring-left.h"
-
 #include "StringUtils.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/APInt.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/APInt.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 
diff --git a/src/checks/level1/qstring-left.h b/src/checks/level1/qstring-left.h
index 9892f935..3494d606 100644
--- a/src/checks/level1/qstring-left.h
+++ b/src/checks/level1/qstring-left.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_QSTRING_LEFT_H
 #define CLAZY_QSTRING_LEFT_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/level1/range-loop.cpp b/src/checks/level1/range-loop.cpp
index c5f4f3da..e3f62fe9 100644
--- a/src/checks/level1/range-loop.cpp
+++ b/src/checks/level1/range-loop.cpp
@@ -23,7 +23,6 @@
 */
 
 #include "range-loop.h"
-
 #include "Utils.h"
 #include "QtUtils.h"
 #include "TypeUtils.h"
@@ -31,14 +30,15 @@
 #include "LoopUtils.h"
 #include "StmtBodyRange.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/StmtCXX.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/StmtCXX.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 
diff --git a/src/checks/level1/range-loop.h b/src/checks/level1/range-loop.h
index 49fb63ca..3941012d 100644
--- a/src/checks/level1/range-loop.h
+++ b/src/checks/level1/range-loop.h
@@ -25,10 +25,10 @@
 #ifndef RANGELOOP_DETACHMENTS_H
 #define RANGELOOP_DETACHMENTS_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level1/returning-data-from-temporary.cpp b/src/checks/level1/returning-data-from-temporary.cpp
index 0183a940..c78cd993 100644
--- a/src/checks/level1/returning-data-from-temporary.cpp
+++ b/src/checks/level1/returning-data-from-temporary.cpp
@@ -20,17 +20,17 @@
 */
 
 #include "returning-data-from-temporary.h"
-
 #include "HierarchyUtils.h"
 #include "TypeUtils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 
diff --git a/src/checks/level1/returning-data-from-temporary.h b/src/checks/level1/returning-data-from-temporary.h
index 7e64a68b..1be26bf9 100644
--- a/src/checks/level1/returning-data-from-temporary.h
+++ b/src/checks/level1/returning-data-from-temporary.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_RETURNING_DATA_FROM_TEMPORARY_H
 #define CLAZY_RETURNING_DATA_FROM_TEMPORARY_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level1/rule-of-two-soft.cpp b/src/checks/level1/rule-of-two-soft.cpp
index 41a97a31..f6671202 100644
--- a/src/checks/level1/rule-of-two-soft.cpp
+++ b/src/checks/level1/rule-of-two-soft.cpp
@@ -20,14 +20,14 @@
 */
 
 #include "rule-of-two-soft.h"
-
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 
diff --git a/src/checks/level1/rule-of-two-soft.h b/src/checks/level1/rule-of-two-soft.h
index afcd0de1..a68ca327 100644
--- a/src/checks/level1/rule-of-two-soft.h
+++ b/src/checks/level1/rule-of-two-soft.h
@@ -22,10 +22,10 @@
 #ifndef CLANG_LAZY_RULE_OF_TWO_SOFT_H
 #define CLANG_LAZY_RULE_OF_TWO_SOFT_H
 
-#include <string>
-
 #include "checks/ruleofbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level1/skipped-base-method.cpp b/src/checks/level1/skipped-base-method.cpp
index c03e6edf..bc334dfc 100644
--- a/src/checks/level1/skipped-base-method.cpp
+++ b/src/checks/level1/skipped-base-method.cpp
@@ -20,19 +20,19 @@
 */
 
 #include "skipped-base-method.h"
-
-#include <vector>
-
 #include "HierarchyUtils.h"
 #include "TypeUtils.h"
 #include "FunctionUtils.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level1/skipped-base-method.h b/src/checks/level1/skipped-base-method.h
index e7fbc0cf..4b6e1d31 100644
--- a/src/checks/level1/skipped-base-method.h
+++ b/src/checks/level1/skipped-base-method.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_SKIPPED_BASE_METHOD_H
 #define CLAZY_SKIPPED_BASE_METHOD_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/level1/virtual-signal.cpp b/src/checks/level1/virtual-signal.cpp
index b983d87a..2a7896b4 100644
--- a/src/checks/level1/virtual-signal.cpp
+++ b/src/checks/level1/virtual-signal.cpp
@@ -20,13 +20,13 @@
 */
 
 #include "virtual-signal.h"
-
 #include "QtUtils.h"
 #include "ClazyContext.h"
 #include "AccessSpecifierManager.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
 
 namespace clang {
 class Decl;
diff --git a/src/checks/level1/virtual-signal.h b/src/checks/level1/virtual-signal.h
index a1dbf67f..09471205 100644
--- a/src/checks/level1/virtual-signal.h
+++ b/src/checks/level1/virtual-signal.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_VIRTUAL_SIGNAL_H
 #define CLAZY_VIRTUAL_SIGNAL_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Decl;
diff --git a/src/checks/level2/base-class-event.cpp b/src/checks/level2/base-class-event.cpp
index d3360403..26cc18d7 100644
--- a/src/checks/level2/base-class-event.cpp
+++ b/src/checks/level2/base-class-event.cpp
@@ -20,20 +20,20 @@
 */
 
 #include "base-class-event.h"
-
-#include <clang/AST/DeclCXX.h>
-#include <array>
-#include <vector>
-
 #include "HierarchyUtils.h"
 #include "QtUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <array>
+#include <vector>
 
 class ClazyContext;
 namespace clang {
diff --git a/src/checks/level2/base-class-event.h b/src/checks/level2/base-class-event.h
index 65f84aef..2b4e3345 100644
--- a/src/checks/level2/base-class-event.h
+++ b/src/checks/level2/base-class-event.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_BASE_CLASS_EVENT_H
 #define CLAZY_BASE_CLASS_EVENT_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Decl;
diff --git a/src/checks/level2/copyable-polymorphic.cpp b/src/checks/level2/copyable-polymorphic.cpp
index 5ebb918d..a503b40d 100644
--- a/src/checks/level2/copyable-polymorphic.cpp
+++ b/src/checks/level2/copyable-polymorphic.cpp
@@ -20,13 +20,13 @@
 */
 
 #include "copyable-polymorphic.h"
-
 #include "Utils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/Specifiers.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/Specifiers.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 namespace clang {
diff --git a/src/checks/level2/copyable-polymorphic.h b/src/checks/level2/copyable-polymorphic.h
index 157b8d62..cd4295fd 100644
--- a/src/checks/level2/copyable-polymorphic.h
+++ b/src/checks/level2/copyable-polymorphic.h
@@ -22,10 +22,10 @@
 #ifndef CLANG_COPYABLE_POLYMORPHIC_H
 #define CLANG_COPYABLE_POLYMORPHIC_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level2/ctor-missing-parent-argument.cpp b/src/checks/level2/ctor-missing-parent-argument.cpp
index 192f2fc6..5c86ff79 100644
--- a/src/checks/level2/ctor-missing-parent-argument.cpp
+++ b/src/checks/level2/ctor-missing-parent-argument.cpp
@@ -20,17 +20,17 @@
 */
 
 #include "ctor-missing-parent-argument.h"
-
 #include "QtUtils.h"
 #include "TypeUtils.h"
 #include "SourceCompatibilityHelpers.h"
 #include "StringUtils.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceManager.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceManager.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 
diff --git a/src/checks/level2/ctor-missing-parent-argument.h b/src/checks/level2/ctor-missing-parent-argument.h
index d3950c2a..0aee650c 100644
--- a/src/checks/level2/ctor-missing-parent-argument.h
+++ b/src/checks/level2/ctor-missing-parent-argument.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_CTOR_MISSING_PARENT_ARGUMENT_H
 #define CLAZY_CTOR_MISSING_PARENT_ARGUMENT_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Decl;
diff --git a/src/checks/level2/function-args-by-ref.cpp b/src/checks/level2/function-args-by-ref.cpp
index 929f035a..4cb5ac51 100644
--- a/src/checks/level2/function-args-by-ref.cpp
+++ b/src/checks/level2/function-args-by-ref.cpp
@@ -23,25 +23,25 @@
 */
 
 #include "function-args-by-ref.h"
-
-#include <vector>
-
 #include "Utils.h"
 #include "TypeUtils.h"
 #include "ClazyContext.h"
 #include "StringUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/LLVM.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/Diagnostic.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/ArrayRef.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 using namespace clang;
 using namespace std;
diff --git a/src/checks/level2/function-args-by-ref.h b/src/checks/level2/function-args-by-ref.h
index 01b3ee53..9ed2b956 100644
--- a/src/checks/level2/function-args-by-ref.h
+++ b/src/checks/level2/function-args-by-ref.h
@@ -25,10 +25,10 @@
 #ifndef FUNCTION_ARGS_BY_REF_H
 #define FUNCTION_ARGS_BY_REF_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level2/function-args-by-value.cpp b/src/checks/level2/function-args-by-value.cpp
index 63affa01..3abaa904 100644
--- a/src/checks/level2/function-args-by-value.cpp
+++ b/src/checks/level2/function-args-by-value.cpp
@@ -20,32 +20,32 @@
 */
 
 #include "function-args-by-value.h"
-
-#include <iterator>
-#include <vector>
-
 #include "Utils.h"
 #include "StringUtils.h"
 #include "TypeUtils.h"
 #include "FixItUtils.h"
 #include "ClazyContext.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/PrettyPrinter.h"
-#include "clang/AST/Redeclarable.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceLocation.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/raw_ostream.h"
+
+#include <clang/AST/ASTContext.h>
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/PrettyPrinter.h>
+#include <clang/AST/Redeclarable.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceLocation.h>
+#include <llvm/ADT/ArrayRef.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+#include <llvm/Support/raw_ostream.h>
+
+#include <iterator>
+#include <vector>
 
 namespace clang {
 class Decl;
diff --git a/src/checks/level2/function-args-by-value.h b/src/checks/level2/function-args-by-value.h
index 2130035a..5ad05867 100644
--- a/src/checks/level2/function-args-by-value.h
+++ b/src/checks/level2/function-args-by-value.h
@@ -22,10 +22,11 @@
 #ifndef CLAZY_FUNC_ARGS_BY_VALUE_H
 #define CLAZY_FUNC_ARGS_BY_VALUE_H
 
-#include <string>
-
 #include "checkbase.h"
-#include "clang/Basic/Diagnostic.h"
+
+#include <clang/Basic/Diagnostic.h>
+
+#include <string>
 
 class ClazyContext;
 
diff --git a/src/checks/level2/global-const-char-pointer.cpp b/src/checks/level2/global-const-char-pointer.cpp
index 17cdccec..b7efb090 100644
--- a/src/checks/level2/global-const-char-pointer.cpp
+++ b/src/checks/level2/global-const-char-pointer.cpp
@@ -23,15 +23,15 @@
 */
 
 #include "global-const-char-pointer.h"
+#include "SourceCompatibilityHelpers.h"
 
 #include <clang/AST/Decl.h>
-#include <vector>
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
 
-#include "SourceCompatibilityHelpers.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level2/global-const-char-pointer.h b/src/checks/level2/global-const-char-pointer.h
index 4d6d6d39..aa82e0bb 100644
--- a/src/checks/level2/global-const-char-pointer.h
+++ b/src/checks/level2/global-const-char-pointer.h
@@ -25,11 +25,11 @@
 #ifndef GLOBAL_CONST_CHAR_POINTER_H
 #define GLOBAL_CONST_CHAR_POINTER_H
 
+#include "checkbase.h"
+
 #include <vector>
 #include <string>
 
-#include "checkbase.h"
-
 class ClazyContext;
 namespace clang {
 class Decl;
diff --git a/src/checks/level2/implicit-casts.cpp b/src/checks/level2/implicit-casts.cpp
index 7a637cf1..e110ec37 100644
--- a/src/checks/level2/implicit-casts.cpp
+++ b/src/checks/level2/implicit-casts.cpp
@@ -23,28 +23,28 @@
 */
 
 #include "implicit-casts.h"
-
-#include <clang/Lex/Lexer.h>
-#include <vector>
-
 #include "ClazyContext.h"
 #include "Utils.h"
 #include "HierarchyUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/OperationKinds.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/Linkage.h"
-#include "clang/Basic/SourceLocation.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/Lex/Lexer.h>
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/OperationKinds.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/Linkage.h>
+#include <clang/Basic/SourceLocation.h>
+#include <llvm/ADT/ArrayRef.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 namespace clang {
 class ParentMap;
diff --git a/src/checks/level2/implicit-casts.h b/src/checks/level2/implicit-casts.h
index 247bd8e8..3b8b9a42 100644
--- a/src/checks/level2/implicit-casts.h
+++ b/src/checks/level2/implicit-casts.h
@@ -25,10 +25,10 @@
 #ifndef CLANG_LAZY_IMPLICIT_CASTS_H
 #define CLANG_LAZY_IMPLICIT_CASTS_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level2/missing-qobject-macro.cpp b/src/checks/level2/missing-qobject-macro.cpp
index 136e30ee..3cc41122 100644
--- a/src/checks/level2/missing-qobject-macro.cpp
+++ b/src/checks/level2/missing-qobject-macro.cpp
@@ -23,14 +23,15 @@
 #include "ClazyContext.h"
 #include "QtUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/Basic/IdentifierTable.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Lex/Token.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/Basic/IdentifierTable.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceManager.h>
+#include <clang/Lex/Token.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
 
 namespace clang {
 class MacroInfo;
diff --git a/src/checks/level2/missing-qobject-macro.h b/src/checks/level2/missing-qobject-macro.h
index 41de5a0f..fb5d484c 100644
--- a/src/checks/level2/missing-qobject-macro.h
+++ b/src/checks/level2/missing-qobject-macro.h
@@ -22,12 +22,13 @@
 #ifndef CLANG_MISSING_Q_OBJECT_H
 #define CLANG_MISSING_Q_OBJECT_H
 
+#include "checkbase.h"
+
+#include <clang/Basic/SourceLocation.h>
+
 #include <vector>
 #include <string>
 
-#include "checkbase.h"
-#include "clang/Basic/SourceLocation.h"
-
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level2/missing-typeinfo.cpp b/src/checks/level2/missing-typeinfo.cpp
index 249fd1be..2622da2b 100644
--- a/src/checks/level2/missing-typeinfo.cpp
+++ b/src/checks/level2/missing-typeinfo.cpp
@@ -23,17 +23,16 @@
 */
 
 #include "missing-typeinfo.h"
-
-#include <clang/AST/DeclTemplate.h>
-
 #include "TemplateUtils.h"
 #include "QtUtils.h"
 #include "StringUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/SourceManager.h"
-#include "llvm/ADT/StringRef.h"
+
+#include <clang/AST/DeclTemplate.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/SourceManager.h>
+#include <llvm/ADT/StringRef.h>
 
 class ClazyContext;
 namespace clang {
diff --git a/src/checks/level2/missing-typeinfo.h b/src/checks/level2/missing-typeinfo.h
index e015b765..11cc26ac 100644
--- a/src/checks/level2/missing-typeinfo.h
+++ b/src/checks/level2/missing-typeinfo.h
@@ -25,11 +25,11 @@
 #ifndef CLAZY_MISSING_TYPE_INFO_H
 #define CLAZY_MISSING_TYPE_INFO_H
 
+#include "checkbase.h"
+
 #include <set>
 #include <string>
 
-#include "checkbase.h"
-
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level2/old-style-connect.cpp b/src/checks/level2/old-style-connect.cpp
index 072ec796..d8329d7f 100644
--- a/src/checks/level2/old-style-connect.cpp
+++ b/src/checks/level2/old-style-connect.cpp
@@ -23,12 +23,6 @@
 */
 
 #include "old-style-connect.h"
-
-#include <clang/AST/Decl.h>
-#include <clang/AST/DeclCXX.h>
-#include <clang/Lex/Lexer.h>
-#include <regex>
-
 #include "Utils.h"
 #include "StringUtils.h"
 #include "FixItUtils.h"
@@ -38,21 +32,27 @@
 #include "AccessSpecifierManager.h"
 #include "HierarchyUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/IdentifierTable.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/TokenKinds.h"
-#include "clang/Lex/Token.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/raw_ostream.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/Lex/Lexer.h>
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/Diagnostic.h>
+#include <clang/Basic/IdentifierTable.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceManager.h>
+#include <clang/Basic/TokenKinds.h>
+#include <clang/Lex/Token.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+#include <llvm/Support/raw_ostream.h>
+
+#include <regex>
 
 namespace clang {
 class MacroInfo;
diff --git a/src/checks/level2/old-style-connect.h b/src/checks/level2/old-style-connect.h
index 245f4dfe..08a4e6e6 100644
--- a/src/checks/level2/old-style-connect.h
+++ b/src/checks/level2/old-style-connect.h
@@ -25,12 +25,13 @@
 #ifndef OLD_STYLE_CONNECT_H
 #define OLD_STYLE_CONNECT_H
 
+#include "checkbase.h"
+
+#include <clang/Basic/SourceLocation.h>
+
 #include <string>
 #include <vector>
 
-#include "checkbase.h"
-#include "clang/Basic/SourceLocation.h"
-
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level2/qstring-allocations.cpp b/src/checks/level2/qstring-allocations.cpp
index 4189af6c..d58c8678 100644
--- a/src/checks/level2/qstring-allocations.cpp
+++ b/src/checks/level2/qstring-allocations.cpp
@@ -23,14 +23,6 @@
 */
 
 #include "qstring-allocations.h"
-
-#include <clang/AST/DeclCXX.h>
-#include <clang/AST/ExprCXX.h>
-#include <clang/AST/Expr.h>
-#include <clang/Basic/Diagnostic.h>
-#include <clang/Lex/Lexer.h>
-#include <assert.h>
-
 #include "ClazyContext.h"
 #include "Utils.h"
 #include "clazy_stl.h"
@@ -40,15 +32,23 @@
 #include "QtUtils.h"
 #include "HierarchyUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/StmtIterator.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/raw_ostream.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/Basic/Diagnostic.h>
+#include <clang/Lex/Lexer.h>
+#include <clang/AST/Decl.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/StmtIterator.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceLocation.h>
+#include <clang/Frontend/CompilerInstance.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+#include <llvm/Support/raw_ostream.h>
+
+#include <assert.h>
 
 namespace clang {
 class LangOptions;
diff --git a/src/checks/level2/qstring-allocations.h b/src/checks/level2/qstring-allocations.h
index 86c35e2c..9e89ee01 100644
--- a/src/checks/level2/qstring-allocations.h
+++ b/src/checks/level2/qstring-allocations.h
@@ -25,12 +25,12 @@
 #ifndef CLAZY_STRING_ALLOCATIONS_H
 #define CLAZY_STRING_ALLOCATIONS_H
 
+#include "checkbase.h"
+
 #include <map>
 #include <vector>
 #include <string>
 
-#include "checkbase.h"
-
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level2/returning-void-expression.cpp b/src/checks/level2/returning-void-expression.cpp
index 26b7f539..c12df8ce 100644
--- a/src/checks/level2/returning-void-expression.cpp
+++ b/src/checks/level2/returning-void-expression.cpp
@@ -20,16 +20,16 @@
 */
 
 #include "returning-void-expression.h"
-
 #include "ContextUtils.h"
 #include "ClazyContext.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
 #include "clazy_stl.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
 
 namespace clang {
 class DeclContext;
diff --git a/src/checks/level2/returning-void-expression.h b/src/checks/level2/returning-void-expression.h
index 10450dd4..eaf9f136 100644
--- a/src/checks/level2/returning-void-expression.h
+++ b/src/checks/level2/returning-void-expression.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_RETURNING_VOID_EXPRESSION_H
 #define CLAZY_RETURNING_VOID_EXPRESSION_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/level2/rule-of-three.cpp b/src/checks/level2/rule-of-three.cpp
index f30c69f6..3670f304 100644
--- a/src/checks/level2/rule-of-three.cpp
+++ b/src/checks/level2/rule-of-three.cpp
@@ -20,22 +20,22 @@
 */
 
 #include "rule-of-three.h"
-
-#include <vector>
-
 #include "Utils.h"
 #include "MacroUtils.h"
 #include "TypeUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/Specifiers.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceLocation.h>
+#include <clang/Basic/SourceManager.h>
+#include <clang/Basic/Specifiers.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level2/rule-of-three.h b/src/checks/level2/rule-of-three.h
index 8eb0e2cb..a85ac5e6 100644
--- a/src/checks/level2/rule-of-three.h
+++ b/src/checks/level2/rule-of-three.h
@@ -22,10 +22,10 @@
 #ifndef CLANG_LAZY_RULE_OF_THREE_H
 #define CLANG_LAZY_RULE_OF_THREE_H
 
-#include <string>
-
 #include "checks/ruleofbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level2/static-pmf.cpp b/src/checks/level2/static-pmf.cpp
index da7dc4cb..dae6bc54 100644
--- a/src/checks/level2/static-pmf.cpp
+++ b/src/checks/level2/static-pmf.cpp
@@ -20,13 +20,13 @@
 */
 
 #include "static-pmf.h"
-
 #include "QtUtils.h"
 #include "TypeUtils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 namespace clang {
diff --git a/src/checks/level2/static-pmf.h b/src/checks/level2/static-pmf.h
index e65e0da4..30674ce5 100644
--- a/src/checks/level2/static-pmf.h
+++ b/src/checks/level2/static-pmf.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_STATIC_PMF_H
 #define CLAZY_STATIC_PMF_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Decl;
diff --git a/src/checks/level2/virtual-call-ctor.cpp b/src/checks/level2/virtual-call-ctor.cpp
index 187ef2ab..c8455a08 100644
--- a/src/checks/level2/virtual-call-ctor.cpp
+++ b/src/checks/level2/virtual-call-ctor.cpp
@@ -23,19 +23,18 @@
 */
 
 #include "virtual-call-ctor.h"
-
-#include <clang/AST/DeclCXX.h>
-
 #include "HierarchyUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceLocation.h"
 #include "clazy_stl.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceLocation.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 
diff --git a/src/checks/level2/virtual-call-ctor.h b/src/checks/level2/virtual-call-ctor.h
index 0e2a746a..27324216 100644
--- a/src/checks/level2/virtual-call-ctor.h
+++ b/src/checks/level2/virtual-call-ctor.h
@@ -25,11 +25,11 @@
 #ifndef VIRTUALCALLSFROMCTOR_H
 #define VIRTUALCALLSFROMCTOR_H
 
+#include "checkbase.h"
+
 #include <vector>
 #include <string>
 
-#include "checkbase.h"
-
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level3/assert-with-side-effects.cpp b/src/checks/level3/assert-with-side-effects.cpp
index 04aa8184..fd7da0d4 100644
--- a/src/checks/level3/assert-with-side-effects.cpp
+++ b/src/checks/level3/assert-with-side-effects.cpp
@@ -23,24 +23,24 @@
 */
 
 #include "assert-with-side-effects.h"
-
-#include <clang/AST/Expr.h>
-#include <clang/AST/Stmt.h>
-#include <vector>
-
 #include "MacroUtils.h"
 #include "StringUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/OperationKinds.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/SourceManager.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/OperationKinds.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceLocation.h>
+#include <clang/Basic/SourceManager.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 class ClazyContext;
 
diff --git a/src/checks/level3/assert-with-side-effects.h b/src/checks/level3/assert-with-side-effects.h
index 01f997fe..4692f3d6 100644
--- a/src/checks/level3/assert-with-side-effects.h
+++ b/src/checks/level3/assert-with-side-effects.h
@@ -25,10 +25,10 @@
 #ifndef ASSERT_WITH_SIDE_EFFECTS_H
 #define ASSERT_WITH_SIDE_EFFECTS_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/level3/detaching-member.cpp b/src/checks/level3/detaching-member.cpp
index d0a238e1..80800e61 100644
--- a/src/checks/level3/detaching-member.cpp
+++ b/src/checks/level3/detaching-member.cpp
@@ -23,25 +23,25 @@
 */
 
 #include "detaching-member.h"
-
-#include <clang/AST/DeclCXX.h>
-#include <clang/AST/Expr.h>
-#include <clang/AST/ExprCXX.h>
-#include <vector>
-
 #include "ClazyContext.h"
 #include "Utils.h"
 #include "HierarchyUtils.h"
 #include "StringUtils.h"
 #include "SourceCompatibilityHelpers.h"
 #include "checkbase.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Decl.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 using namespace clang;
 using namespace std;
diff --git a/src/checks/level3/detaching-member.h b/src/checks/level3/detaching-member.h
index fbf0205f..3b80d44e 100644
--- a/src/checks/level3/detaching-member.h
+++ b/src/checks/level3/detaching-member.h
@@ -25,10 +25,10 @@
 #ifndef DETACHING_MEMBER_H
 #define DETACHING_MEMBER_H
 
-#include <string>
-
 #include "checks/detachingbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/level3/reserve-candidates.cpp b/src/checks/level3/reserve-candidates.cpp
index fa2e44e8..ee21e1a7 100644
--- a/src/checks/level3/reserve-candidates.cpp
+++ b/src/checks/level3/reserve-candidates.cpp
@@ -23,14 +23,6 @@
 */
 
 #include "reserve-candidates.h"
-
-#include <clang/AST/Decl.h>
-#include <clang/AST/DeclCXX.h>
-#include <clang/AST/Expr.h>
-#include <clang/AST/ExprCXX.h>
-#include <clang/AST/Stmt.h>
-#include <vector>
-
 #include "ClazyContext.h"
 #include "Utils.h"
 #include "clazy_stl.h"
@@ -41,13 +33,21 @@
 #include "HierarchyUtils.h"
 #include "LoopUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/StmtCXX.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/SourceManager.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/StmtCXX.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceLocation.h>
+#include <clang/Basic/SourceManager.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 using namespace clang;
 using namespace std;
diff --git a/src/checks/level3/reserve-candidates.h b/src/checks/level3/reserve-candidates.h
index fc89e775..13b08ca3 100644
--- a/src/checks/level3/reserve-candidates.h
+++ b/src/checks/level3/reserve-candidates.h
@@ -25,11 +25,11 @@
 #ifndef CLAZY_RESERVE_CANDIDATES
 #define CLAZY_RESERVE_CANDIDATES
 
+#include "checkbase.h"
+
 #include <vector>
 #include <string>
 
-#include "checkbase.h"
-
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/level3/thread-with-slots.cpp b/src/checks/level3/thread-with-slots.cpp
index f37f37f2..223fe36c 100644
--- a/src/checks/level3/thread-with-slots.cpp
+++ b/src/checks/level3/thread-with-slots.cpp
@@ -20,21 +20,21 @@
 */
 
 #include "thread-with-slots.h"
-
-#include <vector>
-
 #include "HierarchyUtils.h"
 #include "QtUtils.h"
 #include "TypeUtils.h"
 #include "ClazyContext.h"
 #include "AccessSpecifierManager.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
+
+#include <vector>
 
 namespace clang {
 class Decl;
diff --git a/src/checks/level3/thread-with-slots.h b/src/checks/level3/thread-with-slots.h
index bb48f630..c271c73a 100644
--- a/src/checks/level3/thread-with-slots.h
+++ b/src/checks/level3/thread-with-slots.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_THREAD_WITH_SLOTS_H
 #define CLAZY_THREAD_WITH_SLOTS_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Decl;
diff --git a/src/checks/level3/unneeded-cast.cpp b/src/checks/level3/unneeded-cast.cpp
index 4597d420..c9450096 100644
--- a/src/checks/level3/unneeded-cast.cpp
+++ b/src/checks/level3/unneeded-cast.cpp
@@ -23,22 +23,22 @@
 */
 
 #include "unneeded-cast.h"
-
-#include <clang/AST/DeclCXX.h>
-#include <clang/AST/ExprCXX.h>
-#include <iterator>
-
 #include "Utils.h"
 #include "QtUtils.h"
 #include "TypeUtils.h"
 #include "HierarchyUtils.h"
 #include "ClazyContext.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/OperationKinds.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/SourceLocation.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/OperationKinds.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/SourceLocation.h>
+#include <llvm/Support/Casting.h>
+
+#include <iterator>
 
 using namespace llvm;
 using namespace clang;
diff --git a/src/checks/level3/unneeded-cast.h b/src/checks/level3/unneeded-cast.h
index 5bbbf96a..a4f5bb4c 100644
--- a/src/checks/level3/unneeded-cast.h
+++ b/src/checks/level3/unneeded-cast.h
@@ -25,10 +25,10 @@
 #ifndef CLAZY_UNNEEDED_CAST_H
 #define CLAZY_UNNEEDED_CAST_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class CXXNamedCastExpr;
diff --git a/src/checks/manuallevel/container-inside-loop.cpp b/src/checks/manuallevel/container-inside-loop.cpp
index bdd511f1..c91a1f97 100644
--- a/src/checks/manuallevel/container-inside-loop.cpp
+++ b/src/checks/manuallevel/container-inside-loop.cpp
@@ -20,21 +20,20 @@
 */
 
 #include "container-inside-loop.h"
-
-#include <clang/AST/ParentMap.h>
-
 #include "ClazyContext.h"
 #include "Utils.h"
 #include "StringUtils.h"
 #include "LoopUtils.h"
 #include "StmtBodyRange.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
 #include "clazy_stl.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/ParentMap.h>
+#include <clang/AST/Decl.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
 
 namespace clang {
 class CXXConstructorDecl;
diff --git a/src/checks/manuallevel/container-inside-loop.h b/src/checks/manuallevel/container-inside-loop.h
index 20480afe..bffb9a2a 100644
--- a/src/checks/manuallevel/container-inside-loop.h
+++ b/src/checks/manuallevel/container-inside-loop.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_CONTAINER_INSIDE_LOOP_H
 #define CLAZY_CONTAINER_INSIDE_LOOP_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/manuallevel/inefficient-qlist.h b/src/checks/manuallevel/inefficient-qlist.h
index 48375f38..95c5f741 100644
--- a/src/checks/manuallevel/inefficient-qlist.h
+++ b/src/checks/manuallevel/inefficient-qlist.h
@@ -25,10 +25,10 @@
 #ifndef INEFFICIENT_QLIST_H
 #define INEFFICIENT_QLIST_H
 
-#include <string>
-
 #include "checks/inefficientqlistbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 /**
diff --git a/src/checks/manuallevel/isempty-vs-count.cpp b/src/checks/manuallevel/isempty-vs-count.cpp
index 1c3027c0..a4785426 100644
--- a/src/checks/manuallevel/isempty-vs-count.cpp
+++ b/src/checks/manuallevel/isempty-vs-count.cpp
@@ -20,19 +20,19 @@
 */
 
 #include "isempty-vs-count.h"
-
 #include "StringUtils.h"
 #include "QtUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/OperationKinds.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/StmtIterator.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/OperationKinds.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/StmtIterator.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 
diff --git a/src/checks/manuallevel/isempty-vs-count.h b/src/checks/manuallevel/isempty-vs-count.h
index 3381462f..70265606 100644
--- a/src/checks/manuallevel/isempty-vs-count.h
+++ b/src/checks/manuallevel/isempty-vs-count.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_IS_EMPTY_VS_COUNT_H
 #define CLAZY_IS_EMPTY_VS_COUNT_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/manuallevel/qhash-with-char-pointer-key.cpp b/src/checks/manuallevel/qhash-with-char-pointer-key.cpp
index 5ae7adc4..da3b3a4b 100644
--- a/src/checks/manuallevel/qhash-with-char-pointer-key.cpp
+++ b/src/checks/manuallevel/qhash-with-char-pointer-key.cpp
@@ -20,15 +20,15 @@
 */
 
 #include "qhash-with-char-pointer-key.h"
-
 #include "Utils.h"
 #include "TypeUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/DeclBase.h"
-#include "clang/AST/DeclTemplate.h"
-#include "clang/AST/TemplateBase.h"
-#include "clang/AST/Type.h"
-#include "llvm/ADT/StringRef.h"
+
+#include <clang/AST/DeclBase.h>
+#include <clang/AST/DeclTemplate.h>
+#include <clang/AST/TemplateBase.h>
+#include <clang/AST/Type.h>
+#include <llvm/ADT/StringRef.h>
 
 class ClazyContext;
 
diff --git a/src/checks/manuallevel/qhash-with-char-pointer-key.h b/src/checks/manuallevel/qhash-with-char-pointer-key.h
index f8fd0eac..82f92744 100644
--- a/src/checks/manuallevel/qhash-with-char-pointer-key.h
+++ b/src/checks/manuallevel/qhash-with-char-pointer-key.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_QHASH_WITH_CHAR_POINTER_KEY_H
 #define CLAZY_QHASH_WITH_CHAR_POINTER_KEY_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Decl;
diff --git a/src/checks/manuallevel/qstring-varargs.cpp b/src/checks/manuallevel/qstring-varargs.cpp
index 1d30213b..4348f14b 100644
--- a/src/checks/manuallevel/qstring-varargs.cpp
+++ b/src/checks/manuallevel/qstring-varargs.cpp
@@ -20,17 +20,17 @@
 */
 
 #include "qstring-varargs.h"
-
 #include "StringUtils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/OperationKinds.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/OperationKinds.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 
diff --git a/src/checks/manuallevel/qstring-varargs.h b/src/checks/manuallevel/qstring-varargs.h
index 34cd13e9..333dcd69 100644
--- a/src/checks/manuallevel/qstring-varargs.h
+++ b/src/checks/manuallevel/qstring-varargs.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_QSTRING_VARARGS_H
 #define CLAZY_QSTRING_VARARGS_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/manuallevel/qt-keywords.cpp b/src/checks/manuallevel/qt-keywords.cpp
index 7563c361..1ee0226b 100644
--- a/src/checks/manuallevel/qt-keywords.cpp
+++ b/src/checks/manuallevel/qt-keywords.cpp
@@ -20,22 +20,22 @@
 */
 
 #include "qt-keywords.h"
+#include "FixItUtils.h"
+#include "ClazyContext.h"
+#include "PreProcessorVisitor.h"
+#include "clazy_stl.h"
 
 #include <clang/Lex/MacroInfo.h>
+#include <clang/Basic/Diagnostic.h>
+#include <clang/Basic/IdentifierTable.h>
+#include <clang/Basic/SourceManager.h>
+#include <clang/Lex/Token.h>
+#include <llvm/ADT/StringRef.h>
+
 #include <ctype.h>
 #include <algorithm>
 #include <vector>
 
-#include "FixItUtils.h"
-#include "ClazyContext.h"
-#include "PreProcessorVisitor.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/IdentifierTable.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Lex/Token.h"
-#include "clazy_stl.h"
-#include "llvm/ADT/StringRef.h"
-
 using namespace clang;
 using namespace std;
 
diff --git a/src/checks/manuallevel/qt-keywords.h b/src/checks/manuallevel/qt-keywords.h
index 6f6dcda1..810ea0f5 100644
--- a/src/checks/manuallevel/qt-keywords.h
+++ b/src/checks/manuallevel/qt-keywords.h
@@ -22,10 +22,11 @@
 #ifndef CLAZY_QT_KEYWORDS_H
 #define CLAZY_QT_KEYWORDS_H
 
-#include <string>
-
 #include "checkbase.h"
-#include "clang/Basic/SourceLocation.h"
+
+#include <clang/Basic/SourceLocation.h>
+
+#include <string>
 
 class ClazyContext;
 namespace clang {
diff --git a/src/checks/manuallevel/qt4-qstring-from-array.cpp b/src/checks/manuallevel/qt4-qstring-from-array.cpp
index 3ca34fb8..40d13589 100644
--- a/src/checks/manuallevel/qt4-qstring-from-array.cpp
+++ b/src/checks/manuallevel/qt4-qstring-from-array.cpp
@@ -21,28 +21,27 @@
 */
 
 #include "qt4-qstring-from-array.h"
-
-#include <clang/Lex/Lexer.h>
-
 #include "ClazyContext.h"
 #include "Utils.h"
 #include "StringUtils.h"
 #include "FixItUtils.h"
 #include "HierarchyUtils.h"
 #include "SourceCompatibilityHelpers.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ExprCXX.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/SourceLocation.h"
 #include "clazy_stl.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/Lex/Lexer.h>
+#include <clang/AST/Decl.h>
+#include <clang/AST/DeclCXX.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/ExprCXX.h>
+#include <clang/AST/Stmt.h>
+#include <clang/AST/Type.h>
+#include <clang/Basic/Diagnostic.h>
+#include <clang/Basic/LLVM.h>
+#include <clang/Basic/SourceLocation.h>
+#include <llvm/ADT/ArrayRef.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
 
 using namespace clang;
 using namespace std;
diff --git a/src/checks/manuallevel/qt4-qstring-from-array.h b/src/checks/manuallevel/qt4-qstring-from-array.h
index fabf381d..f70e5ae7 100644
--- a/src/checks/manuallevel/qt4-qstring-from-array.h
+++ b/src/checks/manuallevel/qt4-qstring-from-array.h
@@ -23,11 +23,11 @@
 #ifndef CLAZY_QT4_QSTRING_FROM_ARRAY_H
 #define CLAZY_QT4_QSTRING_FROM_ARRAY_H
 
+#include "checkbase.h"
+
 #include <vector>
 #include <string>
 
-#include "checkbase.h"
-
 class ClazyContext;
 
 namespace clang {
diff --git a/src/checks/manuallevel/raw-environment-function.cpp b/src/checks/manuallevel/raw-environment-function.cpp
index ab40f1fe..0f25f31a 100644
--- a/src/checks/manuallevel/raw-environment-function.cpp
+++ b/src/checks/manuallevel/raw-environment-function.cpp
@@ -21,12 +21,12 @@
 
 #include "raw-environment-function.h"
 
-#include "clang/AST/Decl.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
+#include <clang/AST/Decl.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 
diff --git a/src/checks/manuallevel/raw-environment-function.h b/src/checks/manuallevel/raw-environment-function.h
index c50cc7d4..13d41484 100644
--- a/src/checks/manuallevel/raw-environment-function.h
+++ b/src/checks/manuallevel/raw-environment-function.h
@@ -22,10 +22,10 @@
 #ifndef CLAZY_RAW_ENVIRONMENT_FUNCTION_H
 #define CLAZY_RAW_ENVIRONMENT_FUNCTION_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/manuallevel/tr-non-literal.cpp b/src/checks/manuallevel/tr-non-literal.cpp
index 74207531..6f2532e7 100644
--- a/src/checks/manuallevel/tr-non-literal.cpp
+++ b/src/checks/manuallevel/tr-non-literal.cpp
@@ -21,13 +21,13 @@
 */
 
 #include "tr-non-literal.h"
-
 #include "HierarchyUtils.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Stmt.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/Support/Casting.h"
+
+#include <clang/AST/Decl.h>
+#include <clang/AST/Expr.h>
+#include <clang/AST/Stmt.h>
+#include <clang/Basic/LLVM.h>
+#include <llvm/Support/Casting.h>
 
 class ClazyContext;
 
diff --git a/src/checks/manuallevel/tr-non-literal.h b/src/checks/manuallevel/tr-non-literal.h
index 82617ff9..536b613e 100644
--- a/src/checks/manuallevel/tr-non-literal.h
+++ b/src/checks/manuallevel/tr-non-literal.h
@@ -23,10 +23,10 @@
 #ifndef CLAZY_TR_NON_LITERAL_H
 #define CLAZY_TR_NON_LITERAL_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 namespace clang {
 class Stmt;
diff --git a/src/checks/requiredresults.cpp b/src/checks/requiredresults.cpp
index e9a0f09b..74ab6d74 100644
--- a/src/checks/requiredresults.cpp
+++ b/src/checks/requiredresults.cpp
@@ -25,7 +25,6 @@
 #include "requiredresults.h"
 #include "Utils.h"
 
-
 #include <clang/AST/DeclCXX.h>
 #include <clang/AST/Expr.h>
 #include <clang/AST/ExprCXX.h>
diff --git a/src/checks/ruleofbase.cpp b/src/checks/ruleofbase.cpp
index 7fe1fb41..7f9fd428 100644
--- a/src/checks/ruleofbase.cpp
+++ b/src/checks/ruleofbase.cpp
@@ -20,13 +20,13 @@
 */
 
 #include "ruleofbase.h"
-
-#include <vector>
-
 #include "StringUtils.h"
-#include "clang/AST/DeclCXX.h"
 #include "clazy_stl.h"
 
+#include <clang/AST/DeclCXX.h>
+
+#include <vector>
+
 class ClazyContext;
 
 using namespace clang;
diff --git a/src/checks/ruleofbase.h b/src/checks/ruleofbase.h
index bdb01c7f..12ddcd9b 100644
--- a/src/checks/ruleofbase.h
+++ b/src/checks/ruleofbase.h
@@ -22,10 +22,10 @@
 #ifndef CLANG_LAZY_RULE_OF_BASE_H
 #define CLANG_LAZY_RULE_OF_BASE_H
 
-#include <string>
-
 #include "checkbase.h"
 
+#include <string>
+
 class ClazyContext;
 
 namespace clang {
diff --git a/src/clazy_stl.h b/src/clazy_stl.h
index 73f638ed..8ebe5b2c 100644
--- a/src/clazy_stl.h
+++ b/src/clazy_stl.h
@@ -24,6 +24,7 @@
 #define CLAZY_STL_H
 
 #include <clang/AST/Stmt.h>
+
 #include <algorithm>
 #include <sstream>
author	Sergio Martins <smartins@kde.org>	2018-10-19 13:00:58 +0100
committer	Sergio Martins <smartins@kde.org>	2018-10-19 13:03:33 +0100
commit	b581ae7074e588f158339be8aee5391901bf7558 (patch)
tree	72137521cfc572d83e380cfccf62c526f521c94b /src
parent	0f6468877b329c3c14e7287134e53c0d3992e93e (diff)