diff --git a/arch/nios2/include/kernel_arch_func.h b/arch/nios2/include/kernel_arch_func.h
index 076fd41596e..bf8d5b5d134 100644
--- a/arch/nios2/include/kernel_arch_func.h
+++ b/arch/nios2/include/kernel_arch_func.h
@@ -45,10 +45,6 @@ static inline void _IntLibInit(void)
 	/* No special initialization of the interrupt subsystem required */
 }
 
-FUNC_NORETURN void _NanoFatalErrorHandler(unsigned int reason,
-					  const NANO_ESF * esf);
-
-
 #define _is_in_isr() (_kernel.nested != 0)
 
 #ifdef CONFIG_IRQ_OFFLOAD
diff --git a/arch/xtensa/include/kernel_arch_func.h b/arch/xtensa/include/kernel_arch_func.h
index de55b2121d5..4e2d3d10fcb 100644
--- a/arch/xtensa/include/kernel_arch_func.h
+++ b/arch/xtensa/include/kernel_arch_func.h
@@ -76,9 +76,6 @@ static inline void _IntLibInit(void)
 {
 }
 
-FUNC_NORETURN void _NanoFatalErrorHandler(unsigned int reason,
-					  const NANO_ESF *pEsf);
-
 #include <stddef.h> /* For size_t */
 
 #ifdef __cplusplus
diff --git a/include/arch/nios2/arch.h b/include/arch/nios2/arch.h
index 7704305ba4e..364cd0233cd 100644
--- a/include/arch/nios2/arch.h
+++ b/include/arch/nios2/arch.h
@@ -159,6 +159,8 @@ extern const NANO_ESF _default_esf;
 FUNC_NORETURN void _SysFatalErrorHandler(unsigned int reason,
 					 const NANO_ESF *esf);
 
+FUNC_NORETURN void _NanoFatalErrorHandler(unsigned int reason,
+					  const NANO_ESF *esf);
 
 enum nios2_exception_cause {
 	NIOS2_EXCEPTION_UNKNOWN                      = -1,
diff --git a/include/arch/xtensa/arch.h b/include/arch/xtensa/arch.h
index 42fac77d635..22e91aabac8 100644
--- a/include/arch/xtensa/arch.h
+++ b/include/arch/xtensa/arch.h
@@ -129,6 +129,9 @@ extern void _irq_priority_set(u32_t irq, u32_t prio, u32_t flags);
 FUNC_NORETURN void _SysFatalErrorHandler(unsigned int reason,
 					 const NANO_ESF *esf);
 
+FUNC_NORETURN void _NanoFatalErrorHandler(unsigned int reason,
+					  const NANO_ESF *pEsf);
+
 extern u32_t _timer_cycle_get_32(void);
 #define _arch_k_cycle_get_32()	_timer_cycle_get_32()