diff --git a/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_M460/m460_eth.c b/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_M460/m460_eth.c
index 591de2204f..275a3af904 100644
--- a/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_M460/m460_eth.c
+++ b/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_M460/m460_eth.c
@@ -20,6 +20,7 @@
 //#include <stdbool.h>
 #include "m460_eth.h"
 #include "mbed_toolchain.h"
+#include "mbed_interface.h"
 //#define NU_TRACE
 #include "numaker_eth_hal.h"
 
diff --git a/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_M480/m480_eth.c b/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_M480/m480_eth.c
index 6543beac6f..30de209f81 100644
--- a/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_M480/m480_eth.c
+++ b/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_M480/m480_eth.c
@@ -20,6 +20,7 @@
 #include <stdbool.h>
 #include "m480_eth.h"
 #include "mbed_toolchain.h"
+#include "mbed_interface.h"
 //#define NU_TRACE
 #include "numaker_eth_hal.h"
 
diff --git a/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_NUC472/nuc472_eth.c b/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_NUC472/nuc472_eth.c
index 209fb02472..d9dbb51d77 100644
--- a/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_NUC472/nuc472_eth.c
+++ b/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_NUC472/nuc472_eth.c
@@ -20,6 +20,7 @@
 #include <stdbool.h>
 #include "nuc472_eth.h"
 #include "mbed_toolchain.h"
+#include "mbed_interface.h"
 //#define NU_TRACE
 #include "numaker_eth_hal.h"
 
diff --git a/targets/TARGET_NUVOTON/TARGET_M251/analogin_api.c b/targets/TARGET_NUVOTON/TARGET_M251/analogin_api.c
index 3ffc27b4b2..127560816b 100644
--- a/targets/TARGET_NUVOTON/TARGET_M251/analogin_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M251/analogin_api.c
@@ -23,6 +23,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "hal/PinNameAliases.h"
 
diff --git a/targets/TARGET_NUVOTON/TARGET_M251/analogout_api.c b/targets/TARGET_NUVOTON/TARGET_M251/analogout_api.c
index 96da2699db..ee7e991b37 100644
--- a/targets/TARGET_NUVOTON/TARGET_M251/analogout_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M251/analogout_api.c
@@ -23,6 +23,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 
 /* Maximum DAC modules */
diff --git a/targets/TARGET_NUVOTON/TARGET_M251/i2c_api.c b/targets/TARGET_NUVOTON/TARGET_M251/i2c_api.c
index e0ea415271..42e32116f5 100644
--- a/targets/TARGET_NUVOTON/TARGET_M251/i2c_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M251/i2c_api.c
@@ -23,6 +23,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_miscutil.h"
 #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_M251/pwmout_api.c b/targets/TARGET_NUVOTON/TARGET_M251/pwmout_api.c
index 8bf50a261b..90f1d2d12e 100644
--- a/targets/TARGET_NUVOTON/TARGET_M251/pwmout_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M251/pwmout_api.c
@@ -23,6 +23,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_miscutil.h"
 #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_M251/serial_api.c b/targets/TARGET_NUVOTON/TARGET_M251/serial_api.c
index aefd967319..7b63fcf226 100644
--- a/targets/TARGET_NUVOTON/TARGET_M251/serial_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M251/serial_api.c
@@ -24,6 +24,7 @@
 #include "mbed_error.h"
 #include "mbed_assert.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_bitutil.h"
 #include <string.h>
diff --git a/targets/TARGET_NUVOTON/TARGET_M251/spi_api.c b/targets/TARGET_NUVOTON/TARGET_M251/spi_api.c
index d8e9d378ac..ce879d13b7 100644
--- a/targets/TARGET_NUVOTON/TARGET_M251/spi_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M251/spi_api.c
@@ -23,6 +23,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_miscutil.h"
 #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_M261/analogin_api.c b/targets/TARGET_NUVOTON/TARGET_M261/analogin_api.c
index 36cea1f003..ee8058807a 100644
--- a/targets/TARGET_NUVOTON/TARGET_M261/analogin_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M261/analogin_api.c
@@ -22,6 +22,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "hal/PinNameAliases.h"
 
diff --git a/targets/TARGET_NUVOTON/TARGET_M261/analogout_api.c b/targets/TARGET_NUVOTON/TARGET_M261/analogout_api.c
index f4554122e7..02aa47f32e 100644
--- a/targets/TARGET_NUVOTON/TARGET_M261/analogout_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M261/analogout_api.c
@@ -22,6 +22,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 
 /* Maximum DAC modules */
diff --git a/targets/TARGET_NUVOTON/TARGET_M261/can_api.c b/targets/TARGET_NUVOTON/TARGET_M261/can_api.c
index fa04232ee4..dce5a76c50 100644
--- a/targets/TARGET_NUVOTON/TARGET_M261/can_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M261/can_api.c
@@ -23,6 +23,7 @@
  #include "cmsis.h"
  #include "pinmap.h"
  #include "PeripheralPins.h"
