From a22077f7369338c2d46bcc7997109359da25d121 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Thu, 29 Oct 2020 14:00:27 +0000
Subject: [PATCH] Rename AsmData -> AST

Also attempt to only include ASTForward where appropriate.
---
 libsolidity/analysis/ControlFlowBuilder.cpp             | 2 +-
 libsolidity/analysis/ReferencesResolver.cpp             | 2 +-
 libsolidity/analysis/SyntaxChecker.cpp                  | 2 +-
 libsolidity/analysis/TypeChecker.cpp                    | 2 +-
 libsolidity/analysis/ViewPureChecker.cpp                | 2 +-
 libsolidity/ast/AST.h                                   | 2 +-
 libsolidity/ast/ASTJsonConverter.cpp                    | 2 +-
 libsolidity/ast/ASTJsonImporter.cpp                     | 1 +
 libsolidity/codegen/CompilerContext.cpp                 | 1 +
 libsolidity/codegen/ContractCompiler.cpp                | 2 +-
 libsolidity/codegen/ir/IRGeneratorForStatements.cpp     | 2 +-
 libsolidity/interface/CompilerStack.cpp                 | 1 +
 libsolidity/parsing/Parser.cpp                          | 1 +
 libyul/{AsmData.h => AST.h}                             | 2 +-
 libyul/{AsmDataForward.h => ASTForward.h}               | 1 +
 libyul/AsmAnalysis.cpp                                  | 7 ++++++-
 libyul/AsmAnalysis.h                                    | 7 ++-----
 libyul/AsmAnalysisInfo.h                                | 2 +-
 libyul/AsmJsonConverter.cpp                             | 2 +-
 libyul/AsmJsonConverter.h                               | 2 +-
 libyul/AsmJsonImporter.cpp                              | 3 +--
 libyul/AsmJsonImporter.h                                | 2 +-
 libyul/AsmParser.cpp                                    | 1 +
 libyul/AsmParser.h                                      | 2 +-
 libyul/AsmPrinter.cpp                                   | 2 +-
 libyul/AsmPrinter.h                                     | 2 +-
 libyul/AsmScopeFiller.cpp                               | 2 +-
 libyul/AsmScopeFiller.h                                 | 2 +-
 libyul/CMakeLists.txt                                   | 4 ++--
 libyul/CompilabilityChecker.h                           | 2 +-
 libyul/Dialect.cpp                                      | 2 +-
 libyul/Object.h                                         | 2 +-
 libyul/ObjectParser.cpp                                 | 1 +
 libyul/Utilities.cpp                                    | 2 +-
 libyul/Utilities.h                                      | 2 +-
 libyul/backends/evm/AsmCodeGen.cpp                      | 2 +-
 libyul/backends/evm/ConstantOptimiser.cpp               | 2 +-
 libyul/backends/evm/ConstantOptimiser.h                 | 2 +-
 libyul/backends/evm/EVMCodeTransform.cpp                | 2 +-
 libyul/backends/evm/EVMCodeTransform.h                  | 2 +-
 libyul/backends/evm/EVMDialect.cpp                      | 2 +-
 libyul/backends/evm/EVMDialect.h                        | 2 +-
 libyul/backends/evm/EVMMetrics.cpp                      | 2 +-
 libyul/backends/evm/NoOutputAssembly.cpp                | 1 +
 libyul/backends/wasm/EVMToEwasmTranslator.cpp           | 1 +
 libyul/backends/wasm/EVMToEwasmTranslator.h             | 2 +-
 libyul/backends/wasm/WasmCodeTransform.cpp              | 2 +-
 libyul/backends/wasm/WasmCodeTransform.h                | 2 +-
 libyul/backends/wasm/WasmDialect.cpp                    | 2 +-
 libyul/backends/wasm/WordSizeTransform.cpp              | 2 +-
 libyul/optimiser/ASTCopier.cpp                          | 2 +-
 libyul/optimiser/ASTCopier.h                            | 2 +-
 libyul/optimiser/ASTWalker.cpp                          | 2 +-
 libyul/optimiser/ASTWalker.h                            | 2 +-
 libyul/optimiser/BlockFlattener.cpp                     | 5 ++++-
 libyul/optimiser/BlockHasher.cpp                        | 2 ++
 libyul/optimiser/BlockHasher.h                          | 3 +--
 libyul/optimiser/CallGraphGenerator.cpp                 | 2 +-
 libyul/optimiser/CircularReferencesPruner.cpp           | 2 +-
 libyul/optimiser/CommonSubexpressionEliminator.cpp      | 2 +-
 libyul/optimiser/ConditionalSimplifier.cpp              | 2 +-
 libyul/optimiser/ConditionalSimplifier.h                | 1 +
 libyul/optimiser/ConditionalUnsimplifier.cpp            | 2 +-
 libyul/optimiser/ControlFlowSimplifier.cpp              | 2 +-
 libyul/optimiser/DataFlowAnalyzer.cpp                   | 3 +--
 libyul/optimiser/DataFlowAnalyzer.h                     | 2 +-
 libyul/optimiser/DeadCodeEliminator.cpp                 | 2 +-
 libyul/optimiser/Disambiguator.cpp                      | 2 +-
 libyul/optimiser/Disambiguator.h                        | 2 +-
 libyul/optimiser/EquivalentFunctionCombiner.cpp         | 2 +-
 libyul/optimiser/EquivalentFunctionCombiner.h           | 2 +-
 libyul/optimiser/EquivalentFunctionDetector.cpp         | 2 +-
 libyul/optimiser/EquivalentFunctionDetector.h           | 2 +-
 libyul/optimiser/ExpressionInliner.cpp                  | 2 +-
 libyul/optimiser/ExpressionInliner.h                    | 2 +-
 libyul/optimiser/ExpressionJoiner.cpp                   | 2 +-
 libyul/optimiser/ExpressionJoiner.h                     | 3 +--
 libyul/optimiser/ExpressionSimplifier.cpp               | 2 +-
 libyul/optimiser/ExpressionSimplifier.h                 | 2 +-
 libyul/optimiser/ExpressionSplitter.cpp                 | 2 +-
 libyul/optimiser/ExpressionSplitter.h                   | 2 +-
 libyul/optimiser/ForLoopConditionIntoBody.cpp           | 3 ++-
 libyul/optimiser/ForLoopConditionOutOfBody.cpp          | 3 ++-
 libyul/optimiser/ForLoopInitRewriter.cpp                | 4 +++-
 libyul/optimiser/FullInliner.cpp                        | 2 +-
 libyul/optimiser/FullInliner.h                          | 2 +-
 libyul/optimiser/FunctionCallFinder.cpp                 | 2 +-
 libyul/optimiser/FunctionGrouper.cpp                    | 2 +-
 libyul/optimiser/FunctionGrouper.h                      | 2 +-
 libyul/optimiser/FunctionHoister.cpp                    | 2 +-
 libyul/optimiser/FunctionHoister.h                      | 2 +-
 libyul/optimiser/InlinableExpressionFunctionFinder.cpp  | 2 +-
 libyul/optimiser/InlinableExpressionFunctionFinder.h    | 2 +-
 libyul/optimiser/KnowledgeBase.cpp                      | 2 +-
 libyul/optimiser/KnowledgeBase.h                        | 3 ++-
 libyul/optimiser/LoadResolver.cpp                       | 2 +-
 libyul/optimiser/LoopInvariantCodeMotion.cpp            | 2 +-
 libyul/optimiser/MainFunction.cpp                       | 2 +-
 libyul/optimiser/MainFunction.h                         | 2 +-
 libyul/optimiser/Metrics.cpp                            | 2 +-
 libyul/optimiser/NameCollector.cpp                      | 2 +-
 libyul/optimiser/NameDispenser.cpp                      | 2 +-
 libyul/optimiser/NameDispenser.h                        | 2 +-
 libyul/optimiser/NameDisplacer.cpp                      | 3 +--
 libyul/optimiser/NameSimplifier.cpp                     | 2 +-
 libyul/optimiser/NameSimplifier.h                       | 2 +-
 libyul/optimiser/OptimizerUtilities.cpp                 | 2 +-
 libyul/optimiser/OptimizerUtilities.h                   | 2 +-
 libyul/optimiser/ReasoningBasedSimplifier.cpp           | 2 +-
 libyul/optimiser/RedundantAssignEliminator.cpp          | 2 +-
 libyul/optimiser/RedundantAssignEliminator.h            | 2 +-
 libyul/optimiser/Rematerialiser.cpp                     | 2 +-
 libyul/optimiser/SSAReverser.cpp                        | 2 +-
 libyul/optimiser/SSATransform.cpp                       | 2 +-
 libyul/optimiser/SSATransform.h                         | 2 +-
 libyul/optimiser/SSAValueTracker.cpp                    | 2 +-
 libyul/optimiser/SSAValueTracker.h                      | 2 +-
 libyul/optimiser/Semantics.cpp                          | 2 +-
 libyul/optimiser/Semantics.h                            | 2 +-
 libyul/optimiser/SimplificationRules.cpp                | 2 +-
 libyul/optimiser/SimplificationRules.h                  | 5 +++--
 libyul/optimiser/StackCompressor.cpp                    | 2 +-
 libyul/optimiser/StackCompressor.h                      | 2 ++
 libyul/optimiser/StackLimitEvader.cpp                   | 2 +-
 libyul/optimiser/StackToMemoryMover.cpp                 | 2 +-
 libyul/optimiser/StructuralSimplifier.cpp               | 2 +-
 libyul/optimiser/Substitution.cpp                       | 2 +-
 libyul/optimiser/Suite.cpp                              | 2 +-
 libyul/optimiser/Suite.h                                | 2 +-
 libyul/optimiser/SyntacticalEquality.cpp                | 2 +-
 libyul/optimiser/SyntacticalEquality.h                  | 2 +-
 libyul/optimiser/TypeInfo.cpp                           | 2 +-
 libyul/optimiser/TypeInfo.h                             | 2 +-
 libyul/optimiser/UnusedFunctionParameterPruner.cpp      | 2 +-
 libyul/optimiser/UnusedFunctionsCommon.h                | 2 +-
 libyul/optimiser/UnusedPruner.cpp                       | 2 +-
 libyul/optimiser/VarDeclInitializer.cpp                 | 2 +-
 libyul/optimiser/VarDeclInitializer.h                   | 2 +-
 libyul/optimiser/VarNameCleaner.cpp                     | 2 +-
 libyul/optimiser/VarNameCleaner.h                       | 2 +-
 test/libyul/Common.cpp                                  | 1 +
 test/libyul/EwasmTranslationTest.cpp                    | 1 +
 test/libyul/Inliner.cpp                                 | 2 +-
 test/libyul/Metrics.cpp                                 | 2 +-
 test/libyul/Parser.cpp                                  | 1 +
 test/tools/yulInterpreter/EVMInstructionInterpreter.cpp | 2 +-
 test/tools/yulInterpreter/EVMInstructionInterpreter.h   | 2 +-
 test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp   | 2 +-
 test/tools/yulInterpreter/EwasmBuiltinInterpreter.h     | 2 +-
 test/tools/yulInterpreter/Interpreter.cpp               | 2 +-
 test/tools/yulInterpreter/Interpreter.h                 | 2 +-
 test/tools/yulopti.cpp                                  | 2 +-
 test/yulPhaser/Program.cpp                              | 1 -
 tools/solidityUpgrade/Upgrade050.cpp                    | 2 +-
 tools/solidityUpgrade/Upgrade060.cpp                    | 2 +-
 tools/yulPhaser/Program.cpp                             | 1 +
 tools/yulPhaser/Program.h                               | 2 +-
 157 files changed, 175 insertions(+), 152 deletions(-)
 rename libyul/{AsmData.h => AST.h} (99%)
 rename libyul/{AsmDataForward.h => ASTForward.h} (98%)

