diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/NonSecure/main_ns.c b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/NonSecure/main_ns.c
index df7697501..781cc8402 100644
--- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/NonSecure/main_ns.c
+++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/NonSecure/main_ns.c
@@ -65,6 +65,13 @@ const uint32_t * __unprivileged_sram_end__			= ( uint32_t * ) ( 0x30018000 - 0x1
  * @brief Create all demo tasks.
  */
 static void prvCreateTasks( void );
+
+/**
+ * @brief The hard fault handler.
+ *
+ * It calls a function called vHandleMemoryFault.
+ */
+void HardFault_Handler( void ) __attribute__ ( ( naked ) );
 /*-----------------------------------------------------------*/
 
 static void prvCreateTasks( void )
@@ -166,10 +173,6 @@ void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,
 }
 /*-----------------------------------------------------------*/
 
-/**
- * @brief The fault handler implementation calls a function called
- * vHandleMemoryFault.
- */
 void HardFault_Handler( void )
 {
 	__asm volatile
diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/main_ns.c b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/main_ns.c
index 055413bff..fe654cffb 100644
--- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/main_ns.c
+++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/main_ns.c
@@ -57,7 +57,7 @@ void SystemInit( void );
  *
  * It calls a function called vHandleMemoryFault.
  */
-void MemManage_Handler( void )  __attribute__ ( ( naked ) );
+void MemManage_Handler( void ) __attribute__ ( ( naked ) );
 /*-----------------------------------------------------------*/
 
 static void prvCreateTasks( void )
diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/NonSecure/main_ns.c b/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/NonSecure/main_ns.c
index 13e18ab22..e5d974d3f 100644
--- a/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/NonSecure/main_ns.c
+++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/NonSecure/main_ns.c
@@ -63,6 +63,13 @@ const uint32_t * __unprivileged_sram_end__			= ( uint32_t * ) ( 0x20220000 - 0x1
  * @brief Create all demo tasks.
  */
 static void prvCreateTasks( void );
+
+/**
+ * @brief The mem fault handler.
+ *
+ * It calls a function called vHandleMemoryFault.
+ */
+void MemManage_Handler( void ) __attribute__ ( ( naked ) );
 /*-----------------------------------------------------------*/
 
 /*
@@ -170,10 +177,6 @@ void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,
 }
 /*-----------------------------------------------------------*/
 
-/**
- * @brief The mem fault handler implementation calls a function called
- * vHandleMemoryFault.
- */
 void MemManage_Handler( void )
 {
 	__asm volatile