diff --git a/libraries/mbed/api/mbed.h b/libraries/mbed/api/mbed.h
index 2ea16a3269..b0e1324e31 100644
--- a/libraries/mbed/api/mbed.h
+++ b/libraries/mbed/api/mbed.h
@@ -25,7 +25,7 @@
 #include <time.h>
 
 // mbed Debug libraries
-#include "error.h"
+#include "mbed_error.h"
 #include "mbed_interface.h"
 
 // mbed Peripheral components
diff --git a/libraries/mbed/api/error.h b/libraries/mbed/api/mbed_error.h
similarity index 100%
rename from libraries/mbed/api/error.h
rename to libraries/mbed/api/mbed_error.h
diff --git a/libraries/mbed/common/error.c b/libraries/mbed/common/error.c
index b5947cfa79..b307d87565 100644
--- a/libraries/mbed/common/error.c
+++ b/libraries/mbed/common/error.c
@@ -17,7 +17,7 @@
 #include <stdarg.h>
 #include "device.h"
 #include "toolchain.h"
-#include "error.h"
+#include "mbed_error.h"
 #if DEVICE_STDIO_MESSAGES
 #include <stdio.h>
 #endif
diff --git a/libraries/mbed/common/mbed_interface.c b/libraries/mbed/common/mbed_interface.c
index 9230c2d663..d018a5f64a 100644
--- a/libraries/mbed/common/mbed_interface.c
+++ b/libraries/mbed/common/mbed_interface.c
@@ -19,7 +19,7 @@
 #include "gpio_api.h"
 #include "wait_api.h"
 #include "semihost_api.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "toolchain.h"
 
 #if DEVICE_SEMIHOST
