From 713d94476ec5ba61901b538c622c8cca6873c2af Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@ethereum.org>
Date: Fri, 23 Nov 2018 11:31:45 +0100
Subject: Reorder some include files and group <libyul/>'s together (as much as
 possible)

---
 libsolidity/analysis/ReferencesResolver.cpp            | 2 +-
 libsolidity/analysis/ViewPureChecker.cpp               | 2 +-
 libsolidity/codegen/CompilerContext.cpp                | 5 ++---
 libsolidity/codegen/ContractCompiler.cpp               | 6 +++---
 libsolidity/interface/AssemblyStack.cpp                | 5 ++---
 libsolidity/interface/CompilerStack.cpp                | 7 ++++---
 libsolidity/parsing/Parser.cpp                         | 4 ++--
 libyul/AsmCodeGen.cpp                                  | 7 ++++---
 libyul/AsmData.h                                       | 4 ++--
 libyul/optimiser/CommonSubexpressionEliminator.cpp     | 1 -
 libyul/optimiser/DataFlowAnalyzer.cpp                  | 1 -
 libyul/optimiser/DataFlowAnalyzer.h                    | 1 -
 libyul/optimiser/Disambiguator.cpp                     | 1 -
 libyul/optimiser/Disambiguator.h                       | 4 +---
 libyul/optimiser/ExpressionInliner.cpp                 | 1 -
 libyul/optimiser/ExpressionInliner.h                   | 1 -
 libyul/optimiser/ExpressionJoiner.cpp                  | 1 -
 libyul/optimiser/ExpressionJoiner.h                    | 1 -
 libyul/optimiser/ExpressionSimplifier.cpp              | 1 -
 libyul/optimiser/FullInliner.cpp                       | 1 -
 libyul/optimiser/FunctionHoister.cpp                   | 1 -
 libyul/optimiser/FunctionHoister.h                     | 1 -
 libyul/optimiser/InlinableExpressionFunctionFinder.cpp | 1 -
 libyul/optimiser/NameDispenser.cpp                     | 1 -
 libyul/optimiser/RedundantAssignEliminator.cpp         | 1 -
 libyul/optimiser/RedundantAssignEliminator.h           | 1 -
 libyul/optimiser/Rematerialiser.cpp                    | 1 -
 libyul/optimiser/SSATransform.cpp                      | 1 -
 libyul/optimiser/SSATransform.h                        | 1 -
 libyul/optimiser/Semantics.cpp                         | 1 -
 libyul/optimiser/SimplificationRules.cpp               | 1 -
 libyul/optimiser/SimplificationRules.h                 | 1 -
 libyul/optimiser/Substitution.h                        | 1 -
 libyul/optimiser/Suite.cpp                             | 2 --
 libyul/optimiser/SyntacticalEquality.cpp               | 1 -
 libyul/optimiser/UnusedPruner.cpp                      | 1 -
 test/libyul/Common.cpp                                 | 7 +++----
 test/libyul/Inliner.cpp                                | 1 -
 test/libyul/YulOptimizerTest.cpp                       | 7 +++----
 39 files changed, 28 insertions(+), 60 deletions(-)

diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp
index 7399b344..1593c3e0 100644
--- a/libsolidity/analysis/ReferencesResolver.cpp
+++ b/libsolidity/analysis/ReferencesResolver.cpp
@@ -23,12 +23,12 @@
 #include <libsolidity/analysis/ReferencesResolver.h>
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/analysis/NameAndTypeResolver.h>
-#include <liblangutil/Exceptions.h>
 #include <libsolidity/analysis/ConstantEvaluator.h>
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
 #include <libyul/AsmData.h>
 #include <liblangutil/ErrorReporter.h>
+#include <liblangutil/Exceptions.h>
 
 #include <libdevcore/StringUtils.h>
 
diff --git a/libsolidity/analysis/ViewPureChecker.cpp b/libsolidity/analysis/ViewPureChecker.cpp
index a6236e7b..7839ecd3 100644
--- a/libsolidity/analysis/ViewPureChecker.cpp
+++ b/libsolidity/analysis/ViewPureChecker.cpp
@@ -19,8 +19,8 @@
 
 #include <libevmasm/SemanticInformation.h>
 
