From 2e156f19ff47e701d31de105dff2b1831b2ba744 Mon Sep 17 00:00:00 2001
From: Andrew Davis <afd@ti.com>
Date: Fri, 7 Jul 2023 10:23:56 -0500
Subject: [PATCH] lib: Avoid mentioning the current filename in compile-time
 warning

Some of these were not correct in some spots. Instead of trying to include
the name of the current file in this warning (which might change), only
state which file should be included instead.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 lib/system/freertos/alloc.h     | 2 +-
 lib/system/freertos/assert.h    | 2 +-
 lib/system/freertos/cache.h     | 2 +-
 lib/system/freertos/condition.h | 2 +-
 lib/system/freertos/io.h        | 2 +-
 lib/system/freertos/mutex.h     | 2 +-
 lib/system/freertos/sleep.h     | 2 +-
 lib/system/freertos/sys.h       | 2 +-
 lib/system/generic/alloc.h      | 2 +-
 lib/system/generic/assert.h     | 2 +-
 lib/system/generic/cache.h      | 2 +-
 lib/system/generic/condition.h  | 2 +-
 lib/system/generic/io.h         | 2 +-
 lib/system/generic/mutex.h      | 2 +-
 lib/system/generic/sleep.h      | 2 +-
 lib/system/generic/sys.h        | 2 +-
 lib/system/linux/alloc.h        | 2 +-
 lib/system/linux/assert.h       | 2 +-
 lib/system/linux/cache.h        | 2 +-
 lib/system/linux/condition.h    | 2 +-
 lib/system/linux/io.h           | 2 +-
 lib/system/linux/irq.h          | 2 +-
 lib/system/linux/mutex.h        | 2 +-
 lib/system/linux/sleep.h        | 2 +-
 lib/system/linux/sys.h          | 2 +-
 lib/system/nuttx/alloc.h        | 2 +-
 lib/system/nuttx/assert.h       | 2 +-
 lib/system/nuttx/cache.h        | 2 +-
 lib/system/nuttx/condition.h    | 2 +-
 lib/system/nuttx/io.h           | 2 +-
 lib/system/nuttx/irq.h          | 2 +-
 lib/system/nuttx/mutex.h        | 2 +-
 lib/system/nuttx/sleep.h        | 2 +-
 lib/system/nuttx/sys.h          | 2 +-
 lib/system/zephyr/alloc.h       | 2 +-
 lib/system/zephyr/assert.h      | 2 +-
 lib/system/zephyr/cache.h       | 2 +-
 lib/system/zephyr/condition.h   | 2 +-
 lib/system/zephyr/io.h          | 2 +-
 lib/system/zephyr/log.h         | 2 +-
 lib/system/zephyr/mutex.h       | 2 +-
 lib/system/zephyr/sleep.h       | 2 +-
 lib/system/zephyr/sys.h         | 2 +-
 43 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/lib/system/freertos/alloc.h b/lib/system/freertos/alloc.h
index 8ce3dedf2..a8d03abcd 100644
--- a/lib/system/freertos/alloc.h
+++ b/lib/system/freertos/alloc.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_ALLOC__H__
-#error "Include metal/alloc.h instead of metal/freertos/alloc.h"
+#error "Do not include this file directly, include <metal/alloc.h> instead"
 #endif
 
 #ifndef __METAL_FREERTOS_ALLOC__H__
diff --git a/lib/system/freertos/assert.h b/lib/system/freertos/assert.h
index 0194e6f1a..81fc34dbe 100644
--- a/lib/system/freertos/assert.h
+++ b/lib/system/freertos/assert.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_ASSERT__H__
-#error "Include metal/assert.h instead of metal/freertos/assert.h"
+#error "Do not include this file directly, include <metal/assert.h> instead"
 #endif
 
 #ifndef __METAL_FREERTOS_ASSERT__H__