diff --git a/libraries/mbed/common/pinmap_common.c b/libraries/mbed/common/pinmap_common.c
index 837cd44ef3..284268c7e7 100644
--- a/libraries/mbed/common/pinmap_common.c
+++ b/libraries/mbed/common/pinmap_common.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pinmap_pinout(PinName pin, const PinMap *map) {
     if (pin == NC)
diff --git a/libraries/mbed/common/retarget.cpp b/libraries/mbed/common/retarget.cpp
index 168d319a97..271d15d86c 100644
--- a/libraries/mbed/common/retarget.cpp
+++ b/libraries/mbed/common/retarget.cpp
@@ -383,7 +383,7 @@ extern "C" int mkdir(const char *path, mode_t mode) {
 
 #if defined(TOOLCHAIN_GCC)
 /* prevents the exception handling name demangling code getting pulled in */
-#include "error.h"
+#include "mbed_error.h"
 namespace __gnu_cxx {
     void __verbose_terminate_handler() {
         error("Exception");
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_irq_api.c
index 80507abba4..3cce54998e 100644
--- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_irq_api.c
@@ -17,7 +17,7 @@
 #include "cmsis.h"
 
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    160
 
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/gpio_irq_api.c
index be1865862e..a6135afe56 100644
--- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/gpio_irq_api.c
@@ -18,7 +18,7 @@
 
 #include "gpio_irq_api.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    64   // 31 pins on 2 ports
 
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/gpio_irq_api.c
index 3978f79bb0..14a07355ec 100644
--- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/gpio_irq_api.c
@@ -18,7 +18,7 @@
 
 #include "gpio_irq_api.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    64
 
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/gpio_irq_api.c
index 715bdd2f25..41d08062ae 100644
--- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/gpio_irq_api.c
@@ -18,7 +18,7 @@
 
 #include "gpio_irq_api.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    96
 
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogout_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogout_api.c
index b40dacf562..b0c3c40831 100644
--- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogout_api.c
@@ -17,7 +17,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define RANGE_12BIT     0xFFF
 
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_irq_api.c
index a30e21ff2b..4d2b08772f 100644
--- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_irq_api.c
@@ -20,7 +20,7 @@
 #include "gpio_api.h"
 #include "fsl_gpio_hal.h"
 #include "fsl_port_hal.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    160
 
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c
index ecd34ee9eb..f168646a17 100644
--- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "fsl_clock_manager.h"
 #include "fsl_port_hal.h"
 
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c
index 1d7b88594f..11801900bd 100644
--- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c
@@ -19,7 +19,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "fsl_clock_manager.h"
 #include "fsl_dspi_hal.h"
 
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_irq_api.c
index e23e293e1c..73c68af03f 100644
--- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_irq_api.c
@@ -17,7 +17,7 @@
 #include "cmsis.h"
 
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    31
 
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c
index 3e5f230741..9176da9e36 100644
--- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
 }
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c
index e2c641ea25..cc5ae6129b 100644
--- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c
@@ -17,7 +17,7 @@
 #include "pwmout_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define NO_PWMS         3
 #define TIMER_PRECISION 4 //4us ticks   
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c
index 6a51a629c1..54f15a2dcf 100644
--- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c
@@ -18,7 +18,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {SPI_PSELSCK0 , SPI_0, 0x01},
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c
index 14a980da5d..419b473eea 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c
@@ -17,7 +17,7 @@
 #include "analogin_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_ANALOGIN
 
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_irq_api.c
index a0e54ce37e..545defb56f 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_irq_api.c
@@ -17,7 +17,7 @@
 
 #include "cmsis.h"
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_INTERRUPTIN
 
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c
index 366b2e8c8b..548d1d58ab 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
     MBED_ASSERT(pin != (PinName)NC);
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c
index 92c93f34ef..d23a98b07f 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c
@@ -17,7 +17,7 @@
 #include "pwmout_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PWMOUT
 
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c
index e6afbf19f3..d152794f8d 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c
@@ -19,7 +19,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_SPI
 
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c
index 795f0dc476..5084bad02b 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c
@@ -17,7 +17,7 @@
 #include "analogin_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define ANALOGIN_MEDIAN_FILTER      1
 
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_irq_api.c
index 0a992633da..ef4e16c710 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_irq_api.c
@@ -16,7 +16,7 @@
 #include <stddef.h>
 #include "cmsis.h"
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    8
 #define LPC_GPIO_X LPC_GPIO_PIN_INT
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c
index e3b52e866b..9ca018c86a 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define LPC_IOCON0_BASE (LPC_IOCON_BASE)
 #define LPC_IOCON1_BASE (LPC_IOCON_BASE + 0x60)
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c
index 388d4b085a..e9fe33921d 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c
@@ -18,7 +18,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {P0_6 , SPI_0, 0x02},
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/TARGET_LPC11CXX/can_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/TARGET_LPC11CXX/can_api.c
index 1415ee456d..b017d1ab25 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/TARGET_LPC11CXX/can_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/TARGET_LPC11CXX/can_api.c
@@ -16,7 +16,7 @@
 #include "can_api.h"
 
 #include "cmsis.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #include <math.h>
 #include <string.h>
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c
index 96602bbce8..073d973693 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c
@@ -17,7 +17,7 @@
 #include "analogin_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_ADC[] = {
     {P0_11, ADC0_0, 2},
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_irq_api.c
index 0907c46b89..db111511d3 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_irq_api.c
@@ -16,7 +16,7 @@
 #include <stddef.h>
 #include "cmsis.h"
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "gpio_api.h"
 
 // The chip is capable of 42 GPIO interrupts.
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c
index 71b1925c02..f4a271e1d0 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c
@@ -17,7 +17,7 @@
 #include "i2c_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_I2C_SDA[] = {
     {P0_5, I2C_0, 1},
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c
index 9c76cea99f..7dbb40c386 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
     MBED_ASSERT(pin != (PinName)NC);
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c
index a98dc182a1..b38f742d5e 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c
@@ -18,7 +18,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {P0_6 , SPI_0, 0x02},
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c
index 795f0dc476..5084bad02b 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c
@@ -17,7 +17,7 @@
 #include "analogin_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define ANALOGIN_MEDIAN_FILTER      1
 
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_irq_api.c
index 74b3e280cc..4bb2e5b42d 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_irq_api.c
@@ -16,7 +16,7 @@
 #include <stddef.h>
 #include "cmsis.h"
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    8
 #define LPC_GPIO_X LPC_GPIO_PIN_INT
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c
index 5b671a4eed..a19a87deb5 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c
@@ -17,7 +17,7 @@
 #include "i2c_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_I2C_SDA[] = {
     {P0_5, I2C_0, 1},
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c
index 70003372c3..b656b4fae4 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define LPC_IOCON0_BASE (LPC_IOCON_BASE)
 #define LPC_IOCON1_BASE (LPC_IOCON_BASE + 0x60)
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c
index cacd5a2a66..4581b07706 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c
@@ -18,7 +18,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {P0_6 , SPI_0, 0x02},
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/can_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/can_api.c
index 31b5b6b1ee..bb738dbf2b 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/can_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/can_api.c
@@ -17,7 +17,7 @@
 #include "can_api.h"
 
 #include "cmsis.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #include <math.h>
 #include <string.h>
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_irq_api.c
index 8a73e9de03..f4b379295a 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_irq_api.c
@@ -17,7 +17,7 @@
 
 #include "cmsis.h"
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM 8
 #define LPC_GPIO_X LPC_PINT
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c
index abc15268ad..c466534cf9 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
 }
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c
index 2ed50d37c7..0f32764d01 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c
@@ -17,7 +17,7 @@
 #include "pwmout_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static LPC_SCT0_Type *SCTs[4] = {
     (LPC_SCT0_Type*)LPC_SCT0,
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c
index cefa3f4e81..f839864f50 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c
@@ -21,7 +21,7 @@
 #include "serial_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /******************************************************************************
  * INITIALIZATION
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c
index 774e347dc4..4dcc4fca58 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c
@@ -19,7 +19,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const SWM_Map SWM_SPI_SSEL[] = {
     {4, 0},
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/ethernet_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/ethernet_api.c
index 8b0d9cf860..6790249a90 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/ethernet_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/ethernet_api.c
@@ -19,7 +19,7 @@
 #include "cmsis.h"
 #include "mbed_interface.h"
 #include "toolchain.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define NEW_LOGIC       0
 #define NEW_ETH_BUFFER  0
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_irq_api.c
index 2a7936784c..f6ca2da1a1 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_irq_api.c
@@ -16,7 +16,7 @@
 #include <stddef.h>
 
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "cmsis.h"
 
 #define CHANNEL_NUM     48
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c
index c5619a86bb..d7af42e427 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
     MBED_ASSERT(pin != (PinName)NC);
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c
index 27e9f1cf84..aee389df5e 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c
@@ -19,7 +19,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {P0_7 , SPI_1, 2},
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/ethernet_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/ethernet_api.c
index 4b74b7295b..ba76cbc916 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/ethernet_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/ethernet_api.c
@@ -19,7 +19,7 @@
 #include "cmsis.h"
 #include "mbed_interface.h"
 #include "toolchain.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define NEW_LOGIC       0
 #define NEW_ETH_BUFFER  0
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_irq_api.c
index 2518571362..40fcaa6dbe 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_irq_api.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 #include <stddef.h>
 #include "cmsis.h"
 
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c
index 1c82ad78cc..12636f5d69 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
     MBED_ASSERT(pin != (PinName)NC);
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c
index 9247eedbda..b658769889 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c
@@ -19,7 +19,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {P0_7 , SPI_1, 2},
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c
index 7681e3f568..be53b09c04 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c
@@ -17,7 +17,7 @@
 #include "analogin_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define ANALOGIN_MEDIAN_FILTER      1
 
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/ethernet_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/ethernet_api.c
index fe1d57542b..0a20a10a2e 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/ethernet_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/ethernet_api.c
@@ -19,7 +19,7 @@
 #include "cmsis.h"
 #include "mbed_interface.h"
 #include "toolchain.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define NEW_LOGIC       0
 #define NEW_ETH_BUFFER  0
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_irq_api.c
index 85b16c888b..97a79de6d5 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_irq_api.c
@@ -15,7 +15,7 @@
  */
 #include <stddef.h>
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "cmsis.h"
 
 #define CHANNEL_NUM    64
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c
index e10e0eb034..c72389d666 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
     MBED_ASSERT(pin != (PinName)NC);
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c
index 202df6d340..4ab422312c 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c
@@ -21,7 +21,7 @@
 #include "serial_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /******************************************************************************
  * INITIALIZATION
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c
index 3d790608a8..c88e8edd4f 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c
@@ -18,7 +18,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {P0_7 , SPI_1, 2},
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_irq_api.c
index c24fe223e2..7e3aa2b46b 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_irq_api.c
@@ -17,7 +17,7 @@
  */
 #include <stddef.h>
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "cmsis.h"
 
 /* The LPC43xx implements GPIO pin and group interrupts. Any pin in the
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c
index 4f1b48a926..303b1858bb 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c
@@ -17,7 +17,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
     MBED_ASSERT(pin != (PinName)NC);
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c
index f9b39262d6..3ea37da237 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c
@@ -23,7 +23,7 @@
 #include "serial_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /******************************************************************************
  * INITIALIZATION
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c
index cb25a5a039..d06c522410 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c
@@ -21,7 +21,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {P3_0 , SPI_0, (SCU_PINIO_FAST | 2)},
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_irq_api.c
index 95186d0228..cdc510cbe6 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_irq_api.c
@@ -17,7 +17,7 @@
 
 #include "cmsis.h"
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    8
 #define LPC_GPIO_X LPC_PIN_INT
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c
index b75dfbe990..b68317d44a 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 __IO uint32_t* IOCON_REGISTERS[18] = {
         &LPC_IOCON->PIO0_0 , &LPC_IOCON->PIO0_1 , &LPC_IOCON->PIO0_2 ,
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c
index e6d8da2f7f..5e83d9370c 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c
@@ -21,7 +21,7 @@
 #include "serial_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /******************************************************************************
  * INITIALIZATION
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c
index 6634c57ac6..21a6432c0e 100644
--- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c
@@ -19,7 +19,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const SWM_Map SWM_SPI_SSEL[] = {
     {4, 16},
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c
index 4e639adbda..43a38b07f4 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c
@@ -32,7 +32,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "wait_api.h"
 
 static const PinMap PinMap_ADC[] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c
index 21b67056e7..73ebf42d21 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_irq_api.c
index da641357a8..f541b90209 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_irq_api.c
@@ -32,7 +32,7 @@
 
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c
index 13bfc2226f..2f58a9de3c 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Enable GPIO clock and return GPIO base address
 uint32_t Set_GPIO_Clock(uint32_t port_idx) {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/port_api.c
index 9166ecc630..193ba7f9ba 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/port_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/port_api.c
@@ -33,7 +33,7 @@
 
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c
index e2751f3b67..4931950566 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_irq_api.c
index 57ef8b13a1..df00593f79 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_irq_api.c
@@ -32,7 +32,7 @@
 
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c
index 57de90c400..7f1ab299f5 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "device.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Alternate-function mapping
 static const uint32_t AF_mapping[] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/port_api.c
index ea453d23b4..48447ce6a1 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/port_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/port_api.c
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c
index 5b97612803..cd20adfb51 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_irq_api.c
index 1138f4f37f..ac78a1f107 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_irq_api.c
@@ -32,7 +32,7 @@
 
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c
index 584a2fd1a2..a6a53f72a6 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c
@@ -34,7 +34,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /* Timeout values for flags and events waiting loops. These timeouts are
    not based on accurate values, they just guarantee that the application will
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c
index 3c3f535c0a..7771138999 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Enable GPIO clock and return GPIO base address
 uint32_t Set_GPIO_Clock(uint32_t port_idx) {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/port_api.c
index 9166ecc630..193ba7f9ba 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/port_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/port_api.c
@@ -33,7 +33,7 @@
 
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c
index a9bef674dd..3961cdfcc2 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM2 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/analogout_api.c
index ba6510fa9e..c45d859ab7 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/analogout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/analogout_api.c
@@ -31,7 +31,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "stm32f4xx_hal.h"
 
 #define RANGE_12BIT (0xFFF)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c
index b74cfc2ce5..ac68816d08 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_irq_api.c
index 959bce8dc2..db8fdeed6c 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_irq_api.c
@@ -32,7 +32,7 @@
 
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c
index 397ecaf0af..594fe30a13 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // GPIO mode look-up table
 static const uint32_t gpio_mode[12] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/port_api.c
index f60110fd56..412967167d 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/port_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/port_api.c
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c
index d66961b06a..71f4dff67b 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM5 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/rtc_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/rtc_api.c
index f76f9549c1..c9a55b55d0 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/rtc_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/rtc_api.c
@@ -30,7 +30,7 @@
 #include "rtc_api.h"
 
 #if DEVICE_RTC
-#include "error.h"
+#include "mbed_error.h"
 
 static int rtc_inited = 0;
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c
index 91701a8a5f..97f3060d83 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c
@@ -32,7 +32,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "wait_api.h"
 
 static const PinMap PinMap_ADC[] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c
index 5b97612803..cd20adfb51 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_irq_api.c
index 3ec4449108..10819cfc83 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_irq_api.c
@@ -32,7 +32,7 @@
 
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c
index dca0305b81..3197e881b1 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Enable GPIO clock and return GPIO base address
 uint32_t Set_GPIO_Clock(uint32_t port_idx) {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/port_api.c
index 78ae7da93c..9dc935435d 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/port_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/port_api.c
@@ -33,7 +33,7 @@
 
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/analogout_api.c
index 72c54a3b86..fddd540e67 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/analogout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/analogout_api.c
@@ -32,7 +32,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define DAC_RANGE (0xFFF) // 12 bits
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/gpio_api.c
index 54f3157106..90ff9d61e7 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/gpio_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/gpio_api.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/gpio_irq_api.c
index bfc8ae58b8..e35e1272c7 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/gpio_irq_api.c
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/pinmap.c
index fbd0a7c13c..09597e846e 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/pinmap.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // GPIO mode look-up table
 static const uint32_t gpio_mode[12] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/port_api.c
index 9a6ad5e5f4..337a3af226 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/port_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/port_api.c
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/pwmout_api.c
index 4f2790a556..12139424ef 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/pwmout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/pwmout_api.c
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM2 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/rtc_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/rtc_api.c
index 10d34dfbbe..3cfc14bfc4 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/rtc_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/rtc_api.c
@@ -31,7 +31,7 @@
 
 #if DEVICE_RTC
 
-#include "error.h"
+#include "mbed_error.h"
 
 static int rtc_inited = 0;
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c
index 6ec02db5ad..d37ae7e721 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_irq_api.c
index a776ff7c66..86a6ccaf13 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_irq_api.c
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c
index 7beb6e92e5..43d82f77df 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Alternate-function mapping
 #define AF_NUM (10)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/port_api.c
index bc0060014a..34598358be 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/port_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/port_api.c
@@ -33,7 +33,7 @@
 
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c
index 5b97612803..cd20adfb51 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_irq_api.c
index 9bdac95a88..86d433b30f 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_irq_api.c
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c
index 1c92c88a99..5760921ee2 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c
@@ -34,7 +34,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /* Timeout values for flags and events waiting loops. These timeouts are
    not based on accurate values, they just guarantee that the application will
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c
index 50c7792349..a107987dd1 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Enable GPIO clock and return GPIO base address
 uint32_t Set_GPIO_Clock(uint32_t port_idx) {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/port_api.c
index 78ae7da93c..9dc935435d 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/port_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/port_api.c
@@ -33,7 +33,7 @@
 
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pwmout_api.c
index 3405f27cc3..cc98fe2a0c 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pwmout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pwmout_api.c
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM2 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/analogout_api.c
index 5679a345e2..a1fa26a3c0 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/analogout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/analogout_api.c
@@ -32,7 +32,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define DAC_RANGE (0xFFF) // 12 bits
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/gpio_api.c
index 3ba161b961..b9ff5c114b 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/gpio_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/gpio_api.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/gpio_irq_api.c
index 661b987c72..bc73112cb2 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/gpio_irq_api.c
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/pinmap.c
index 5a7d5a30c4..5daa0d9ce0 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/pinmap.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // GPIO mode look-up table
 static const uint32_t gpio_mode[12] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/port_api.c
index 6281c31e52..e982858665 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/port_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/port_api.c
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/pwmout_api.c
index 697ed1eb25..b2aa63a18e 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/pwmout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/pwmout_api.c
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM2 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/rtc_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/rtc_api.c
index 28911960d0..6d49409b65 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/rtc_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/rtc_api.c
@@ -31,7 +31,7 @@
 
 #if DEVICE_RTC
 
-#include "error.h"
+#include "mbed_error.h"
 
 static int rtc_inited = 0;
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c
index 316295d4da..bcaa1f861c 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_irq_api.c
index bad20e7360..47f0883692 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_irq_api.c
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c
index dd55e6dcac..01afd00dab 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // GPIO mode look-up table
 static const uint32_t gpio_mode[12] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/port_api.c
index 9a6ad5e5f4..337a3af226 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/port_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/port_api.c
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pwmout_api.c
index 934fb67b45..69c87706dd 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pwmout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pwmout_api.c
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM5 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/rtc_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/rtc_api.c
index ee7e84242a..1c0bde768d 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/rtc_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/rtc_api.c
@@ -31,7 +31,7 @@
 
 #if DEVICE_RTC
 
-#include "error.h"
+#include "mbed_error.h"
 
 static int rtc_inited = 0;
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/gpio_api.c
index a9c28ece8c..df6fd9c1f7 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/gpio_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/gpio_api.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/gpio_irq_api.c
index e0b1c0e523..42ba48870b 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/gpio_irq_api.c
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/pinmap.c
index 56c02cb282..524733cdad 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/pinmap.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // GPIO mode look-up table
 static const uint32_t gpio_mode[12] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/port_api.c
index 6281c31e52..e982858665 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/port_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/port_api.c
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/pwmout_api.c
index 5349dedd7b..96bd95c96b 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/pwmout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/pwmout_api.c
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM5 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/rtc_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/rtc_api.c
index d4627017d0..bd0f2c0140 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/rtc_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/rtc_api.c
@@ -31,7 +31,7 @@
 
 #if DEVICE_RTC
 
-#include "error.h"
+#include "mbed_error.h"
 
 static int rtc_inited = 0;
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c
index 991acd2a63..9b39aa54de 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c
@@ -32,7 +32,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define DAC_RANGE (0xFFF) // 12 bits
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c
index de541d16d7..6457f88f46 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_irq_api.c
index 5ee15601c8..ba1ff31b2f 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_irq_api.c
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c
index 23c321c18d..837d355077 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c
@@ -34,7 +34,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /* Timeout values for flags and events waiting loops. These timeouts are
    not based on accurate values, they just guarantee that the application will
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c
index 66292a3da2..85eef83575 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // GPIO mode look-up table
 static const uint32_t gpio_mode[12] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/port_api.c
index 9a6ad5e5f4..337a3af226 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/port_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/port_api.c
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pwmout_api.c
index 202d61dec3..accfb30ddb 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pwmout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pwmout_api.c
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM21 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/rtc_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/rtc_api.c
index ee7e84242a..1c0bde768d 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/rtc_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/rtc_api.c
@@ -31,7 +31,7 @@
 
 #if DEVICE_RTC
 
-#include "error.h"
+#include "mbed_error.h"
 
 static int rtc_inited = 0;
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c
index 1183c2805c..81f28fc45c 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_irq_api.c
index efd4558dd7..dbb8c8209d 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_irq_api.c
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c
index 0bfc6811c4..926c1b4bc7 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Enable GPIO clock and return GPIO base address
 uint32_t Set_GPIO_Clock(uint32_t port_idx) {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/port_api.c
index 78ae7da93c..9dc935435d 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/port_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/port_api.c
@@ -33,7 +33,7 @@
 
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c
index 6743f91187..50ab4dc856 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_irq_api.c
index f729c93d81..9a41e8be05 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_irq_api.c
@@ -32,7 +32,7 @@
 
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c
index b8989a93c0..59618c5512 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Enable GPIO clock and return GPIO base address
 uint32_t Set_GPIO_Clock(uint32_t port_idx) {
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/port_api.c
index b257b612d6..d09d416124 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/port_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/port_api.c
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c
index e2fdc6a513..fc9855511a 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c
@@ -20,7 +20,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define ADC_10BIT_RANGE             0x3FF
 #define ADC_12BIT_RANGE             0xFFF
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c
index b9e619bedc..3e9dc9a6e5 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c
@@ -20,7 +20,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_I2C_SDA[] = {
     {PB_7,  I2C_1, STM_PIN_DATA(2, 4)},
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c
index 33a08966f8..c3ad164795 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /**
  * Set the pin into input, output, alternate function or analog mode