diff --git a/hal/api/mbed.h b/hal/api/mbed.h
index b44d183122..9540ba65b4 100644
--- a/hal/api/mbed.h
+++ b/hal/api/mbed.h
@@ -18,6 +18,7 @@
 
 #define MBED_LIBRARY_VERSION 117
 
+#include "toolchain.h"
 #include "platform.h"
 
 // Useful C libraries
diff --git a/hal/api/toolchain.h b/hal/api/toolchain.h
index b140643b38..7a79226941 100644
--- a/hal/api/toolchain.h
+++ b/hal/api/toolchain.h
@@ -24,6 +24,10 @@
 typedef int FILEHANDLE;
 #endif
 
+#ifndef EXTERN
+#define EXTERN extern
+#endif
+
 #if defined (__ICCARM__)
 #   define WEAK     __weak
 #   define PACKED   __packed
diff --git a/hal/common/error.c b/hal/common/mbed_error.c
similarity index 100%
rename from hal/common/error.c
rename to hal/common/mbed_error.c