diff --git a/lib/stm32/l4/Makefile b/lib/stm32/l4/Makefile
index dd834031..514128f6 100644
--- a/lib/stm32/l4/Makefile
+++ b/lib/stm32/l4/Makefile
@@ -35,29 +35,27 @@ TGT_CFLAGS      += $(DEBUG_FLAGS)
 TGT_CFLAGS	+= $(STANDARD_FLAGS)
 ARFLAGS		= rcs
 
-# Specific objs
-OBJS		= adc.o flash.o pwr.o rcc.o can.o
+OBJS += adc.o adc_common_v2.o adc_common_v2_multi.o
+OBJS += can.o
+OBJS += crc_common_all.o crc_v2.o
+OBJS += crs_common_all.o
+OBJS += dac_common_all.o
+OBJS += dma_common_l1f013.o dma_common_csel.o
+OBJS += exti_common_all.o
+OBJS += flash.o flash_common_all.o flash_common_f.o flash_common_idcache.o
+OBJS += gpio_common_all.o gpio_common_f0234.o
+OBJS += i2c_common_v2.o
+OBJS += iwdg_common_all.o
+OBJS += pwr.o
+OBJS += rcc.o rcc_common_all.o
+OBJS += rng_common_v1.o
+OBJS += rtc_common_l1f024.o
+OBJS += spi_common_all.o spi_common_v2.o
+OBJS += timer_common_all.o
+OBJS += usart_common_all.o usart_common_v2.o
 
-# common/shared objs
-OBJS            += rcc_common_all.o
-OBJS            += gpio_common_all.o gpio_common_f0234.o
-OBJS            += exti_common_all.o
-OBJS            += adc_common_v2.o adc_common_v2_multi.o
-OBJS            += crc_common_all.o crc_v2.o
-OBJS            += crs_common_all.o
-OBJS            += flash_common_all.o flash_common_f.o flash_common_idcache.o
-OBJS            += rng_common_v1.o
-OBJS            += timer_common_all.o
-OBJS            += i2c_common_v2.o
-OBJS            += usart_common_all.o usart_common_v2.o
-OBJS            += dma_common_l1f013.o dma_common_csel.o
-OBJS            += iwdg_common_all.o
-OBJS            += rtc_common_l1f024.o
-OBJS            += spi_common_all.o spi_common_v2.o
-OBJS            += dac_common_all.o
-
-OBJS            += usb.o usb_control.o usb_standard.o usb_msc.o
-OBJS            += st_usbfs_core.o st_usbfs_v2.o
+OBJS += usb.o usb_control.o usb_standard.o usb_msc.o
+OBJS += st_usbfs_core.o st_usbfs_v2.o
 
 VPATH += ../../usb:../:../../cm3:../common
 VPATH += ../../ethernet