diff --git a/libraries/AP_HAL/AP_HAL_Boards.h b/libraries/AP_HAL/AP_HAL_Boards.h
index 1d94f75faf..a9560e014f 100644
--- a/libraries/AP_HAL/AP_HAL_Boards.h
+++ b/libraries/AP_HAL/AP_HAL_Boards.h
@@ -262,7 +262,7 @@
 #endif
 
 #ifndef HAL_WITH_MCU_MONITORING
-#define HAL_WITH_MCU_MONITORING defined(STM32H7) && STM32_HAS_ADC3
+#define HAL_WITH_MCU_MONITORING 0
 #endif
 
 #ifndef HAL_HNF_MAX_FILTERS
diff --git a/libraries/AP_HAL/board/chibios.h b/libraries/AP_HAL/board/chibios.h
index fdca5eb609..fa3e48511e 100644
--- a/libraries/AP_HAL/board/chibios.h
+++ b/libraries/AP_HAL/board/chibios.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <hwdef.h>
-#include <hal.h>
 
 #define HAL_BOARD_NAME "ChibiOS"
 
@@ -113,7 +112,7 @@
 #endif
 
 #ifndef HAL_DSHOT_ALARM
-#if !defined(HAL_BUILD_AP_PERIPH) && !defined(HAL_BOOTLOADER_BUILD) && HAL_USE_PWM == TRUE
+#if !defined(HAL_BUILD_AP_PERIPH) && !defined(HAL_BOOTLOADER_BUILD) && HAL_PWM_COUNT > 0
 #define HAL_DSHOT_ALARM 1
 #else
 #define HAL_DSHOT_ALARM 0