diff --git a/Sts1CobcSw/FramSections/CMakeLists.txt b/Sts1CobcSw/FramSections/CMakeLists.txt
index 537b0b6b..1b09a4dd 100644
--- a/Sts1CobcSw/FramSections/CMakeLists.txt
+++ b/Sts1CobcSw/FramSections/CMakeLists.txt
@@ -3,6 +3,4 @@ target_link_libraries(
                                       Sts1CobcSw_Serial Sts1CobcSw_Utility
 )
 
-if(CMAKE_SYSTEM_NAME STREQUAL Generic)
-    target_link_libraries(Sts1CobcSw_FramSections PRIVATE TelemetryRecord.cpp TelemetryMemory.cpp)
-endif()
+target_sources(Sts1CobcSw_FramSections PRIVATE TelemetryRecord.cpp TelemetryMemory.cpp)
diff --git a/Sts1CobcSw/FramSections/TelemetryMemory.hpp b/Sts1CobcSw/FramSections/TelemetryMemory.hpp
index b37956cb..afab0eb4 100644
--- a/Sts1CobcSw/FramSections/TelemetryMemory.hpp
+++ b/Sts1CobcSw/FramSections/TelemetryMemory.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
 
+#include <Sts1CobcSw/FramSections/FramLayout.hpp>
 #include <Sts1CobcSw/FramSections/FramRingArray.hpp>
+#include <Sts1CobcSw/FramSections/Subsections.hpp>
 #include <Sts1CobcSw/FramSections/TelemetryRecord.hpp>
 
 #include <cstdint>