diff --git a/targets/TARGET_STM/TARGET_STM32L4/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/CMakeLists.txt
index 403089b019..0642e934d0 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L4/CMakeLists.txt
@@ -13,6 +13,7 @@ add_subdirectory(TARGET_STM32L496xG EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_STM32L4R5xI EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_STM32L4R9xI EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_STM32L4S5xI EXCLUDE_FROM_ALL)
+add_subdirectory(STM32Cube_FW EXCLUDE_FROM_ALL)
 
 add_library(mbed-stm32l4 INTERFACE)
 
@@ -32,5 +33,4 @@ target_include_directories(mbed-stm32l4
         .
 )
 
-add_subdirectory(STM32Cube_FW EXCLUDE_FROM_ALL)
 target_link_libraries(mbed-stm32l4 INTERFACE mbed-stm mbed-stm32l4cube-fw)
diff --git a/targets/TARGET_STM/TARGET_STM32L4/STM32Cube_FW/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/STM32Cube_FW/CMakeLists.txt
index 27652b1b34..1459a87c0f 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/STM32Cube_FW/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L4/STM32Cube_FW/CMakeLists.txt
@@ -5,6 +5,109 @@ add_library(mbed-stm32l4cube-fw INTERFACE)
 
 target_sources(mbed-stm32l4cube-fw
     INTERFACE
+        STM32L4xx_HAL_Driver/Legacy/stm32l4xx_hal_can_legacy.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_adc.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_adc_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_can.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_comp.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_cortex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_crc.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_crc_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_cryp.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_cryp_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_dac.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_dac_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_dcmi.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_dfsdm.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_dfsdm_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_dma.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_dma2d.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_dma_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_dsi.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_exti.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_firewall.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_flash.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_flash_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_flash_ramfunc.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_gfxmmu.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_gpio.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_hash.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_hash_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_hcd.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_i2c.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_i2c_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_irda.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_iwdg.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_lcd.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_lptim.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_ltdc.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_ltdc_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_mmc.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_mmc_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_nand.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_nor.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_opamp.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_opamp_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_ospi.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_pcd.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_pcd_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_pka.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_pssi.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_pwr.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_pwr_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_qspi.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_rcc.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_rcc_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_rng.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_rng_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_rtc.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_rtc_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_sai.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_sai_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_sd.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_sd_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_smartcard.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_smartcard_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_smbus.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_spi.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_spi_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_sram.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_swpmi.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_tim.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_tim_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_tsc.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_uart.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_uart_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_usart.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_usart_ex.c
+        STM32L4xx_HAL_Driver/stm32l4xx_hal_wwdg.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_adc.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_comp.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_crc.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_crs.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_dac.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_dma.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_dma2d.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_exti.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_fmc.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_gpio.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_i2c.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_lptim.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_lpuart.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_opamp.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_pka.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_pwr.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_rcc.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_rng.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_rtc.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_sdmmc.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_spi.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_swpmi.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_tim.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_usart.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_usb.c
+        STM32L4xx_HAL_Driver/stm32l4xx_ll_utils.c
         system_stm32l4xx.c
 )
 
@@ -12,8 +115,6 @@ target_include_directories(mbed-stm32l4cube-fw
     INTERFACE
         .
         CMSIS
+        STM32L4xx_HAL_Driver
+        STM32L4xx_HAL_Driver/Legacy
 )