diff --git a/lib/system/freertos/cache.h b/lib/system/freertos/cache.h
index 0718f22f8..eec331556 100644
--- a/lib/system/freertos/cache.h
+++ b/lib/system/freertos/cache.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_CACHE__H__
-#error "Include metal/cache.h instead of metal/freertos/cache.h"
+#error "Do not include this file directly, include <metal/cache.h> instead"
 #endif
 
 #ifndef __METAL_FREERTOS_CACHE__H__
diff --git a/lib/system/freertos/condition.h b/lib/system/freertos/condition.h
index 3571a7600..d5f38f78f 100644
--- a/lib/system/freertos/condition.h
+++ b/lib/system/freertos/condition.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_CONDITION__H__
-#error "Include metal/condition.h instead of metal/freertos/condition.h"
+#error "Do not include this file directly, include <metal/condition.h> instead"
 #endif
 
 #ifndef __METAL_FREERTOS_CONDITION__H__
diff --git a/lib/system/freertos/io.h b/lib/system/freertos/io.h
index d4047951a..ae4c34c2c 100644
--- a/lib/system/freertos/io.h
+++ b/lib/system/freertos/io.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_IO__H__
-#error "Include metal/io.h instead of metal/freertos/io.h"
+#error "Do not include this file directly, include <metal/io.h> instead"
 #endif
 
 #ifndef __METAL_FREEROTS_IO__H__
diff --git a/lib/system/freertos/mutex.h b/lib/system/freertos/mutex.h
index 5cf1b7497..60f950b26 100644
--- a/lib/system/freertos/mutex.h
+++ b/lib/system/freertos/mutex.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_MUTEX__H__
-#error "Include metal/mutex.h instead of metal/freertos/mutex.h"
+#error "Do not include this file directly, include <metal/mutex.h> instead"
 #endif
 
 #ifndef __METAL_FREERTOS_MUTEX__H__
diff --git a/lib/system/freertos/sleep.h b/lib/system/freertos/sleep.h
index f9eee9f1e..b7a407775 100644
--- a/lib/system/freertos/sleep.h
+++ b/lib/system/freertos/sleep.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_SLEEP__H__
-#error "Include metal/sleep.h instead of metal/freertos/sleep.h"
+#error "Do not include this file directly, include <metal/sleep.h> instead"
 #endif
 
 #ifndef __METAL_FREERTOS_SLEEP__H__
diff --git a/lib/system/freertos/sys.h b/lib/system/freertos/sys.h
index 18b50d19c..8bafa0a61 100644
--- a/lib/system/freertos/sys.h
+++ b/lib/system/freertos/sys.h
@@ -11,7 +11,7 @@
  */
 
 #ifndef __METAL_SYS__H__
-#error "Include metal/sys.h instead of metal/freertos/sys.h"
+#error "Do not include this file directly, include <metal/sys.h> instead"
 #endif
 
 #ifndef __METAL_FREERTOS_SYS__H__
diff --git a/lib/system/generic/alloc.h b/lib/system/generic/alloc.h
index 94e891b7a..cd40457a6 100644
--- a/lib/system/generic/alloc.h
+++ b/lib/system/generic/alloc.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_ALLOC__H__
-#error "Include metal/alloc.h instead of metal/generic/alloc.h"
+#error "Do not include this file directly, include <metal/alloc.h> instead"
 #endif
 
 #ifndef __METAL_GENERIC_ALLOC__H__
diff --git a/lib/system/generic/assert.h b/lib/system/generic/assert.h
index a0aed192b..9094298dd 100644
--- a/lib/system/generic/assert.h
+++ b/lib/system/generic/assert.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_ASSERT__H__
-#error "Include metal/assert.h instead of metal/generic/assert.h"
+#error "Do not include this file directly, include <metal/assert.h> instead"
 #endif
 
 #ifndef __METAL_GENERIC_ASSERT__H__
