diff --git a/lib/device.c b/lib/device.c
index e38a04f..45e08ec 100644
--- a/lib/device.c
+++ b/lib/device.c
@@ -5,9 +5,9 @@
  */
 
 #include <string.h>
-#include <errno.h>
 #include <metal/assert.h>
 #include <metal/device.h>
+#include <metal/errno.h>
 #include <metal/list.h>
 #include <metal/log.h>
 #include <metal/sys.h>
diff --git a/lib/dma.c b/lib/dma.c
index d8fe123..7edaa54 100644
--- a/lib/dma.c
+++ b/lib/dma.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <errno.h>
+#include <metal/errno.h>
 #include <string.h>
 #include <metal/device.h>
 #include <metal/log.h>
diff --git a/lib/io.c b/lib/io.c
index 289b1d6..8376ded 100644
--- a/lib/io.c
+++ b/lib/io.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <errno.h>
 #include <limits.h>
+#include <metal/errno.h>
 #include <metal/io.h>
 #include <metal/sys.h>
 
diff --git a/lib/irq.c b/lib/irq.c
index 5c414f9..c8578fa 100644
--- a/lib/irq.c
+++ b/lib/irq.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <errno.h>
+#include <metal/errno.h>
 #include <metal/irq.h>
 #include <metal/irq_controller.h>
 #include <metal/list.h>
diff --git a/lib/shmem.c b/lib/shmem.c
index e78be38..0ded4ec 100644
--- a/lib/shmem.c
+++ b/lib/shmem.c
@@ -9,8 +9,8 @@
  * @brief	Generic libmetal shared memory handling.
  */
 
-#include <errno.h>
 #include <metal/assert.h>
+#include <metal/errno.h>
 #include <metal/shmem.h>
 #include <metal/sys.h>
 #include <metal/utilities.h>
diff --git a/lib/softirq.c b/lib/softirq.c
index 7aa71c8..4ba745f 100644
--- a/lib/softirq.c
+++ b/lib/softirq.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <errno.h>
 #include <metal/atomic.h>
+#include <metal/errno.h>
 #include <metal/irq.h>
 #include <metal/irq_controller.h>
 #include <metal/log.h>
diff --git a/lib/system/freertos/irq.c b/lib/system/freertos/irq.c
index 0888915..3955e3f 100644
--- a/lib/system/freertos/irq.c
+++ b/lib/system/freertos/irq.c
@@ -9,7 +9,7 @@
  * @brief	FreeRTOS libmetal irq definitions.
  */
 
-#include <errno.h>
+#include <metal/errno.h>
 #include <metal/irq.h>
 #include <metal/sys.h>
 #include <metal/log.h>
diff --git a/lib/system/freertos/xlnx_common/irq.c b/lib/system/freertos/xlnx_common/irq.c
index 7638d19..9f31861 100644
--- a/lib/system/freertos/xlnx_common/irq.c
+++ b/lib/system/freertos/xlnx_common/irq.c
@@ -9,7 +9,7 @@
  * @brief	generic libmetal Xilinx irq controller definitions.
  */
 
-#include <errno.h>
+#include <metal/errno.h>
 #include <metal/irq_controller.h>
 #include <metal/sys.h>
 #include <metal/log.h>
diff --git a/lib/system/generic/condition.h b/lib/system/generic/condition.h
index ef4b01d..6369e9d 100644
--- a/lib/system/generic/condition.h
+++ b/lib/system/generic/condition.h
@@ -19,7 +19,7 @@
 #include <metal/atomic.h>
 #include <stdint.h>
 #include <limits.h>
-#include <errno.h>
+#include <metal/errno.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/system/generic/irq.c b/lib/system/generic/irq.c
index 4242b6e..f871aa2 100644
--- a/lib/system/generic/irq.c
+++ b/lib/system/generic/irq.c
@@ -9,7 +9,7 @@
  * @brief	generic libmetal irq definitions.
  */
 
-#include <errno.h>
+#include <metal/errno.h>
 #include <metal/irq.h>
 #include <metal/sys.h>
 #include <metal/log.h>
diff --git a/lib/system/generic/sys.h b/lib/system/generic/sys.h
index 3ac329b..a505423 100644
--- a/lib/system/generic/sys.h
+++ b/lib/system/generic/sys.h
@@ -16,8 +16,8 @@
 #ifndef __METAL_GENERIC_SYS__H__
 #define __METAL_GENERIC_SYS__H__
 
-#include <errno.h>
 #include <limits.h>
+#include <metal/errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/lib/system/generic/xlnx_common/irq.c b/lib/system/generic/xlnx_common/irq.c
index 717078b..82749d3 100644
--- a/lib/system/generic/xlnx_common/irq.c
+++ b/lib/system/generic/xlnx_common/irq.c
@@ -9,7 +9,7 @@
  * @brief	generic libmetal Xilinx irq controller definitions.
  */
 
-#include <errno.h>
+#include <metal/errno.h>
 #include <metal/irq_controller.h>
 #include <metal/sys.h>
 #include <metal/log.h>
diff --git a/lib/system/linux/condition.h b/lib/system/linux/condition.h
index e8f98a4..fdb1372 100644
--- a/lib/system/linux/condition.h
+++ b/lib/system/linux/condition.h
@@ -20,9 +20,9 @@
 #include <sys/syscall.h>
 #include <linux/futex.h>
 #include <metal/atomic.h>
+#include <metal/errno.h>
 #include <stdint.h>
 #include <limits.h>
-#include <errno.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/system/linux/sys.h b/lib/system/linux/sys.h
index 1183428..17774c6 100644
--- a/lib/system/linux/sys.h
+++ b/lib/system/linux/sys.h
@@ -16,10 +16,10 @@
 #ifndef __METAL_LINUX_SYS__H__
 #define __METAL_LINUX_SYS__H__
 
-#include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
 #include <limits.h>
+#include <metal/errno.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/system/nuttx/irq.c b/lib/system/nuttx/irq.c
index 6a0795e..64cf535 100644
--- a/lib/system/nuttx/irq.c
+++ b/lib/system/nuttx/irq.c
@@ -9,7 +9,7 @@
  * @brief	NuttX libmetal irq definitions.
  */
 
-#include <errno.h>
+#include <metal/errno.h>
 #include <metal/irq_controller.h>
 #include <metal/alloc.h>
 #include <nuttx/irq.h>
diff --git a/lib/system/zephyr/condition.h b/lib/system/zephyr/condition.h
index bb8b6d7..f9dc728 100644
--- a/lib/system/zephyr/condition.h
+++ b/lib/system/zephyr/condition.h
@@ -16,8 +16,8 @@
 #ifndef __METAL_ZEPHYR_CONDITION__H__
 #define __METAL_ZEPHYR_CONDITION__H__
 
-#include <errno.h>
 #include <metal/atomic.h>
+#include <metal/errno.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/lib/system/zephyr/irq.c b/lib/system/zephyr/irq.c
index 38dd629..9692734 100644
--- a/lib/system/zephyr/irq.c
+++ b/lib/system/zephyr/irq.c
@@ -9,7 +9,7 @@
  * @brief	Zephyr libmetal irq definitions.
  */
 
-#include <errno.h>
+#include <metal/errno.h>
 #include <metal/irq.h>
 #include <metal/sys.h>
 #include <metal/log.h>