-#include <libyul/AsmData.h>
 #include <libsolidity/ast/ExperimentalFeatures.h>
+#include <libyul/AsmData.h>
 
 #include <liblangutil/ErrorReporter.h>
 
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index 5117567f..32be521c 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -25,15 +25,14 @@
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/codegen/Compiler.h>
 #include <libsolidity/interface/Version.h>
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/Scanner.h>
 #include <libsolidity/interface/SourceReferenceFormatter.h>
-#include <liblangutil/Scanner.h>
 #include <libyul/AsmParser.h>
 #include <libyul/AsmCodeGen.h>
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
 #include <libyul/YulString.h>
+#include <liblangutil/ErrorReporter.h>
+#include <liblangutil/Scanner.h>
 
 #include <boost/algorithm/string/replace.hpp>
 
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index b2a3e05f..815c2a4f 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -21,11 +21,11 @@
  */
 
 #include <libsolidity/codegen/ContractCompiler.h>
-#include <libyul/AsmCodeGen.h>
-#include <libsolidity/ast/AST.h>
-#include <liblangutil/ErrorReporter.h>
 #include <libsolidity/codegen/ExpressionCompiler.h>
 #include <libsolidity/codegen/CompilerUtils.h>
+#include <libsolidity/ast/AST.h>
+#include <libyul/AsmCodeGen.h>
+#include <liblangutil/ErrorReporter.h>
 
 #include <libevmasm/Instruction.h>
 #include <libevmasm/Assembly.h>
diff --git a/libsolidity/interface/AssemblyStack.cpp b/libsolidity/interface/AssemblyStack.cpp
index 5d834389..cd8b125e 100644
--- a/libsolidity/interface/AssemblyStack.cpp
+++ b/libsolidity/interface/AssemblyStack.cpp
@@ -28,12 +28,11 @@
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
 #include <libyul/AsmCodeGen.h>
-
-#include <libevmasm/Assembly.h>
-
 #include <libyul/backends/evm/EVMCodeTransform.h>
 #include <libyul/backends/evm/EVMAssembly.h>
 
+#include <libevmasm/Assembly.h>
+
 using namespace std;
 using namespace dev;
 using namespace langutil;
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index a5674705..f3c15cc9 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -27,7 +27,6 @@
 #include <libsolidity/interface/Version.h>
 #include <libsolidity/analysis/SemVerHandler.h>
 #include <libsolidity/ast/AST.h>
-#include <liblangutil/Scanner.h>
 #include <libsolidity/parsing/Parser.h>
 #include <libsolidity/analysis/ControlFlowAnalyzer.h>
 #include <libsolidity/analysis/ControlFlowGraph.h>
@@ -45,10 +44,12 @@
 #include <libsolidity/interface/Natspec.h>
 #include <libsolidity/interface/GasEstimator.h>
 
-#include <libevmasm/Exceptions.h>
-
 #include <libyul/YulString.h>
 
+#include <liblangutil/Scanner.h>
+
+#include <libevmasm/Exceptions.h>
+
 #include <libdevcore/SwarmHash.h>
 #include <libdevcore/JSON.h>
 
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 1ec10a72..560d8e8b 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -22,11 +22,11 @@
 
 #include <cctype>
 #include <vector>
-#include <liblangutil/SourceLocation.h>
 #include <libsolidity/parsing/Parser.h>
-#include <liblangutil/Scanner.h>
 #include <libyul/AsmParser.h>
+#include <liblangutil/SourceLocation.h>
 #include <liblangutil/ErrorReporter.h>
+#include <liblangutil/Scanner.h>
 
 using namespace std;
 using namespace langutil;
diff --git a/libyul/AsmCodeGen.cpp b/libyul/AsmCodeGen.cpp
index 862337a7..5bc2fee3 100644
--- a/libyul/AsmCodeGen.cpp
+++ b/libyul/AsmCodeGen.cpp
@@ -28,12 +28,13 @@
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
 