diff --git a/libsolidity/analysis/ControlFlowBuilder.cpp b/libsolidity/analysis/ControlFlowBuilder.cpp
index 4eb4658e1..832be7d20 100644
--- a/libsolidity/analysis/ControlFlowBuilder.cpp
+++ b/libsolidity/analysis/ControlFlowBuilder.cpp
@@ -17,7 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 
 #include <libsolidity/analysis/ControlFlowBuilder.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
 using namespace solidity;
diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp
index cd0d4852e..d553fb8a2 100644
--- a/libsolidity/analysis/ReferencesResolver.cpp
+++ b/libsolidity/analysis/ReferencesResolver.cpp
@@ -27,7 +27,7 @@
 
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
 #include <liblangutil/ErrorReporter.h>
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index e6c5daeca..7f41a2d48 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -23,7 +23,7 @@
 #include <libsolidity/interface/Version.h>
 
 #include <libyul/optimiser/Semantics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/SemVerHandler.h>
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 7bc4677e2..c2e2adf6f 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -28,7 +28,7 @@
 
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <liblangutil/ErrorReporter.h>
 
diff --git a/libsolidity/analysis/ViewPureChecker.cpp b/libsolidity/analysis/ViewPureChecker.cpp
index a5ec40eb4..f680be863 100644
--- a/libsolidity/analysis/ViewPureChecker.cpp
+++ b/libsolidity/analysis/ViewPureChecker.cpp
@@ -18,7 +18,7 @@
 
 #include <libsolidity/analysis/ViewPureChecker.h>
 #include <libsolidity/ast/ExperimentalFeatures.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <liblangutil/ErrorReporter.h>
 #include <libevmasm/SemanticInformation.h>
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index ee3ff0be2..d5e0285b1 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -45,7 +45,7 @@
 
 namespace solidity::yul
 {
-// Forward-declaration to <yul/AsmData.h>
+// Forward-declaration to <yul/AST.h>
 struct Block;
 struct Dialect;
 }
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp
index f95b5c378..c9385a523 100644
--- a/libsolidity/ast/ASTJsonConverter.cpp
+++ b/libsolidity/ast/ASTJsonConverter.cpp
@@ -26,8 +26,8 @@
 #include <libsolidity/ast/TypeProvider.h>
 
 #include <libyul/AsmJsonConverter.h>
-#include <libyul/AsmData.h>
 #include <libyul/AsmPrinter.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
 #include <libsolutil/JSON.h>
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index d9d662571..cd8dab03c 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -25,6 +25,7 @@
 
 #include <libyul/AsmJsonImporter.h>
 #include <libyul/AsmParser.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index ff52e626c..fb69cd868 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -32,6 +32,7 @@
 #include <libyul/AsmPrinter.h>
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/AsmCodeGen.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/backends/evm/EVMMetrics.h>
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index a73166507..a5252b3ce 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -31,7 +31,7 @@
 
 #include <libyul/AsmAnalysisInfo.h>
 #include <libyul/AsmAnalysis.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/AsmCodeGen.h>
 #include <libyul/backends/evm/EVMMetrics.h>
 #include <libyul/backends/evm/EVMDialect.h>
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 69ded018d..64c2288ef 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -35,7 +35,7 @@
 #include <libevmasm/GasMeter.h>
 
 #include <libyul/AsmPrinter.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/optimiser/ASTCopier.h>
 
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 874be0a00..5228d995b 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -60,6 +60,7 @@
 #include <libyul/AsmJsonConverter.h>
 #include <libyul/AssemblyStack.h>
 #include <libyul/AsmParser.h>
+#include <libyul/AST.h>
 
 #include <liblangutil/Scanner.h>
 #include <liblangutil/SemVerHandler.h>
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 053a6718b..b8a445a85 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -25,6 +25,7 @@
 
 #include <libsolidity/interface/Version.h>
 #include <libyul/AsmParser.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/Scanner.h>
diff --git a/libyul/AsmData.h b/libyul/AST.h
similarity index 99%
rename from libyul/AsmData.h
rename to libyul/AST.h
index c4040f320..09d39832f 100644
--- a/libyul/AsmData.h
+++ b/libyul/AST.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/YulString.h>
 
 #include <liblangutil/SourceLocation.h>
diff --git a/libyul/AsmDataForward.h b/libyul/ASTForward.h
similarity index 98%
rename from libyul/AsmDataForward.h
rename to libyul/ASTForward.h
index 02216fd01..a4dc5be3f 100644
--- a/libyul/AsmDataForward.h
+++ b/libyul/ASTForward.h
@@ -28,6 +28,7 @@
 namespace solidity::yul
 {
 
+enum class LiteralKind;
 struct Literal;
 struct Label;
 struct Identifier;
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index 631d0881c..b6eba1119 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -21,7 +21,7 @@
 
 #include <libyul/AsmAnalysis.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/AsmScopeFiller.h>
 #include <libyul/AsmScope.h>
 #include <libyul/AsmAnalysisInfo.h>
@@ -668,3 +668,8 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
 
 	return true;
 }
+
+bool AsmAnalyzer::validateInstructions(FunctionCall const& _functionCall)
+{
+	return validateInstructions(_functionCall.functionName.name.str(), _functionCall.functionName.location);
+}
diff --git a/libyul/AsmAnalysis.h b/libyul/AsmAnalysis.h
index 9906c66e2..d362c963a 100644
--- a/libyul/AsmAnalysis.h
+++ b/libyul/AsmAnalysis.h
@@ -26,7 +26,7 @@
 
 #include <libyul/Dialect.h>
 #include <libyul/AsmScope.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <libyul/backends/evm/AbstractAssembly.h>
 #include <libyul/backends/evm/EVMDialect.h>
@@ -114,10 +114,7 @@ private:
 
 	bool validateInstructions(evmasm::Instruction _instr, langutil::SourceLocation const& _location);
 	bool validateInstructions(std::string const& _instrIdentifier, langutil::SourceLocation const& _location);
-	bool validateInstructions(FunctionCall const& _functionCall)
-	{
-		return validateInstructions(_functionCall.functionName.name.str(), _functionCall.functionName.location);
-	}
+	bool validateInstructions(FunctionCall const& _functionCall);
 
 	yul::ExternalIdentifierAccess::Resolver m_resolver;
 	Scope* m_currentScope = nullptr;
diff --git a/libyul/AsmAnalysisInfo.h b/libyul/AsmAnalysisInfo.h
index 9ac179ad8..120228d2e 100644
--- a/libyul/AsmAnalysisInfo.h
+++ b/libyul/AsmAnalysisInfo.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <map>
 #include <memory>
diff --git a/libyul/AsmJsonConverter.cpp b/libyul/AsmJsonConverter.cpp
index 58b11338d..019a5c4ce 100644
--- a/libyul/AsmJsonConverter.cpp
+++ b/libyul/AsmJsonConverter.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <libyul/AsmJsonConverter.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 #include <libsolutil/CommonData.h>
 