diff --git a/lib/system/generic/cache.h b/lib/system/generic/cache.h
index 77068f1f9..563bccb39 100644
--- a/lib/system/generic/cache.h
+++ b/lib/system/generic/cache.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_CACHE__H__
-#error "Include metal/cache.h instead of metal/generic/cache.h"
+#error "Do not include this file directly, include <metal/cache.h> instead"
 #endif
 
 #ifndef __METAL_GENERIC_CACHE__H__
diff --git a/lib/system/generic/condition.h b/lib/system/generic/condition.h
index d61af1651..46bbbd0e5 100644
--- a/lib/system/generic/condition.h
+++ b/lib/system/generic/condition.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_CONDITION__H__
-#error "Include metal/condition.h instead of metal/generic/condition.h"
+#error "Do not include this file directly, include <metal/condition.h> instead"
 #endif
 
 #ifndef __METAL_GENERIC_CONDITION__H__
diff --git a/lib/system/generic/io.h b/lib/system/generic/io.h
index 137fc30a5..5e4c1f1f9 100644
--- a/lib/system/generic/io.h
+++ b/lib/system/generic/io.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_IO__H__
-#error "Include metal/io.h instead of metal/generic/io.h"
+#error "Do not include this file directly, include <metal/io.h> instead"
 #endif
 
 #ifndef __METAL_GENERIC_IO__H__
diff --git a/lib/system/generic/mutex.h b/lib/system/generic/mutex.h
index 8ba186733..4d9260e12 100644
--- a/lib/system/generic/mutex.h
+++ b/lib/system/generic/mutex.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_MUTEX__H__
-#error "Include metal/mutex.h instead of metal/generic/mutex.h"
+#error "Do not include this file directly, include <metal/mutex.h> instead"
 #endif
 
 #ifndef __METAL_GENERIC_MUTEX__H__
diff --git a/lib/system/generic/sleep.h b/lib/system/generic/sleep.h
index 4ba52ce18..3fa2ae94d 100644
--- a/lib/system/generic/sleep.h
+++ b/lib/system/generic/sleep.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_SLEEP__H__
-#error "Include metal/sleep.h instead of metal/generic/sleep.h"
+#error "Do not include this file directly, include <metal/sleep.h> instead"
 #endif
 
 #ifndef __METAL_GENERIC_SLEEP__H__
diff --git a/lib/system/generic/sys.h b/lib/system/generic/sys.h
index df19c11bf..9d34056a7 100644
--- a/lib/system/generic/sys.h
+++ b/lib/system/generic/sys.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_SYS__H__
-#error "Include metal/sys.h instead of metal/generic/sys.h"
+#error "Do not include this file directly, include <metal/sys.h> instead"
 #endif
 
 #ifndef __METAL_GENERIC_SYS__H__
diff --git a/lib/system/linux/alloc.h b/lib/system/linux/alloc.h
index f79f99e9e..d2b0faf1b 100644
--- a/lib/system/linux/alloc.h
+++ b/lib/system/linux/alloc.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_ALLOC__H__
-#error "Include metal/alloc.h instead of metal/linux/alloc.h"
+#error "Do not include this file directly, include <metal/alloc.h> instead"
 #endif
 
 #ifndef __METAL_LINUX_ALLOC__H__
diff --git a/lib/system/linux/assert.h b/lib/system/linux/assert.h
index d0d91086f..dacad488b 100644
--- a/lib/system/linux/assert.h
+++ b/lib/system/linux/assert.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_ASSERT__H__
-#error "Include metal/assert.h instead of metal/linux/assert.h"
+#error "Do not include this file directly, include <metal/assert.h> instead"
 #endif
 
 #ifndef __METAL_LINUX_ASSERT__H__
diff --git a/lib/system/linux/cache.h b/lib/system/linux/cache.h
index ed7b9ec30..1d0a136b2 100644
--- a/lib/system/linux/cache.h
+++ b/lib/system/linux/cache.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_CACHE__H__
-#error "Include metal/cache.h instead of metal/linux/cache.h"
+#error "Do not include this file directly, include <metal/cache.h> instead"
 #endif
 
 #ifndef __METAL_LINUX_CACHE__H__