+ #include "gpio_api.h"
  #include "nu_modutil.h"
  #include "nu_miscutil.h"
  #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_M261/i2c_api.c b/targets/TARGET_NUVOTON/TARGET_M261/i2c_api.c
index 4e1752fd29..597326edeb 100644
--- a/targets/TARGET_NUVOTON/TARGET_M261/i2c_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M261/i2c_api.c
@@ -22,6 +22,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_miscutil.h"
 #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_M261/pwmout_api.c b/targets/TARGET_NUVOTON/TARGET_M261/pwmout_api.c
index ef07b168e5..f62cba8ac6 100644
--- a/targets/TARGET_NUVOTON/TARGET_M261/pwmout_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M261/pwmout_api.c
@@ -22,6 +22,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_miscutil.h"
 #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_M261/serial_api.c b/targets/TARGET_NUVOTON/TARGET_M261/serial_api.c
index a57c20204d..5fad8f8b97 100644
--- a/targets/TARGET_NUVOTON/TARGET_M261/serial_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M261/serial_api.c
@@ -23,6 +23,7 @@
 #include "mbed_error.h"
 #include "mbed_assert.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_bitutil.h"
 #include <string.h>
diff --git a/targets/TARGET_NUVOTON/TARGET_M261/spi_api.c b/targets/TARGET_NUVOTON/TARGET_M261/spi_api.c
index ebf7da50f2..265ac7f43d 100644
--- a/targets/TARGET_NUVOTON/TARGET_M261/spi_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M261/spi_api.c
@@ -23,6 +23,7 @@
 #include "mbed_error.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_miscutil.h"
 #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_M451/analogin_api.c b/targets/TARGET_NUVOTON/TARGET_M451/analogin_api.c
index b559d77aa1..eb41c3257d 100644
--- a/targets/TARGET_NUVOTON/TARGET_M451/analogin_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M451/analogin_api.c
@@ -21,6 +21,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "hal/PinNameAliases.h"
 
diff --git a/targets/TARGET_NUVOTON/TARGET_M451/analogout_api.c b/targets/TARGET_NUVOTON/TARGET_M451/analogout_api.c
index 54a0c633dc..c0a72fa5c1 100644
--- a/targets/TARGET_NUVOTON/TARGET_M451/analogout_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M451/analogout_api.c
@@ -22,6 +22,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 
 /* Maximum DAC modules */
diff --git a/targets/TARGET_NUVOTON/TARGET_M451/can_api.c b/targets/TARGET_NUVOTON/TARGET_M451/can_api.c
index d8254406de..8fd7b3c161 100644
--- a/targets/TARGET_NUVOTON/TARGET_M451/can_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M451/can_api.c
@@ -23,6 +23,7 @@
  #include "cmsis.h"
  #include "pinmap.h"
  #include "PeripheralPins.h"
+ #include "gpio_api.h"
  #include "nu_modutil.h"
  #include "nu_miscutil.h"
  #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_M451/i2c_api.c b/targets/TARGET_NUVOTON/TARGET_M451/i2c_api.c
index 452131c791..5dac613f20 100644
--- a/targets/TARGET_NUVOTON/TARGET_M451/i2c_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M451/i2c_api.c
@@ -21,6 +21,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_miscutil.h"
 #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_M451/pwmout_api.c b/targets/TARGET_NUVOTON/TARGET_M451/pwmout_api.c
index 74323159d4..97b0896467 100644
--- a/targets/TARGET_NUVOTON/TARGET_M451/pwmout_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M451/pwmout_api.c
@@ -21,6 +21,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_miscutil.h"
 #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_M451/serial_api.c b/targets/TARGET_NUVOTON/TARGET_M451/serial_api.c
index 7d7bce7e7a..7a6b9f5d15 100644
--- a/targets/TARGET_NUVOTON/TARGET_M451/serial_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M451/serial_api.c
@@ -22,6 +22,7 @@
 #include "mbed_error.h"
 #include "mbed_assert.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_bitutil.h"
 #include <string.h>
diff --git a/targets/TARGET_NUVOTON/TARGET_M451/spi_api.c b/targets/TARGET_NUVOTON/TARGET_M451/spi_api.c
index 8b2de0ed2e..ef0101e8fa 100644
--- a/targets/TARGET_NUVOTON/TARGET_M451/spi_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_M451/spi_api.c
@@ -21,6 +21,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_miscutil.h"
 #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_NANO100/analogin_api.c b/targets/TARGET_NUVOTON/TARGET_NANO100/analogin_api.c
index 2ca7160cee..1907ffb035 100644
--- a/targets/TARGET_NUVOTON/TARGET_NANO100/analogin_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_NANO100/analogin_api.c
@@ -22,6 +22,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "hal/PinNameAliases.h"
 