+#include <libyul/backends/evm/AbstractAssembly.h>
+#include <libyul/backends/evm/EVMCodeTransform.h>
+
 #include <libevmasm/Assembly.h>
-#include <liblangutil/SourceLocation.h>
 #include <libevmasm/Instruction.h>
 
-#include <libyul/backends/evm/AbstractAssembly.h>
-#include <libyul/backends/evm/EVMCodeTransform.h>
+#include <liblangutil/SourceLocation.h>
 
 #include <libdevcore/CommonIO.h>
 
diff --git a/libyul/AsmData.h b/libyul/AsmData.h
index e7af61bb..6979d29c 100644
--- a/libyul/AsmData.h
+++ b/libyul/AsmData.h
@@ -24,11 +24,11 @@
 
 #include <libyul/AsmDataForward.h>
 
+#include <libyul/YulString.h>
+
 #include <libevmasm/Instruction.h>
 #include <liblangutil/SourceLocation.h>
 
-#include <libyul/YulString.h>
-
 #include <boost/variant.hpp>
 #include <boost/noncopyable.hpp>
 
diff --git a/libyul/optimiser/CommonSubexpressionEliminator.cpp b/libyul/optimiser/CommonSubexpressionEliminator.cpp
index 118d14ad..fc78b1ad 100644
--- a/libyul/optimiser/CommonSubexpressionEliminator.cpp
+++ b/libyul/optimiser/CommonSubexpressionEliminator.cpp
@@ -24,7 +24,6 @@
 #include <libyul/optimiser/Metrics.h>
 #include <libyul/optimiser/SyntacticalEquality.h>
 #include <libyul/Exceptions.h>
-
 #include <libyul/AsmData.h>
 
 using namespace std;
diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index 7642948a..046f466c 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -25,7 +25,6 @@
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/Exceptions.h>
-
 #include <libyul/AsmData.h>
 
 #include <libdevcore/CommonData.h>
diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
index a946529a..f83543c5 100644
--- a/libyul/optimiser/DataFlowAnalyzer.h
+++ b/libyul/optimiser/DataFlowAnalyzer.h
@@ -23,7 +23,6 @@
 #pragma once
 
 #include <libyul/optimiser/ASTWalker.h>
-
 #include <libyul/YulString.h>
 
 #include <map>
diff --git a/libyul/optimiser/Disambiguator.cpp b/libyul/optimiser/Disambiguator.cpp
index f6553ef6..e8c31aea 100644
--- a/libyul/optimiser/Disambiguator.cpp
+++ b/libyul/optimiser/Disambiguator.cpp
@@ -21,7 +21,6 @@
 #include <libyul/optimiser/Disambiguator.h>
 
 #include <libyul/Exceptions.h>
-
 #include <libyul/AsmData.h>
 #include <libyul/AsmScope.h>
 
diff --git a/libyul/optimiser/Disambiguator.h b/libyul/optimiser/Disambiguator.h
index 032bfedc..b2f80e47 100644
--- a/libyul/optimiser/Disambiguator.h
+++ b/libyul/optimiser/Disambiguator.h
@@ -21,12 +21,10 @@
 #pragma once
 
 #include <libyul/ASTDataForward.h>
-
+#include <libyul/AsmAnalysisInfo.h>
 #include <libyul/optimiser/ASTCopier.h>
 #include <libyul/optimiser/NameDispenser.h>
 
-#include <libyul/AsmAnalysisInfo.h>
-
 #include <boost/variant.hpp>
 #include <boost/optional.hpp>
 
diff --git a/libyul/optimiser/ExpressionInliner.cpp b/libyul/optimiser/ExpressionInliner.cpp
index 2a1b8e63..abc006d4 100644
--- a/libyul/optimiser/ExpressionInliner.cpp
+++ b/libyul/optimiser/ExpressionInliner.cpp
@@ -23,7 +23,6 @@
 #include <libyul/optimiser/InlinableExpressionFunctionFinder.h>
 #include <libyul/optimiser/Substitution.h>
 #include <libyul/optimiser/Semantics.h>
-
 #include <libyul/AsmData.h>
 
 #include <boost/algorithm/cxx11/all_of.hpp>
