diff --git a/variants/MINIMA/pins_arduino.h b/variants/MINIMA/pins_arduino.h
index 2786bc95a..a541b1f27 100644
--- a/variants/MINIMA/pins_arduino.h
+++ b/variants/MINIMA/pins_arduino.h
@@ -110,9 +110,10 @@ static const uint8_t D15 = PIN_D15;
 
 /****** WIRE CORE DEFINES ******/
 
-#define WIRE_HOWMANY      1
-#define WIRE_SDA_PIN      18 /* A4 */
-#define WIRE_SCL_PIN      19 /* A5 */
+#define WIRE_HOWMANY            1
+#define WIRE_INTERFACES_COUNT   WIRE_HOWMANY
+#define WIRE_SDA_PIN            18 /* A4 */
+#define WIRE_SCL_PIN            19 /* A5 */
 
 static const uint8_t SDA = WIRE_SDA_PIN;
 static const uint8_t SCL = WIRE_SCL_PIN;
diff --git a/variants/MUXTO/pins_arduino.h b/variants/MUXTO/pins_arduino.h
index 002ea3bfa..aebe8c891 100644
--- a/variants/MUXTO/pins_arduino.h
+++ b/variants/MUXTO/pins_arduino.h
@@ -145,9 +145,10 @@ static const uint8_t A6 = PIN_A6;
 
 /****** WIRE CORE DEFINES ******/
 
-#define WIRE_HOWMANY      1
-#define WIRE_SDA_PIN      20
-#define WIRE_SCL_PIN      21
+#define WIRE_HOWMANY            1
+#define WIRE_INTERFACES_COUNT   WIRE_HOWMANY
+#define WIRE_SDA_PIN            20
+#define WIRE_SCL_PIN            21
 
 // TODO: removeme
 #ifdef __cplusplus
diff --git a/variants/NANOR4/pins_arduino.h b/variants/NANOR4/pins_arduino.h
index d0ad8a41d..af5fbca7d 100644
--- a/variants/NANOR4/pins_arduino.h
+++ b/variants/NANOR4/pins_arduino.h
@@ -117,11 +117,12 @@ static const uint8_t D15 = PIN_D15;
 
 /****** WIRE CORE DEFINES ******/
 
-#define WIRE_HOWMANY      2
-#define WIRE_SDA_PIN      18 /* A4 */
-#define WIRE_SCL_PIN      19 /* A5 */
-#define WIRE1_SDA_PIN     27
-#define WIRE1_SCL_PIN     26
+#define WIRE_HOWMANY            2
+#define WIRE_INTERFACES_COUNT   WIRE_HOWMANY
+#define WIRE_SDA_PIN            18 /* A4 */
+#define WIRE_SCL_PIN            19 /* A5 */
+#define WIRE1_SDA_PIN           27
+#define WIRE1_SCL_PIN           26
 
 static const uint8_t SDA = WIRE_SDA_PIN;
 static const uint8_t SCL = WIRE_SCL_PIN;
diff --git a/variants/OPTA_ANALOG/pins_arduino.h b/variants/OPTA_ANALOG/pins_arduino.h
index 37981bffd..b28a92613 100644
--- a/variants/OPTA_ANALOG/pins_arduino.h
+++ b/variants/OPTA_ANALOG/pins_arduino.h
@@ -74,10 +74,11 @@ extern "C" unsigned int PINCOUNT_fn();
 #define UART1_RX_PIN               UART_RX
 /* ************************** WIRE CORE DEFINES **************************** */
 #define WIRE_HOWMANY               1
-#define WIRE_SDA_PIN               I2C_SDA 
-#define WIRE_SCL_PIN               I2C_SCL 
+#define WIRE_INTERFACES_COUNT      WIRE_HOWMANY
+#define WIRE_SDA_PIN               I2C_SDA
+#define WIRE_SCL_PIN               I2C_SCL
 static const uint8_t SDA = WIRE_SDA_PIN;
