diff --git a/hal_st/std_periph/CMakeLists.txt b/hal_st/std_periph/CMakeLists.txt
index a5c44949..d980195f 100644
--- a/hal_st/std_periph/CMakeLists.txt
+++ b/hal_st/std_periph/CMakeLists.txt
@@ -10,16 +10,25 @@ add_subdirectory(atomic)
 add_library(hal_st.std_periph ${HALST_EXCLUDE_FROM_ALL} INTERFACE)
 install(TARGETS hal_st.std_periph EXPORT halStTargets)
 
+if("${TARGET_MCU_FAMILY}" STREQUAL stm32f0xx)
+    target_link_libraries(hal_st.std_periph INTERFACE hal_st.atomic)
+    target_link_libraries(hal_st.std_periph INTERFACE hal_st.std_periph_stm32wbxx)
+elseif("${TARGET_MCU_FAMILY}" STREQUAL stm32f2xx)
+    target_link_libraries(hal_st.std_periph INTERFACE hal_st.std_periph_stm32f2xx)
+elseif("${TARGET_MCU_FAMILY}" STREQUAL stm32f3xx)
+    target_link_libraries(hal_st.std_periph INTERFACE hal_st.std_periph_stm32f3xx)
+elseif("${TARGET_MCU_FAMILY}" STREQUAL stm32f4xx)
+    target_link_libraries(hal_st.std_periph INTERFACE hal_st.std_periph_stm32f4xx)
+elseif("${TARGET_MCU_FAMILY}" STREQUAL stm32f7xx)
+    target_link_libraries(hal_st.std_periph INTERFACE hal_st.std_periph_stm32f7xx)
+elseif("${TARGET_MCU_FAMILY}" STREQUAL stm32wbxx)
+    target_link_libraries(hal_st.std_periph INTERFACE hal_st.std_periph_stm32wbxx)
+elseif(EMIL_HOST_BUILD)
+    target_link_libraries(hal_st.std_periph INTERFACE hal_st.cmsis_windows_stub)
+endif()
+
 target_link_libraries(hal_st.std_periph INTERFACE
-    $<$<STREQUAL:${TARGET_MCU_FAMILY},stm32f0xx>:hal_st.atomic>
-    $<$<STREQUAL:${TARGET_MCU_FAMILY},stm32f0xx>:hal_st.std_periph_stm32f0xx>
-    $<$<STREQUAL:${TARGET_MCU_FAMILY},stm32f2xx>:hal_st.std_periph_stm32f2xx>
-    $<$<STREQUAL:${TARGET_MCU_FAMILY},stm32f3xx>:hal_st.std_periph_stm32f3xx>
-    $<$<STREQUAL:${TARGET_MCU_FAMILY},stm32f4xx>:hal_st.std_periph_stm32f4xx>
-    $<$<STREQUAL:${TARGET_MCU_FAMILY},stm32f7xx>:hal_st.std_periph_stm32f7xx>
-    $<$<STREQUAL:${TARGET_MCU_FAMILY},stm32wbxx>:hal_st.std_periph_stm32wbxx>
     $<TARGET_OBJECTS:hal_st.startup>
-    $<$<BOOL:${EMIL_HOST_BUILD}>:hal_st.cmsis_windows_stub>
 )
 
 add_library(hal_st.default_linker_scripts INTERFACE)
diff --git a/hal_st/stm32fxxx/CMakeLists.txt b/hal_st/stm32fxxx/CMakeLists.txt
index 42dc54a9..d2f40a90 100644
--- a/hal_st/stm32fxxx/CMakeLists.txt
+++ b/hal_st/stm32fxxx/CMakeLists.txt
@@ -60,6 +60,8 @@ target_sources(hal_st.stm32fxxx PRIVATE
     SpiDataSizeConfiguratorStm.hpp
     $<$<NOT:$<STREQUAL:${TARGET_MCU},stm32wb55>>:SingleSpeedQuadSpiStmDma.cpp>
     $<$<NOT:$<STREQUAL:${TARGET_MCU},stm32wb55>>:SingleSpeedQuadSpiStmDma.hpp>
+    SpiMasterStm.cpp
+    SpiMasterStm.hpp
     $<$<NOT:$<STREQUAL:${TARGET_MCU},stm32wb55>>:SpiMasterStmDma.cpp>
     $<$<NOT:$<STREQUAL:${TARGET_MCU},stm32wb55>>:SpiMasterStmDma.hpp>
     $<$<NOT:$<STREQUAL:${TARGET_MCU},stm32wb55>>:SpiSlaveStmDma.cpp>