diff --git a/libyul/optimiser/ExpressionInliner.h b/libyul/optimiser/ExpressionInliner.h
index ee98da8f..46c27080 100644
--- a/libyul/optimiser/ExpressionInliner.h
+++ b/libyul/optimiser/ExpressionInliner.h
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <libyul/optimiser/ASTWalker.h>
-
 #include <libyul/ASTDataForward.h>
 
 #include <boost/variant.hpp>
diff --git a/libyul/optimiser/ExpressionJoiner.cpp b/libyul/optimiser/ExpressionJoiner.cpp
index 647e2705..90301bad 100644
--- a/libyul/optimiser/ExpressionJoiner.cpp
+++ b/libyul/optimiser/ExpressionJoiner.cpp
@@ -24,7 +24,6 @@
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/Utilities.h>
 #include <libyul/Exceptions.h>
-
 #include <libyul/AsmData.h>
 
 #include <libdevcore/CommonData.h>
diff --git a/libyul/optimiser/ExpressionJoiner.h b/libyul/optimiser/ExpressionJoiner.h
index 0cc61981..62d3beb9 100644
--- a/libyul/optimiser/ExpressionJoiner.h
+++ b/libyul/optimiser/ExpressionJoiner.h
@@ -21,7 +21,6 @@
 #pragma once
 
 #include <libyul/ASTDataForward.h>
-
 #include <libyul/optimiser/ASTWalker.h>
 
 #include <map>
diff --git a/libyul/optimiser/ExpressionSimplifier.cpp b/libyul/optimiser/ExpressionSimplifier.cpp
index 2c67c77a..8746a783 100644
--- a/libyul/optimiser/ExpressionSimplifier.cpp
+++ b/libyul/optimiser/ExpressionSimplifier.cpp
@@ -23,7 +23,6 @@
 #include <libyul/optimiser/SimplificationRules.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/SSAValueTracker.h>
-
 #include <libyul/AsmData.h>
 
 #include <libdevcore/CommonData.h>
diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
index a77f12f3..47299f5f 100644
--- a/libyul/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@@ -27,7 +27,6 @@
 #include <libyul/optimiser/Metrics.h>
 #include <libyul/optimiser/SSAValueTracker.h>
 #include <libyul/Exceptions.h>
-
 #include <libyul/AsmData.h>
 
 #include <libdevcore/CommonData.h>
diff --git a/libyul/optimiser/FunctionHoister.cpp b/libyul/optimiser/FunctionHoister.cpp
index d5c25e23..51755968 100644
--- a/libyul/optimiser/FunctionHoister.cpp
+++ b/libyul/optimiser/FunctionHoister.cpp
@@ -22,7 +22,6 @@
 
 #include <libyul/optimiser/FunctionHoister.h>
 #include <libyul/optimiser/Utilities.h>
-
 #include <libyul/AsmData.h>
 
 #include <libdevcore/CommonData.h>
diff --git a/libyul/optimiser/FunctionHoister.h b/libyul/optimiser/FunctionHoister.h
index 823b9e2b..29894895 100644
--- a/libyul/optimiser/FunctionHoister.h
+++ b/libyul/optimiser/FunctionHoister.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include <libyul/ASTDataForward.h>
-
 #include <libyul/optimiser/ASTWalker.h>
 
 namespace dev
diff --git a/libyul/optimiser/InlinableExpressionFunctionFinder.cpp b/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
index b15d17ce..22267b62 100644
--- a/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
+++ b/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
@@ -21,7 +21,6 @@
 #include <libyul/optimiser/InlinableExpressionFunctionFinder.h>
 
 #include <libyul/optimiser/Utilities.h>
-
 #include <libyul/AsmData.h>
 
 using namespace std;
diff --git a/libyul/optimiser/NameDispenser.cpp b/libyul/optimiser/NameDispenser.cpp
index 0109e606..11e85477 100644
--- a/libyul/optimiser/NameDispenser.cpp
+++ b/libyul/optimiser/NameDispenser.cpp
@@ -21,7 +21,6 @@
 #include <libyul/optimiser/NameDispenser.h>
 
 #include <libyul/optimiser/NameCollector.h>