-static const uint8_t SCL = WIRE_SDA_PIN;
+static const uint8_t SCL = WIRE_SCL_PIN;
 /* *************************** SPI CORE DEFINES **************************** */
 #define SPI_HOWMANY                1
 #define PIN_SPI_MOSI               SPI_MOSI
diff --git a/variants/OPTA_DIGITAL/pins_arduino.h b/variants/OPTA_DIGITAL/pins_arduino.h
index d163e0817..f976f2cbf 100644
--- a/variants/OPTA_DIGITAL/pins_arduino.h
+++ b/variants/OPTA_DIGITAL/pins_arduino.h
@@ -138,12 +138,13 @@ static const uint8_t A15 = AN15;
 #define UART1_RX_PIN        UART_TX
 
 /****** WIRE CORE DEFINES ******/
-#define WIRE_HOWMANY      1
-#define WIRE_SDA_PIN      I2C_SDA 
-#define WIRE_SCL_PIN      I2C_SCL 
+#define WIRE_HOWMANY            1
+#define WIRE_INTERFACES_COUNT   WIRE_HOWMANY
+#define WIRE_SDA_PIN            I2C_SDA
+#define WIRE_SCL_PIN            I2C_SCL
 
 static const uint8_t SDA = WIRE_SDA_PIN;
-static const uint8_t SCL = WIRE_SDA_PIN;
+static const uint8_t SCL = WIRE_SCL_PIN;
 
 /****** SPI CORE DEFINES ******/
 
diff --git a/variants/PORTENTA_C33/pins_arduino.h b/variants/PORTENTA_C33/pins_arduino.h
index 2193ee5b9..ab66f611d 100644
--- a/variants/PORTENTA_C33/pins_arduino.h
+++ b/variants/PORTENTA_C33/pins_arduino.h
@@ -99,15 +99,16 @@ static const uint8_t D7 = PIN_D7;
 
 /****** WIRE CORE DEFINES ******/
 
-#define WIRE_HOWMANY      4
-#define WIRE_SDA_PIN      11
-#define WIRE_SCL_PIN      12
-#define WIRE1_SDA_PIN     37
-#define WIRE1_SCL_PIN     38
-#define WIRE2_SDA_PIN     39
-#define WIRE2_SCL_PIN     40
-#define WIRE3_SDA_PIN     96
-#define WIRE3_SCL_PIN     97
+#define WIRE_HOWMANY            4
+#define WIRE_INTERFACES_COUNT   WIRE_HOWMANY
+#define WIRE_SDA_PIN            11
+#define WIRE_SCL_PIN            12
+#define WIRE1_SDA_PIN           37
+#define WIRE1_SCL_PIN           38
+#define WIRE2_SDA_PIN           39
+#define WIRE2_SCL_PIN           40
+#define WIRE3_SDA_PIN           96
+#define WIRE3_SCL_PIN           97
 
 /****** SPI CORE DEFINES ******/
 
diff --git a/variants/UNOWIFIR4/pins_arduino.h b/variants/UNOWIFIR4/pins_arduino.h
index b16d73fd3..846232136 100644
--- a/variants/UNOWIFIR4/pins_arduino.h
+++ b/variants/UNOWIFIR4/pins_arduino.h
@@ -113,11 +113,12 @@ static const uint8_t D15 = PIN_D15;
 
 /****** WIRE CORE DEFINES ******/
 
-#define WIRE_HOWMANY      2
-#define WIRE_SDA_PIN      18 /* A4 */
-#define WIRE_SCL_PIN      19 /* A5 */
-#define WIRE1_SDA_PIN     27
-#define WIRE1_SCL_PIN     26
+#define WIRE_HOWMANY            2
+#define WIRE_INTERFACES_COUNT   WIRE_HOWMANY
+#define WIRE_SDA_PIN            18 /* A4 */
+#define WIRE_SCL_PIN            19 /* A5 */
+#define WIRE1_SDA_PIN           27
+#define WIRE1_SCL_PIN           26
 
 static const uint8_t SDA = WIRE_SDA_PIN;
 static const uint8_t SCL = WIRE_SCL_PIN;