diff --git a/os/hal/platforms/STM32/i2c_lld.c b/os/hal/platforms/STM32/i2c_lld.c
index f00dfdc89..ac80ba1fb 100644
--- a/os/hal/platforms/STM32/i2c_lld.c
+++ b/os/hal/platforms/STM32/i2c_lld.c
@@ -32,7 +32,6 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "i2c_lld.h"
 
 #if HAL_USE_I2C || defined(__DOXYGEN__)
 
@@ -295,7 +294,6 @@ static uint32_t i2c_get_event(I2CDriver *i2cp) {
   return (I2C_EV_MASK & (regSR1 | (regSR2 << 16)));
 }
 
-
 /**
  * @brief   I2C shared ISR code.
  *
diff --git a/os/hal/platforms/STM32/i2c_lld.h b/os/hal/platforms/STM32/i2c_lld.h
index f2589775d..c3b6c7bba 100644
--- a/os/hal/platforms/STM32/i2c_lld.h
+++ b/os/hal/platforms/STM32/i2c_lld.h
@@ -370,6 +370,9 @@ struct I2CDriver{
   Semaphore                 semaphore;
 #endif
 #endif /* I2C_USE_MUTUAL_EXCLUSION */
+#if defined(I2C_DRIVER_EXT_FIELDS)
+  I2C_DRIVER_EXT_FIELDS
+#endif
   /* End of the mandatory fields.*/
   /**
    * @brief   Thread waiting for I/O completion.