diff --git a/arch/src/arm_main.c b/arch/src/arm_main.c
index d30ef78577aedcc64273e08077380811c8c044b9..95070aa341c806ce5cf6d33eff1d76dce465efdc 100644
--- a/arch/src/arm_main.c
+++ b/arch/src/arm_main.c
@@ -8,8 +8,8 @@
 #include <stdbool.h>
 #include <fwk_arch.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <cmsis_compiler.h>
 
 #define SCB_CCR ((FWK_RW uint32_t *)(0xE000ED14))
diff --git a/arch/src/arm_mm.c b/arch/src/arm_mm.c
index 1695553351cc4926d8512437eb411fb6e857454b..81f07ccc9c53a8875024258f5008ac842b038419 100644
--- a/arch/src/arm_mm.c
+++ b/arch/src/arm_mm.c
@@ -11,8 +11,8 @@
 #include <stdint.h>
 #include <fwk_arch.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 
 int arm_mm_init(struct fwk_arch_mm_data *data)
 {
diff --git a/arch/src/arm_nvic.c b/arch/src/arm_nvic.c
index 51063f1575fd9c62301b11331e0583192706e386..a9640cd46c3f5d939bf36e1173980a9120aa488e 100644
--- a/arch/src/arm_nvic.c
+++ b/arch/src/arm_nvic.c
@@ -11,11 +11,11 @@
 #include <limits.h>
 #include <stdint.h>
 #include <fwk_arch.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
 #include <fwk_noreturn.h>
+#include <fwk_status.h>
 #include <cmsis_compiler.h>
 
 #ifdef BUILD_HAS_MULTITHREADING
diff --git a/arch/src/host.c b/arch/src/host.c
index 52f3011513eddaca094c0d39cef5a7a8eafd6371..c15699457d58e2aecd3b1cd328989f9805199211 100644
--- a/arch/src/host.c
+++ b/arch/src/host.c
@@ -8,8 +8,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <fwk_arch.h>
-#include <fwk_errno.h>
 #include <fwk_noreturn.h>
+#include <fwk_status.h>
 
 extern int host_interrupt_init(struct fwk_arch_interrupt_driver **driver);
 
diff --git a/arch/src/host_interrupt.c b/arch/src/host_interrupt.c
index 6ce2121c7bc801d4bfd032cffef543cc6e126e15..3a9885bf7c8de649cc58f270b80e3a006244114a 100644
--- a/arch/src/host_interrupt.c
+++ b/arch/src/host_interrupt.c
@@ -11,7 +11,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <fwk_arch.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 
 static int global_enable(void)
 {
diff --git a/framework/include/fwk_id.h b/framework/include/fwk_id.h
index b97b00c3de6249cb0818832c0b267f6117506b18..168008144721672de7110108774e8c31fa325e9e 100644
--- a/framework/include/fwk_id.h
+++ b/framework/include/fwk_id.h
@@ -14,7 +14,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <internal/fwk_id.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 
 /*!
  * \addtogroup GroupLibFramework Framework
diff --git a/framework/include/fwk_errno.h b/framework/include/fwk_status.h
similarity index 87%
rename from framework/include/fwk_errno.h
rename to framework/include/fwk_status.h
index 7f75778bb5231e6d91938c4232ee8abce6303103..67ff54364d68b07fd364dc74e414ebeeacdca9bc 100644
--- a/framework/include/fwk_errno.h
+++ b/framework/include/fwk_status.h
@@ -8,8 +8,8 @@
  *     Standard return codes.
  */
 
-#ifndef FWK_ERRNO_H
-#define FWK_ERRNO_H
+#ifndef FWK_STATUS_H
+#define FWK_STATUS_H
 
 /*!
  * \addtogroup GroupLibFramework Framework
@@ -17,12 +17,15 @@
  */
 
 /*!
- * \defgroup GroupErrno Return Codes
+ * \defgroup GroupStatus Return Codes
  * @{
  */
 
+/*! Success, request is pending */
+#define FWK_PENDING         1
+
 /*! Success */
-#define FWK_SUCCESS          0
+#define FWK_SUCCESS         0
 
 /*! Invalid parameter(s) */
 #define FWK_E_PARAM         -1
@@ -86,4 +89,4 @@
  * @}
  */
 
-#endif /* FWK_ERRNO_H */
+#endif /* FWK_STATUS_H */
diff --git a/framework/src/fwk_arch.c b/framework/src/fwk_arch.c
index 95f5cbf2d36123b4f9ddda65491acb218be709f1..465026d49586f2bd0b58ad7c8c73e2bbff0745c3 100644
--- a/framework/src/fwk_arch.c
+++ b/framework/src/fwk_arch.c
@@ -9,9 +9,9 @@
  */
 
 #include <fwk_arch.h>
-#include <fwk_errno.h>
 #include <fwk_host.h>
 #include <fwk_mm.h>
+#include <fwk_status.h>
 #include <internal/fwk_module.h>
 
 extern int fwk_mm_init(uintptr_t start, size_t size);
diff --git a/framework/src/fwk_interrupt.c b/framework/src/fwk_interrupt.c
index eadbf5c5c0849d21696e2f2237de4611a0b7b6d2..82a692d3989e0ec27f994cc86117e0315023c396 100644
--- a/framework/src/fwk_interrupt.c
+++ b/framework/src/fwk_interrupt.c
@@ -11,9 +11,9 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <fwk_arch.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
+#include <fwk_status.h>
 
 static bool initialized;
 static const struct fwk_arch_interrupt_driver *driver;
diff --git a/framework/src/fwk_mm.c b/framework/src/fwk_mm.c
index 7bc0afcb00f80766e1d2895c8cc4398b19e586c5..ece4ed05318225e5653d08120c58c2e42da23b59 100644
--- a/framework/src/fwk_mm.c
+++ b/framework/src/fwk_mm.c
@@ -14,9 +14,9 @@
 #include <stdint.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
+#include <fwk_status.h>
 
 static bool initialized;
 static bool mm_locked;
diff --git a/framework/src/fwk_module.c b/framework/src/fwk_module.c
index 8f695842ac01ad450c963aa11466e45e5195f1cf..c01b1de89eb04fb5aa464d6ceb8061beaff2008e 100644
--- a/framework/src/fwk_module.c
+++ b/framework/src/fwk_module.c
@@ -10,9 +10,9 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_host.h>
 #include <fwk_mm.h>
+#include <fwk_status.h>
 #include <internal/fwk_module.h>
 #include <internal/fwk_thread.h>
 #ifdef BUILD_HAS_NOTIFICATION
diff --git a/framework/src/fwk_multi_thread.c b/framework/src/fwk_multi_thread.c
index 65cf84345dccdca0c73c87ef4e5628970ea47a31..546d2fc758e7f7b203675f3e5ca6d47e45536939 100644
--- a/framework/src/fwk_multi_thread.c
+++ b/framework/src/fwk_multi_thread.c
@@ -9,11 +9,11 @@
 #include <stdint.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_host.h>
 #include <fwk_interrupt.h>
 #include <fwk_element.h>
 #include <fwk_mm.h>
+#include <fwk_status.h>
 #include <internal/fwk_module.h>
 #include <internal/fwk_notification.h>
 #include <internal/fwk_multi_thread.h>
diff --git a/framework/src/fwk_thread.c b/framework/src/fwk_thread.c
index d8a89a7bb7a32a9b51df24ba0d3f450e595d38b5..97f9a49ac08baffc7cfff1d9d8a090680fe77fa1 100644
--- a/framework/src/fwk_thread.c
+++ b/framework/src/fwk_thread.c
@@ -12,11 +12,11 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_host.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
+#include <fwk_status.h>
 #include <internal/fwk_module.h>
 #include <internal/fwk_notification.h>
 #include <internal/fwk_single_thread.h>
diff --git a/framework/test/fwk_test.c b/framework/test/fwk_test.c
index 956c5ce7158dc8c7f3f458cfef763a3886bfae96..d1295036d81f7153a3644ee789cb001620715e1b 100644
--- a/framework/test/fwk_test.c
+++ b/framework/test/fwk_test.c
@@ -8,8 +8,8 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <fwk_errno.h>
 #include <fwk_noreturn.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 
 /* Test information provided by the test suite */
diff --git a/framework/test/test_fwk_arch.c b/framework/test/test_fwk_arch.c
index e1e930e1a2fa45c18395a13443d2d51ca743c714..ee678bdfde636b58f7bfb2c3b480a4b6e4841bfe 100644
--- a/framework/test/test_fwk_arch.c
+++ b/framework/test/test_fwk_arch.c
@@ -8,8 +8,8 @@
 #include <stdbool.h>
 #include <fwk_assert.h>
 #include <fwk_arch.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 
 static int fwk_mm_init_return_val;
diff --git a/framework/test/test_fwk_interrupt.c b/framework/test/test_fwk_interrupt.c
index 7ea4d947b144cfb43a4ef20d5dcc38f664e1fbcb..5a2d9804485f93179e3c38b3360a1d5abbb2c697 100644
--- a/framework/test/test_fwk_interrupt.c
+++ b/framework/test/test_fwk_interrupt.c
@@ -8,9 +8,9 @@
 #include <stdint.h>
 #include <fwk_assert.h>
 #include <fwk_arch.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 
 #define INTERRUPT_ID 42
diff --git a/framework/test/test_fwk_mm.c b/framework/test/test_fwk_mm.c
index 08dcebd4251290af54a43d08412bf9bf81baafdc..486e4ad97ca38db30432101a62f52185f7040ce3 100644
--- a/framework/test/test_fwk_mm.c
+++ b/framework/test/test_fwk_mm.c
@@ -10,9 +10,9 @@
 #include <stdint.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 
 #define SIZE_MEM            (1024 * 1024)
diff --git a/framework/test/test_fwk_module.c b/framework/test/test_fwk_module.c
index f7126bb38b045d4cbe273eed11e99d44dba1f493..f31ed664e02a7c791a34da5d6cad594bed8b65bf 100644
--- a/framework/test/test_fwk_module.c
+++ b/framework/test/test_fwk_module.c
@@ -7,8 +7,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_module.h>
 
diff --git a/framework/test/test_fwk_multi_thread_common_thread.c b/framework/test/test_fwk_multi_thread_common_thread.c
index 4cae23e607d3a178cc8d1f32d5c510a77487ab3f..19295413999db54743bbf81f0acf068f108a594a 100644
--- a/framework/test/test_fwk_multi_thread_common_thread.c
+++ b/framework/test/test_fwk_multi_thread_common_thread.c
@@ -11,10 +11,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_event.h>
 #include <fwk_list.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_id.h>
 #include <internal/fwk_module.h>
diff --git a/framework/test/test_fwk_multi_thread_create.c b/framework/test/test_fwk_multi_thread_create.c
index 0d868467b520f6d8230c6a11f090fccd6160aa4c..76d910e163ad2c6c1cbd78ac69fb56c7acc5ca68 100644
--- a/framework/test/test_fwk_multi_thread_create.c
+++ b/framework/test/test_fwk_multi_thread_create.c
@@ -13,9 +13,9 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_id.h>
 #include <internal/fwk_module.h>
diff --git a/framework/test/test_fwk_multi_thread_init.c b/framework/test/test_fwk_multi_thread_init.c
index a7cca306c8c80e3634ee086c5c5965ef754c3d1a..8db7ac8a6c136cb6a8d3a22e321365215d71df72 100644
--- a/framework/test/test_fwk_multi_thread_init.c
+++ b/framework/test/test_fwk_multi_thread_init.c
@@ -10,10 +10,10 @@
 #include <stdlib.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_event.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_id.h>
 #include <internal/fwk_module.h>
diff --git a/framework/test/test_fwk_multi_thread_put_event.c b/framework/test/test_fwk_multi_thread_put_event.c
index 3dd4a94a4cac8518e0d5d6581337878c972c6e38..c34fceeb85a9d1756b835de0c7b0f9083360f2aa 100644
--- a/framework/test/test_fwk_multi_thread_put_event.c
+++ b/framework/test/test_fwk_multi_thread_put_event.c
@@ -13,10 +13,10 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_event.h>
 #include <fwk_list.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_id.h>
 #include <internal/fwk_module.h>
diff --git a/framework/test/test_fwk_multi_thread_util.c b/framework/test/test_fwk_multi_thread_util.c
index 2944ed5a8ce2e8af71f1db024f6da0b5487fc150..b8410ceeec2f0dd4b2c469b59ba61149c9bd1e62 100644
--- a/framework/test/test_fwk_multi_thread_util.c
+++ b/framework/test/test_fwk_multi_thread_util.c
@@ -11,10 +11,10 @@
 #include <stdlib.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_event.h>
 #include <fwk_list.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_id.h>
 #include <internal/fwk_module.h>
diff --git a/framework/test/test_fwk_notification.c b/framework/test/test_fwk_notification.c
index 53a26ea9c8743ae1a500e89f49a45b18e7a0a4b1..b32dbcb091e252ea430a2a2334ca8f5f08d0cb9c 100644
--- a/framework/test/test_fwk_notification.c
+++ b/framework/test/test_fwk_notification.c
@@ -9,11 +9,11 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_list.h>
 #include <fwk_macros.h>
 #include <fwk_slist.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_module.h>
 #include <internal/fwk_single_thread.h>
diff --git a/framework/test/test_fwk_thread.c b/framework/test/test_fwk_thread.c
index 875ca944d38e094d7383296d2a948a5bce2dbb16..349a9975ef468217ee30e15185342365f0af6b8f 100644
--- a/framework/test/test_fwk_thread.c
+++ b/framework/test/test_fwk_thread.c
@@ -9,11 +9,11 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_list.h>
 #include <fwk_macros.h>
 #include <fwk_slist.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_module.h>
 #include <internal/fwk_single_thread.h>
diff --git a/framework/test/test_version.c b/framework/test/test_version.c
index 6d2147184decc901995941d9f29d65d0f9515aa4..68d1b2d36cd83381c839298a3379132e1e30404b 100644
--- a/framework/test/test_version.c
+++ b/framework/test/test_version.c
@@ -7,8 +7,8 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 
 static void test_version(void)
diff --git a/module/apcontext/src/mod_apcontext.c b/module/apcontext/src/mod_apcontext.c
index 098b331176203dd7919c2545aaf383db3c348e7e..a7d2413b0b27b36bba07f38b233207464d4b711d 100644
--- a/module/apcontext/src/mod_apcontext.c
+++ b/module/apcontext/src/mod_apcontext.c
@@ -7,11 +7,11 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_apcontext.h>
 #include <mod_clock.h>
 #include <mod_log.h>
diff --git a/module/bootloader/src/mod_bootloader.c b/module/bootloader/src/mod_bootloader.c
index e69bfb22b575bb8a40dc6994a852b671bdc971fd..816319c396edb2a8904b7a1c68e1d26b48f5b44f 100644
--- a/module/bootloader/src/mod_bootloader.c
+++ b/module/bootloader/src/mod_bootloader.c
@@ -8,10 +8,10 @@
 #include <stdint.h>
 #include <string.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_bootloader.h>
 #include <mod_sds.h>
 
diff --git a/module/clock/src/mod_clock.c b/module/clock/src/mod_clock.c
index 8efd6e891ad187d0fd986eca793d1c066d8a76da..42020b9d004af329d9380784ea24ccc98abc07d3 100644
--- a/module/clock/src/mod_clock.c
+++ b/module/clock/src/mod_clock.c
@@ -8,12 +8,12 @@
 #include <stdint.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
-#include <fwk_thread.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
+#include <fwk_thread.h>
 #include <mod_clock.h>
 #include <mod_power_domain.h>
 
diff --git a/module/cmn600/src/mod_cmn600.c b/module/cmn600/src/mod_cmn600.c
index c9dc281e62a520953256983fabc74d22cc33897a..e0f5a6a634e3e245d5e2b06089391826de21cd38 100644
--- a/module/cmn600/src/mod_cmn600.c
+++ b/module/cmn600/src/mod_cmn600.c
@@ -8,13 +8,13 @@
 #include <stdbool.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
 #include <fwk_math.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_cmn600.h>
 #include <mod_log.h>
diff --git a/module/css_clock/src/mod_css_clock.c b/module/css_clock/src/mod_css_clock.c
index 9f1b110cf8e9fe6ba853a3bc4c6cfdb67e6eb7a1..be8459de737ef5f775f2fdd7522344eb426e42c2 100644
--- a/module/css_clock/src/mod_css_clock.c
+++ b/module/css_clock/src/mod_css_clock.c
@@ -8,9 +8,9 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_css_clock.h>
 #include <mod_power_domain.h>
diff --git a/module/ddr_phy500/src/mod_ddr_phy500.c b/module/ddr_phy500/src/mod_ddr_phy500.c
index c250e3d6224f9e2410a61552ade06babc6afe0e4..ddb9ecb1c61239b85b432f0b2f6e239fb084bd4f 100644
--- a/module/ddr_phy500/src/mod_ddr_phy500.c
+++ b/module/ddr_phy500/src/mod_ddr_phy500.c
@@ -9,11 +9,11 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_ddr_phy500.h>
 
 #ifdef BUILD_HAS_MOD_DMC500
diff --git a/module/dmc620/src/mod_dmc620.c b/module/dmc620/src/mod_dmc620.c
index 0fd5329c5b3d61c3db9a2d7c64426a0df0447b6d..6d4243ef0a5c79d9380338d25258921d9ff7d924 100644
--- a/module/dmc620/src/mod_dmc620.c
+++ b/module/dmc620/src/mod_dmc620.c
@@ -9,10 +9,10 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_dmc620.h>
 #include <mod_clock.h>
 #include <mod_log.h>
diff --git a/module/dw_apb_i2c/src/mod_dw_apb_i2c.c b/module/dw_apb_i2c/src/mod_dw_apb_i2c.c
index 948a35a4d1436b22295873bd74f3868a25e14cfc..25e174836fa719ed157257022c10c05b24488209 100644
--- a/module/dw_apb_i2c/src/mod_dw_apb_i2c.c
+++ b/module/dw_apb_i2c/src/mod_dw_apb_i2c.c
@@ -5,11 +5,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <stdbool.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_dw_apb_i2c.h>
 #include <mod_i2c.h>
 #include <mod_timer.h>
diff --git a/module/gtimer/src/mod_gtimer.c b/module/gtimer/src/mod_gtimer.c
index 75903282755dd1e140a29665b4860c4ce7f47ea4..e4be1d4ad14090eaa3bace5b6708d286f44d83bc 100644
--- a/module/gtimer/src/mod_gtimer.c
+++ b/module/gtimer/src/mod_gtimer.c
@@ -7,12 +7,12 @@
 
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <gtimer_reg.h>
 #include <mod_clock.h>
 #include <mod_gtimer.h>
diff --git a/module/host_console/src/mod_host_console.c b/module/host_console/src/mod_host_console.c
index f10b491374a819428e8a7e76d5b3147ecf05a00f..f45515a002589d6032a003e846154c9e0449fba3 100644
--- a/module/host_console/src/mod_host_console.c
+++ b/module/host_console/src/mod_host_console.c
@@ -7,8 +7,8 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include <fwk_errno.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_log.h>
 
 /*
diff --git a/module/i2c/src/mod_i2c.c b/module/i2c/src/mod_i2c.c
index 34e67a2d3300ca796f376ff33d8a7497104edcb8..6a3816e840c77ca24ccab98568a91656f8e88097 100644
--- a/module/i2c/src/mod_i2c.c
+++ b/module/i2c/src/mod_i2c.c
@@ -7,11 +7,11 @@
 #include <stdbool.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_i2c.h>
 
diff --git a/module/log/src/mod_log.c b/module/log/src/mod_log.c
index 8451c654a3e7b4cc83fe15e04851c1ec3ae41a7e..ca70caf69f34101f5d22eee1586dca3057b65449 100644
--- a/module/log/src/mod_log.c
+++ b/module/log/src/mod_log.c
@@ -10,11 +10,11 @@
 #include <stdint.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
+#include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
-#include <fwk_mm.h>
+#include <fwk_status.h>
 #include <mod_log.h>
 
 static const struct mod_log_config *log_config;
diff --git a/module/mhu/src/mod_mhu.c b/module/mhu/src/mod_mhu.c
index 71fdb5e1d3a01e09a1f95c8b25057087633a4c3d..3e4169eba0846c6a3d71bf98de115c104f870cc2 100644
--- a/module/mhu/src/mod_mhu.c
+++ b/module/mhu/src/mod_mhu.c
@@ -10,12 +10,12 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/mhu.h>
 #include <mod_smt.h>
 
diff --git a/module/mhu2/src/mod_mhu2.c b/module/mhu2/src/mod_mhu2.c
index 8e776c2fce7ec9e4340cb0f5c818c073c7e34642..814cb3d7da16743c13b10c216db3248481ea238f 100644
--- a/module/mhu2/src/mod_mhu2.c
+++ b/module/mhu2/src/mod_mhu2.c
@@ -11,12 +11,12 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_mhu2.h>
 #include <mhu2.h>
 #include <mod_smt.h>
diff --git a/module/msys_rom/src/mod_msys_rom.c b/module/msys_rom/src/mod_msys_rom.c
index d12170fdc210093116d9eee2b2535a99ba7c4069..266ad517fd64b72457831e1087878fb72c56bded 100644
--- a/module/msys_rom/src/mod_msys_rom.c
+++ b/module/msys_rom/src/mod_msys_rom.c
@@ -13,12 +13,12 @@
 #include <stdint.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_noreturn.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_bootloader.h>
 #include <mod_log.h>
diff --git a/module/pik_clock/src/mod_pik_clock.c b/module/pik_clock/src/mod_pik_clock.c
index 7ecf4f72648050943dae1a6068537f0ad03d2e36..9f7a1e8f8360b18df2454e57920155a076387bcf 100644
--- a/module/pik_clock/src/mod_pik_clock.c
+++ b/module/pik_clock/src/mod_pik_clock.c
@@ -9,10 +9,10 @@
 #include <stdlib.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_css_clock.h>
 #include <mod_pik_clock.h>
diff --git a/module/pl011/src/mod_pl011.c b/module/pl011/src/mod_pl011.c
index c257877d97912d29ed656f572975f449e1f181fe..837a2029045bb35670355903af6f7ab7bc82ba5e 100644
--- a/module/pl011/src/mod_pl011.c
+++ b/module/pl011/src/mod_pl011.c
@@ -6,10 +6,10 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_log.h>
 #include <mod_pl011.h>
diff --git a/module/power_domain/src/mod_power_domain.c b/module/power_domain/src/mod_power_domain.c
index 9c891d5b275007ce6a1af53f9a47c71a3d86d19d..1691c043a5b90fbebf0e6b17e99da94ea578a828 100644
--- a/module/power_domain/src/mod_power_domain.c
+++ b/module/power_domain/src/mod_power_domain.c
@@ -14,15 +14,15 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
-#include <fwk_thread.h>
 #include <fwk_multi_thread.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
+#include <fwk_thread.h>
 #include <mod_log.h>
 #include <mod_power_domain.h>
 
diff --git a/module/ppu_v0/src/ppu_v0.c b/module/ppu_v0/src/ppu_v0.c
index bd35351164b6cea9c8fb6a6475d4bd2910094679..e49cb53d6a933647114b0d50776c649845fd9e84 100644
--- a/module/ppu_v0/src/ppu_v0.c
+++ b/module/ppu_v0/src/ppu_v0.c
@@ -8,7 +8,7 @@
 #include <stddef.h>
 #include <ppu_v0.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 
 void ppu_v0_init(struct ppu_v0_reg *ppu)
 {
diff --git a/module/ppu_v1/src/ppu_v1.c b/module/ppu_v1/src/ppu_v1.c
index 9fbbc3d4219a3570753f528b81698e3c7f0a75be..38406525bd022ef4e1e7d36631aab1a86ff894aa 100644
--- a/module/ppu_v1/src/ppu_v1.c
+++ b/module/ppu_v1/src/ppu_v1.c
@@ -8,7 +8,7 @@
 #include <stddef.h>
 #include <ppu_v1.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 
 void ppu_v1_init(struct ppu_v1_reg *ppu)
 {
diff --git a/module/reg_sensor/src/mod_reg_sensor.c b/module/reg_sensor/src/mod_reg_sensor.c
index 2096707914a9fa3fb21b88cc7b76703a6928c1be..117dbf74b463e52a5a4ac5c6339139296a3b31db 100644
--- a/module/reg_sensor/src/mod_reg_sensor.c
+++ b/module/reg_sensor/src/mod_reg_sensor.c
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_reg_sensor.h>
 #include <mod_sensor.h>
 
diff --git a/module/scmi/src/mod_scmi.c b/module/scmi/src/mod_scmi.c
index ed3a2766ef928f9f9dc629029b6f944e2e9932bf..22ab7f269204dd0183b054150b1b31f255f865e6 100644
--- a/module/scmi/src/mod_scmi.c
+++ b/module/scmi/src/mod_scmi.c
@@ -12,7 +12,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
@@ -20,6 +19,7 @@
 #include <fwk_module_idx.h>
 #include <fwk_multi_thread.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <internal/mod_scmi.h>
 #include <internal/scmi.h>
 #include <internal/scmi_base.h>
diff --git a/module/scmi_apcore/src/mod_scmi_apcore.c b/module/scmi_apcore/src/mod_scmi_apcore.c
index dac63dcd7dd7a3c7a5d9b698a88f0796cc2cd08f..fd0379c04fa8eda6a97de69fb871beace64a0d54 100644
--- a/module/scmi_apcore/src/mod_scmi_apcore.c
+++ b/module/scmi_apcore/src/mod_scmi_apcore.c
@@ -10,11 +10,11 @@
 
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <internal/scmi_apcore.h>
 #include <mod_scmi.h>
diff --git a/module/scmi_clock/src/mod_scmi_clock.c b/module/scmi_clock/src/mod_scmi_clock.c
index b0beb0a3cbe6d8a10c5efeba1248afad1dbcd287..d49f850e6adf08d15579573aea55464e9ec7a422 100644
--- a/module/scmi_clock/src/mod_scmi_clock.c
+++ b/module/scmi_clock/src/mod_scmi_clock.c
@@ -10,11 +10,11 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <internal/scmi_clock.h>
 #include <mod_clock.h>
diff --git a/module/scmi_perf/src/mod_scmi_perf.c b/module/scmi_perf/src/mod_scmi_perf.c
index f9395a64c0e109e74d11a0b15e11390472afa4f1..59abfcf73ae5e6949ffc0e514cc456404b3d1489 100644
--- a/module/scmi_perf/src/mod_scmi_perf.c
+++ b/module/scmi_perf/src/mod_scmi_perf.c
@@ -10,10 +10,10 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <internal/scmi_perf.h>
 #include <mod_dvfs.h>
diff --git a/module/scmi_power_domain/src/mod_scmi_power_domain.c b/module/scmi_power_domain/src/mod_scmi_power_domain.c
index 1556afdd09595d9b8d9760015d1c5a4f0afaa9d4..92f10407bfa56c9f31fabefefc5f1dd1902465c3 100644
--- a/module/scmi_power_domain/src/mod_scmi_power_domain.c
+++ b/module/scmi_power_domain/src/mod_scmi_power_domain.c
@@ -11,11 +11,11 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <internal/scmi_power_domain.h>
 #include <mod_log.h>
diff --git a/module/scmi_sensor/src/mod_scmi_sensor.c b/module/scmi_sensor/src/mod_scmi_sensor.c
index 66eeee253d59830e8bffce52af7fbe4a8049b289..afe9211ea8760c6581ea1d8405324b53f77e861d 100644
--- a/module/scmi_sensor/src/mod_scmi_sensor.c
+++ b/module/scmi_sensor/src/mod_scmi_sensor.c
@@ -11,11 +11,11 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <internal/scmi_sensor.h>
 #include <mod_sensor.h>
diff --git a/module/scmi_system_power/src/mod_scmi_system_power.c b/module/scmi_system_power/src/mod_scmi_system_power.c
index 9374ea8f585556e426f4b8dcc0604b6313c2884d..7540c9dfbc66960b8d279e079e89dfc9f18912ba 100644
--- a/module/scmi_system_power/src/mod_scmi_system_power.c
+++ b/module/scmi_system_power/src/mod_scmi_system_power.c
@@ -7,11 +7,11 @@
 
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <internal/scmi_system_power.h>
 #include <mod_power_domain.h>
diff --git a/module/sds/src/mod_sds.c b/module/sds/src/mod_sds.c
index d87e6f719d8dc1f74744d7d9a21cee6fe0dd1455..c7665a29ca53b1af510c090ce29f5929dc92462b 100644
--- a/module/sds/src/mod_sds.c
+++ b/module/sds/src/mod_sds.c
@@ -11,11 +11,11 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_sds.h>
 
 #if BUILD_HAS_MOD_CLOCK
diff --git a/module/sensor/src/mod_sensor.c b/module/sensor/src/mod_sensor.c
index 86af115b39bb0ebebca4c69596e47bd37f1d7d64..dd11683f8a0424981d51ca6abebba37a038ea34a 100644
--- a/module/sensor/src/mod_sensor.c
+++ b/module/sensor/src/mod_sensor.c
@@ -7,11 +7,11 @@
 
 #include <stdbool.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_sensor.h>
 
 struct sensor_dev_ctx {
diff --git a/module/smt/src/mod_smt.c b/module/smt/src/mod_smt.c
index 253271192c6fb2cc7ed4f83c00a78419a41d70fc..e0e8dde6fb26a25cacae90c148b4fb803e494d97 100644
--- a/module/smt/src/mod_smt.c
+++ b/module/smt/src/mod_smt.c
@@ -8,12 +8,12 @@
 #include <stdbool.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_log.h>
 #include <mod_power_domain.h>
 #include <mod_scmi.h>
diff --git a/module/system_pll/src/mod_system_pll.c b/module/system_pll/src/mod_system_pll.c
index 76aa9f7e44f3cd7baef529c593134574cd787c59..d2f73a233d34703838eee9a1fd0ec08b0f7233a9 100644
--- a/module/system_pll/src/mod_system_pll.c
+++ b/module/system_pll/src/mod_system_pll.c
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_system_pll.h>
 #include <mod_power_domain.h>
diff --git a/module/timer/src/mod_timer.c b/module/timer/src/mod_timer.c
index 00a4ba9255385f6ba50d3d522031f80151c846e2..8edd91f6e379d29c5f17acd9ff4bd8b96e9121ee 100644
--- a/module/timer/src/mod_timer.c
+++ b/module/timer/src/mod_timer.c
@@ -13,7 +13,6 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_event.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
@@ -21,6 +20,7 @@
 #include <fwk_macros.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_log.h>
 #include <mod_timer.h>
diff --git a/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c b/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c
index 735a736096d021dec7d633b0da141a15d8cb847e..a52d834159699a2d801f64a7cb615a38acf33289 100644
--- a/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c
+++ b/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c
@@ -9,11 +9,11 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_juno_ddr_phy400.h>
 #include <mod_juno_dmc400.h>
 #include <juno_scc.h>
diff --git a/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c b/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c
index c60edafcc21ed8a66bea15113e9f4e8bad1900f1..6617eb1c01c738e3288aea7fcd9ed2b77e8951ce 100644
--- a/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c
+++ b/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c
@@ -9,13 +9,13 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_multi_thread.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_juno_dmc400.h>
 #include <mod_log.h>
 #include <mod_power_domain.h>
diff --git a/product/juno/module/juno_ppu/src/mod_juno_ppu.c b/product/juno/module/juno_ppu/src/mod_juno_ppu.c
index affe5bb3b0732891bb06d7a212f241795f606f73..583f708fd1d6328765cd0d951942dda720521ba7 100644
--- a/product/juno/module/juno_ppu/src/mod_juno_ppu.c
+++ b/product/juno/module/juno_ppu/src/mod_juno_ppu.c
@@ -7,12 +7,12 @@
 
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_juno_ppu.h>
 #include <mod_log.h>
 #include <mod_power_domain.h>
diff --git a/product/juno/module/juno_ram/src/mod_juno_ram.c b/product/juno/module/juno_ram/src/mod_juno_ram.c
index d2ff61a582a21bd09bee4512461fd71eeca4f323..a89eb512fe7b34527413d3ef04313d1130a8fc44 100644
--- a/product/juno/module/juno_ram/src/mod_juno_ram.c
+++ b/product/juno/module/juno_ram/src/mod_juno_ram.c
@@ -6,10 +6,10 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_math.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_juno_ram.h>
 #include <mod_timer.h>
 #include <juno_id.h>
diff --git a/product/juno/module/juno_rom/src/juno_debug_rom.c b/product/juno/module/juno_rom/src/juno_debug_rom.c
index 0e358d9e1f726ae84f4be30b81053a6bdc6baba6..0fd465b385770fb59480890deeb1b797843ab4ed 100644
--- a/product/juno/module/juno_rom/src/juno_debug_rom.c
+++ b/product/juno/module/juno_rom/src/juno_debug_rom.c
@@ -6,9 +6,9 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_juno_ppu.h>
 #include <juno_irq.h>
 #include <juno_ppu_idx.h>
diff --git a/product/juno/module/juno_rom/src/mod_juno_rom.c b/product/juno/module/juno_rom/src/mod_juno_rom.c
index 0dff1dd331d279c19467ecf753e9d0bf421ffca3..6062c402bf17756e142e9718cf389ce07c3d1692 100644
--- a/product/juno/module/juno_rom/src/mod_juno_rom.c
+++ b/product/juno/module/juno_rom/src/mod_juno_rom.c
@@ -7,12 +7,12 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_bootloader.h>
 #include <mod_juno_ppu.h>
diff --git a/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c b/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c
index b6f6ca616bed37c079f8aea7067961750a747d55..f57231bacfb5db580071de285e1ac9fc3c270139 100644
--- a/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c
+++ b/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c
@@ -10,8 +10,8 @@
 
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_juno_soc_clock.h>
 #include <juno_id.h>
 #include <juno_scc.h>
diff --git a/product/juno/module/juno_system/src/mod_juno_system.c b/product/juno/module/juno_system/src/mod_juno_system.c
index c15f2bf04ba35cdd1392ff0218ac992b60d7109b..243535fa43be64f6c966764e7658ed08a46adcfa 100644
--- a/product/juno/module/juno_system/src/mod_juno_system.c
+++ b/product/juno/module/juno_system/src/mod_juno_system.c
@@ -8,12 +8,12 @@
 #include <stdint.h>
 #include <fmw_cmsis.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_juno_system.h>
 #include <mod_juno_xrp7724.h>
 #include <mod_scmi.h>
diff --git a/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c b/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c
index bc0f710e67a71b50ca9662cfb4718c255faf09f5..ca7f5cf5eb652086faf1c4554201811b1605ce7f 100644
--- a/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c
+++ b/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c
@@ -7,11 +7,11 @@
 
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_multi_thread.h>
+#include <fwk_status.h>
 #include <mod_i2c.h>
 #include <mod_juno_xrp7724.h>
 #include <mod_timer.h>
diff --git a/product/juno/src/juno_id.c b/product/juno/src/juno_id.c
index 09d28b52e4a769682f7d5b3450ae1fbd2c740019..bf3b3bfc6d262e5c770ab3b06c9de01f8efdf37e 100644
--- a/product/juno/src/juno_id.c
+++ b/product/juno/src/juno_id.c
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 #include <juno_id.h>
 #include <juno_scc.h>
 #include <v2m_sys_regs.h>
diff --git a/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c b/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c
index c1cb1f9bbc1578f3a63d5316ad454bdab2417947..d16e9ce23ed3b81ed8f6668490049002115407c3 100644
--- a/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c
+++ b/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c
@@ -10,11 +10,11 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/n1sdp_ddr_phy.h>
 #include <mod_n1sdp_ddr_phy.h>
 #include <mod_n1sdp_dmc620.h>
diff --git a/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c b/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c
index f418dbf767396a483c518470821ff688b540d907..122e613510953b3ecb16e8d39c2d358e988fd9c2 100644
--- a/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c
+++ b/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c
@@ -9,11 +9,11 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_log.h>
 #include <mod_n1sdp_dmc620.h>
diff --git a/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c b/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c
index e34e88a248dc7380d393dded44351b3ca52de376..09126f3b23690e024b9e86419fdb00fa0c8aaac9 100644
--- a/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c
+++ b/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c
@@ -11,10 +11,10 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_n1sdp_flash.h>
 #include <internal/n1sdp_flash_layout.h>
 
diff --git a/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c b/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c
index 0c8888ef28d0895cb8e1fb4f4208345a0fa9a644..b7a42ce994b4a8dc52b89a2caa5efc3f6ac543ef 100644
--- a/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c
+++ b/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c
@@ -9,9 +9,9 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <internal/n1sdp_i2c.h>
 #include <mod_log.h>
 #include <mod_n1sdp_i2c.h>
diff --git a/product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c b/product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c
index 95be1c97c892326cbf6d9c28ff8fee2c0c8463ac..be5e34defd54bf29a7e156fd3fa892eb08069dfa 100644
--- a/product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c
+++ b/product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c
@@ -10,12 +10,12 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/mhu.h>
 #include <mod_smt.h>
 
diff --git a/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c b/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c
index 0cc7c3a733a0995d1f747e2ed0c0b4876dd5b82b..70ae5b118f95a8f753be5359e3d17b166cd827bd 100644
--- a/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c
+++ b/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c
@@ -7,13 +7,13 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_math.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_n1sdp_pcie.h>
 #include <mod_log.h>
diff --git a/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c b/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c
index 1ec2dc9a20760d7ad9a9f9b39d6facb793e77771..f29594bf8c787980c2dd9c822c44c4d791a8d1e8 100644
--- a/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c
+++ b/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c
@@ -9,7 +9,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 #include <internal/pcie_ctrl_apb_reg.h>
 #include <mod_n1sdp_pcie.h>
 #include <mod_timer.h>
diff --git a/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c b/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c
index fa3599498d659d5c75601cd5ecc048e7a49640b6..43935f497f67e117050f87fa47019974406125ba 100644
--- a/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c
+++ b/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c
@@ -9,10 +9,10 @@
 #include <stdint.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_n1sdp_pll.h>
 #include <mod_power_domain.h>
diff --git a/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c b/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c
index c24cbac53eff66bfa6df1c0f319ba9f38ebdb7cf..c73e4426509ecfa901aa6910c19dad2e1efe7a6b 100644
--- a/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c
+++ b/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_n1sdp_flash.h>
 #include <mod_n1sdp_rom.h>
diff --git a/product/n1sdp/module/n1sdp_smt/src/mod_smt.c b/product/n1sdp/module/n1sdp_smt/src/mod_smt.c
index b30c70800285fe4010f6fc46e18879838a4554e7..042dcab553b7b89004211ea829f07b0a5ffbae93 100644
--- a/product/n1sdp/module/n1sdp_smt/src/mod_smt.c
+++ b/product/n1sdp/module/n1sdp_smt/src/mod_smt.c
@@ -8,12 +8,12 @@
 #include <stdbool.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_log.h>
 #include <mod_power_domain.h>
 #include <mod_smt.h>
diff --git a/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c b/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c
index 9c4125830a147638bc8f506962925ec4fc2bea21..76168143f48360f4bda8eb2853891af919d181d8 100644
--- a/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c
+++ b/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c
@@ -11,11 +11,11 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <internal/mod_scmi_ccix_config.h>
 #include <mod_n1sdp_pcie.h>
diff --git a/product/n1sdp/module/scmi_management/src/mod_scmi_management.c b/product/n1sdp/module/scmi_management/src/mod_scmi_management.c
index 329adba8f911db827b030dd3c5d0f33dc33863b0..7a27ebea6730ce8394693da4f29407d9f98873fc 100644
--- a/product/n1sdp/module/scmi_management/src/mod_scmi_management.c
+++ b/product/n1sdp/module/scmi_management/src/mod_scmi_management.c
@@ -10,11 +10,11 @@
 
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <mod_scmi.h>
 #include <mod_scmi_management.h>
diff --git a/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c b/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c
index 86f51f5b87dcf0d88fc651a8f581409f48a9a87d..05135a8676a5e6d57e2f7bb3d7d8471bf0784190 100644
--- a/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c
+++ b/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_log.h>
 #include <mod_rdn1e1_rom.h>
diff --git a/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c b/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c
index fde5122653c75c6fbf5f2c68802bb7c54f01d11f..4150fdcdf9adeb52f81827c918dc7eea884cb228 100644
--- a/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c
+++ b/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_log.h>
 #include <mod_sgi575_rom.h>
diff --git a/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c b/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c
index 8a187c0e26bf22d201981b650e04331bcf5a728f..6a6263d53e888eb21f533c1cf853286664370bcd 100644
--- a/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c
+++ b/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c
@@ -9,11 +9,11 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_sgm775_ddr_phy500.h>
 #include <mod_sgm775_dmc500.h>
 
diff --git a/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c b/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c
index 6d88ebcc86233a0a825e442b691a13d7215ab1f7..02f67678e6485b35d38a26ffe8a93bb999c1203c 100644
--- a/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c
+++ b/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c
@@ -9,10 +9,10 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_sgm775_dmc500.h>
 
 #define COL_BITS 1
diff --git a/product/synquacer/module/ccn512/src/mod_ccn512.c b/product/synquacer/module/ccn512/src/mod_ccn512.c
index 7e13e807264e1653d66b467c6da0d133485c1a27..d1b3ccc4c0e0a0ebd70881b59199c3f981e6e5be 100644
--- a/product/synquacer/module/ccn512/src/mod_ccn512.c
+++ b/product/synquacer/module/ccn512/src/mod_ccn512.c
@@ -6,10 +6,10 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_ccn512.h>
 #include <mod_log.h>
 #include <synquacer_ddr.h>
diff --git a/product/synquacer/module/f_i2c/src/mod_f_i2c.c b/product/synquacer/module/f_i2c/src/mod_f_i2c.c
index a49c58bc8ff8f07fcf24944d73eb97fdc56a041a..844f8287b599041685563a81c118ca7c3558d18c 100644
--- a/product/synquacer/module/f_i2c/src/mod_f_i2c.c
+++ b/product/synquacer/module/f_i2c/src/mod_f_i2c.c
@@ -6,10 +6,10 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_f_i2c.h>
 #include <mod_log.h>
diff --git a/product/synquacer/module/f_uart3/src/mod_f_uart3.c b/product/synquacer/module/f_uart3/src/mod_f_uart3.c
index 881c95b21460596137507440621b2169f1b83d37..5c8ae347b5db6d715fb3360494b350ce2498e47d 100644
--- a/product/synquacer/module/f_uart3/src/mod_f_uart3.c
+++ b/product/synquacer/module/f_uart3/src/mod_f_uart3.c
@@ -7,10 +7,10 @@
 
 #include <fmw_cmsis.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_f_uart3.h>
 #include <mod_log.h>
diff --git a/product/synquacer/module/hsspi/src/mod_hsspi.c b/product/synquacer/module/hsspi/src/mod_hsspi.c
index f4a49b294cfb35f57e7bb4b66fe548217410f1de..8f96d82ceeb2da5170229f6b22c9e0b34bed6d50 100644
--- a/product/synquacer/module/hsspi/src/mod_hsspi.c
+++ b/product/synquacer/module/hsspi/src/mod_hsspi.c
@@ -9,10 +9,10 @@
 #include <stdint.h>
 #include <fmw_cmsis.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_hsspi.h>
 #include <mod_log.h>
diff --git a/product/synquacer/module/ppu_v0_synquacer/src/ppu_v0.c b/product/synquacer/module/ppu_v0_synquacer/src/ppu_v0.c
index 4bb8498ec1078c72c19c59d4f0c255468ed673a1..7d4f1ebe59c086569ea3646456f2fcf0b21c5b06 100644
--- a/product/synquacer/module/ppu_v0_synquacer/src/ppu_v0.c
+++ b/product/synquacer/module/ppu_v0_synquacer/src/ppu_v0.c
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 #include <ppu_v0.h>
 
 void ppu_v0_init(struct ppu_v0_reg *ppu)
diff --git a/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c b/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c
index 7adfae2cb600342d7a5aac9ff552d93e4a3d39d8..e5bf6a53131e1f80328a6ecd01fbfc6891020c70 100644
--- a/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c
+++ b/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c
@@ -8,11 +8,11 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_log.h>
 #include <mod_scmi.h>
 #include <ddr_init.h>
diff --git a/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c b/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c
index 9ccc5230768ed1efed36a680a899d55982c6fc9f..eced93a9bc6ad15d134fabe242af2ac6fabc9015 100644
--- a/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c
+++ b/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c
@@ -6,9 +6,9 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_log.h>
 #include <mod_synquacer_memc.h>
 #include <synquacer_ddr.h>
diff --git a/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c b/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c
index 4a1137d1ca402adb2d2aa26c0beb9633a05f32ef..6dabecbea6723c10db4deaa539f060d0ddcda216 100644
--- a/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c
+++ b/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c
@@ -8,7 +8,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 #include <mod_f_i2c.h>
 #include <synquacer_config.h>
 #include <synquacer_ddr.h>
diff --git a/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c b/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c
index 85cfcacac87168d9bdfcefa900427948b9a70a3b..d18074a97819dc2835ea38ac30983f168f9aea87 100644
--- a/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c
+++ b/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c
@@ -9,10 +9,10 @@
 #include <stdlib.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_css_clock.h>
 #include <mod_power_domain.h>
diff --git a/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c b/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c
index 462ee3f6740abb163ad347a109cf462bb8f867d4..fd92226fc41d56f6ab823a46f28b2707edcd3be9 100644
--- a/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c
+++ b/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_log.h>
 #include <mod_synquacer_rom.h>
diff --git a/product/synquacer/module/synquacer_system/src/synquacer_main.c b/product/synquacer/module/synquacer_system/src/synquacer_main.c
index f979b5b2f76670a7be22cc2df65ea89993fcaeb8..41bf2e1a3d1414e4f58515932abfa98a1cbae809 100644
--- a/product/synquacer/module/synquacer_system/src/synquacer_main.c
+++ b/product/synquacer/module/synquacer_system/src/synquacer_main.c
@@ -9,12 +9,12 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 
 #include <mod_f_i2c.h>
 #include <mod_hsspi.h>
diff --git a/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c b/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c
index 87ab6c70e1998475b3357265a624fa7365e502db..706ea8706c544caeb6af2eb730c24e13b16b7173 100644
--- a/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c
+++ b/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c
@@ -9,7 +9,7 @@
 #include <stdint.h>
 
 #include <fmw_cmsis.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 
 #include <synquacer_core.h>
 #include <synquacer_debug.h>
diff --git a/product/synquacer/module/synquacer_system/src/sysoc.c b/product/synquacer/module/synquacer_system/src/sysoc.c
index 5e056222debd3d7ea693e7864f079af2cf82c0a1..abb9f6d87134ea61744b0de06d46617c2651fcf1 100644
--- a/product/synquacer/module/synquacer_system/src/sysoc.c
+++ b/product/synquacer/module/synquacer_system/src/sysoc.c
@@ -8,7 +8,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <fwk_errno.h>
+#include <fwk_status.h>
 
 #include <synquacer_debug.h>
 #include <synquacer_mmap.h>
diff --git a/product/synquacer/module/synquacer_system/src/thermal_sensor.c b/product/synquacer/module/synquacer_system/src/thermal_sensor.c
index 86d9ffa6ca93e261e02449fc92dc695c52a38808..39d1c91952cd1cdbf2edc959cae43e40f1cc44af 100644
--- a/product/synquacer/module/synquacer_system/src/thermal_sensor.c
+++ b/product/synquacer/module/synquacer_system/src/thermal_sensor.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <fwk_errno.h>
+#include <fwk_status.h>
 #include <cmsis_os2.h>
 
 #include <synquacer_debug.h>