diff --git a/libyul/AsmJsonConverter.h b/libyul/AsmJsonConverter.h
index 3436523b7..fe0c4685c 100644
--- a/libyul/AsmJsonConverter.h
+++ b/libyul/AsmJsonConverter.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <liblangutil/SourceLocation.h>
 #include <json/json.h>
 #include <boost/variant.hpp>
diff --git a/libyul/AsmJsonImporter.cpp b/libyul/AsmJsonImporter.cpp
index 5940d055c..bbcd1b9a7 100644
--- a/libyul/AsmJsonImporter.cpp
+++ b/libyul/AsmJsonImporter.cpp
@@ -23,8 +23,7 @@
  */
 
 #include <libyul/AsmJsonImporter.h>
-#include <libyul/AsmData.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 
 #include <liblangutil/Scanner.h>
diff --git a/libyul/AsmJsonImporter.h b/libyul/AsmJsonImporter.h
index 65f549dc5..e491430b6 100644
--- a/libyul/AsmJsonImporter.h
+++ b/libyul/AsmJsonImporter.h
@@ -25,7 +25,7 @@
 
 #include <json/json.h>
 #include <liblangutil/SourceLocation.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <utility>
 
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index 2baefa16f..00cdb4a22 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -22,6 +22,7 @@
  */
 
 #include <libyul/AsmParser.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 #include <liblangutil/Scanner.h>
 #include <liblangutil/ErrorReporter.h>
diff --git a/libyul/AsmParser.h b/libyul/AsmParser.h
index c48910064..705711b52 100644
--- a/libyul/AsmParser.h
+++ b/libyul/AsmParser.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <libyul/AsmData.h>
+#include <libyul/ASTForward.h>
 #include <libyul/Dialect.h>
 
 #include <liblangutil/SourceLocation.h>
diff --git a/libyul/AsmPrinter.cpp b/libyul/AsmPrinter.cpp
index c5982afc9..61e01bf0f 100644
--- a/libyul/AsmPrinter.cpp
+++ b/libyul/AsmPrinter.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <libyul/AsmPrinter.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 #include <libyul/Dialect.h>
 
diff --git a/libyul/AsmPrinter.h b/libyul/AsmPrinter.h
index 648181cbf..63b1bd3a2 100644
--- a/libyul/AsmPrinter.h
+++ b/libyul/AsmPrinter.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <libyul/YulString.h>
 
diff --git a/libyul/AsmScopeFiller.cpp b/libyul/AsmScopeFiller.cpp
index 0e0695410..287c0caea 100644
--- a/libyul/AsmScopeFiller.cpp
+++ b/libyul/AsmScopeFiller.cpp
@@ -21,7 +21,7 @@
 
 #include <libyul/AsmScopeFiller.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/AsmScope.h>
 #include <libyul/AsmAnalysisInfo.h>
 #include <libyul/Exceptions.h>