-
 #include <libyul/AsmData.h>
 
 using namespace std;
diff --git a/libyul/optimiser/RedundantAssignEliminator.cpp b/libyul/optimiser/RedundantAssignEliminator.cpp
index e10fd549..f415a36c 100644
--- a/libyul/optimiser/RedundantAssignEliminator.cpp
+++ b/libyul/optimiser/RedundantAssignEliminator.cpp
@@ -22,7 +22,6 @@
 #include <libyul/optimiser/RedundantAssignEliminator.h>
 
 #include <libyul/optimiser/Semantics.h>
-
 #include <libyul/AsmData.h>
 
 #include <libdevcore/CommonData.h>
diff --git a/libyul/optimiser/RedundantAssignEliminator.h b/libyul/optimiser/RedundantAssignEliminator.h
index 76106aae..bffbb07a 100644
--- a/libyul/optimiser/RedundantAssignEliminator.h
+++ b/libyul/optimiser/RedundantAssignEliminator.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include <libyul/ASTDataForward.h>
-
 #include <libyul/optimiser/ASTWalker.h>
 
 #include <map>
diff --git a/libyul/optimiser/Rematerialiser.cpp b/libyul/optimiser/Rematerialiser.cpp
index 8578748f..b9a127bb 100644
--- a/libyul/optimiser/Rematerialiser.cpp
+++ b/libyul/optimiser/Rematerialiser.cpp
@@ -23,7 +23,6 @@
 #include <libyul/optimiser/Metrics.h>
 #include <libyul/optimiser/ASTCopier.h>
 #include <libyul/Exceptions.h>
-
 #include <libyul/AsmData.h>
 
 using namespace std;
diff --git a/libyul/optimiser/SSATransform.cpp b/libyul/optimiser/SSATransform.cpp
index dd981775..ae84dd94 100644
--- a/libyul/optimiser/SSATransform.cpp
+++ b/libyul/optimiser/SSATransform.cpp
@@ -23,7 +23,6 @@
 
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/NameDispenser.h>
-
 #include <libyul/AsmData.h>
 
 #include <libdevcore/CommonData.h>
diff --git a/libyul/optimiser/SSATransform.h b/libyul/optimiser/SSATransform.h
index bb642549..69638904 100644
--- a/libyul/optimiser/SSATransform.h
+++ b/libyul/optimiser/SSATransform.h
@@ -21,7 +21,6 @@
 #pragma once
 
 #include <libyul/ASTDataForward.h>
-
 #include <libyul/optimiser/ASTWalker.h>
 
 #include <vector>
diff --git a/libyul/optimiser/Semantics.cpp b/libyul/optimiser/Semantics.cpp
index f16a1630..ad9b1922 100644
--- a/libyul/optimiser/Semantics.cpp
+++ b/libyul/optimiser/Semantics.cpp
@@ -21,7 +21,6 @@
 #include <libyul/optimiser/Semantics.h>
 
 #include <libyul/Exceptions.h>
-
 #include <libyul/AsmData.h>
 
 #include <libevmasm/SemanticInformation.h>
diff --git a/libyul/optimiser/SimplificationRules.cpp b/libyul/optimiser/SimplificationRules.cpp
index 48945fbc..ec5379fc 100644
--- a/libyul/optimiser/SimplificationRules.cpp
+++ b/libyul/optimiser/SimplificationRules.cpp
@@ -24,7 +24,6 @@
 #include <libyul/optimiser/ASTCopier.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/SyntacticalEquality.h>
-
 #include <libyul/AsmData.h>
 
 #include <libevmasm/RuleList.h>
diff --git a/libyul/optimiser/SimplificationRules.h b/libyul/optimiser/SimplificationRules.h
index de8bcf20..3d3d8d2b 100644
--- a/libyul/optimiser/SimplificationRules.h
+++ b/libyul/optimiser/SimplificationRules.h
@@ -24,7 +24,6 @@
 #include <libevmasm/SimplificationRule.h>
 
 #include <libyul/ASTDataForward.h>
