diff --git a/matter/efr32/efr32mg24/BRD2601B/autogen/sl_event_handler.c b/matter/efr32/efr32mg24/BRD2601B/autogen/sl_event_handler.c
index 0139871593..9a06731cec 100644
--- a/matter/efr32/efr32mg24/BRD2601B/autogen/sl_event_handler.c
+++ b/matter/efr32/efr32mg24/BRD2601B/autogen/sl_event_handler.c
@@ -18,9 +18,9 @@
 #include "sl_sleeptimer.h"
 #include "sl_mpu.h"
 #include "gpiointerrupt.h"
-#if defined(USE_TEMP_SENSOR)
+#if defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_i2cspm_instances.h"
-#endif
+#endif // defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_iostream_rtt.h"
 #include "sl_mbedtls.h"
 #include "nvm3_default.h"
diff --git a/matter/efr32/efr32mg24/BRD4186A/autogen/sl_event_handler.c b/matter/efr32/efr32mg24/BRD4186A/autogen/sl_event_handler.c
index fa1a1bee7a..b5f5fc0603 100644
--- a/matter/efr32/efr32mg24/BRD4186A/autogen/sl_event_handler.c
+++ b/matter/efr32/efr32mg24/BRD4186A/autogen/sl_event_handler.c
@@ -18,9 +18,9 @@
 #include "sl_sleeptimer.h"
 #include "sl_mpu.h"
 #include "gpiointerrupt.h"
-#if defined(USE_TEMP_SENSOR)
+#if defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_i2cspm_instances.h"
-#endif
+#endif // defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_iostream_rtt.h"
 #include "sl_mbedtls.h"
 #include "nvm3_default.h"
diff --git a/matter/efr32/efr32mg24/BRD4186C/autogen/sl_event_handler.c b/matter/efr32/efr32mg24/BRD4186C/autogen/sl_event_handler.c
index cd4c0b0b57..de5610e0a3 100644
--- a/matter/efr32/efr32mg24/BRD4186C/autogen/sl_event_handler.c
+++ b/matter/efr32/efr32mg24/BRD4186C/autogen/sl_event_handler.c
@@ -20,9 +20,9 @@
 #include "sl_sleeptimer.h"
 #include "sl_mpu.h"
 #include "gpiointerrupt.h"
-#if defined(USE_TEMP_SENSOR)
+#if defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_i2cspm_instances.h"
-#endif
+#endif // defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_iostream_rtt.h"
 #include "sl_mbedtls.h"
 #include "nvm3_default.h"
diff --git a/matter/efr32/efr32mg24/BRD4187A/autogen/sl_event_handler.c b/matter/efr32/efr32mg24/BRD4187A/autogen/sl_event_handler.c
index cd593d82ac..ea30482482 100644
--- a/matter/efr32/efr32mg24/BRD4187A/autogen/sl_event_handler.c
+++ b/matter/efr32/efr32mg24/BRD4187A/autogen/sl_event_handler.c
@@ -20,9 +20,9 @@
 #include "sl_sleeptimer.h"
 #include "sl_mpu.h"
 #include "gpiointerrupt.h"
-#if defined(USE_TEMP_SENSOR)
+#if defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_i2cspm_instances.h"
-#endif
+#endif // defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_iostream_rtt.h"
 #include "sl_mbedtls.h"
 #include "nvm3_default.h"
diff --git a/matter/efr32/efr32mg24/BRD4187C/autogen/sl_event_handler.c b/matter/efr32/efr32mg24/BRD4187C/autogen/sl_event_handler.c
index 09042da18e..792faa37e2 100644
--- a/matter/efr32/efr32mg24/BRD4187C/autogen/sl_event_handler.c
+++ b/matter/efr32/efr32mg24/BRD4187C/autogen/sl_event_handler.c
@@ -20,9 +20,9 @@
 #include "sl_sleeptimer.h"
 #include "sl_mpu.h"
 #include "gpiointerrupt.h"
-#if defined(USE_TEMP_SENSOR)
+#if defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_i2cspm_instances.h"
-#endif
+#endif // defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_iostream_rtt.h"
 #include "sl_mbedtls.h"
 #include "nvm3_default.h"
@@ -74,9 +74,9 @@ void sl_driver_init(void)
   sl_spidrv_init_instances();
 #endif
 #endif
-#if defined(USE_TEMP_SENSOR)
+#if defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
   sl_i2cspm_init_instances();
-#endif
+#endif // defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
   sl_simple_button_init_instances();
   sl_simple_led_init_instances();
 #if defined(CONFIG_ENABLE_UART)
diff --git a/matter/efr32/efr32mg26/BRD2608A/autogen/sl_event_handler.c b/matter/efr32/efr32mg26/BRD2608A/autogen/sl_event_handler.c
index cd4c0b0b57..de5610e0a3 100644
--- a/matter/efr32/efr32mg26/BRD2608A/autogen/sl_event_handler.c
+++ b/matter/efr32/efr32mg26/BRD2608A/autogen/sl_event_handler.c
@@ -20,9 +20,9 @@
 #include "sl_sleeptimer.h"
 #include "sl_mpu.h"
 #include "gpiointerrupt.h"
