diff --git a/arch/8051/src/up_exit.c b/arch/8051/src/up_exit.c
index 235eb691fbd..9ef27329445 100644
--- a/arch/8051/src/up_exit.c
+++ b/arch/8051/src/up_exit.c
@@ -45,6 +45,7 @@
 #include <8052.h>
 #include <nuttx/arch.h>
 
+#include "task/task.h"
 #include "os_internal.h"
 #include "up_internal.h"
 
diff --git a/arch/arm/src/common/up_exit.c b/arch/arm/src/common/up_exit.c
index 37b603e5052..70358184d9a 100644
--- a/arch/arm/src/common/up_exit.c
+++ b/arch/arm/src/common/up_exit.c
@@ -43,13 +43,14 @@
 #include <debug.h>
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
-#include "up_internal.h"
-
 #ifdef CONFIG_DUMP_ON_EXIT
 #include <nuttx/fs/fs.h>
 #endif
 
+#include "task/task.h"
+#include "os_internal.h"
+#include "up_internal.h"
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/avr/src/common/up_exit.c b/arch/avr/src/common/up_exit.c
index 355163359ef..db422b410dc 100644
--- a/arch/avr/src/common/up_exit.c
+++ b/arch/avr/src/common/up_exit.c
@@ -43,13 +43,14 @@
 #include <debug.h>
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
-#include "up_internal.h"
-
 #ifdef CONFIG_DUMP_ON_EXIT
 #include <nuttx/fs/fs.h>
 #endif
 
+#include "task/task.h"
+#include "os_internal.h"
+#include "up_internal.h"
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/hc/src/common/up_exit.c b/arch/hc/src/common/up_exit.c
index 7fa526ff729..1e8bdca2e80 100644
--- a/arch/hc/src/common/up_exit.c
+++ b/arch/hc/src/common/up_exit.c
@@ -43,13 +43,14 @@
 #include <debug.h>
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
-#include "up_internal.h"
-
 #ifdef CONFIG_DUMP_ON_EXIT
 #include <nuttx/fs/fs.h>
 #endif
 
+#include "task/task.h"
+#include "os_internal.h"
+#include "up_internal.h"
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/mips/src/common/up_exit.c b/arch/mips/src/common/up_exit.c
index 415ca64eeee..585a667a7c8 100644
--- a/arch/mips/src/common/up_exit.c
+++ b/arch/mips/src/common/up_exit.c
@@ -45,13 +45,14 @@
 #include <debug.h>
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
-#include "up_internal.h"
-
 #ifdef CONFIG_DUMP_ON_EXIT
 #include <nuttx/fs/fs.h>
 #endif
 
+#include "task/task.h"
+#include "os_internal.h"
+#include "up_internal.h"
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/rgmp/src/nuttx.c b/arch/rgmp/src/nuttx.c
index 0178ae58af0..2b20cad6481 100644
--- a/arch/rgmp/src/nuttx.c
+++ b/arch/rgmp/src/nuttx.c
@@ -52,11 +52,12 @@
 #include <stdlib.h>
 #include <arch/irq.h>
 #include <arch/arch.h>
-#include <os_internal.h>
+
+#include "task/task.h"
+#include "os_internal.h"
 
 struct tcb_s *current_task = NULL;
 
-
 /**
  * This function is called in non-interrupt context
  * to switch tasks.
diff --git a/arch/sh/src/common/up_exit.c b/arch/sh/src/common/up_exit.c
index d4669caf47f..bdb1c520e92 100644
--- a/arch/sh/src/common/up_exit.c
+++ b/arch/sh/src/common/up_exit.c
@@ -44,13 +44,14 @@
 
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
-#include "up_internal.h"
-
 #ifdef CONFIG_DUMP_ON_EXIT
 #include <nuttx/fs/fs.h>
 #endif
 
+#include "task/task.h"
+#include "os_internal.h"
+#include "up_internal.h"
+
 /****************************************************************************
  * Private Definitions
  ****************************************************************************/
diff --git a/arch/sim/src/up_exit.c b/arch/sim/src/up_exit.c
index f4c91e544ae..b70a9115450 100644
--- a/arch/sim/src/up_exit.c
+++ b/arch/sim/src/up_exit.c
@@ -44,6 +44,7 @@
 
 #include <nuttx/arch.h>
 
+#include "task/task.h"
 #include "os_internal.h"
 #include "up_internal.h"
 
diff --git a/arch/x86/src/common/up_exit.c b/arch/x86/src/common/up_exit.c
index ad1ec41c61c..bf2548214bd 100644
--- a/arch/x86/src/common/up_exit.c
+++ b/arch/x86/src/common/up_exit.c
@@ -43,13 +43,14 @@
 #include <debug.h>
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
-#include "up_internal.h"
-
 #ifdef CONFIG_DUMP_ON_EXIT
 #include <nuttx/fs/fs.h>
 #endif
 
+#include "task/task.h"
+#include "os_internal.h"
+#include "up_internal.h"
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/z16/src/common/up_exit.c b/arch/z16/src/common/up_exit.c
index c578a3bfed0..99d50bab832 100644
--- a/arch/z16/src/common/up_exit.c
+++ b/arch/z16/src/common/up_exit.c
@@ -44,14 +44,15 @@
 
 #include <nuttx/arch.h>
 
-#include "chip/chip.h"
-#include "os_internal.h"
-#include "up_internal.h"
-
 #ifdef CONFIG_DUMP_ON_EXIT
 #include <nuttx/fs/fs.h>
 #endif
 
+#include "chip/chip.h"
+#include "task/task.h"
+#include "os_internal.h"
+#include "up_internal.h"
+
 /****************************************************************************
  * Private Definitions
  ****************************************************************************/
diff --git a/arch/z80/src/common/up_exit.c b/arch/z80/src/common/up_exit.c
index 50d675f96ed..124ee103547 100644
--- a/arch/z80/src/common/up_exit.c
+++ b/arch/z80/src/common/up_exit.c
@@ -45,14 +45,15 @@
 
 #include <nuttx/arch.h>
 
-#include "chip/chip.h"
-#include "os_internal.h"
-#include "up_internal.h"
-
 #ifdef CONFIG_DUMP_ON_EXIT
 #include <nuttx/fs/fs.h>
 #endif
 
+#include "chip/chip.h"
+#include "task/task.h"
+#include "os_internal.h"
+#include "up_internal.h"
+
 /****************************************************************************
  * Private Definitions
  ****************************************************************************/