diff --git a/Sts1CobcSw/CobcSoftware/CommandParser.cpp b/Sts1CobcSw/CobcSoftware/CommandParser.cpp
index 1ffd8bf2..95719759 100644
--- a/Sts1CobcSw/CobcSoftware/CommandParser.cpp
+++ b/Sts1CobcSw/CobcSoftware/CommandParser.cpp
@@ -9,10 +9,9 @@
 
 #include <cinttypes>  // IWYU pragma: keep
 
+
 namespace sts1cobcsw
 {
-
-
 auto DispatchCommand(etl::vector<Byte, commandSize> const & command) -> void
 {
     auto gsCommandHeader =
diff --git a/Sts1CobcSw/CobcSoftware/FramEpsStartupTestThread.cpp b/Sts1CobcSw/CobcSoftware/FramEpsStartupTestThread.cpp
index a95f5360..b07335df 100644
--- a/Sts1CobcSw/CobcSoftware/FramEpsStartupTestThread.cpp
+++ b/Sts1CobcSw/CobcSoftware/FramEpsStartupTestThread.cpp
@@ -1,6 +1,8 @@
 #include <Sts1CobcSw/CobcSoftware/FramEpsStartupTestThread.hpp>
 #include <Sts1CobcSw/CobcSoftware/SpiStartupTestAndSupervisorThread.hpp>
 #include <Sts1CobcSw/CobcSoftware/ThreadPriorities.hpp>
+#include <Sts1CobcSw/FramSections/FramLayout.hpp>
+#include <Sts1CobcSw/FramSections/PersistentVariables.hpp>
 #include <Sts1CobcSw/Periphery/Eps.hpp>
 #include <Sts1CobcSw/Periphery/Fram.hpp>
 #include <Sts1CobcSw/Utility/Debug.hpp>
@@ -9,6 +11,7 @@
 
 #include <rodos_no_using_namespace.h>
 
+#include <algorithm>
 #include <array>
 
 
diff --git a/Tests/HardwareTests/CMakeLists.txt b/Tests/HardwareTests/CMakeLists.txt
index 35f1b367..38c8fd34 100644
--- a/Tests/HardwareTests/CMakeLists.txt
+++ b/Tests/HardwareTests/CMakeLists.txt
@@ -92,7 +92,13 @@ target_sources(
 )
 target_link_libraries(
     Sts1CobcSwTests_SpiSupervisor
-    PRIVATE rodos::rodos Sts1CobcSw_Periphery Sts1CobcSw_Utility Sts1CobcSw_Hal Sts1CobcSw_Serial
+    PRIVATE rodos::rodos
+            strong_type::strong_type
+            Sts1CobcSw_FramSections
+            Sts1CobcSw_Hal
+            Sts1CobcSw_Periphery
+            Sts1CobcSw_Serial
+            Sts1CobcSw_Utility
             Sts1CobcSwTests_RfLatchupDisablePin
 )
 add_watchdog_version_of(SpiSupervisor)