diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat
index 258a9ea054..59258189a7 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat
@@ -36,7 +36,6 @@ SERIAL_ORDER OTG1 USART1 USART2 USART3 UART4 EMPTY USART6 UART7
 # buzzer
 PC13 BUZZER OUTPUT LOW PULLDOWN GPIO(80)
 define HAL_BUZZER_PIN 80
-define AP_NOTIFY_TONEALARM_ENABLED 1
 
 # PA10 IO-debug-console
 PA11 OTG_FS_DM OTG1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat
index a28f83b8ee..32ee577be1 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat
@@ -36,7 +36,6 @@ SERIAL_ORDER OTG1 USART1 USART2 USART3 UART4 UART5 USART6 UART7 UART8
 # buzzer
 PE3 BUZZER OUTPUT LOW PULLDOWN GPIO(80)
 define HAL_BUZZER_PIN 80
-define AP_NOTIFY_TONEALARM_ENABLED 1
 
 # PA10 IO-debug-console
 PA11 OTG_FS_DM OTG1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/RADIX2HD/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/RADIX2HD/hwdef.dat
index b74ee1163c..879f86ce33 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/RADIX2HD/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/RADIX2HD/hwdef.dat
@@ -137,7 +137,6 @@ PA3 TIM5_CH4 TIM5 PWM(11) GPIO(60)
 # Buzzer pin
 PE4 BUZZER OUTPUT LOW PULLDOWN GPIO(80)
 define HAL_BUZZER_PIN 80
-define AP_NOTIFY_TONEALARM_ENABLED 1
 
 # LEDs
 PE5 LED_RED OUTPUT HIGH OPENDRAIN GPIO(10)
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat
index 1af2d6a364..dff4bd5cae 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat
@@ -35,7 +35,6 @@ SERIAL_ORDER OTG1 USART1 USART2 USART3 UART4 UART5 USART6 UART7 UART8
 # buzzer
 PB3 BUZZER OUTPUT LOW PULLDOWN GPIO(80)
 define HAL_BUZZER_PIN 80
-define AP_NOTIFY_TONEALARM_ENABLED 1
 
 # USB
 PA11 OTG_FS_DM OTG1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/TBS_LUCID_H7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/TBS_LUCID_H7/hwdef.dat
index 614741e8a1..1745117699 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/TBS_LUCID_H7/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/TBS_LUCID_H7/hwdef.dat
@@ -161,7 +161,6 @@ PA8 TIM1_CH1 TIM1 PWM(13) GPIO(62) # for WS2812 LED
 # Beeper
 PA15 BUZZER OUTPUT GPIO(32) LOW
 define HAL_BUZZER_PIN 32
-define AP_NOTIFY_TONEALARM_ENABLED 1
 
 # microSD support
 PC8 SDMMC1_D0 SDMMC1