diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/common.h b/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/common.h
index 1181557..9a9ed4c 100644
--- a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/common.h
+++ b/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/common.h
@@ -14,7 +14,7 @@
 #include <metal/atomic.h>
 #include <metal/alloc.h>
 #include <metal/irq.h>
-#include <errno.h>
+#include <metal/errno.h>
 #include <metal/sys.h>
 #include <metal/cpu.h>
 #include <metal/io.h>
diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c b/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c
index b603838..80a66b9 100644
--- a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c
+++ b/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c
@@ -37,7 +37,7 @@
 #include <metal/alloc.h>
 #include <metal/device.h>
 #include <metal/irq.h>
-#include <errno.h>
+#include <metal/errno.h>
 #include "common.h"
 
 #define BUF_SIZE_MAX 512
diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/common.h b/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/common.h
index 532e33b..ebb9769 100644
--- a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/common.h
+++ b/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/common.h
@@ -14,7 +14,7 @@
 #include <metal/atomic.h>
 #include <metal/alloc.h>
 #include <metal/irq.h>
-#include <errno.h>
+#include <metal/errno.h>
 #include <metal/sys.h>
 #include <metal/cpu.h>
 #include <metal/io.h>
diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c b/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c
index b603838..80a66b9 100644
--- a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c
+++ b/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c
@@ -37,7 +37,7 @@
 #include <metal/alloc.h>
 #include <metal/device.h>
 #include <metal/irq.h>
-#include <errno.h>
+#include <metal/errno.h>
 #include "common.h"
 
 #define BUF_SIZE_MAX 512
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_latency_demo.c b/examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_latency_demo.c
index 6bc270f..c4d25e4 100644
--- a/examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_latency_demo.c
+++ b/examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_latency_demo.c
@@ -27,7 +27,7 @@
 
 #include <unistd.h>
 #include <stdio.h>
-#include <errno.h>
+#include <metal/errno.h>
 #include <sys/types.h>
 #include <metal/atomic.h>
 #include <metal/io.h>
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_shmem_demo.c b/examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_shmem_demo.c
index a7625dd..5dbc554 100644
--- a/examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_shmem_demo.c
+++ b/examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_shmem_demo.c
@@ -41,7 +41,7 @@
 #include <sys/types.h>
 #include <metal/device.h>
 #include <metal/irq.h>
-#include <errno.h>
+#include <metal/errno.h>
 #include "common.h"
 
 /* Shared memory offsets */
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_atomic_demo.c b/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_atomic_demo.c
index 72588ed..6b0361a 100644
--- a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_atomic_demo.c
+++ b/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_atomic_demo.c
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <metal/device.h>
 #include <metal/irq.h>
-#include <errno.h>
+#include <metal/errno.h>
 #include <time.h>
 #include "common.h"
 
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_demo.c b/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_demo.c
index 0c6250c..439bdc9 100644
--- a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_demo.c
+++ b/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_demo.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include <errno.h>
+#include <metal/errno.h>
 #include <string.h>
 #include <metal/io.h>
 #include <metal/alloc.h>
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_latency_demo.c b/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_latency_demo.c
index 7164c1b..824e323 100644
--- a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_latency_demo.c
+++ b/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_latency_demo.c
@@ -25,7 +25,7 @@
  * 10. Clean up: disable IPI interrupt, deregister the IPI interrupt handler.
  */
 #include <unistd.h>
-#include <errno.h>
+#include <metal/errno.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <metal/atomic.h>
diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_throughput_demo.c b/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_throughput_demo.c
index 1ce07b5..aba0684 100644
--- a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_throughput_demo.c
+++ b/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_throughput_demo.c
@@ -41,7 +41,7 @@
  */
 
 #include <unistd.h>
-#include <errno.h>
+#include <metal/errno.h>
 #include <metal/atomic.h>
 #include <metal/io.h>
 #include <metal/device.h>
diff --git a/test/metal-test.c b/test/metal-test.c
index b86209b..34bfe81 100644
--- a/test/metal-test.c
+++ b/test/metal-test.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "metal-test.h"
 #include <metal/compiler.h>
+#include <metal/errno.h>
 #include <metal/sys.h>
 #include <metal/utilities.h>
 
diff --git a/test/system/freertos/alloc.c b/test/system/freertos/alloc.c
index 95286bc..2e02dc4 100644
--- a/test/system/freertos/alloc.c
+++ b/test/system/freertos/alloc.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <errno.h>
 #include <string.h>
 #include "FreeRTOS.h"
 #include "task.h"
 
 #include "metal-test.h"
 #include <metal/alloc.h>
+#include <metal/errno.h>
 #include <metal/log.h>
 #include <metal/sys.h>
 
diff --git a/test/system/freertos/atomic.c b/test/system/freertos/atomic.c
index bd584a4..b5d14da 100644
--- a/test/system/freertos/atomic.c
+++ b/test/system/freertos/atomic.c
@@ -5,9 +5,9 @@
  */
 
 #include <stdlib.h>
-#include <errno.h>
 #include "metal-test.h"
 #include <metal/atomic.h>
+#include <metal/errno.h>
 #include <metal/log.h>
 #include <metal/sys.h>
 
diff --git a/test/system/freertos/irq.c b/test/system/freertos/irq.c
index 2b9b790..ee961a5 100644
--- a/test/system/freertos/irq.c
+++ b/test/system/freertos/irq.c
@@ -5,13 +5,13 @@
  */
 
 #include <stdlib.h>
-#include <errno.h>
 
 /* We need to find the internal MAX_IRQS limit */
 /* Could be retrieved from platform specific files in the future */
 #define METAL_INTERNAL
 
 #include "metal-test.h"
+#include <metal/errno.h>
 #include <metal/irq.h>
 #include <metal/log.h>
 #include <metal/sys.h>
diff --git a/test/system/freertos/sleep.c b/test/system/freertos/sleep.c
index d203567..c9cd03a 100644
--- a/test/system/freertos/sleep.c
+++ b/test/system/freertos/sleep.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <errno.h>
+#include <metal/errno.h>
 #include <string.h>
 #include "FreeRTOS.h"
 #include "task.h"
diff --git a/test/system/freertos/threads.c b/test/system/freertos/threads.c
index 958881a..1c15a1e 100644
--- a/test/system/freertos/threads.c
+++ b/test/system/freertos/threads.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <errno.h>
+#include <metal/errno.h>
 #include "FreeRTOS.h"
 #include "task.h"
 #include <metal/sys.h>
diff --git a/test/system/generic/irq.c b/test/system/generic/irq.c
index 2b9b790..2f1773e 100644
--- a/test/system/generic/irq.c
+++ b/test/system/generic/irq.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include <errno.h>
+#include <metal/errno.h>
 
 /* We need to find the internal MAX_IRQS limit */
 /* Could be retrieved from platform specific files in the future */
diff --git a/test/system/linux/irq.c b/test/system/linux/irq.c
index fda9524..eb02b2b 100644
--- a/test/system/linux/irq.c
+++ b/test/system/linux/irq.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include <errno.h>
+#include <metal/errno.h>
 #include <sys/eventfd.h>
 
 /* We need to find the internal MAX_IRQS limit */