diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index 4c3749b7c..92ef6275d 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -61,7 +61,6 @@ ioport_peripheral_t getPinConfig(bsp_io_port_pin_t pin);
 extern "C" {
 #endif
 extern const PinMuxCfg_t g_pin_cfg[];
-extern const size_t g_pin_cfg_size;
 #if defined(__cplusplus)
 }
 #endif
diff --git a/cores/arduino/Interrupts.cpp b/cores/arduino/Interrupts.cpp
index fbbda54b0..a01b79fa5 100644
--- a/cores/arduino/Interrupts.cpp
+++ b/cores/arduino/Interrupts.cpp
@@ -24,7 +24,6 @@
 #if EXT_INTERRUPTS_HOWMANY > 0
 
 extern const PinMuxCfg_t g_pin_cfg[];
-extern const size_t g_pin_cfg_size;
 
 #define MAX_IRQ_CHANNEL (15)
 
@@ -76,7 +75,7 @@ pin_size_t digitalPinToInterrupt(pin_size_t pin) { return pin; }
 static int pin2IrqChannel(int pin) {
 /* -------------------------------------------------------------------------- */  
   /* verify index are good */
-  if(pin < 0 || pin >= (int)(g_pin_cfg_size / sizeof(g_pin_cfg[0]))) {
+  if(pin < 0 || pin >= PINS_COUNT) {
     return -1;
   }
   /* getting configuration from table */
diff --git a/cores/arduino/Serial.cpp b/cores/arduino/Serial.cpp
index 4de9c7efa..d905edd90 100644
--- a/cores/arduino/Serial.cpp
+++ b/cores/arduino/Serial.cpp
@@ -194,7 +194,7 @@ bool  UART::cfg_pins(int max_index) {
 /* -------------------------------------------------------------------------- */
 void UART::begin(unsigned long baudrate, uint16_t config) {
 /* -------------------------------------------------------------------------- */  
-  int max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int max_index = PINS_COUNT;
 
   init_ok = cfg_pins(max_index);
   
diff --git a/cores/arduino/pwm.cpp b/cores/arduino/pwm.cpp
index ab753add5..96e2ea29f 100644
--- a/cores/arduino/pwm.cpp
+++ b/cores/arduino/pwm.cpp
@@ -2,9 +2,6 @@
 #include "pwm.h"
 #include "bsp_api.h"
 
-extern const PinMuxCfg_t g_pin_cfg[];
-extern const size_t g_pin_cfg_size;
-
 PwmOut::PwmOut(int pinNumber) :
   _pin(pinNumber),
   _enabled(false)
@@ -43,7 +40,7 @@ bool PwmOut::cfg_pin(int max_index) {
 /* default begin function, starts the timers with default pwm configuration (490Hz and 50%) */
 bool PwmOut::begin() {
   bool rv = true;
-  int max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int max_index = PINS_COUNT;
   rv &= cfg_pin(max_index);
 
   if(rv) {
@@ -67,7 +64,7 @@ bool PwmOut::begin() {
 bool PwmOut::begin(uint32_t period_width, uint32_t pulse_width, bool raw /*= false */, timer_source_div_t sd /*= TIMER_SOURCE_DIV_1*/) {
 /* -------------------------------------------------------------------------- */
   _enabled = true;
-  int max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int max_index = PINS_COUNT;
   _enabled &= cfg_pin(max_index);
   
   if(_enabled) {
diff --git a/cores/arduino/variant_helper.cpp b/cores/arduino/variant_helper.cpp
index b7abc799d..bf8ca736b 100644
--- a/cores/arduino/variant_helper.cpp
+++ b/cores/arduino/variant_helper.cpp
@@ -1,13 +1,10 @@
 #include "Arduino.h"
 #include "variant.h"
 
-extern const PinMuxCfg_t g_pin_cfg[];
-extern const size_t g_pin_cfg_size;
-
 std::array<uint16_t, 3> getPinCfgs(const pin_size_t pin, PinCfgReq_t req) {
 
   std::array<uint16_t, 3> ret = {0 , 0, 0};
-  if (pin > g_pin_cfg_size) {
+  if (pin > PINS_COUNT) {
     return ret;
   }
 
diff --git a/libraries/Arduino_CAN/src/R7FA4M1_CAN.cpp b/libraries/Arduino_CAN/src/R7FA4M1_CAN.cpp
index 4c6873244..833ebcb7c 100644
--- a/libraries/Arduino_CAN/src/R7FA4M1_CAN.cpp
+++ b/libraries/Arduino_CAN/src/R7FA4M1_CAN.cpp
@@ -142,7 +142,7 @@ bool R7FA4M1_CAN::begin(CanBitRate const can_bitrate)
 
   /* Configure the pins for CAN.
    */
-  int const max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int const max_index = PINS_COUNT;
   init_ok &= cfg_pins(max_index, _can_tx_pin, _can_rx_pin);
 
   /* Configure the interrupts.
diff --git a/libraries/Arduino_CAN/src/R7FA6M5_CAN.cpp b/libraries/Arduino_CAN/src/R7FA6M5_CAN.cpp
index e0ed27ed7..ace7cf39b 100644
--- a/libraries/Arduino_CAN/src/R7FA6M5_CAN.cpp
+++ b/libraries/Arduino_CAN/src/R7FA6M5_CAN.cpp
@@ -105,7 +105,7 @@ bool R7FA6M5_CAN::begin(CanBitRate const can_bitrate)
 
   /* Configure the pins for CAN.
    */
-  int const max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int const max_index = PINS_COUNT;
   auto [cfg_init_ok, cfg_channel] = cfg_pins(max_index, _can_tx_pin, _can_rx_pin);
   init_ok &= cfg_init_ok;
   _canfd_cfg.channel = cfg_channel;
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
index e4d5b40d4..96651d023 100644
--- a/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/SPI.cpp
@@ -25,13 +25,6 @@
 
 using namespace arduino;
 
-/**************************************************************************************
- * EXTERN GLOBAL CONSTANTS
- **************************************************************************************/
-
-extern const PinMuxCfg_t g_pin_cfg[];
-extern const size_t g_pin_cfg_size;
-
 /**************************************************************************************
  * GLOBAL MEMBER VARIABLES
  **************************************************************************************/
@@ -73,7 +66,7 @@ void ArduinoSPI::begin()
   /* Configure the pins and auto-determine channel and
    * whether or not we are using a SCI.
    */
-  int const max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int const max_index = PINS_COUNT;
   auto [cfg_pins_ok, cfg_channel, cfg_is_sci] = cfg_pins(max_index, _miso_pin, _mosi_pin, _sck_pin, _periph_mode);
   init_ok &= cfg_pins_ok;
   _channel = cfg_channel;
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
index b8704318e..778f0a93c 100644
--- a/libraries/Wire/Wire.cpp
+++ b/libraries/Wire/Wire.cpp
@@ -275,7 +275,7 @@ bool TwoWire::cfg_pins(int max_index) {
 void TwoWire::begin(void) {
 /* -------------------------------------------------------------------------- */  
   init_ok = true;
-  int max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int max_index = PINS_COUNT;
 
   init_ok &= cfg_pins(max_index);
 
diff --git a/variants/MINIMA/pins_arduino.h b/variants/MINIMA/pins_arduino.h
index 0f1bc16d7..a0b29ae20 100644
--- a/variants/MINIMA/pins_arduino.h
+++ b/variants/MINIMA/pins_arduino.h
@@ -4,6 +4,9 @@
 
 // Pin count
 // ----
+#ifdef __cplusplus
+extern "C" unsigned int PINCOUNT_fn();
+#endif
 #define PINS_COUNT           (PINCOUNT_fn())
 #define NUM_DIGITAL_PINS     (22u)
 #define NUM_ANALOG_INPUTS    (6u)
diff --git a/variants/MINIMA/variant.cpp b/variants/MINIMA/variant.cpp
index 6e2f01898..43e79b677 100644
--- a/variants/MINIMA/variant.cpp
+++ b/variants/MINIMA/variant.cpp
@@ -50,10 +50,14 @@ extern "C" const PinMuxCfg_t g_pin_cfg[] = {
   { BSP_IO_PORT_00_PIN_13,    P013   }, /* (22) RX LED  */
 };
 
-extern "C" const size_t g_pin_cfg_size = sizeof(g_pin_cfg);
+extern "C" {
+    unsigned int PINCOUNT_fn() {
+        return (sizeof(g_pin_cfg) / sizeof(g_pin_cfg[0]));
+    }
+}
 
 int32_t getPinIndex(bsp_io_port_pin_t p) {
-  int max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int max_index = PINS_COUNT;
   int rv = -1;
   for(int i = 0; i < max_index; i++) {
     if(g_pin_cfg[i].pin == p) {
diff --git a/variants/MUXTO/pins_arduino.h b/variants/MUXTO/pins_arduino.h
index 9375421ff..002ea3bfa 100644
--- a/variants/MUXTO/pins_arduino.h
+++ b/variants/MUXTO/pins_arduino.h
@@ -1,17 +1,12 @@
 #pragma once
 
-#ifdef __cplusplus
-extern "C" unsigned int PINCOUNT_fn();
-extern "C" unsigned int I2C_COUNT_fn();
-extern "C" unsigned int SPI_COUNT_fn();
-extern "C" unsigned int UART_COUNT_fn();
-extern "C" unsigned int SCI_COUNT_fn();
-#endif
-
 #define PIN(X,Y) (X * 16 + Y)
 
 // Pin count
 // ----
+#ifdef __cplusplus
+extern "C" unsigned int PINCOUNT_fn();
+#endif
 #define PINS_COUNT           (PINCOUNT_fn())
 #define NUM_DIGITAL_PINS     (22u)
 #define NUM_ANALOG_INPUTS    (6u)
diff --git a/variants/MUXTO/variant.cpp b/variants/MUXTO/variant.cpp
index 9b9ca4b3f..d473a6bb8 100644
--- a/variants/MUXTO/variant.cpp
+++ b/variants/MUXTO/variant.cpp
@@ -62,7 +62,11 @@ extern "C" const PinMuxCfg_t g_pin_cfg[] = {
   { BSP_IO_PORT_02_PIN_06,    P206   }, /* (27) D27  */
 };
 
-extern "C" const size_t g_pin_cfg_size = sizeof(g_pin_cfg);
+extern "C" {
+    unsigned int PINCOUNT_fn() {
+        return (sizeof(g_pin_cfg) / sizeof(g_pin_cfg[0]));
+    }
+}
 
 const ioport_pin_cfg_t bsp_pin_cfg_data[] = {
   { ((uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_USB_FS), BSP_IO_PORT_09_PIN_15 },
diff --git a/variants/PORTENTA_C33/pins_arduino.h b/variants/PORTENTA_C33/pins_arduino.h
index 2b8b3d6d5..43112b7a4 100644
--- a/variants/PORTENTA_C33/pins_arduino.h
+++ b/variants/PORTENTA_C33/pins_arduino.h
@@ -1,17 +1,12 @@
 #pragma once
 
-#ifdef __cplusplus
-extern "C" unsigned int PINCOUNT_fn();
-extern "C" unsigned int I2C_COUNT_fn();
-extern "C" unsigned int SPI_COUNT_fn();
-extern "C" unsigned int UART_COUNT_fn();
-extern "C" unsigned int SCI_COUNT_fn();
-#endif
-
 #define PIN(X,Y) (X * 16 + Y)
 
 // Pin count
 // ----
+#ifdef __cplusplus
+extern "C" unsigned int PINCOUNT_fn();
+#endif
 #define PINS_COUNT           (PINCOUNT_fn())
 #define NUM_DIGITAL_PINS     (121u)
 #define NUM_ANALOG_INPUTS    (8u)
diff --git a/variants/PORTENTA_C33/variant.cpp b/variants/PORTENTA_C33/variant.cpp
index 309d3de2d..3dd128d2a 100644
--- a/variants/PORTENTA_C33/variant.cpp
+++ b/variants/PORTENTA_C33/variant.cpp
@@ -198,10 +198,14 @@ extern "C" const PinMuxCfg_t g_pin_cfg[] = {
   { BSP_IO_PORT_02_PIN_08,  P208 }, /*   D121   |   QSPI IO3    */
 };
 
-extern "C" const size_t g_pin_cfg_size = sizeof(g_pin_cfg);
+extern "C" {
+    unsigned int PINCOUNT_fn() {
+        return (sizeof(g_pin_cfg) / sizeof(g_pin_cfg[0]));
+    }
+}
 
 int32_t getPinIndex(bsp_io_port_pin_t p) {
-  int max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int max_index = PINS_COUNT;
   int rv = -1;
   for(int i = 0; i < max_index; i++) {
     if(g_pin_cfg[i].pin == p) {
diff --git a/variants/UNOWIFIR4/pins_arduino.h b/variants/UNOWIFIR4/pins_arduino.h
index 70eebe526..6ebd498dd 100644
--- a/variants/UNOWIFIR4/pins_arduino.h
+++ b/variants/UNOWIFIR4/pins_arduino.h
@@ -4,6 +4,9 @@
 
 // Pin count
 // ----
+#ifdef __cplusplus
+extern "C" unsigned int PINCOUNT_fn();
+#endif
 #define PINS_COUNT           (PINCOUNT_fn())
 #define NUM_DIGITAL_PINS     (22u)
 #define NUM_ANALOG_INPUTS    (6u)
diff --git a/variants/UNOWIFIR4/variant.cpp b/variants/UNOWIFIR4/variant.cpp
index 12f56af71..89907ad70 100644
--- a/variants/UNOWIFIR4/variant.cpp
+++ b/variants/UNOWIFIR4/variant.cpp
@@ -69,10 +69,14 @@ extern "C" const PinMuxCfg_t g_pin_cfg[] = {
   { BSP_IO_PORT_02_PIN_13,    P213   }, /* (38) D38  */
 };
 
-extern "C" const size_t g_pin_cfg_size = sizeof(g_pin_cfg);
+extern "C" {
+    unsigned int PINCOUNT_fn() {
+        return (sizeof(g_pin_cfg) / sizeof(g_pin_cfg[0]));
+    }
+}
 
 int32_t getPinIndex(bsp_io_port_pin_t p) {
-  int max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int max_index = PINS_COUNT;
   int rv = -1;
   for(int i = 0; i < max_index; i++) {
     if(g_pin_cfg[i].pin == p) {