diff --git a/os/hal/include/hal_eeprom.h b/os/hal/include/hal_eeprom.h
index 6f53fb9c..25e03bda 100644
--- a/os/hal/include/hal_eeprom.h
+++ b/os/hal/include/hal_eeprom.h
@@ -29,7 +29,6 @@
 #ifndef HAL_EEPROM_H_
 #define HAL_EEPROM_H_
 
-#include "ch.h"
 #include "hal.h"
 
 #ifndef EEPROM_USE_EE25XX
diff --git a/os/hal/include/hal_timcap.h b/os/hal/include/hal_timcap.h
index 61c7fc5d..a5db7d85 100644
--- a/os/hal/include/hal_timcap.h
+++ b/os/hal/include/hal_timcap.h
@@ -29,7 +29,6 @@
 #ifndef HAL_TIMCAP_H_
 #define HAL_TIMCAP_H_
 
-#include "ch.h"
 #include "hal.h"
 
 #if (HAL_USE_TIMCAP == TRUE) || defined(__DOXYGEN__)
diff --git a/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.c b/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.c
index c55fae22..37a48fd9 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.c
+++ b/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.c
@@ -31,7 +31,6 @@
  * @{
  */
 
-#include "ch.h"
 #include "hal.h"
 
 #if HAL_USE_TIMCAP || defined(__DOXYGEN__)
diff --git a/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.h b/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.h
index 643798a7..621313a7 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.h
+++ b/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.h
@@ -25,7 +25,6 @@
 #ifndef HAL_TIMCAP_LLD_H_
 #define HAL_TIMCAP_LLD_H_
 
-#include "ch.h"
 #include "hal.h"
 #include "stm32_tim.h"
 
diff --git a/testhal/STM32/STM32F3xx/EEProm/halconf.h b/testhal/STM32/STM32F3xx/EEProm/halconf.h
index 53edc1bb..3c5601ea 100644
--- a/testhal/STM32/STM32F3xx/EEProm/halconf.h
+++ b/testhal/STM32/STM32F3xx/EEProm/halconf.h
@@ -167,7 +167,7 @@
  * @brief   Enables the WDG subsystem.
  */
 #if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
-#define HAL_USE_WDG                 TRUE
+#define HAL_USE_WDG                 FALSE
 #endif
 
 /*===========================================================================*/