diff --git a/mpact/sim/generic/fifo.cc b/mpact/sim/generic/fifo.cc
index a4cacf5..7b543ac 100644
--- a/mpact/sim/generic/fifo.cc
+++ b/mpact/sim/generic/fifo.cc
@@ -18,6 +18,10 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
+#include "mpact/sim/generic/arch_state.h"
+#include "mpact/sim/generic/component.h"
+#include "mpact/sim/generic/data_buffer.h"
+#include "mpact/sim/generic/state_item_base.h"
 
 namespace mpact {
 namespace sim {
@@ -38,10 +42,9 @@
 }
 
 FifoBase::~FifoBase() {
-  for (auto ptr : fifo_) {
-    ptr->DecRef();
+  while (Available() > 0) {
+    Pop();
   }
-  fifo_.clear();
 }
 
 bool FifoBase::IsFull() const { return fifo_.size() + reserved_ >= capacity_; }
diff --git a/mpact/sim/generic/fifo.h b/mpact/sim/generic/fifo.h
index 0d22168..f5e841b 100644
--- a/mpact/sim/generic/fifo.h
+++ b/mpact/sim/generic/fifo.h
@@ -24,6 +24,7 @@
 #include <utility>
 #include <vector>
 
+#include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "mpact/sim/generic/arch_state.h"
 #include "mpact/sim/generic/component.h"