diff --git a/hal/common/critical.c b/hal/common/critical.c
index 8705a88061e..735a8b65ab9 100644
--- a/hal/common/critical.c
+++ b/hal/common/critical.c
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-
+#define __STDC_LIMIT_MACROS
 #include <stdint.h>
 #include <stddef.h>
 #include "cmsis.h"
diff --git a/hal/common/error.c b/hal/common/error.c
index faa1622e31c..3b121934221 100644
--- a/hal/common/error.c
+++ b/hal/common/error.c
@@ -18,6 +18,7 @@
 #include "device.h"
 #include "toolchain.h"
 #include "mbed_error.h"
+#include "mbed_interface.h"
 #if DEVICE_STDIO_MESSAGES
 #include <stdio.h>
 #endif