diff --git a/mpact/sim/generic/operand_interface.h b/mpact/sim/generic/operand_interface.h
index b71260a..60714f8 100644
--- a/mpact/sim/generic/operand_interface.h
+++ b/mpact/sim/generic/operand_interface.h
@@ -98,7 +98,7 @@
   virtual DataBuffer *CopyDataBuffer() = 0;
   // Returns the latency associated with the destination operand.
   virtual int latency() const = 0;
-  // Return a pointer to the object instance that implmements the state in
+  // Return a pointer to the object instance that implements the state in
   // question (or nullptr if no such object "makes sense").
   virtual std::any GetObject() const = 0;
   // Returns the order of the destination operand (size in each dimension).
diff --git a/mpact/sim/generic/state_item_base.h b/mpact/sim/generic/state_item_base.h
index 15913a9..6ca3df4 100644
--- a/mpact/sim/generic/state_item_base.h
+++ b/mpact/sim/generic/state_item_base.h
@@ -20,7 +20,6 @@
 
 #include "absl/strings/string_view.h"
 #include "mpact/sim/generic/data_buffer.h"
-#include "mpact/sim/generic/operand_interface.h"
 
 namespace mpact {
 namespace sim {