-
 #include <libyul/AsmData.h>
 
 #include <boost/noncopyable.hpp>
diff --git a/libyul/optimiser/Substitution.h b/libyul/optimiser/Substitution.h
index 3cc4b45e..6a0679f5 100644
--- a/libyul/optimiser/Substitution.h
+++ b/libyul/optimiser/Substitution.h
@@ -21,7 +21,6 @@
 #pragma once
 
 #include <libyul/optimiser/ASTCopier.h>
-
 #include <libyul/YulString.h>
 
 #include <map>
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index db6dbf3e..b6920633 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -35,10 +35,8 @@
 #include <libyul/optimiser/SSATransform.h>
 #include <libyul/optimiser/RedundantAssignEliminator.h>
 #include <libyul/optimiser/VarDeclPropagator.h>
-
 #include <libyul/AsmAnalysisInfo.h>
 #include <libyul/AsmData.h>
-
 #include <libyul/AsmPrinter.h>
 
 #include <libdevcore/CommonData.h>
diff --git a/libyul/optimiser/SyntacticalEquality.cpp b/libyul/optimiser/SyntacticalEquality.cpp
index 092f9d82..ff4ff81b 100644
--- a/libyul/optimiser/SyntacticalEquality.cpp
+++ b/libyul/optimiser/SyntacticalEquality.cpp
@@ -21,7 +21,6 @@
 #include <libyul/optimiser/SyntacticalEquality.h>
 
 #include <libyul/Exceptions.h>
-
 #include <libyul/AsmData.h>
 
 #include <libdevcore/CommonData.h>
diff --git a/libyul/optimiser/UnusedPruner.cpp b/libyul/optimiser/UnusedPruner.cpp
index 2072f42b..484e7475 100644
--- a/libyul/optimiser/UnusedPruner.cpp
+++ b/libyul/optimiser/UnusedPruner.cpp
@@ -24,7 +24,6 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/Utilities.h>
 #include <libyul/Exceptions.h>
-
 #include <libyul/AsmData.h>
 
 #include <boost/algorithm/cxx11/none_of.hpp>
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index ae7686b7..5851555a 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -23,15 +23,14 @@
 
 #include <test/Options.h>
 
-#include <libyul/optimiser/Disambiguator.h>
-
-#include <liblangutil/Scanner.h>
+#include <libsolidity/interface/SourceReferenceFormatter.h>
 
+#include <libyul/optimiser/Disambiguator.h>
 #include <libyul/AsmParser.h>
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmPrinter.h>
 
-#include <libsolidity/interface/SourceReferenceFormatter.h>
+#include <liblangutil/Scanner.h>
 #include <liblangutil/ErrorReporter.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/test/libyul/Inliner.cpp b/test/libyul/Inliner.cpp
index 38d2491f..0f82dee3 100644
--- a/test/libyul/Inliner.cpp
+++ b/test/libyul/Inliner.cpp
@@ -26,7 +26,6 @@
 #include <libyul/optimiser/FullInliner.h>
 #include <libyul/optimiser/FunctionHoister.h>
 #include <libyul/optimiser/FunctionGrouper.h>
-
 #include <libyul/AsmPrinter.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index a8ad5680..02a63ae3 100644
--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -21,9 +21,6 @@
 
 #include <test/Options.h>
 
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/Scanner.h>
-
 #include <libyul/optimiser/BlockFlattener.h>
 #include <libyul/optimiser/VarDeclPropagator.h>
 #include <libyul/optimiser/Disambiguator.h>
@@ -43,12 +40,14 @@
 #include <libyul/optimiser/SSATransform.h>
 #include <libyul/optimiser/RedundantAssignEliminator.h>
 #include <libyul/optimiser/Suite.h>
-
 #include <libyul/AsmPrinter.h>
 #include <libyul/AsmParser.h>
 #include <libyul/AsmAnalysis.h>
 #include <libsolidity/interface/SourceReferenceFormatter.h>
 
+#include <liblangutil/ErrorReporter.h>
+#include <liblangutil/Scanner.h>
+
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
 
-- 
cgit v1.2.3