diff --git a/lib/stm32/f0/Makefile b/lib/stm32/f0/Makefile
index ba7ce654..8057f642 100644
--- a/lib/stm32/f0/Makefile
+++ b/lib/stm32/f0/Makefile
@@ -55,11 +55,10 @@ OBJS += timer_common_all.o timer_common_f0234.o
 OBJS += usart_common_all.o usart_common_v2.o
 
 OBJS += usb.o usb_control.o usb_standard.o usb_msc.o
-OBJS += usb_hid.o
+OBJS += usb_hid.o usb_bos.o usb_microsoft.o
 OBJS += usb_audio.o usb_cdc.o usb_midi.o
 OBJS += st_usbfs_core.o st_usbfs_v2.o
 
 VPATH += ../../usb:../:../../cm3:../common
 
 include ../../Makefile.include
-
diff --git a/lib/stm32/f2/Makefile b/lib/stm32/f2/Makefile
index 9e3203c2..fc8585c1 100644
--- a/lib/stm32/f2/Makefile
+++ b/lib/stm32/f2/Makefile
@@ -53,7 +53,7 @@ OBJS += timer_common_all.o timer_common_f0234.o timer_common_f24.o
 OBJS += usart_common_all.o usart_common_f124.o
 
 OBJS += usb.o usb_standard.o usb_control.o usb_msc.o
-OBJS += usb_hid.o
+OBJS += usb_hid.o usb_bos.o usb_microsoft.o
 OBJS += usb_audio.o usb_cdc.o usb_midi.o
 OBJS += usb_dwc_common.o usb_f107.o usb_f207.o
 
diff --git a/lib/stm32/f3/Makefile b/lib/stm32/f3/Makefile
index 359dc743..357b1645 100644
--- a/lib/stm32/f3/Makefile
+++ b/lib/stm32/f3/Makefile
@@ -55,7 +55,7 @@ OBJS += timer_common_all.o timer_common_f0234.o
 OBJS += usart_common_v2.o usart_common_all.o
 
 OBJS += usb.o usb_control.o usb_standard.o usb_msc.o
-OBJS += usb_hid.o
+OBJS += usb_hid.o usb_bos.o usb_microsoft.o
 OBJS += usb_audio.o usb_cdc.o usb_midi.o
 OBJS += st_usbfs_core.o st_usbfs_v1.o
 
diff --git a/lib/stm32/f4/Makefile b/lib/stm32/f4/Makefile
index 3f59a1eb..4e12811c 100644
--- a/lib/stm32/f4/Makefile
+++ b/lib/stm32/f4/Makefile
@@ -67,7 +67,7 @@ OBJS += usart_common_all.o usart_common_f124.o
 OBJS += quadspi_common_v1.o
 
 OBJS += usb.o usb_standard.o usb_control.o usb_msc.o
-OBJS += usb_hid.o
+OBJS += usb_hid.o usb_bos.o usb_microsoft.o
 OBJS += usb_audio.o usb_cdc.o usb_midi.o
 OBJS += usb_dwc_common.o usb_f107.o usb_f207.o
 
diff --git a/lib/stm32/f7/Makefile b/lib/stm32/f7/Makefile
index 33195130..c363fe50 100644
--- a/lib/stm32/f7/Makefile
+++ b/lib/stm32/f7/Makefile
@@ -71,7 +71,9 @@ OBJS += mac.o phy.o mac_stm32fxx7.o phy_ksz80x1.o
 OBJS += usb.o usb_standard.o usb_control.o
 OBJS += usb_audio.o
 OBJS += usb_cdc.o
+OBJS += usb_bos.o
 OBJS += usb_hid.o
+OBJS += usb_microsoft.o
 OBJS += usb_midi.o
 OBJS += usb_msc.o
 OBJS += usb_dwc_common.o usb_f107.o usb_f207.o
diff --git a/lib/stm32/g4/Makefile b/lib/stm32/g4/Makefile
index 8cf1c4a9..5c02cdcd 100644
--- a/lib/stm32/g4/Makefile
+++ b/lib/stm32/g4/Makefile
@@ -60,7 +60,9 @@ OBJS += usart_common_v2.o usart_common_all.o
 OBJS += usb.o usb_control.o usb_standard.o
 OBJS += usb_audio.o
 OBJS += usb_cdc.o
+OBJS += usb_bos.o
 OBJS += usb_hid.o
+OBJS += usb_microsoft.o
 OBJS += usb_midi.o
 OBJS += usb_msc.o
 OBJS += st_usbfs_core.o st_usbfs_v2.o
diff --git a/lib/stm32/l0/Makefile b/lib/stm32/l0/Makefile
index 1322690d..4a0819a4 100644
--- a/lib/stm32/l0/Makefile
+++ b/lib/stm32/l0/Makefile
@@ -54,11 +54,10 @@ OBJS += timer_common_all.o
 OBJS += usart_common_all.o usart_common_v2.o
 
 OBJS += usb.o usb_control.o usb_standard.o usb_msc.o
-OBJS += usb_hid.o
+OBJS += usb_hid.o usb_bos.o usb_microsoft.o
 OBJS += usb_audio.o usb_cdc.o usb_midi.o
 OBJS += st_usbfs_core.o st_usbfs_v2.o
 
 VPATH += ../../usb:../:../../cm3:../common
 
 include ../../Makefile.include
-
diff --git a/lib/stm32/l1/Makefile b/lib/stm32/l1/Makefile
index 55c92a89..0c98c201 100644
--- a/lib/stm32/l1/Makefile
+++ b/lib/stm32/l1/Makefile
@@ -53,11 +53,10 @@ OBJS += timer.o timer_common_all.o
 OBJS += usart_common_all.o usart_common_f124.o
 
 OBJS += usb.o usb_control.o usb_standard.o usb_msc.o
-OBJS += usb_hid.o
+OBJS += usb_hid.o usb_bos.o usb_microsoft.o
 OBJS += usb_audio.o usb_cdc.o usb_midi.o
 OBJS += st_usbfs_core.o st_usbfs_v1.o
 
 VPATH += ../../usb:../:../../cm3:../common
 
 include ../../Makefile.include
-
diff --git a/lib/stm32/l4/Makefile b/lib/stm32/l4/Makefile
index 54853ba3..4e0af528 100644
--- a/lib/stm32/l4/Makefile
+++ b/lib/stm32/l4/Makefile
@@ -57,7 +57,7 @@ OBJS += usart_common_all.o usart_common_v2.o
 OBJS += quadspi_common_v1.o
 
 OBJS += usb.o usb_control.o usb_standard.o usb_msc.o
-OBJS += usb_hid.o
+OBJS += usb_hid.o usb_bos.o usb_microsoft.o
 OBJS += usb_audio.o usb_cdc.o usb_midi.o
 OBJS += st_usbfs_core.o st_usbfs_v2.o
 OBJS += usb_dwc_common.o usb_f107.o