diff --git a/lib/system/linux/condition.h b/lib/system/linux/condition.h
index 1aaad20dc..35c77072f 100644
--- a/lib/system/linux/condition.h
+++ b/lib/system/linux/condition.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_CONDITION__H__
-#error "Include metal/condition.h instead of metal/linux/condition.h"
+#error "Do not include this file directly, include <metal/condition.h> instead"
 #endif
 
 #ifndef __METAL_LINUX_CONDITION__H__
diff --git a/lib/system/linux/io.h b/lib/system/linux/io.h
index 5e9949f85..590b2a5ea 100644
--- a/lib/system/linux/io.h
+++ b/lib/system/linux/io.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_IO__H__
-#error "Include metal/io.h instead of metal/linux/io.h"
+#error "Do not include this file directly, include <metal/io.h> instead"
 #endif
 
 #ifndef __METAL_LINUX_IO__H__
diff --git a/lib/system/linux/irq.h b/lib/system/linux/irq.h
index 77a26ce1b..ff02b7e48 100644
--- a/lib/system/linux/irq.h
+++ b/lib/system/linux/irq.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_IRQ__H__
-#error "Include metal/irq.h instead of metal/linux/irq.h"
+#error "Do not include this file directly, include <metal/irq.h> instead"
 #endif
 
 #ifndef __METAL_LINUX_IRQ__H__
diff --git a/lib/system/linux/mutex.h b/lib/system/linux/mutex.h
index 3d388cf6d..e85f3d795 100644
--- a/lib/system/linux/mutex.h
+++ b/lib/system/linux/mutex.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_MUTEX__H__
-#error "Include metal/mutex.h instead of metal/linux/mutex.h"
+#error "Do not include this file directly, include <metal/mutex.h> instead"
 #endif
 
 #ifndef __METAL_LINUX_MUTEX__H__
diff --git a/lib/system/linux/sleep.h b/lib/system/linux/sleep.h
index bf8ab2d5d..ba7d7832f 100644
--- a/lib/system/linux/sleep.h
+++ b/lib/system/linux/sleep.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_SLEEP__H__
-#error "Include metal/sleep.h instead of metal/linux/sleep.h"
+#error "Do not include this file directly, include <metal/sleep.h> instead"
 #endif
 
 #ifndef __METAL_LINUX_SLEEP__H__
diff --git a/lib/system/linux/sys.h b/lib/system/linux/sys.h
index 194701108..c17dd5f10 100644
--- a/lib/system/linux/sys.h
+++ b/lib/system/linux/sys.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_SYS__H__
-#error "Include metal/sys.h instead of metal/linux/sys.h"
+#error "Do not include this file directly, include <metal/sys.h> instead"
 #endif
 
 #ifndef __METAL_LINUX_SYS__H__
diff --git a/lib/system/nuttx/alloc.h b/lib/system/nuttx/alloc.h
index e504978a9..723c9f576 100644
--- a/lib/system/nuttx/alloc.h
+++ b/lib/system/nuttx/alloc.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_ALLOC__H__
-#error "Include metal/alloc.h instead of metal/nuttx/alloc.h"
+#error "Do not include this file directly, include <metal/alloc.h> instead"
 #endif
 
 #ifndef __METAL_NUTTX_ALLOC__H__
diff --git a/lib/system/nuttx/assert.h b/lib/system/nuttx/assert.h
index fab92fbb5..5881b8478 100644
--- a/lib/system/nuttx/assert.h
+++ b/lib/system/nuttx/assert.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_ASSERT__H__
-#error "Include metal/assert.h instead of metal/nuttx/assert.h"
+#error "Do not include this file directly, include <metal/assert.h> instead"
 #endif
 
 #ifndef __METAL_NUTTX_ASSERT__H__