diff --git a/libyul/AsmScopeFiller.h b/libyul/AsmScopeFiller.h
index f2c35118b..b43910874 100644
--- a/libyul/AsmScopeFiller.h
+++ b/libyul/AsmScopeFiller.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <functional>
 #include <memory>
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index 14f0d6884..4dd59df2f 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -2,8 +2,8 @@ add_library(yul
 	AsmAnalysis.cpp
 	AsmAnalysis.h
 	AsmAnalysisInfo.h
-	AsmData.h
-	AsmDataForward.h
+	AST.h
+	ASTForward.h
 	AsmJsonConverter.h
 	AsmJsonConverter.cpp
 	AsmJsonImporter.h
diff --git a/libyul/CompilabilityChecker.h b/libyul/CompilabilityChecker.h
index ba9191e28..307d719e4 100644
--- a/libyul/CompilabilityChecker.h
+++ b/libyul/CompilabilityChecker.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <libyul/Dialect.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/Object.h>
 
 #include <map>
diff --git a/libyul/Dialect.cpp b/libyul/Dialect.cpp
index 6c498ce4c..847c9f1ac 100644
--- a/libyul/Dialect.cpp
+++ b/libyul/Dialect.cpp
@@ -20,7 +20,7 @@
  */
 
 #include <libyul/Dialect.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 using namespace solidity::yul;
 using namespace std;
diff --git a/libyul/Object.h b/libyul/Object.h
index deb52eb25..aa4bde629 100644
--- a/libyul/Object.h
+++ b/libyul/Object.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/YulString.h>
 
 #include <libsolutil/Common.h>
diff --git a/libyul/ObjectParser.cpp b/libyul/ObjectParser.cpp
index f1d38ad73..4385c2b3b 100644
--- a/libyul/ObjectParser.cpp
+++ b/libyul/ObjectParser.cpp
@@ -22,6 +22,7 @@
 #include <libyul/ObjectParser.h>
 
 #include <libyul/AsmParser.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 
 #include <liblangutil/Token.h>
diff --git a/libyul/Utilities.cpp b/libyul/Utilities.cpp
index af72888fa..64009a0f3 100644
--- a/libyul/Utilities.cpp
+++ b/libyul/Utilities.cpp
@@ -21,7 +21,7 @@
 
 #include <libyul/Utilities.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 
 #include <libsolutil/CommonData.h>
diff --git a/libyul/Utilities.h b/libyul/Utilities.h
index 53913e6fd..b9077eeae 100644
--- a/libyul/Utilities.h
+++ b/libyul/Utilities.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <libsolutil/Common.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 namespace solidity::yul
 {
diff --git a/libyul/backends/evm/AsmCodeGen.cpp b/libyul/backends/evm/AsmCodeGen.cpp
index 15d646755..49665e347 100644
--- a/libyul/backends/evm/AsmCodeGen.cpp
+++ b/libyul/backends/evm/AsmCodeGen.cpp
@@ -21,8 +21,8 @@
 
 #include <libyul/backends/evm/AsmCodeGen.h>
 
-#include <libyul/AsmData.h>
 #include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AST.h>
 
 #include <libyul/backends/evm/AbstractAssembly.h>
 #include <libyul/backends/evm/EVMCodeTransform.h>
diff --git a/libyul/backends/evm/ConstantOptimiser.cpp b/libyul/backends/evm/ConstantOptimiser.cpp
index 9148b0793..d37ddade1 100644
--- a/libyul/backends/evm/ConstantOptimiser.cpp
+++ b/libyul/backends/evm/ConstantOptimiser.cpp
@@ -23,7 +23,7 @@
 
 #include <libyul/optimiser/ASTCopier.h>
 #include <libyul/backends/evm/EVMMetrics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 
 #include <libsolutil/CommonData.h>
diff --git a/libyul/backends/evm/ConstantOptimiser.h b/libyul/backends/evm/ConstantOptimiser.h
index d6844bbe6..52d78be86 100644
--- a/libyul/backends/evm/ConstantOptimiser.h
+++ b/libyul/backends/evm/ConstantOptimiser.h
@@ -25,7 +25,7 @@
 #include <libyul/YulString.h>
 #include <libyul/Dialect.h>
 #include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AsmData.h>
+#include <libyul/ASTForward.h>
 
 #include <liblangutil/SourceLocation.h>
 
diff --git a/libyul/backends/evm/EVMCodeTransform.cpp b/libyul/backends/evm/EVMCodeTransform.cpp
index 95f787400..496a13629 100644
--- a/libyul/backends/evm/EVMCodeTransform.cpp
+++ b/libyul/backends/evm/EVMCodeTransform.cpp
@@ -23,7 +23,7 @@
 
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 
 #include <liblangutil/Exceptions.h>
diff --git a/libyul/backends/evm/EVMCodeTransform.h b/libyul/backends/evm/EVMCodeTransform.h
index 0ddcf1703..45443ae7d 100644
--- a/libyul/backends/evm/EVMCodeTransform.h
+++ b/libyul/backends/evm/EVMCodeTransform.h
@@ -25,7 +25,7 @@
 
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/AsmScope.h>
 
 #include <optional>
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index 2c3b6be6d..49cb15d98 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -22,7 +22,7 @@
 #include <libyul/backends/evm/EVMDialect.h>
 
 #include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Object.h>
 #include <libyul/Exceptions.h>
 #include <libyul/AsmParser.h>
diff --git a/libyul/backends/evm/EVMDialect.h b/libyul/backends/evm/EVMDialect.h
index 8cac1e0be..a890a0ce2 100644
--- a/libyul/backends/evm/EVMDialect.h
+++ b/libyul/backends/evm/EVMDialect.h
@@ -24,7 +24,7 @@
 #include <libyul/Dialect.h>
 
 #include <libyul/backends/evm/AbstractAssembly.h>
-#include <libyul/AsmData.h>
+#include <libyul/ASTForward.h>
 #include <liblangutil/EVMVersion.h>
 
 #include <map>
diff --git a/libyul/backends/evm/EVMMetrics.cpp b/libyul/backends/evm/EVMMetrics.cpp
index 5fb6d863a..ce8d8f31e 100644
--- a/libyul/backends/evm/EVMMetrics.cpp
+++ b/libyul/backends/evm/EVMMetrics.cpp
@@ -21,7 +21,7 @@
 
 #include <libyul/backends/evm/EVMMetrics.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 #include <libyul/Utilities.h>
 #include <libyul/backends/evm/EVMDialect.h>
diff --git a/libyul/backends/evm/NoOutputAssembly.cpp b/libyul/backends/evm/NoOutputAssembly.cpp
index 2ddeae05d..74caf8073 100644
--- a/libyul/backends/evm/NoOutputAssembly.cpp
+++ b/libyul/backends/evm/NoOutputAssembly.cpp
@@ -21,6 +21,7 @@
 
 #include <libyul/backends/evm/NoOutputAssembly.h>
 
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 
 #include <libevmasm/Instruction.h>
diff --git a/libyul/backends/wasm/EVMToEwasmTranslator.cpp b/libyul/backends/wasm/EVMToEwasmTranslator.cpp
index e6d74bd14..3ba58e73e 100644
--- a/libyul/backends/wasm/EVMToEwasmTranslator.cpp
+++ b/libyul/backends/wasm/EVMToEwasmTranslator.cpp
@@ -35,6 +35,7 @@
 #include <libyul/AsmParser.h>
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AST.h>
 #include <libyul/Object.h>
 
 #include <liblangutil/ErrorReporter.h>
diff --git a/libyul/backends/wasm/EVMToEwasmTranslator.h b/libyul/backends/wasm/EVMToEwasmTranslator.h
index ecb34ec11..251e3352b 100644
--- a/libyul/backends/wasm/EVMToEwasmTranslator.h
+++ b/libyul/backends/wasm/EVMToEwasmTranslator.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/Dialect.h>
 
diff --git a/libyul/backends/wasm/WasmCodeTransform.cpp b/libyul/backends/wasm/WasmCodeTransform.cpp
index 541f1f9f8..b6bc026a4 100644
--- a/libyul/backends/wasm/WasmCodeTransform.cpp
+++ b/libyul/backends/wasm/WasmCodeTransform.cpp
@@ -25,7 +25,7 @@
 
 #include <libyul/optimiser/NameCollector.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/Utilities.h>
 #include <libyul/Exceptions.h>
diff --git a/libyul/backends/wasm/WasmCodeTransform.h b/libyul/backends/wasm/WasmCodeTransform.h
index 79d3552c6..1e9f1fd9c 100644
--- a/libyul/backends/wasm/WasmCodeTransform.h
+++ b/libyul/backends/wasm/WasmCodeTransform.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <libyul/backends/wasm/WasmAST.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/Dialect.h>
 #include <libyul/optimiser/NameDispenser.h>
 #include <libyul/optimiser/TypeInfo.h>
diff --git a/libyul/backends/wasm/WasmDialect.cpp b/libyul/backends/wasm/WasmDialect.cpp
index 1c7755d6a..283f5dd62 100644
--- a/libyul/backends/wasm/WasmDialect.cpp
+++ b/libyul/backends/wasm/WasmDialect.cpp
@@ -21,7 +21,7 @@
 
 #include <libyul/backends/wasm/WasmDialect.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 
 using namespace std;
diff --git a/libyul/backends/wasm/WordSizeTransform.cpp b/libyul/backends/wasm/WordSizeTransform.cpp
index 3e322bc05..ec5e3a0de 100644
--- a/libyul/backends/wasm/WordSizeTransform.cpp
+++ b/libyul/backends/wasm/WordSizeTransform.cpp
@@ -16,7 +16,7 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/backends/wasm/WordSizeTransform.h>
 #include <libyul/Utilities.h>
 #include <libyul/Dialect.h>
diff --git a/libyul/optimiser/ASTCopier.cpp b/libyul/optimiser/ASTCopier.cpp
index 8dc08f6fa..358811358 100644
--- a/libyul/optimiser/ASTCopier.cpp
+++ b/libyul/optimiser/ASTCopier.cpp
@@ -23,7 +23,7 @@
 
 #include <libyul/Exceptions.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libsolutil/Common.h>
 
diff --git a/libyul/optimiser/ASTCopier.h b/libyul/optimiser/ASTCopier.h
index 8afb50d97..4cf69b0b7 100644
--- a/libyul/optimiser/ASTCopier.h
+++ b/libyul/optimiser/ASTCopier.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <libyul/YulString.h>
 
diff --git a/libyul/optimiser/ASTWalker.cpp b/libyul/optimiser/ASTWalker.cpp
index 057f94b88..d0ce29054 100644
--- a/libyul/optimiser/ASTWalker.cpp
+++ b/libyul/optimiser/ASTWalker.cpp
@@ -21,7 +21,7 @@
 
 #include <libyul/optimiser/ASTWalker.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 
diff --git a/libyul/optimiser/ASTWalker.h b/libyul/optimiser/ASTWalker.h
index c62be4844..107658dfc 100644
--- a/libyul/optimiser/ASTWalker.h
+++ b/libyul/optimiser/ASTWalker.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <libyul/Exceptions.h>
 #include <libyul/YulString.h>
diff --git a/libyul/optimiser/BlockFlattener.cpp b/libyul/optimiser/BlockFlattener.cpp
index 24f57594c..e32972e66 100644
--- a/libyul/optimiser/BlockFlattener.cpp
+++ b/libyul/optimiser/BlockFlattener.cpp
@@ -15,10 +15,13 @@
 	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 */
 // SPDX-License-Identifier: GPL-3.0
+
 #include <libyul/optimiser/BlockFlattener.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
+
 #include <libsolutil/Visitor.h>
 #include <libsolutil/CommonData.h>
+
 #include <functional>
 
 using namespace std;
diff --git a/libyul/optimiser/BlockHasher.cpp b/libyul/optimiser/BlockHasher.cpp
index 4fb199982..02db3bc43 100644
--- a/libyul/optimiser/BlockHasher.cpp
+++ b/libyul/optimiser/BlockHasher.cpp
@@ -21,7 +21,9 @@
 
 #include <libyul/optimiser/BlockHasher.h>
 #include <libyul/optimiser/SyntacticalEquality.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
+
 #include <libsolutil/CommonData.h>
 
 using namespace std;
diff --git a/libyul/optimiser/BlockHasher.h b/libyul/optimiser/BlockHasher.h
index 36826e158..a831efa23 100644
--- a/libyul/optimiser/BlockHasher.h
+++ b/libyul/optimiser/BlockHasher.h
@@ -21,9 +21,8 @@
 #pragma once
 
 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/YulString.h>
-#include <libyul/AsmData.h>
 
 namespace solidity::yul
 {
diff --git a/libyul/optimiser/CallGraphGenerator.cpp b/libyul/optimiser/CallGraphGenerator.cpp
index 76f5220c8..5aeff50be 100644
--- a/libyul/optimiser/CallGraphGenerator.cpp
+++ b/libyul/optimiser/CallGraphGenerator.cpp
@@ -19,7 +19,7 @@
  * Specific AST walker that generates the call graph.
  */
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
 
 #include <stack>
diff --git a/libyul/optimiser/CircularReferencesPruner.cpp b/libyul/optimiser/CircularReferencesPruner.cpp
index 2fe6a1d80..1078779c5 100644
--- a/libyul/optimiser/CircularReferencesPruner.cpp
+++ b/libyul/optimiser/CircularReferencesPruner.cpp
@@ -19,7 +19,7 @@
 
 #include <libyul/optimiser/CallGraphGenerator.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libsolutil/Algorithms.h>
 
diff --git a/libyul/optimiser/CommonSubexpressionEliminator.cpp b/libyul/optimiser/CommonSubexpressionEliminator.cpp
index 2f80e7bc4..80c03e3ad 100644
--- a/libyul/optimiser/CommonSubexpressionEliminator.cpp
+++ b/libyul/optimiser/CommonSubexpressionEliminator.cpp
@@ -27,7 +27,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/SideEffects.h>
 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 
 using namespace std;
diff --git a/libyul/optimiser/ConditionalSimplifier.cpp b/libyul/optimiser/ConditionalSimplifier.cpp
index f95ef830a..0a66e28df 100644
--- a/libyul/optimiser/ConditionalSimplifier.cpp
+++ b/libyul/optimiser/ConditionalSimplifier.cpp
@@ -17,7 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 #include <libyul/optimiser/ConditionalSimplifier.h>
 #include <libyul/optimiser/Semantics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 #include <libyul/optimiser/NameCollector.h>
 #include <libsolutil/CommonData.h>
diff --git a/libyul/optimiser/ConditionalSimplifier.h b/libyul/optimiser/ConditionalSimplifier.h
index 9a48b813f..e41ee579c 100644
--- a/libyul/optimiser/ConditionalSimplifier.h
+++ b/libyul/optimiser/ConditionalSimplifier.h
@@ -19,6 +19,7 @@
 
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>
+#include <libyul/ASTForward.h>
 #include <libyul/Dialect.h>
 #include <libsolutil/Common.h>
 
diff --git a/libyul/optimiser/ConditionalUnsimplifier.cpp b/libyul/optimiser/ConditionalUnsimplifier.cpp
index 28bc11a0c..e51cbbf3c 100644
--- a/libyul/optimiser/ConditionalUnsimplifier.cpp
+++ b/libyul/optimiser/ConditionalUnsimplifier.cpp
@@ -17,7 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 #include <libyul/optimiser/ConditionalUnsimplifier.h>
 #include <libyul/optimiser/Semantics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 #include <libyul/optimiser/NameCollector.h>
 #include <libsolutil/CommonData.h>
diff --git a/libyul/optimiser/ControlFlowSimplifier.cpp b/libyul/optimiser/ControlFlowSimplifier.cpp
index 044061d9d..c617e2005 100644
--- a/libyul/optimiser/ControlFlowSimplifier.cpp
+++ b/libyul/optimiser/ControlFlowSimplifier.cpp
@@ -19,7 +19,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/optimiser/TypeInfo.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 #include <libyul/Dialect.h>
 #include <libsolutil/CommonData.h>
diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index 6755500b3..f07bc8d29 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -24,8 +24,8 @@
 
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/Semantics.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
 #include <libsolutil/CommonData.h>
@@ -39,7 +39,6 @@ using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::yul;
 
-
 void DataFlowAnalyzer::operator()(ExpressionStatement& _statement)
 {
 	if (auto vars = isSimpleStore(evmasm::Instruction::SSTORE, _statement))
diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
index 237b48597..8974d2184 100644
--- a/libyul/optimiser/DataFlowAnalyzer.h
+++ b/libyul/optimiser/DataFlowAnalyzer.h
@@ -26,7 +26,7 @@
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/KnowledgeBase.h>
 #include <libyul/YulString.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h> // Needed for m_zero below.
 #include <libyul/SideEffects.h>
 
 // TODO avoid
diff --git a/libyul/optimiser/DeadCodeEliminator.cpp b/libyul/optimiser/DeadCodeEliminator.cpp
index 1bb4f460d..1c6818e9d 100644
--- a/libyul/optimiser/DeadCodeEliminator.cpp
+++ b/libyul/optimiser/DeadCodeEliminator.cpp
@@ -22,7 +22,7 @@
 #include <libyul/optimiser/DeadCodeEliminator.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libevmasm/SemanticInformation.h>
 #include <libevmasm/AssemblyItem.h>
diff --git a/libyul/optimiser/Disambiguator.cpp b/libyul/optimiser/Disambiguator.cpp
index 2e20d4be2..8bcc07d2b 100644
--- a/libyul/optimiser/Disambiguator.cpp
+++ b/libyul/optimiser/Disambiguator.cpp
@@ -22,7 +22,7 @@
 #include <libyul/optimiser/Disambiguator.h>
 
 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/AsmScope.h>
 #include <libyul/Dialect.h>
 
diff --git a/libyul/optimiser/Disambiguator.h b/libyul/optimiser/Disambiguator.h
index 6d8a3775c..062173882 100644
--- a/libyul/optimiser/Disambiguator.h
+++ b/libyul/optimiser/Disambiguator.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/AsmAnalysisInfo.h>
 #include <libyul/optimiser/ASTCopier.h>
 #include <libyul/optimiser/NameDispenser.h>
diff --git a/libyul/optimiser/EquivalentFunctionCombiner.cpp b/libyul/optimiser/EquivalentFunctionCombiner.cpp
index 8cea5d63e..90091f6ae 100644
--- a/libyul/optimiser/EquivalentFunctionCombiner.cpp
+++ b/libyul/optimiser/EquivalentFunctionCombiner.cpp
@@ -20,7 +20,7 @@
  */
 
 #include <libyul/optimiser/EquivalentFunctionCombiner.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libsolutil/CommonData.h>
 
 using namespace std;
diff --git a/libyul/optimiser/EquivalentFunctionCombiner.h b/libyul/optimiser/EquivalentFunctionCombiner.h
index d43fa3986..5337f7684 100644
--- a/libyul/optimiser/EquivalentFunctionCombiner.h
+++ b/libyul/optimiser/EquivalentFunctionCombiner.h
@@ -23,7 +23,7 @@
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/EquivalentFunctionDetector.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 namespace solidity::yul
 {
diff --git a/libyul/optimiser/EquivalentFunctionDetector.cpp b/libyul/optimiser/EquivalentFunctionDetector.cpp
index 5c49ddb89..b25600c21 100644
--- a/libyul/optimiser/EquivalentFunctionDetector.cpp
+++ b/libyul/optimiser/EquivalentFunctionDetector.cpp
@@ -22,7 +22,7 @@
 #include <libyul/optimiser/EquivalentFunctionDetector.h>
 #include <libyul/optimiser/SyntacticalEquality.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/optimiser/Metrics.h>
 
 using namespace std;
diff --git a/libyul/optimiser/EquivalentFunctionDetector.h b/libyul/optimiser/EquivalentFunctionDetector.h
index 107b355e6..d3ddc25f7 100644
--- a/libyul/optimiser/EquivalentFunctionDetector.h
+++ b/libyul/optimiser/EquivalentFunctionDetector.h
@@ -22,7 +22,7 @@
 
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/BlockHasher.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 namespace solidity::yul
 {
diff --git a/libyul/optimiser/ExpressionInliner.cpp b/libyul/optimiser/ExpressionInliner.cpp
index ca29a5829..ce0d1c739 100644
--- a/libyul/optimiser/ExpressionInliner.cpp
+++ b/libyul/optimiser/ExpressionInliner.cpp
@@ -28,7 +28,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimiserStep.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/ExpressionInliner.h b/libyul/optimiser/ExpressionInliner.h
index f3a8833df..ff7da67b8 100644
--- a/libyul/optimiser/ExpressionInliner.h
+++ b/libyul/optimiser/ExpressionInliner.h
@@ -21,7 +21,7 @@
 #pragma once
 
 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <optional>
 #include <set>
diff --git a/libyul/optimiser/ExpressionJoiner.cpp b/libyul/optimiser/ExpressionJoiner.cpp
index fa9aac9ce..7e97fedb2 100644
--- a/libyul/optimiser/ExpressionJoiner.cpp
+++ b/libyul/optimiser/ExpressionJoiner.cpp
@@ -25,7 +25,7 @@
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libsolutil/CommonData.h>
 
diff --git a/libyul/optimiser/ExpressionJoiner.h b/libyul/optimiser/ExpressionJoiner.h
index db3217de0..eb22ad79f 100644
--- a/libyul/optimiser/ExpressionJoiner.h
+++ b/libyul/optimiser/ExpressionJoiner.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 
 #include <map>
@@ -32,7 +32,6 @@ namespace solidity::yul
 class NameCollector;
 struct OptimiserStepContext;
 
-
 /**
  * Optimiser component that modifies an AST in place, turning sequences
  * of variable declarations into complex expressions, if the variables
diff --git a/libyul/optimiser/ExpressionSimplifier.cpp b/libyul/optimiser/ExpressionSimplifier.cpp
index 623bc12b4..21107c026 100644
--- a/libyul/optimiser/ExpressionSimplifier.cpp
+++ b/libyul/optimiser/ExpressionSimplifier.cpp
@@ -23,7 +23,7 @@
 
 #include <libyul/optimiser/SimplificationRules.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/ExpressionSimplifier.h b/libyul/optimiser/ExpressionSimplifier.h
index f5e1781cf..f9d4e8da5 100644
--- a/libyul/optimiser/ExpressionSimplifier.h
+++ b/libyul/optimiser/ExpressionSimplifier.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <libyul/optimiser/DataFlowAnalyzer.h>
 
diff --git a/libyul/optimiser/ExpressionSplitter.cpp b/libyul/optimiser/ExpressionSplitter.cpp
index 6ce26bf81..7aad0bd58 100644
--- a/libyul/optimiser/ExpressionSplitter.cpp
+++ b/libyul/optimiser/ExpressionSplitter.cpp
@@ -26,7 +26,7 @@
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/optimiser/TypeInfo.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 
 #include <libsolutil/CommonData.h>
diff --git a/libyul/optimiser/ExpressionSplitter.h b/libyul/optimiser/ExpressionSplitter.h
index ebcdd7f6d..bbde8d6a2 100644
--- a/libyul/optimiser/ExpressionSplitter.h
+++ b/libyul/optimiser/ExpressionSplitter.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/NameDispenser.h>
diff --git a/libyul/optimiser/ForLoopConditionIntoBody.cpp b/libyul/optimiser/ForLoopConditionIntoBody.cpp
index a5b907ce7..059479757 100644
--- a/libyul/optimiser/ForLoopConditionIntoBody.cpp
+++ b/libyul/optimiser/ForLoopConditionIntoBody.cpp
@@ -18,7 +18,8 @@
 
 #include <libyul/optimiser/ForLoopConditionIntoBody.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
+
 #include <libsolutil/CommonData.h>
 
 using namespace std;
diff --git a/libyul/optimiser/ForLoopConditionOutOfBody.cpp b/libyul/optimiser/ForLoopConditionOutOfBody.cpp
index f13b417e8..1ddc3c257 100644
--- a/libyul/optimiser/ForLoopConditionOutOfBody.cpp
+++ b/libyul/optimiser/ForLoopConditionOutOfBody.cpp
@@ -18,8 +18,9 @@
 
 #include <libyul/optimiser/ForLoopConditionOutOfBody.h>
 #include <libyul/optimiser/Semantics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
+
 #include <libsolutil/CommonData.h>
 
 using namespace std;
diff --git a/libyul/optimiser/ForLoopInitRewriter.cpp b/libyul/optimiser/ForLoopInitRewriter.cpp
index 62d520199..345dd1266 100644
--- a/libyul/optimiser/ForLoopInitRewriter.cpp
+++ b/libyul/optimiser/ForLoopInitRewriter.cpp
@@ -16,8 +16,10 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 #include <libyul/optimiser/ForLoopInitRewriter.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
+
 #include <libsolutil/CommonData.h>
+
 #include <functional>
 
 using namespace std;
diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
index 101b89c34..189a06164 100644
--- a/libyul/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@@ -30,7 +30,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 
 #include <libsolutil/CommonData.h>
diff --git a/libyul/optimiser/FullInliner.h b/libyul/optimiser/FullInliner.h
index c0106807a..a743bf323 100644
--- a/libyul/optimiser/FullInliner.h
+++ b/libyul/optimiser/FullInliner.h
@@ -20,7 +20,7 @@
  */
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <libyul/optimiser/ASTCopier.h>
 #include <libyul/optimiser/ASTWalker.h>
diff --git a/libyul/optimiser/FunctionCallFinder.cpp b/libyul/optimiser/FunctionCallFinder.cpp
index d5a6afcc9..4bc1998b1 100644
--- a/libyul/optimiser/FunctionCallFinder.cpp
+++ b/libyul/optimiser/FunctionCallFinder.cpp
@@ -16,7 +16,7 @@
 */
 
 #include <libyul/optimiser/FunctionCallFinder.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/FunctionGrouper.cpp b/libyul/optimiser/FunctionGrouper.cpp
index 86d59dd53..6ebab56db 100644
--- a/libyul/optimiser/FunctionGrouper.cpp
+++ b/libyul/optimiser/FunctionGrouper.cpp
@@ -22,7 +22,7 @@
 
 #include <libyul/optimiser/FunctionGrouper.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <boost/range/algorithm_ext/erase.hpp>
 
diff --git a/libyul/optimiser/FunctionGrouper.h b/libyul/optimiser/FunctionGrouper.h
index ead0ddc11..fa5409936 100644
--- a/libyul/optimiser/FunctionGrouper.h
+++ b/libyul/optimiser/FunctionGrouper.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 namespace solidity::yul
 {
diff --git a/libyul/optimiser/FunctionHoister.cpp b/libyul/optimiser/FunctionHoister.cpp
index a02feeda8..aa5c373e9 100644
--- a/libyul/optimiser/FunctionHoister.cpp
+++ b/libyul/optimiser/FunctionHoister.cpp
@@ -23,7 +23,7 @@
 
 #include <libyul/optimiser/FunctionHoister.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libsolutil/CommonData.h>
 
diff --git a/libyul/optimiser/FunctionHoister.h b/libyul/optimiser/FunctionHoister.h
index 39e692c8a..04d7f64e3 100644
--- a/libyul/optimiser/FunctionHoister.h
+++ b/libyul/optimiser/FunctionHoister.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 
 namespace solidity::yul
diff --git a/libyul/optimiser/InlinableExpressionFunctionFinder.cpp b/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
index c7830d480..8c9b80265 100644
--- a/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
+++ b/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
@@ -22,7 +22,7 @@
 #include <libyul/optimiser/InlinableExpressionFunctionFinder.h>
 
 #include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/InlinableExpressionFunctionFinder.h b/libyul/optimiser/InlinableExpressionFunctionFinder.h
index 3c0b768e6..587bdca91 100644
--- a/libyul/optimiser/InlinableExpressionFunctionFinder.h
+++ b/libyul/optimiser/InlinableExpressionFunctionFinder.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 
 #include <set>
diff --git a/libyul/optimiser/KnowledgeBase.cpp b/libyul/optimiser/KnowledgeBase.cpp
index 0692d0c06..623db6a70 100644
--- a/libyul/optimiser/KnowledgeBase.cpp
+++ b/libyul/optimiser/KnowledgeBase.cpp
@@ -21,7 +21,7 @@
 
 #include <libyul/optimiser/KnowledgeBase.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 #include <libyul/optimiser/SimplificationRules.h>
 #include <libyul/optimiser/DataFlowAnalyzer.h>
diff --git a/libyul/optimiser/KnowledgeBase.h b/libyul/optimiser/KnowledgeBase.h
index 7d4cdfb6b..a240a108a 100644
--- a/libyul/optimiser/KnowledgeBase.h
+++ b/libyul/optimiser/KnowledgeBase.h
@@ -21,8 +21,9 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/YulString.h>
+
 #include <map>
 
 namespace solidity::yul
diff --git a/libyul/optimiser/LoadResolver.cpp b/libyul/optimiser/LoadResolver.cpp
index 7635f9d61..cc69b630a 100644
--- a/libyul/optimiser/LoadResolver.cpp
+++ b/libyul/optimiser/LoadResolver.cpp
@@ -26,7 +26,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
 #include <libyul/SideEffects.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/LoopInvariantCodeMotion.cpp b/libyul/optimiser/LoopInvariantCodeMotion.cpp
index 3cc8397a9..fe8ddff97 100644
--- a/libyul/optimiser/LoopInvariantCodeMotion.cpp
+++ b/libyul/optimiser/LoopInvariantCodeMotion.cpp
@@ -22,7 +22,7 @@
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/SSAValueTracker.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libsolutil/CommonData.h>
 
 #include <utility>
diff --git a/libyul/optimiser/MainFunction.cpp b/libyul/optimiser/MainFunction.cpp
index 83968651d..646bc8faf 100644
--- a/libyul/optimiser/MainFunction.cpp
+++ b/libyul/optimiser/MainFunction.cpp
@@ -25,7 +25,7 @@
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/Exceptions.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libsolutil/CommonData.h>
 
diff --git a/libyul/optimiser/MainFunction.h b/libyul/optimiser/MainFunction.h
index 92781f81c..c2f137e48 100644
--- a/libyul/optimiser/MainFunction.h
+++ b/libyul/optimiser/MainFunction.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 namespace solidity::yul
 {
diff --git a/libyul/optimiser/Metrics.cpp b/libyul/optimiser/Metrics.cpp
index 5a7162294..0af4d4572 100644
--- a/libyul/optimiser/Metrics.cpp
+++ b/libyul/optimiser/Metrics.cpp
@@ -20,7 +20,7 @@
 
 #include <libyul/optimiser/Metrics.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 #include <libyul/Utilities.h>
 #include <libyul/backends/evm/EVMDialect.h>
diff --git a/libyul/optimiser/NameCollector.cpp b/libyul/optimiser/NameCollector.cpp
index 5c6f2ab79..bc0fccda4 100644
--- a/libyul/optimiser/NameCollector.cpp
+++ b/libyul/optimiser/NameCollector.cpp
@@ -21,7 +21,7 @@
 
 #include <libyul/optimiser/NameCollector.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/NameDispenser.cpp b/libyul/optimiser/NameDispenser.cpp
index eaf9b8b4b..7c9fcc6bc 100644
--- a/libyul/optimiser/NameDispenser.cpp
+++ b/libyul/optimiser/NameDispenser.cpp
@@ -23,7 +23,7 @@
 
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/YulString.h>
 
diff --git a/libyul/optimiser/NameDispenser.h b/libyul/optimiser/NameDispenser.h
index 1ef8c92e7..e379708d0 100644
--- a/libyul/optimiser/NameDispenser.h
+++ b/libyul/optimiser/NameDispenser.h
@@ -20,7 +20,7 @@
  */
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <libyul/YulString.h>
 
diff --git a/libyul/optimiser/NameDisplacer.cpp b/libyul/optimiser/NameDisplacer.cpp
index 81248819c..4d1a61a8e 100644
--- a/libyul/optimiser/NameDisplacer.cpp
+++ b/libyul/optimiser/NameDisplacer.cpp
@@ -21,8 +21,7 @@
 
 #include <libyul/optimiser/NameDisplacer.h>
 
-#include <libyul/AsmData.h>
-
+#include <libyul/AST.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/NameSimplifier.cpp b/libyul/optimiser/NameSimplifier.cpp
index 2e1bb822a..741280edd 100644
--- a/libyul/optimiser/NameSimplifier.cpp
+++ b/libyul/optimiser/NameSimplifier.cpp
@@ -17,7 +17,7 @@
 
 #include <libyul/optimiser/NameSimplifier.h>
 #include <libyul/optimiser/NameCollector.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
 
diff --git a/libyul/optimiser/NameSimplifier.h b/libyul/optimiser/NameSimplifier.h
index 924e734f9..0edbc595f 100644
--- a/libyul/optimiser/NameSimplifier.h
+++ b/libyul/optimiser/NameSimplifier.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/YulString.h>
 #include <libyul/optimiser/OptimiserStep.h>
diff --git a/libyul/optimiser/OptimizerUtilities.cpp b/libyul/optimiser/OptimizerUtilities.cpp
index ad46f7cb1..2a3f7db90 100644
--- a/libyul/optimiser/OptimizerUtilities.cpp
+++ b/libyul/optimiser/OptimizerUtilities.cpp
@@ -22,7 +22,7 @@
 #include <libyul/optimiser/OptimizerUtilities.h>
 
 #include <libyul/Dialect.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <liblangutil/Token.h>
 #include <libsolutil/CommonData.h>
diff --git a/libyul/optimiser/OptimizerUtilities.h b/libyul/optimiser/OptimizerUtilities.h
index 829d10b55..22191538b 100644
--- a/libyul/optimiser/OptimizerUtilities.h
+++ b/libyul/optimiser/OptimizerUtilities.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <libsolutil/Common.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/Dialect.h>
 #include <libyul/YulString.h>
 
diff --git a/libyul/optimiser/ReasoningBasedSimplifier.cpp b/libyul/optimiser/ReasoningBasedSimplifier.cpp
index ea464f248..f61bee321 100644
--- a/libyul/optimiser/ReasoningBasedSimplifier.cpp
+++ b/libyul/optimiser/ReasoningBasedSimplifier.cpp
@@ -19,7 +19,7 @@
 
 #include <libyul/optimiser/SSAValueTracker.h>
 #include <libyul/optimiser/Semantics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 #include <libyul/Dialect.h>
 
diff --git a/libyul/optimiser/RedundantAssignEliminator.cpp b/libyul/optimiser/RedundantAssignEliminator.cpp
index 170cf1d79..cd528aedf 100644
--- a/libyul/optimiser/RedundantAssignEliminator.cpp
+++ b/libyul/optimiser/RedundantAssignEliminator.cpp
@@ -23,7 +23,7 @@
 #include <libyul/optimiser/RedundantAssignEliminator.h>
 
 #include <libyul/optimiser/Semantics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libsolutil/CommonData.h>
 
diff --git a/libyul/optimiser/RedundantAssignEliminator.h b/libyul/optimiser/RedundantAssignEliminator.h
index 81e977e8d..bccc1e8ef 100644
--- a/libyul/optimiser/RedundantAssignEliminator.h
+++ b/libyul/optimiser/RedundantAssignEliminator.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>
 
diff --git a/libyul/optimiser/Rematerialiser.cpp b/libyul/optimiser/Rematerialiser.cpp
index 53974616c..abd1bcdd8 100644
--- a/libyul/optimiser/Rematerialiser.cpp
+++ b/libyul/optimiser/Rematerialiser.cpp
@@ -24,7 +24,7 @@
 #include <libyul/optimiser/ASTCopier.h>
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/SSAReverser.cpp b/libyul/optimiser/SSAReverser.cpp
index e1902608d..d59a93d0e 100644
--- a/libyul/optimiser/SSAReverser.cpp
+++ b/libyul/optimiser/SSAReverser.cpp
@@ -17,7 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 #include <libyul/optimiser/SSAReverser.h>
 #include <libyul/optimiser/Metrics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libsolutil/CommonData.h>
 
 #include <variant>
diff --git a/libyul/optimiser/SSATransform.cpp b/libyul/optimiser/SSATransform.cpp
index 332b7af1d..f77e836f2 100644
--- a/libyul/optimiser/SSATransform.cpp
+++ b/libyul/optimiser/SSATransform.cpp
@@ -24,7 +24,7 @@
 
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/NameDispenser.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libsolutil/CommonData.h>
 
diff --git a/libyul/optimiser/SSATransform.h b/libyul/optimiser/SSATransform.h
index 74e52b62a..66015362a 100644
--- a/libyul/optimiser/SSATransform.h
+++ b/libyul/optimiser/SSATransform.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>
 
diff --git a/libyul/optimiser/SSAValueTracker.cpp b/libyul/optimiser/SSAValueTracker.cpp
index 452123447..df3c5adce 100644
--- a/libyul/optimiser/SSAValueTracker.cpp
+++ b/libyul/optimiser/SSAValueTracker.cpp
@@ -22,7 +22,7 @@
 
 #include <libyul/optimiser/SSAValueTracker.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/SSAValueTracker.h b/libyul/optimiser/SSAValueTracker.h
index f206cab5e..f1c93ff22 100644
--- a/libyul/optimiser/SSAValueTracker.h
+++ b/libyul/optimiser/SSAValueTracker.h
@@ -23,7 +23,7 @@
 #pragma once
 
 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h> // Needed for m_zero below.
 
 #include <map>
 #include <set>
diff --git a/libyul/optimiser/Semantics.cpp b/libyul/optimiser/Semantics.cpp
index 735ed13d0..070e83c3e 100644
--- a/libyul/optimiser/Semantics.cpp
+++ b/libyul/optimiser/Semantics.cpp
@@ -22,7 +22,7 @@
 #include <libyul/optimiser/Semantics.h>
 
 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
diff --git a/libyul/optimiser/Semantics.h b/libyul/optimiser/Semantics.h
index 70ec119ac..3426f23d8 100644
--- a/libyul/optimiser/Semantics.h
+++ b/libyul/optimiser/Semantics.h
@@ -24,7 +24,7 @@
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/SideEffects.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <set>
 
diff --git a/libyul/optimiser/SimplificationRules.cpp b/libyul/optimiser/SimplificationRules.cpp
index cb797975b..8e55e8c5e 100644
--- a/libyul/optimiser/SimplificationRules.cpp
+++ b/libyul/optimiser/SimplificationRules.cpp
@@ -26,7 +26,7 @@
 #include <libyul/optimiser/SyntacticalEquality.h>
 #include <libyul/optimiser/DataFlowAnalyzer.h>
 #include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 
 #include <libevmasm/RuleList.h>
diff --git a/libyul/optimiser/SimplificationRules.h b/libyul/optimiser/SimplificationRules.h
index 05e4e0d59..ca0b7a801 100644
--- a/libyul/optimiser/SimplificationRules.h
+++ b/libyul/optimiser/SimplificationRules.h
@@ -23,12 +23,13 @@
 
 #include <libevmasm/SimplificationRule.h>
 
-#include <libyul/AsmDataForward.h>
-#include <libyul/AsmData.h>
+#include <libyul/ASTForward.h>
+#include <libyul/YulString.h>
 
 #include <libsolutil/CommonData.h>
 
 #include <liblangutil/EVMVersion.h>
+#include <liblangutil/SourceLocation.h>
 
 #include <boost/noncopyable.hpp>
 
diff --git a/libyul/optimiser/StackCompressor.cpp b/libyul/optimiser/StackCompressor.cpp
index 98850f03e..a8dc9d871 100644
--- a/libyul/optimiser/StackCompressor.cpp
+++ b/libyul/optimiser/StackCompressor.cpp
@@ -30,7 +30,7 @@
 
 #include <libyul/CompilabilityChecker.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/StackCompressor.h b/libyul/optimiser/StackCompressor.h
index f10a6ba17..d18618667 100644
--- a/libyul/optimiser/StackCompressor.h
+++ b/libyul/optimiser/StackCompressor.h
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include <libyul/Object.h>
+
 #include <memory>
 
 namespace solidity::yul
diff --git a/libyul/optimiser/StackLimitEvader.cpp b/libyul/optimiser/StackLimitEvader.cpp
index a78b00625..a7169f08a 100644
--- a/libyul/optimiser/StackLimitEvader.cpp
+++ b/libyul/optimiser/StackLimitEvader.cpp
@@ -21,7 +21,7 @@
 #include <libyul/optimiser/NameDispenser.h>
 #include <libyul/optimiser/StackToMemoryMover.h>
 #include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/Exceptions.h>
 #include <libyul/Object.h>
diff --git a/libyul/optimiser/StackToMemoryMover.cpp b/libyul/optimiser/StackToMemoryMover.cpp
index ccac48296..25eb25cd5 100644
--- a/libyul/optimiser/StackToMemoryMover.cpp
+++ b/libyul/optimiser/StackToMemoryMover.cpp
@@ -18,7 +18,7 @@
 #include <libyul/optimiser/NameDispenser.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Visitor.h>
diff --git a/libyul/optimiser/StructuralSimplifier.cpp b/libyul/optimiser/StructuralSimplifier.cpp
index 09fe9ca1f..4cfa0b3f1 100644
--- a/libyul/optimiser/StructuralSimplifier.cpp
+++ b/libyul/optimiser/StructuralSimplifier.cpp
@@ -17,7 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 #include <libyul/optimiser/StructuralSimplifier.h>
 #include <libyul/optimiser/Semantics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Visitor.h>
diff --git a/libyul/optimiser/Substitution.cpp b/libyul/optimiser/Substitution.cpp
index ee2323577..e0557ad74 100644
--- a/libyul/optimiser/Substitution.cpp
+++ b/libyul/optimiser/Substitution.cpp
@@ -21,7 +21,7 @@
 
 #include <libyul/optimiser/Substitution.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index f07a16c83..953120e8f 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -63,8 +63,8 @@
 #include <libyul/backends/evm/ConstantOptimiser.h>
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmData.h>
 #include <libyul/AsmPrinter.h>
+#include <libyul/AST.h>
 #include <libyul/Object.h>
 
 #include <libyul/backends/wasm/WasmDialect.h>
diff --git a/libyul/optimiser/Suite.h b/libyul/optimiser/Suite.h
index affbd37c0..9ae0ada58 100644
--- a/libyul/optimiser/Suite.h
+++ b/libyul/optimiser/Suite.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/YulString.h>
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/optimiser/NameDispenser.h>
diff --git a/libyul/optimiser/SyntacticalEquality.cpp b/libyul/optimiser/SyntacticalEquality.cpp
index 1ce5da7d1..490e1c9e7 100644
--- a/libyul/optimiser/SyntacticalEquality.cpp
+++ b/libyul/optimiser/SyntacticalEquality.cpp
@@ -21,7 +21,7 @@
 #include <libyul/optimiser/SyntacticalEquality.h>
 
 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 
 #include <libsolutil/CommonData.h>
diff --git a/libyul/optimiser/SyntacticalEquality.h b/libyul/optimiser/SyntacticalEquality.h
index 774a223cc..02a6d4b39 100644
--- a/libyul/optimiser/SyntacticalEquality.h
+++ b/libyul/optimiser/SyntacticalEquality.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/YulString.h>
 
 #include <map>
diff --git a/libyul/optimiser/TypeInfo.cpp b/libyul/optimiser/TypeInfo.cpp
index 740856c72..81bc7ac0b 100644
--- a/libyul/optimiser/TypeInfo.cpp
+++ b/libyul/optimiser/TypeInfo.cpp
@@ -23,7 +23,7 @@
 
 #include <libyul/optimiser/NameCollector.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 
 #include <libsolutil/Visitor.h>
diff --git a/libyul/optimiser/TypeInfo.h b/libyul/optimiser/TypeInfo.h
index f458cbe44..5ed0a0d55 100644
--- a/libyul/optimiser/TypeInfo.h
+++ b/libyul/optimiser/TypeInfo.h
@@ -20,7 +20,7 @@
  */
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/YulString.h>
 
 #include <vector>
diff --git a/libyul/optimiser/UnusedFunctionParameterPruner.cpp b/libyul/optimiser/UnusedFunctionParameterPruner.cpp
index d103e9c6f..75e8325a3 100644
--- a/libyul/optimiser/UnusedFunctionParameterPruner.cpp
+++ b/libyul/optimiser/UnusedFunctionParameterPruner.cpp
@@ -27,7 +27,7 @@
 #include <libyul/optimiser/NameDisplacer.h>
 #include <libyul/optimiser/NameDispenser.h>
 #include <libyul/YulString.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libsolutil/CommonData.h>
 
diff --git a/libyul/optimiser/UnusedFunctionsCommon.h b/libyul/optimiser/UnusedFunctionsCommon.h
index aaa8180f7..dcf9ca55b 100644
--- a/libyul/optimiser/UnusedFunctionsCommon.h
+++ b/libyul/optimiser/UnusedFunctionsCommon.h
@@ -19,7 +19,7 @@
 
 #include <libyul/optimiser/Metrics.h>
 #include <libyul/optimiser/NameDispenser.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/Exceptions.h>
 
diff --git a/libyul/optimiser/UnusedPruner.cpp b/libyul/optimiser/UnusedPruner.cpp
index 3779c0d63..b0b4b794c 100644
--- a/libyul/optimiser/UnusedPruner.cpp
+++ b/libyul/optimiser/UnusedPruner.cpp
@@ -25,7 +25,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/SideEffects.h>
 
diff --git a/libyul/optimiser/VarDeclInitializer.cpp b/libyul/optimiser/VarDeclInitializer.cpp
index ca6c89feb..dc3e27c2a 100644
--- a/libyul/optimiser/VarDeclInitializer.cpp
+++ b/libyul/optimiser/VarDeclInitializer.cpp
@@ -17,7 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 
 #include <libyul/optimiser/VarDeclInitializer.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Visitor.h>
diff --git a/libyul/optimiser/VarDeclInitializer.h b/libyul/optimiser/VarDeclInitializer.h
index 3d2d51c34..4060878b1 100644
--- a/libyul/optimiser/VarDeclInitializer.h
+++ b/libyul/optimiser/VarDeclInitializer.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>
 
diff --git a/libyul/optimiser/VarNameCleaner.cpp b/libyul/optimiser/VarNameCleaner.cpp
index 85ecece46..55fc71fd6 100644
--- a/libyul/optimiser/VarNameCleaner.cpp
+++ b/libyul/optimiser/VarNameCleaner.cpp
@@ -18,7 +18,7 @@
 
 #include <libyul/optimiser/VarNameCleaner.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 
 #include <algorithm>
diff --git a/libyul/optimiser/VarNameCleaner.h b/libyul/optimiser/VarNameCleaner.h
index 2c26cc7a6..7823e5716 100644
--- a/libyul/optimiser/VarNameCleaner.h
+++ b/libyul/optimiser/VarNameCleaner.h
@@ -19,7 +19,7 @@
 #pragma once
 
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/YulString.h>
 #include <libyul/optimiser/OptimiserStep.h>
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index bc598d3c2..a6f3f6ff9 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -30,6 +30,7 @@
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmPrinter.h>
 #include <libyul/AssemblyStack.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/backends/wasm/WasmDialect.h>
 
diff --git a/test/libyul/EwasmTranslationTest.cpp b/test/libyul/EwasmTranslationTest.cpp
index bf01b7765..fe3d42969 100644
--- a/test/libyul/EwasmTranslationTest.cpp
+++ b/test/libyul/EwasmTranslationTest.cpp
@@ -28,6 +28,7 @@
 #include <libyul/AsmParser.h>
 #include <libyul/AssemblyStack.h>
 #include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AST.h>
 #include <libyul/Object.h>
 
 #include <liblangutil/ErrorReporter.h>
diff --git a/test/libyul/Inliner.cpp b/test/libyul/Inliner.cpp
index 926e29811..6fc50ddc6 100644
--- a/test/libyul/Inliner.cpp
+++ b/test/libyul/Inliner.cpp
@@ -28,7 +28,7 @@
 #include <libyul/optimiser/FunctionHoister.h>
 #include <libyul/optimiser/FunctionGrouper.h>
 #include <libyul/AsmPrinter.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/libyul/Metrics.cpp b/test/libyul/Metrics.cpp
index 7ae9e44f5..e9a591b62 100644
--- a/test/libyul/Metrics.cpp
+++ b/test/libyul/Metrics.cpp
@@ -23,7 +23,7 @@
 #include <test/libyul/Common.h>
 
 #include <libyul/optimiser/Metrics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
index 5f947a6b3..6d40acdd4 100644
--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@@ -28,6 +28,7 @@
 #include <libyul/AsmPrinter.h>
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <liblangutil/Scanner.h>
 #include <liblangutil/ErrorReporter.h>
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index 75c59c180..5475818a3 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -24,7 +24,7 @@
 #include <test/tools/yulInterpreter/Interpreter.h>
 
 #include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libevmasm/Instruction.h>
 
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.h b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
index 3747a3fb1..25f9f2519 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.h
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <libsolutil/CommonData.h>
 
diff --git a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp b/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
index 10c8af230..afc2a111e 100644
--- a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
+++ b/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
@@ -24,7 +24,7 @@
 #include <test/tools/yulInterpreter/Interpreter.h>
 
 #include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libevmasm/Instruction.h>
 
diff --git a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.h b/test/tools/yulInterpreter/EwasmBuiltinInterpreter.h
index 24e85cf2a..1837f7509 100644
--- a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.h
+++ b/test/tools/yulInterpreter/EwasmBuiltinInterpreter.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <libsolutil/CommonData.h>
 #include <libsolutil/FixedHash.h>
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index c2fd9bff9..70cd9dc29 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -24,7 +24,7 @@
 #include <test/tools/yulInterpreter/EVMInstructionInterpreter.h>
 #include <test/tools/yulInterpreter/EwasmBuiltinInterpreter.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/Utilities.h>
 #include <libyul/backends/evm/EVMDialect.h>
diff --git a/test/tools/yulInterpreter/Interpreter.h b/test/tools/yulInterpreter/Interpreter.h
index 0f2fa5c7e..42c8c9138 100644
--- a/test/tools/yulInterpreter/Interpreter.h
+++ b/test/tools/yulInterpreter/Interpreter.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmData.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 
 #include <libsolutil/FixedHash.h>
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index 3be13ec01..1c3e0740a 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -26,7 +26,7 @@
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
 #include <libsolidity/parsing/Parser.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/AsmParser.h>
 #include <libyul/AsmPrinter.h>
 #include <libyul/Object.h>
diff --git a/test/yulPhaser/Program.cpp b/test/yulPhaser/Program.cpp
index b7dd1f8ed..8aa2479a2 100644
--- a/test/yulPhaser/Program.cpp
+++ b/test/yulPhaser/Program.cpp
@@ -24,7 +24,6 @@
 #include <libyul/optimiser/BlockFlattener.h>
 #include <libyul/optimiser/Metrics.h>
 #include <libyul/optimiser/StructuralSimplifier.h>
-#include <libyul/AsmData.h>
 
 #include <libsolutil/CommonIO.h>
 #include <libsolutil/JSON.h>
diff --git a/tools/solidityUpgrade/Upgrade050.cpp b/tools/solidityUpgrade/Upgrade050.cpp
index 8e1a2f027..9c0ecd656 100644
--- a/tools/solidityUpgrade/Upgrade050.cpp
+++ b/tools/solidityUpgrade/Upgrade050.cpp
@@ -20,7 +20,7 @@
 
 #include <libsolidity/analysis/OverrideChecker.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <regex>
 
diff --git a/tools/solidityUpgrade/Upgrade060.cpp b/tools/solidityUpgrade/Upgrade060.cpp
index a5d2f0af6..c614f89d0 100644
--- a/tools/solidityUpgrade/Upgrade060.cpp
+++ b/tools/solidityUpgrade/Upgrade060.cpp
@@ -20,7 +20,7 @@
 
 #include <libsolidity/analysis/OverrideChecker.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <regex>
 
diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
index e254ca241..0c897e566 100644
--- a/tools/yulPhaser/Program.cpp
+++ b/tools/yulPhaser/Program.cpp
@@ -27,6 +27,7 @@
 #include <libyul/AsmJsonConverter.h>
 #include <libyul/AsmParser.h>
 #include <libyul/AsmPrinter.h>
+#include <libyul/AST.h>
 #include <libyul/ObjectParser.h>
 #include <libyul/YulString.h>
 #include <libyul/backends/evm/EVMDialect.h>
diff --git a/tools/yulPhaser/Program.h b/tools/yulPhaser/Program.h
index 12026805b..8eec71be2 100644
--- a/tools/yulPhaser/Program.h
+++ b/tools/yulPhaser/Program.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include <libyul/optimiser/NameDispenser.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <liblangutil/Exceptions.h>