-#if defined(USE_TEMP_SENSOR)
+#if defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_i2cspm_instances.h"
-#endif
+#endif // defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_iostream_rtt.h"
 #include "sl_mbedtls.h"
 #include "nvm3_default.h"
diff --git a/matter/efr32/efr32mg26/BRD4116A/autogen/sl_event_handler.c b/matter/efr32/efr32mg26/BRD4116A/autogen/sl_event_handler.c
index cd4c0b0b57..de5610e0a3 100644
--- a/matter/efr32/efr32mg26/BRD4116A/autogen/sl_event_handler.c
+++ b/matter/efr32/efr32mg26/BRD4116A/autogen/sl_event_handler.c
@@ -20,9 +20,9 @@
 #include "sl_sleeptimer.h"
 #include "sl_mpu.h"
 #include "gpiointerrupt.h"
-#if defined(USE_TEMP_SENSOR)
+#if defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_i2cspm_instances.h"
-#endif
+#endif // defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_iostream_rtt.h"
 #include "sl_mbedtls.h"
 #include "nvm3_default.h"
diff --git a/matter/efr32/efr32mg26/BRD4117A/autogen/sl_event_handler.c b/matter/efr32/efr32mg26/BRD4117A/autogen/sl_event_handler.c
index cd4c0b0b57..de5610e0a3 100644
--- a/matter/efr32/efr32mg26/BRD4117A/autogen/sl_event_handler.c
+++ b/matter/efr32/efr32mg26/BRD4117A/autogen/sl_event_handler.c
@@ -20,9 +20,9 @@
 #include "sl_sleeptimer.h"
 #include "sl_mpu.h"
 #include "gpiointerrupt.h"
-#if defined(USE_TEMP_SENSOR)
+#if defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_i2cspm_instances.h"
-#endif
+#endif // defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_iostream_rtt.h"
 #include "sl_mbedtls.h"
 #include "nvm3_default.h"
diff --git a/matter/efr32/efr32mg26/BRD4118A/autogen/sl_event_handler.c b/matter/efr32/efr32mg26/BRD4118A/autogen/sl_event_handler.c
index cd4c0b0b57..de5610e0a3 100644
--- a/matter/efr32/efr32mg26/BRD4118A/autogen/sl_event_handler.c
+++ b/matter/efr32/efr32mg26/BRD4118A/autogen/sl_event_handler.c
@@ -20,9 +20,9 @@
 #include "sl_sleeptimer.h"
 #include "sl_mpu.h"
 #include "gpiointerrupt.h"
-#if defined(USE_TEMP_SENSOR)
+#if defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_i2cspm_instances.h"
-#endif
+#endif // defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_iostream_rtt.h"
 #include "sl_mbedtls.h"
 #include "nvm3_default.h"
diff --git a/matter/efr32/mgm24/BRD4316A/autogen/sl_event_handler.c b/matter/efr32/mgm24/BRD4316A/autogen/sl_event_handler.c
index 45c1855cb8..45622a2350 100644
--- a/matter/efr32/mgm24/BRD4316A/autogen/sl_event_handler.c
+++ b/matter/efr32/mgm24/BRD4316A/autogen/sl_event_handler.c
@@ -19,9 +19,9 @@
 #include "sl_sleeptimer.h"
 #include "sl_mpu.h"
 #include "gpiointerrupt.h"
-#ifdef USE_TEMP_SENSOR
+#if defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_i2cspm_instances.h"
-#endif
+#endif // defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_iostream_rtt.h"
 #include "sl_mbedtls.h"
 #include "nvm3_default.h"
diff --git a/matter/efr32/mgm24/BRD4317A/autogen/sl_event_handler.c b/matter/efr32/mgm24/BRD4317A/autogen/sl_event_handler.c
index 8447141320..422192007b 100644
--- a/matter/efr32/mgm24/BRD4317A/autogen/sl_event_handler.c
+++ b/matter/efr32/mgm24/BRD4317A/autogen/sl_event_handler.c
@@ -19,9 +19,9 @@
 #include "sl_sleeptimer.h"
 #include "sl_mpu.h"
 #include "gpiointerrupt.h"
-#ifdef USE_TEMP_SENSOR
+#if defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_i2cspm_instances.h"
-#endif
+#endif // defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_iostream_rtt.h"
 #include "sl_mbedtls.h"
 #include "nvm3_default.h"
diff --git a/matter/efr32/mgm24/BRD4318A/autogen/sl_event_handler.c b/matter/efr32/mgm24/BRD4318A/autogen/sl_event_handler.c
index 21ee92a570..b130f781d3 100644
--- a/matter/efr32/mgm24/BRD4318A/autogen/sl_event_handler.c
+++ b/matter/efr32/mgm24/BRD4318A/autogen/sl_event_handler.c
@@ -19,9 +19,9 @@
 #include "sl_sleeptimer.h"
 #include "sl_mpu.h"
 #include "gpiointerrupt.h"
-#ifdef USE_TEMP_SENSOR
+#if defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_i2cspm_instances.h"
-#endif
+#endif // defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 #include "sl_iostream_rtt.h"
 #include "sl_mbedtls.h"
 #include "nvm3_default.h"