diff --git a/lib/system/nuttx/cache.h b/lib/system/nuttx/cache.h
index 0a484b350..5c2aff651 100644
--- a/lib/system/nuttx/cache.h
+++ b/lib/system/nuttx/cache.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_CACHE__H__
-#error "Include metal/cache.h instead of metal/nuttx/cache.h"
+#error "Do not include this file directly, include <metal/cache.h> instead"
 #endif
 
 #ifndef __METAL_NUTTX_CACHE__H__
diff --git a/lib/system/nuttx/condition.h b/lib/system/nuttx/condition.h
index f8a2df7ff..2ad7d9d1f 100644
--- a/lib/system/nuttx/condition.h
+++ b/lib/system/nuttx/condition.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_CONDITION__H__
-#error "Include metal/condition.h instead of metal/nuttx/condition.h"
+#error "Do not include this file directly, include <metal/condition.h> instead"
 #endif
 
 #ifndef __METAL_NUTTX_CONDITION__H__
diff --git a/lib/system/nuttx/io.h b/lib/system/nuttx/io.h
index 9587786f8..9f06a853a 100644
--- a/lib/system/nuttx/io.h
+++ b/lib/system/nuttx/io.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_IO__H__
-#error "Include metal/io.h instead of metal/nuttx/io.h"
+#error "Do not include this file directly, include <metal/io.h> instead"
 #endif
 
 #ifndef __METAL_NUTTX_IO__H__
diff --git a/lib/system/nuttx/irq.h b/lib/system/nuttx/irq.h
index 84581b051..f9dacb710 100644
--- a/lib/system/nuttx/irq.h
+++ b/lib/system/nuttx/irq.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_IRQ__H__
-#error "Include metal/irq.h instead of metal/nuttx/irq.h"
+#error "Do not include this file directly, include <metal/irq.h> instead"
 #endif
 
 #ifndef __METAL_NUTTX_IRQ__H__
diff --git a/lib/system/nuttx/mutex.h b/lib/system/nuttx/mutex.h
index c9db309ca..1e7406cbd 100644
--- a/lib/system/nuttx/mutex.h
+++ b/lib/system/nuttx/mutex.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_MUTEX__H__
-#error "Include metal/mutex.h instead of metal/nuttx/mutex.h"
+#error "Do not include this file directly, include <metal/mutex.h> instead"
 #endif
 
 #ifndef __METAL_NUTTX_MUTEX__H__
diff --git a/lib/system/nuttx/sleep.h b/lib/system/nuttx/sleep.h
index c0c19050a..16699f87d 100644
--- a/lib/system/nuttx/sleep.h
+++ b/lib/system/nuttx/sleep.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_SLEEP__H__
-#error "Include metal/sleep.h instead of metal/nuttx/sleep.h"
+#error "Do not include this file directly, include <metal/sleep.h> instead"
 #endif
 
 #ifndef __METAL_NUTTX_SLEEP__H__
diff --git a/lib/system/nuttx/sys.h b/lib/system/nuttx/sys.h
index 64f291ce2..cee53c478 100644
--- a/lib/system/nuttx/sys.h
+++ b/lib/system/nuttx/sys.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_SYS__H__
-#error "Include metal/sys.h instead of metal/nuttx/sys.h"
+#error "Do not include this file directly, include <metal/sys.h> instead"
 #endif
 
 #ifndef __METAL_NUTTX_SYS__H__
diff --git a/lib/system/zephyr/alloc.h b/lib/system/zephyr/alloc.h
index c11b32cb3..5f855f4b4 100644
--- a/lib/system/zephyr/alloc.h
+++ b/lib/system/zephyr/alloc.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_ALLOC__H__
-#error "Include metal/alloc.h instead of metal/zephyr/alloc.h"
+#error "Do not include this file directly, include <metal/alloc.h> instead"
 #endif
 
 #ifndef __METAL_ZEPHYR_ALLOC__H__
