Forward declare Instruction enum in EVMVersion

liblangutil/EVMVersion.cpp

@@ -20,6 +20,7 @@
  */
 
 #include <liblangutil/EVMVersion.h>
+#include <libevmasm/Instruction.h>
 
 using namespace solidity;
 using namespace solidity::evmasm;

liblangutil/EVMVersion.h

@@ -21,14 +21,18 @@
 
 #pragma once
 
-#include <libevmasm/Instruction.h>
-
 #include <optional>
 #include <string>
 
 #include <boost/operators.hpp>
 
 
+namespace solidity::evmasm
+{
+/// Virtual machine bytecode instruction. Forward declared from libevmasm/Instruction.h
+enum class Instruction: uint8_t;
+}
+
 namespace solidity::langutil
 {
 

libyul/AsmAnalysis.cpp

@@ -35,6 +35,8 @@
 #include <libsolutil/StringUtils.h>
 #include <libsolutil/Visitor.h>
 
+#include <libevmasm/Instruction.h>
+
 #include <boost/algorithm/string.hpp>
 
 #include <fmt/format.h>

libyul/backends/evm/EVMCodeTransform.cpp

@@ -30,6 +30,8 @@
 
 #include <liblangutil/Exceptions.h>
 
+#include <libevmasm/Instruction.h>
+
 #include <range/v3/view/reverse.hpp>
 
 #include <range/v3/algorithm/max.hpp>

libyul/backends/evm/OptimizedEVMCodeTransform.cpp

@@ -23,6 +23,8 @@
 
 #include <libyul/Utilities.h>
 
+#include <libevmasm/Instruction.h>
+
 #include <libsolutil/Visitor.h>
 #include <libsolutil/cxx20.h>
 

libyul/optimiser/ReasoningBasedSimplifier.cpp

@@ -28,6 +28,8 @@
 
 #include <libsolutil/CommonData.h>
 
+#include <libevmasm/Instruction.h>
+
 #include <utility>
 #include <memory>