diff --git a/libyul/optimiser/CallGraphGenerator.cpp b/libyul/optimiser/CallGraphGenerator.cpp
index 85fb1c66c..76f5220c8 100644
--- a/libyul/optimiser/CallGraphGenerator.cpp
+++ b/libyul/optimiser/CallGraphGenerator.cpp
@@ -22,8 +22,6 @@
 #include <libyul/AsmData.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
 
-#include <libevmasm/Instruction.h>
-
 #include <stack>
 
 using namespace std;
diff --git a/libyul/optimiser/NameDispenser.cpp b/libyul/optimiser/NameDispenser.cpp
index cfc7fdcb9..ec091b2d7 100644
--- a/libyul/optimiser/NameDispenser.cpp
+++ b/libyul/optimiser/NameDispenser.cpp
@@ -24,10 +24,8 @@
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/AsmData.h>
 #include <libyul/Dialect.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AsmParser.h>
 
-#include <libevmasm/Instruction.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 using namespace solidity;
@@ -61,7 +59,5 @@ bool NameDispenser::illegalName(YulString _name)
 {
 	if (_name.empty() || m_usedNames.count(_name) || m_dialect.builtin(_name))
 		return true;
-	if (dynamic_cast<EVMDialect const*>(&m_dialect))
-		return Parser::instructions().count(_name.str());
 	return false;
 }
diff --git a/libyul/optimiser/VarNameCleaner.cpp b/libyul/optimiser/VarNameCleaner.cpp
index 15d215f2c..edea33d2b 100644
--- a/libyul/optimiser/VarNameCleaner.cpp
+++ b/libyul/optimiser/VarNameCleaner.cpp
@@ -19,8 +19,7 @@
 #include <libyul/optimiser/VarNameCleaner.h>
 #include <libyul/AsmData.h>
 #include <libyul/Dialect.h>
-#include <libyul/AsmParser.h>
-#include <libyul/backends/evm/EVMDialect.h>
+
 #include <algorithm>
 #include <cctype>
 #include <climits>
@@ -113,8 +112,6 @@ bool VarNameCleaner::isUsedName(YulString const& _name) const
 {
 	if (_name.empty() || m_dialect.builtin(_name) || m_usedNames.count(_name))
 		return true;
-	if (dynamic_cast<EVMDialect const*>(&m_dialect))
-		return Parser::instructions().count(_name.str());
 	return false;
 }