diff --git a/lib/system/zephyr/assert.h b/lib/system/zephyr/assert.h
index 6bb6824c1..8d7335864 100644
--- a/lib/system/zephyr/assert.h
+++ b/lib/system/zephyr/assert.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_ASSERT__H__
-#error "Include metal/assert.h instead of metal/zephyr/assert.h"
+#error "Do not include this file directly, include <metal/assert.h> instead"
 #endif
 
 #ifndef __METAL_ZEPHYR_ASSERT__H__
diff --git a/lib/system/zephyr/cache.h b/lib/system/zephyr/cache.h
index 48f9b95a3..3542756dc 100644
--- a/lib/system/zephyr/cache.h
+++ b/lib/system/zephyr/cache.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_CACHE__H__
-#error "Include metal/cache.h instead of metal/zephyr/cache.h"
+#error "Do not include this file directly, include <metal/cache.h> instead"
 #endif
 
 #ifndef __METAL_ZEPHYR_CACHE__H__
diff --git a/lib/system/zephyr/condition.h b/lib/system/zephyr/condition.h
index ee834bcd1..33562fa99 100644
--- a/lib/system/zephyr/condition.h
+++ b/lib/system/zephyr/condition.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_CONDITION__H__
-#error "Include metal/condition.h instead of metal/generic/condition.h"
+#error "Do not include this file directly, include <metal/condition.h> instead"
 #endif
 
 #ifndef __METAL_ZEPHYR_CONDITION__H__
diff --git a/lib/system/zephyr/io.h b/lib/system/zephyr/io.h
index f738ca99a..6ac7b02da 100644
--- a/lib/system/zephyr/io.h
+++ b/lib/system/zephyr/io.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_IO__H__
-#error "Include metal/io.h instead of metal/zephyr/io.h"
+#error "Do not include this file directly, include <metal/io.h> instead"
 #endif
 
 #ifndef __METAL_ZEPHYR_IO__H__
diff --git a/lib/system/zephyr/log.h b/lib/system/zephyr/log.h
index 403409722..5a01e172d 100644
--- a/lib/system/zephyr/log.h
+++ b/lib/system/zephyr/log.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_METAL_LOG__H__
-#error "Include metal/log.h instead of metal/zephyr/log.h"
+#error "Do not include this file directly, include <metal/log.h> instead"
 #endif
 
 #ifndef __METAL_ZEPHYR_LOG__H__
diff --git a/lib/system/zephyr/mutex.h b/lib/system/zephyr/mutex.h
index 7e02f7202..d77ed65a4 100644
--- a/lib/system/zephyr/mutex.h
+++ b/lib/system/zephyr/mutex.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_MUTEX__H__
-#error "Include metal/mutex.h instead of metal/zephyr/mutex.h"
+#error "Do not include this file directly, include <metal/mutex.h> instead"
 #endif
 
 #ifndef __METAL_ZEPHYR_MUTEX__H__
diff --git a/lib/system/zephyr/sleep.h b/lib/system/zephyr/sleep.h
index 629a60384..e9bd8e1c3 100644
--- a/lib/system/zephyr/sleep.h
+++ b/lib/system/zephyr/sleep.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_SLEEP__H__
-#error "Include metal/sleep.h instead of metal/zephyr/sleep.h"
+#error "Do not include this file directly, include <metal/sleep.h> instead"
 #endif
 
 #ifndef __METAL_ZEPHYR_SLEEP__H__
diff --git a/lib/system/zephyr/sys.h b/lib/system/zephyr/sys.h
index 95a629e9b..d510e2ba8 100644
--- a/lib/system/zephyr/sys.h
+++ b/lib/system/zephyr/sys.h
@@ -10,7 +10,7 @@
  */
 
 #ifndef __METAL_SYS__H__
-#error "Include metal/sys.h instead of metal/zephyr/sys.h"
+#error "Do not include this file directly, include <metal/sys.h> instead"
 #endif
 
 #ifndef __METAL_ZEPHYR_SYS__H__