diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F439ZI/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F439ZI/CMakeLists.txt
index 0726441f58..605771d9ca 100644
--- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F439ZI/CMakeLists.txt
+++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F439ZI/CMakeLists.txt
@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-emac
-    PUBLIC
+    INTERFACE
         .
 )
 
 target_sources(mbed-emac
-    PRIVATE
+    INTERFACE
         stm32f4_eth_conf.c
 )
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/CMakeLists.txt
index c018f3d429..48674dbcf0 100644
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/CMakeLists.txt
@@ -1,39 +1,39 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-function(_mbed_get_assembly_stm32f439xi)
-    if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
-        set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f439xx.S)
-    elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-        set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32f439xx.S)
-    elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
-        set(STARTUP_FILE TOOLCHAIN_IAR/startup_stm32f439xx.S)
-    endif()
-    target_sources(mbed-core INTERFACE ${STARTUP_FILE})
-endfunction()
-
-function(_mbed_set_linker_file)
-    if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
-        set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_GCC_ARM/STM32F439ZI.ld)
-    elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-        set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_ARM/stm32f439xx.sct)
-    elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
-        set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_IAR/stm32f439xx_flash.icf)
-    endif()
-    set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${LINKER_FILE})
-endfunction()
-
-_mbed_get_assembly_stm32f439xi()
-_mbed_set_linker_file()
-
 if("NUCLEO_F439ZI" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_NUCLEO_F439ZI)
+    target_include_directories(mbed-core INTERFACE TARGET_NUCLEO_F439ZI)
+    set(PERIPHERALPINS_FILE TARGET_NUCLEO_F439ZI/PeripheralPins.c)
+    set(SYSTEM_CLOCK_FILE TARGET_NUCLEO_F439ZI/system_clock.c)
 elseif("WIO_3G" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_WIO_3G)
+    target_include_directories(mbed-core INTERFACE TARGET_WIO_3G)
+    set(PERIPHERALPINS_FILE TARGET_WIO_3G/PeripheralPins.c)
+    set(SYSTEM_CLOCK_FILE TARGET_WIO_3G/system_clock.c)
+    target_sources(mbed-core INTERFACE TARGET_WIO_3G/ONBOARD_QUECTEL_UG96.cpp)
 elseif("WIO_BG96" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_WIO_BG96)
+    target_include_directories(mbed-core INTERFACE TARGET_WIO_BG96)
+    set(PERIPHERALPINS_FILE TARGET_WIO_BG96/PeripheralPins.c)
+    set(SYSTEM_CLOCK_FILE TARGET_WIO_BG96/system_clock.c)
+    target_sources(mbed-core INTERFACE TARGET_WIO_BG96/ONBOARD_QUECTEL_BG96.cpp)
 endif()
 
+if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f439xx.S)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/STM32F439ZI.ld)
+elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
+    set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32f439xx.S)
+    set(LINKER_FILE TOOLCHAIN_ARM/stm32f439xx.sct)
+endif()
+
+set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
+target_sources(mbed-core
+    INTERFACE
+        ${PERIPHERALPINS_FILE}
+        ${STARTUP_FILE}
+        ${SYSTEM_CLOCK_FILE}
+)
+
 target_include_directories(mbed-core
     INTERFACE
         .
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_NUCLEO_F439ZI/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_NUCLEO_F439ZI/CMakeLists.txt
deleted file mode 100644
index 3a805bbdaa..0000000000
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_NUCLEO_F439ZI/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-target_sources(mbed-core
-    INTERFACE
-        PeripheralPins.c
-        system_clock.c
-)
-
-target_include_directories(mbed-core
-    INTERFACE
-        .
-)
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_3G/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_3G/CMakeLists.txt
deleted file mode 100644
index e24389aa75..0000000000
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_3G/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-target_sources(mbed-core
-    INTERFACE
-        ONBOARD_QUECTEL_UG96.cpp
-        PeripheralPins.c
-        system_clock.c
-)
-
-target_include_directories(mbed-core
-    INTERFACE
-        .
-)
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_BG96/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_BG96/CMakeLists.txt
deleted file mode 100644
index 25716b2fa4..0000000000
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_BG96/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-target_sources(mbed-core
-    INTERFACE
-        ONBOARD_QUECTEL_BG96.cpp
-        PeripheralPins.c
-        system_clock.c
-)
-
-target_include_directories(mbed-core
-    INTERFACE
-        .
-)