diff --git a/targets/TARGET_NUVOTON/TARGET_NANO100/analogout_api.c b/targets/TARGET_NUVOTON/TARGET_NANO100/analogout_api.c
index 896014e71c..92119d8ca3 100644
--- a/targets/TARGET_NUVOTON/TARGET_NANO100/analogout_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_NANO100/analogout_api.c
@@ -22,6 +22,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 
 /* Maximum DAC modules */
diff --git a/targets/TARGET_NUVOTON/TARGET_NANO100/i2c_api.c b/targets/TARGET_NUVOTON/TARGET_NANO100/i2c_api.c
index 72aa9cda7a..a8d5a6dbb2 100644
--- a/targets/TARGET_NUVOTON/TARGET_NANO100/i2c_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_NANO100/i2c_api.c
@@ -21,6 +21,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_miscutil.h"
 #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_NANO100/pwmout_api.c b/targets/TARGET_NUVOTON/TARGET_NANO100/pwmout_api.c
index 8ba1f40dd4..f4255e5c70 100644
--- a/targets/TARGET_NUVOTON/TARGET_NANO100/pwmout_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_NANO100/pwmout_api.c
@@ -21,6 +21,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_miscutil.h"
 #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_NANO100/serial_api.c b/targets/TARGET_NUVOTON/TARGET_NANO100/serial_api.c
index 2da2c9d360..2742a938f7 100644
--- a/targets/TARGET_NUVOTON/TARGET_NANO100/serial_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_NANO100/serial_api.c
@@ -22,6 +22,7 @@
 #include "mbed_error.h"
 #include "mbed_assert.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_bitutil.h"
 #include <string.h>
diff --git a/targets/TARGET_NUVOTON/TARGET_NANO100/spi_api.c b/targets/TARGET_NUVOTON/TARGET_NANO100/spi_api.c
index 3862edf516..d77e0864ca 100644
--- a/targets/TARGET_NUVOTON/TARGET_NANO100/spi_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_NANO100/spi_api.c
@@ -21,6 +21,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_miscutil.h"
 #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_NUC472/analogin_api.c b/targets/TARGET_NUVOTON/TARGET_NUC472/analogin_api.c
index 88bfd03b91..753d7136be 100644
--- a/targets/TARGET_NUVOTON/TARGET_NUC472/analogin_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_NUC472/analogin_api.c
@@ -21,6 +21,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "hal/PinNameAliases.h"
 
diff --git a/targets/TARGET_NUVOTON/TARGET_NUC472/can_api.c b/targets/TARGET_NUVOTON/TARGET_NUC472/can_api.c
index 3a258a9843..4d8fdaaefa 100644
--- a/targets/TARGET_NUVOTON/TARGET_NUC472/can_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_NUC472/can_api.c
@@ -23,6 +23,7 @@
  #include "cmsis.h"
  #include "pinmap.h"
  #include "PeripheralPins.h"
+ #include "gpio_api.h"
  #include "nu_modutil.h"
  #include "nu_miscutil.h"
  #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_NUC472/i2c_api.c b/targets/TARGET_NUVOTON/TARGET_NUC472/i2c_api.c
index e88835cc65..941bd78d81 100644
--- a/targets/TARGET_NUVOTON/TARGET_NUC472/i2c_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_NUC472/i2c_api.c
@@ -21,6 +21,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_miscutil.h"
 #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_NUC472/pwmout_api.c b/targets/TARGET_NUVOTON/TARGET_NUC472/pwmout_api.c
index aa81799abe..a981dff479 100644
--- a/targets/TARGET_NUVOTON/TARGET_NUC472/pwmout_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_NUC472/pwmout_api.c
@@ -21,6 +21,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_miscutil.h"
 #include "nu_bitutil.h"
diff --git a/targets/TARGET_NUVOTON/TARGET_NUC472/serial_api.c b/targets/TARGET_NUVOTON/TARGET_NUC472/serial_api.c
index 6c1f8889b0..029b944dde 100644
--- a/targets/TARGET_NUVOTON/TARGET_NUC472/serial_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_NUC472/serial_api.c
@@ -22,6 +22,7 @@
 #include "mbed_error.h"
 #include "mbed_assert.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_bitutil.h"
 #include <string.h>
diff --git a/targets/TARGET_NUVOTON/TARGET_NUC472/spi_api.c b/targets/TARGET_NUVOTON/TARGET_NUC472/spi_api.c
index ddcf800de5..38c4ed2e24 100644
--- a/targets/TARGET_NUVOTON/TARGET_NUC472/spi_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_NUC472/spi_api.c
@@ -21,6 +21,7 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "PeripheralPins.h"
+#include "gpio_api.h"
 #include "nu_modutil.h"
 #include "nu_miscutil.h"
 #include "nu_bitutil.h"