-
-add_subdirectory(STM32L4xx_HAL_Driver EXCLUDE_FROM_ALL)
-
-target_link_libraries(mbed-stm32l4cube-fw INTERFACE mbed-stm32l4xx-hal-driver)
diff --git a/targets/TARGET_STM/TARGET_STM32L4/STM32Cube_FW/STM32L4xx_HAL_Driver/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/STM32Cube_FW/STM32L4xx_HAL_Driver/CMakeLists.txt
deleted file mode 100644
index 5db8973e8c..0000000000
--- a/targets/TARGET_STM/TARGET_STM32L4/STM32Cube_FW/STM32L4xx_HAL_Driver/CMakeLists.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(mbed-stm32l4xx-hal-driver INTERFACE)
-
-target_include_directories(mbed-stm32l4xx-hal-driver
-    INTERFACE
-        .
-)
-
-target_sources(mbed-stm32l4xx-hal-driver
-    INTERFACE
-        stm32l4xx_hal_adc.c
-        stm32l4xx_hal_adc_ex.c
-        stm32l4xx_hal.c
-        stm32l4xx_hal_can.c
-        stm32l4xx_hal_comp.c
-        stm32l4xx_hal_cortex.c
-        stm32l4xx_hal_crc.c
-        stm32l4xx_hal_crc_ex.c
-        stm32l4xx_hal_cryp.c
-        stm32l4xx_hal_cryp_ex.c
-        stm32l4xx_hal_dac.c
-        stm32l4xx_hal_dac_ex.c
-        stm32l4xx_hal_dcmi.c
-        stm32l4xx_hal_dfsdm.c
-        stm32l4xx_hal_dfsdm_ex.c
-        stm32l4xx_hal_dma2d.c
-        stm32l4xx_hal_dma.c
-        stm32l4xx_hal_dma_ex.c
-        stm32l4xx_hal_dsi.c
-        stm32l4xx_hal_exti.c
-        stm32l4xx_hal_firewall.c
-        stm32l4xx_hal_flash.c
-        stm32l4xx_hal_flash_ex.c
-        stm32l4xx_hal_flash_ramfunc.c
-        stm32l4xx_hal_gfxmmu.c
-        stm32l4xx_hal_gpio.c
-        stm32l4xx_hal_hash.c
-        stm32l4xx_hal_hash_ex.c
-        stm32l4xx_hal_hcd.c
-        stm32l4xx_hal_i2c.c
-        stm32l4xx_hal_i2c_ex.c
-        stm32l4xx_hal_irda.c
-        stm32l4xx_hal_iwdg.c
-        stm32l4xx_hal_lcd.c
-        stm32l4xx_hal_lptim.c
-        stm32l4xx_hal_ltdc.c
-        stm32l4xx_hal_ltdc_ex.c
-        stm32l4xx_hal_mmc.c
-        stm32l4xx_hal_mmc_ex.c
-        stm32l4xx_hal_nand.c
-        stm32l4xx_hal_nor.c
-        stm32l4xx_hal_opamp.c
-        stm32l4xx_hal_opamp_ex.c
-        stm32l4xx_hal_ospi.c
-        stm32l4xx_hal_pcd.c
-        stm32l4xx_hal_pcd_ex.c
-        stm32l4xx_hal_pka.c
-        stm32l4xx_hal_pssi.c
-        stm32l4xx_hal_pwr.c
-        stm32l4xx_hal_pwr_ex.c
-        stm32l4xx_hal_qspi.c
-        stm32l4xx_hal_rcc.c
-        stm32l4xx_hal_rcc_ex.c
-        stm32l4xx_hal_rng.c
-        stm32l4xx_hal_rng_ex.c
-        stm32l4xx_hal_rtc.c
-        stm32l4xx_hal_rtc_ex.c
-        stm32l4xx_hal_sai.c
-        stm32l4xx_hal_sai_ex.c
-        stm32l4xx_hal_sd.c
-        stm32l4xx_hal_sd_ex.c
-        stm32l4xx_hal_smartcard.c
-        stm32l4xx_hal_smartcard_ex.c
-        stm32l4xx_hal_smbus.c
-        stm32l4xx_hal_spi.c
-        stm32l4xx_hal_spi_ex.c
-        stm32l4xx_hal_sram.c
-        stm32l4xx_hal_swpmi.c
-        stm32l4xx_hal_tim.c
-        stm32l4xx_hal_tim_ex.c
-        stm32l4xx_hal_tsc.c
-        stm32l4xx_hal_uart.c
-        stm32l4xx_hal_uart_ex.c
-        stm32l4xx_hal_usart.c
-        stm32l4xx_hal_usart_ex.c
-        stm32l4xx_hal_wwdg.c
-        stm32l4xx_ll_adc.c
-        stm32l4xx_ll_comp.c
-        stm32l4xx_ll_crc.c
-        stm32l4xx_ll_crs.c
-        stm32l4xx_ll_dac.c
-        stm32l4xx_ll_dma2d.c
-        stm32l4xx_ll_dma.c
-        stm32l4xx_ll_exti.c
-        stm32l4xx_ll_fmc.c
-        stm32l4xx_ll_gpio.c
-        stm32l4xx_ll_i2c.c
-        stm32l4xx_ll_lptim.c
-        stm32l4xx_ll_lpuart.c
-        stm32l4xx_ll_opamp.c
-        stm32l4xx_ll_pka.c
-        stm32l4xx_ll_pwr.c
-        stm32l4xx_ll_rcc.c
-        stm32l4xx_ll_rng.c
-        stm32l4xx_ll_rtc.c
-        stm32l4xx_ll_sdmmc.c
-        stm32l4xx_ll_spi.c
-        stm32l4xx_ll_swpmi.c
-        stm32l4xx_ll_tim.c
-        stm32l4xx_ll_usart.c
-        stm32l4xx_ll_usb.c
-        stm32l4xx_ll_utils.c
-)
-add_subdirectory(Legacy EXCLUDE_FROM_ALL)
-target_link_libraries(mbed-stm32l4xx-hal-driver INTERFACE mbed-stm32l4xx-legacy-hal-driver)
diff --git a/targets/TARGET_STM/TARGET_STM32L4/STM32Cube_FW/STM32L4xx_HAL_Driver/Legacy/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/STM32Cube_FW/STM32L4xx_HAL_Driver/Legacy/CMakeLists.txt
deleted file mode 100644
index dc2ef71906..0000000000
--- a/targets/TARGET_STM/TARGET_STM32L4/STM32Cube_FW/STM32L4xx_HAL_Driver/Legacy/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(mbed-stm32l4xx-legacy-hal-driver INTERFACE)
-
-target_include_directories(mbed-stm32l4xx-legacy-hal-driver
-    INTERFACE
-        .
-)
-
-target_sources(mbed-stm32l4xx-legacy-hal-driver
-    INTERFACE
-        stm32l4xx_hal_can_legacy.c
-)