diff --git a/sim/BUILD b/sim/BUILD
index 1dff6db..7e7068b 100644
--- a/sim/BUILD
+++ b/sim/BUILD
@@ -36,6 +36,8 @@
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
         "@com_google_mpact-riscv//riscv:riscv_state",
+        "@com_google_mpact-sim//mpact/sim/generic:instruction",
+        "@com_google_mpact-sim//mpact/sim/util/memory",
     ],
 )
 
@@ -61,6 +63,7 @@
         "@com_google_absl//absl/numeric:bits",
         "@com_google_absl//absl/types:span",
         "@com_google_mpact-riscv//riscv:riscv_state",
+        "@com_google_mpact-sim//mpact/sim/generic:arch_state",
         "@com_google_mpact-sim//mpact/sim/generic:core",
         "@com_google_mpact-sim//mpact/sim/generic:instruction",
         "@com_google_mpact-sim//mpact/sim/generic:type_helpers",
@@ -127,6 +130,7 @@
         "@com_google_mpact-sim//mpact/sim/generic:arch_state",
         "@com_google_mpact-sim//mpact/sim/generic:core",
         "@com_google_mpact-sim//mpact/sim/generic:instruction",
+        "@com_google_mpact-sim//mpact/sim/generic:program_error",
         "@com_google_mpact-sim//mpact/sim/generic:type_helpers",
         "@com_google_mpact-sim//mpact/sim/util/memory",
     ],
diff --git a/sim/decoder.cc b/sim/decoder.cc
index 60cd156..030b21a 100644
--- a/sim/decoder.cc
+++ b/sim/decoder.cc
@@ -14,7 +14,15 @@
 
 #include "sim/decoder.h"
 
+#include "sim/kelvin_decoder.h"
+#include "sim/kelvin_encoding.h"
+#include "sim/kelvin_enums.h"
+#include "sim/kelvin_state.h"
+#include "riscv/riscv_state.h"
+#include "mpact/sim/generic/instruction.h"
+#include "mpact/sim/generic/program_error.h"
 #include "mpact/sim/generic/type_helpers.h"
+#include "mpact/sim/util/memory/memory_interface.h"
 
 namespace kelvin::sim {
 
diff --git a/sim/decoder.h b/sim/decoder.h
index a8ef8db..49b6fc2 100644
--- a/sim/decoder.h
+++ b/sim/decoder.h
@@ -21,10 +21,13 @@
 
 #include "sim/kelvin_decoder.h"
 #include "sim/kelvin_encoding.h"
+#include "sim/kelvin_enums.h"
 #include "sim/kelvin_state.h"
 #include "mpact/sim/generic/arch_state.h"
+#include "mpact/sim/generic/data_buffer.h"
 #include "mpact/sim/generic/decoder_interface.h"
 #include "mpact/sim/generic/instruction.h"
+#include "mpact/sim/generic/program_error.h"
 #include "mpact/sim/util/memory/memory_interface.h"
 
 namespace kelvin::sim {
diff --git a/sim/kelvin_state.cc b/sim/kelvin_state.cc
index c16b02d..a5c0ca3 100644
--- a/sim/kelvin_state.cc
+++ b/sim/kelvin_state.cc
@@ -23,6 +23,8 @@
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
+#include "riscv/riscv_state.h"
+#include "mpact/sim/util/memory/memory_interface.h"
 
 namespace kelvin::sim {
 
diff --git a/sim/kelvin_state.h b/sim/kelvin_state.h
index f2c26df..45357cc 100644
--- a/sim/kelvin_state.h
+++ b/sim/kelvin_state.h
@@ -27,6 +27,8 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/strings/string_view.h"
 #include "riscv/riscv_state.h"
+#include "mpact/sim/generic/instruction.h"
+#include "mpact/sim/util/memory/memory_interface.h"
 
 namespace kelvin::sim {
 
diff --git a/sim/kelvin_vector_memory_instructions.cc b/sim/kelvin_vector_memory_instructions.cc
index 405181b..775bb7b 100644
--- a/sim/kelvin_vector_memory_instructions.cc
+++ b/sim/kelvin_vector_memory_instructions.cc
@@ -23,6 +23,7 @@
 #include "riscv/riscv_state.h"
 #include "mpact/sim/generic/data_buffer.h"
 #include "mpact/sim/generic/instruction.h"
+#include "mpact/sim/generic/register.h"
 
 namespace kelvin::sim {
 
diff --git a/sim/test/BUILD b/sim/test/BUILD
index 09f53cc..a965726 100644
--- a/sim/test/BUILD
+++ b/sim/test/BUILD
@@ -60,7 +60,9 @@
         "@com_github_serge1_elfio//:elfio",
         "@com_google_absl//absl/log",
         "@com_google_absl//absl/log:check",
+        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
+        "@com_google_mpact-riscv//riscv:riscv_state",
         "@com_google_mpact-sim//mpact/sim/generic:instruction",
         "@com_google_mpact-sim//mpact/sim/util/memory",
         "@com_google_mpact-sim//mpact/sim/util/program_loader:elf_loader",
@@ -169,7 +171,9 @@
     deps = [
         ":kelvin_vector_instructions_test_base",
         "//sim:kelvin_instructions",
+        "//sim:kelvin_state",
         "@com_google_absl//absl/functional:bind_front",
+        "@com_google_absl//absl/random:distributions",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/types:span",
         "@com_google_googletest//:gtest_main",
diff --git a/sim/test/kelvin_decoder_test.cc b/sim/test/kelvin_decoder_test.cc
index 42f65b6..dae78c7 100644
--- a/sim/test/kelvin_decoder_test.cc
+++ b/sim/test/kelvin_decoder_test.cc
@@ -20,9 +20,12 @@
 #include "googletest/include/gtest/gtest.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
+#include "elfio/elf_types.hpp"
 #include "elfio/elfio.hpp"
 #include "elfio/elfio_section.hpp"
 #include "elfio/elfio_symbols.hpp"
+#include "riscv/riscv_state.h"
 #include "mpact/sim/generic/instruction.h"
 #include "mpact/sim/util/memory/flat_demand_memory.h"
 #include "mpact/sim/util/program_loader/elf_program_loader.h"
diff --git a/sim/test/kelvin_encoding_test.cc b/sim/test/kelvin_encoding_test.cc
index 54e2931..8ebd7ca 100644
--- a/sim/test/kelvin_encoding_test.cc
+++ b/sim/test/kelvin_encoding_test.cc
@@ -22,6 +22,7 @@
 #include "sim/kelvin_state.h"
 #include "googletest/include/gtest/gtest.h"
 #include "riscv/riscv_register.h"
+#include "riscv/riscv_state.h"
 #include "mpact/sim/generic/register.h"
 
 namespace {
diff --git a/sim/test/kelvin_vector_memory_instructions_test.cc b/sim/test/kelvin_vector_memory_instructions_test.cc
index 81a7c87..4c79c85 100644
--- a/sim/test/kelvin_vector_memory_instructions_test.cc
+++ b/sim/test/kelvin_vector_memory_instructions_test.cc
@@ -22,9 +22,11 @@
 #include <utility>
 #include <vector>
 
+#include "sim/kelvin_state.h"
 #include "sim/test/kelvin_vector_instructions_test_base.h"
 #include "googletest/include/gtest/gtest.h"
 #include "absl/functional/bind_front.h"
+#include "absl/random/distributions.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"