Remove os_internal.h it has been replace by several new header files under sched/. There have been some sneak inclusion paths via os_internal.h, so expect a few compilation errors for some architectures

158 files changed, 54 insertions, 269 deletions

diff --git a/nuttx/arch/8051/src/up_allocateheap.c b/nuttx/arch/8051/src/up_allocateheap.c
index 483759df2..0b00f88ec 100644
--- a/nuttx/arch/8051/src/up_allocateheap.c
+++ b/nuttx/arch/8051/src/up_allocateheap.c
@@ -46,7 +46,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 #include "up_mem.h"
 
diff --git a/nuttx/arch/arm/src/a1x/a1x_irq.c b/nuttx/arch/arm/src/a1x/a1x_irq.c
index 7f043568d..b4a69405c 100644
--- a/nuttx/arch/arm/src/a1x/a1x_irq.c
+++ b/nuttx/arch/arm/src/a1x/a1x_irq.c
@@ -48,7 +48,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 #include "sctlr.h"
 
diff --git a/nuttx/arch/arm/src/a1x/a1x_serial.c b/nuttx/arch/arm/src/a1x/a1x_serial.c
index d2cc36642..f3a9d86c4 100644
--- a/nuttx/arch/arm/src/a1x/a1x_serial.c
+++ b/nuttx/arch/arm/src/a1x/a1x_serial.c
@@ -59,7 +59,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "chip.h"
diff --git a/nuttx/arch/arm/src/arm/up_copyfullstate.c b/nuttx/arch/arm/src/arm/up_copyfullstate.c
index 3dffb8518..5a60f7a1a 100644
--- a/nuttx/arch/arm/src/arm/up_copyfullstate.c
+++ b/nuttx/arch/arm/src/arm/up_copyfullstate.c
@@ -40,8 +40,8 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <arch/irq.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/arm/up_doirq.c b/nuttx/arch/arm/src/arm/up_doirq.c
index c548a13b5..63bbac8d0 100644
--- a/nuttx/arch/arm/src/arm/up_doirq.c
+++ b/nuttx/arch/arm/src/arm/up_doirq.c
@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/arm/up_syscall.c b/nuttx/arch/arm/src/arm/up_syscall.c
index 35f7027dd..4d4110b12 100644
--- a/nuttx/arch/arm/src/arm/up_syscall.c
+++ b/nuttx/arch/arm/src/arm/up_syscall.c
@@ -42,8 +42,9 @@
 #include <stdint.h>
 #include <debug.h>
 
+#include <arch/irq.h>
+
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/arm/up_undefinedinsn.c b/nuttx/arch/arm/src/arm/up_undefinedinsn.c
index fa0da7352..bb80be9b2 100644
--- a/nuttx/arch/arm/src/arm/up_undefinedinsn.c
+++ b/nuttx/arch/arm/src/arm/up_undefinedinsn.c
@@ -38,10 +38,13 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+
 #include <stdint.h>
+#include <assert.h>
 #include <debug.h>
 
-#include "os_internal.h"
+#include <arch/irq.h>
+
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/armv6-m/up_copyfullstate.c b/nuttx/arch/arm/src/armv6-m/up_copyfullstate.c
index 0747de452..0699462d8 100644
--- a/nuttx/arch/arm/src/armv6-m/up_copyfullstate.c
+++ b/nuttx/arch/arm/src/armv6-m/up_copyfullstate.c
@@ -40,8 +40,8 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <arch/irq.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/armv6-m/up_doirq.c b/nuttx/arch/arm/src/armv6-m/up_doirq.c
index b3694612b..c5656e621 100644
--- a/nuttx/arch/arm/src/armv6-m/up_doirq.c
+++ b/nuttx/arch/arm/src/armv6-m/up_doirq.c
@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/armv6-m/up_hardfault.c b/nuttx/arch/arm/src/armv6-m/up_hardfault.c
index 18126e2f4..988a4f13b 100644
--- a/nuttx/arch/arm/src/armv6-m/up_hardfault.c
+++ b/nuttx/arch/arm/src/armv6-m/up_hardfault.c
@@ -47,7 +47,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "nvic.h"
 #include "up_internal.h"
 
diff --git a/nuttx/arch/arm/src/armv6-m/up_svcall.c b/nuttx/arch/arm/src/armv6-m/up_svcall.c
index 2f643adf7..1b367259b 100644
--- a/nuttx/arch/arm/src/armv6-m/up_svcall.c
+++ b/nuttx/arch/arm/src/armv6-m/up_svcall.c
@@ -53,7 +53,6 @@
 
 #include "svcall.h"
 #include "exc_return.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-a/arm_copyarmstate.c b/nuttx/arch/arm/src/armv7-a/arm_copyarmstate.c
index 5de72aef9..0a9d8ca1b 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_copyarmstate.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_copyarmstate.c
@@ -41,7 +41,8 @@
 
 #include <stdint.h>
 
-#include "os_internal.h"
+#include <arch/irq.h>
+
 #include "up_internal.h"
 
 #ifdef CONFIG_ARCH_FPU
diff --git a/nuttx/arch/arm/src/armv7-a/arm_copyfullstate.c b/nuttx/arch/arm/src/armv7-a/arm_copyfullstate.c
index cdc43a9bd..b41b3f2eb 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_copyfullstate.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_copyfullstate.c
@@ -40,8 +40,8 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <arch/irq.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-a/arm_doirq.c b/nuttx/arch/arm/src/armv7-a/arm_doirq.c
index 40b00626e..80dc1361e 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_doirq.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_doirq.c
@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-a/arm_syscall.c b/nuttx/arch/arm/src/armv7-a/arm_syscall.c
index 2c9c951d8..a165db1d1 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_syscall.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_syscall.c
@@ -42,8 +42,9 @@
 #include <stdint.h>
 #include <debug.h>
 
+#include <arch/irq.h>
+
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-a/arm_undefinedinsn.c b/nuttx/arch/arm/src/armv7-a/arm_undefinedinsn.c
index 5143f9bd5..a1af60a4c 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_undefinedinsn.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_undefinedinsn.c
@@ -38,10 +38,13 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+
 #include <stdint.h>
+#include <assert.h>
 #include <debug.h>
 
-#include "os_internal.h"
+#include <arch/irq.h>
+
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-m/up_copyarmstate.c b/nuttx/arch/arm/src/armv7-m/up_copyarmstate.c
index b705be5ea..c5af56c9e 100644
--- a/nuttx/arch/arm/src/armv7-m/up_copyarmstate.c
+++ b/nuttx/arch/arm/src/armv7-m/up_copyarmstate.c
@@ -41,7 +41,8 @@
 
 #include <stdint.h>
 
-#include "os_internal.h"
+#include <arch/irq.h>
+
 #include "up_internal.h"
 
 #if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_ARMV7M_CMNVECTOR)
diff --git a/nuttx/arch/arm/src/armv7-m/up_copyfullstate.c b/nuttx/arch/arm/src/armv7-m/up_copyfullstate.c
index 7f320f842..e3618d486 100644
--- a/nuttx/arch/arm/src/armv7-m/up_copyfullstate.c
+++ b/nuttx/arch/arm/src/armv7-m/up_copyfullstate.c
@@ -40,8 +40,8 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <arch/irq.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-m/up_doirq.c b/nuttx/arch/arm/src/armv7-m/up_doirq.c
index afad0c0d0..175994654 100644
--- a/nuttx/arch/arm/src/armv7-m/up_doirq.c
+++ b/nuttx/arch/arm/src/armv7-m/up_doirq.c
@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-m/up_hardfault.c b/nuttx/arch/arm/src/armv7-m/up_hardfault.c
index 1fab28040..732c2ca0e 100644
--- a/nuttx/arch/arm/src/armv7-m/up_hardfault.c
+++ b/nuttx/arch/arm/src/armv7-m/up_hardfault.c
@@ -48,7 +48,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "nvic.h"
 #include "up_internal.h"
 
diff --git a/nuttx/arch/arm/src/armv7-m/up_memfault.c b/nuttx/arch/arm/src/armv7-m/up_memfault.c
index 8d5fdb461..7ac5cd088 100644
--- a/nuttx/arch/arm/src/armv7-m/up_memfault.c
+++ b/nuttx/arch/arm/src/armv7-m/up_memfault.c
@@ -45,7 +45,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "nvic.h"
 #include "up_internal.h"
 
diff --git a/nuttx/arch/arm/src/armv7-m/up_svcall.c b/nuttx/arch/arm/src/armv7-m/up_svcall.c
index bae1b17d0..be33b675d 100644
--- a/nuttx/arch/arm/src/armv7-m/up_svcall.c
+++ b/nuttx/arch/arm/src/armv7-m/up_svcall.c
@@ -53,7 +53,6 @@
 
 #include "svcall.h"
 #include "exc_return.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/c5471/c5471_irq.c b/nuttx/arch/arm/src/c5471/c5471_irq.c
index fc7f83e08..7f0f3a668 100644
--- a/nuttx/arch/arm/src/c5471/c5471_irq.c
+++ b/nuttx/arch/arm/src/c5471/c5471_irq.c
@@ -45,7 +45,6 @@
 #include "arm.h"
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/c5471/c5471_serial.c b/nuttx/arch/arm/src/c5471/c5471_serial.c
index f1b9f7b70..81cb08467 100644
--- a/nuttx/arch/arm/src/c5471/c5471_serial.c
+++ b/nuttx/arch/arm/src/c5471/c5471_serial.c
@@ -55,7 +55,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/calypso/calypso_serial.c b/nuttx/arch/arm/src/calypso/calypso_serial.c
index d3f9cf590..0fceb344d 100644
--- a/nuttx/arch/arm/src/calypso/calypso_serial.c
+++ b/nuttx/arch/arm/src/calypso/calypso_serial.c
@@ -59,7 +59,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/common/up_releasestack.c b/nuttx/arch/arm/src/common/up_releasestack.c
index 9ab872d33..9668ec245 100644
--- a/nuttx/arch/arm/src/common/up_releasestack.c
+++ b/nuttx/arch/arm/src/common/up_releasestack.c
@@ -41,9 +41,10 @@
 
 #include <sched.h>
 #include <debug.h>
+
 #include <nuttx/arch.h>
+#include <nuttx/kmalloc.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/dm320/dm320_decodeirq.c b/nuttx/arch/arm/src/dm320/dm320_decodeirq.c
index c29207a5b..8c5bd38ae 100644
--- a/nuttx/arch/arm/src/dm320/dm320_decodeirq.c
+++ b/nuttx/arch/arm/src/dm320/dm320_decodeirq.c
@@ -48,7 +48,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /********************************************************************************
diff --git a/nuttx/arch/arm/src/dm320/dm320_irq.c b/nuttx/arch/arm/src/dm320/dm320_irq.c
index 2fb41475d..e909571f3 100644
--- a/nuttx/arch/arm/src/dm320/dm320_irq.c
+++ b/nuttx/arch/arm/src/dm320/dm320_irq.c
@@ -46,7 +46,6 @@
 #include "chip.h"
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /************************************************************************
diff --git a/nuttx/arch/arm/src/dm320/dm320_serial.c b/nuttx/arch/arm/src/dm320/dm320_serial.c
index be74e227f..e8a620c86 100644
--- a/nuttx/arch/arm/src/dm320/dm320_serial.c
+++ b/nuttx/arch/arm/src/dm320/dm320_serial.c
@@ -57,7 +57,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #ifdef USE_SERIALDRIVER
diff --git a/nuttx/arch/arm/src/imx/imx_decodeirq.c b/nuttx/arch/arm/src/imx/imx_decodeirq.c
index dc2326524..fea7bd621 100644
--- a/nuttx/arch/arm/src/imx/imx_decodeirq.c
+++ b/nuttx/arch/arm/src/imx/imx_decodeirq.c
@@ -48,7 +48,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /********************************************************************************
diff --git a/nuttx/arch/arm/src/imx/imx_irq.c b/nuttx/arch/arm/src/imx/imx_irq.c
index 6715a4ad7..9e0fe124f 100644
--- a/nuttx/arch/arm/src/imx/imx_irq.c
+++ b/nuttx/arch/arm/src/imx/imx_irq.c
@@ -45,7 +45,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/imx/imx_serial.c b/nuttx/arch/arm/src/imx/imx_serial.c
index b5939fad7..b4206a3fb 100644
--- a/nuttx/arch/arm/src/imx/imx_serial.c
+++ b/nuttx/arch/arm/src/imx/imx_serial.c
@@ -58,7 +58,6 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "imx_gpio.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #ifdef USE_SERIALDRIVER
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_irq.c b/nuttx/arch/arm/src/kinetis/kinetis_irq.c
index cc805293a..3d304ebad 100644
--- a/nuttx/arch/arm/src/kinetis/kinetis_irq.c
+++ b/nuttx/arch/arm/src/kinetis/kinetis_irq.c
@@ -49,7 +49,6 @@
 #include "nvic.h"
 #include "ram_vectors.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 #include "kinetis_internal.h"
 
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_serial.c b/nuttx/arch/arm/src/kinetis/kinetis_serial.c
index 0df9b88ab..b674e9a4e 100644
--- a/nuttx/arch/arm/src/kinetis/kinetis_serial.c
+++ b/nuttx/arch/arm/src/kinetis/kinetis_serial.c
@@ -56,7 +56,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "kinetis_config.h"
 #include "chip.h"
diff --git a/nuttx/arch/arm/src/kl/kl_irq.c b/nuttx/arch/arm/src/kl/kl_irq.c
index 4c910a15f..493e3cb95 100644
--- a/nuttx/arch/arm/src/kl/kl_irq.c
+++ b/nuttx/arch/arm/src/kl/kl_irq.c
@@ -48,7 +48,6 @@
 
 #include "nvic.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "kl_irq.h"
diff --git a/nuttx/arch/arm/src/kl/kl_serial.c b/nuttx/arch/arm/src/kl/kl_serial.c
index 262167e1f..eb4501e4a 100644
--- a/nuttx/arch/arm/src/kl/kl_serial.c
+++ b/nuttx/arch/arm/src/kl/kl_serial.c
@@ -56,7 +56,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "kl_config.h"
 #include "kl_lowputc.h"
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c b/nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c
index 82b0cc6c9..c4c5917ed 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c
@@ -64,7 +64,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "chip.h"
 #include "chip/lpc17_syscon.h"
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_irq.c b/nuttx/arch/arm/src/lpc17xx/lpc17_irq.c
index 93b3b2de8..29f398c8e 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_irq.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_irq.c
@@ -49,7 +49,6 @@
 #include "nvic.h"
 #include "ram_vectors.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc17_gpio.h"
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_serial.c b/nuttx/arch/arm/src/lpc17xx/lpc17_serial.c
index 86e5b2187..55d85849c 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_serial.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_serial.c
@@ -59,7 +59,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "chip.h"
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_decodeirq.c b/nuttx/arch/arm/src/lpc214x/lpc214x_decodeirq.c
index 7886e5500..ea0eb5683 100644
--- a/nuttx/arch/arm/src/lpc214x/lpc214x_decodeirq.c
+++ b/nuttx/arch/arm/src/lpc214x/lpc214x_decodeirq.c
@@ -47,7 +47,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc214x_vic.h"
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_irq.c b/nuttx/arch/arm/src/lpc214x/lpc214x_irq.c
index cb0f6e12f..0f7f94006 100644
--- a/nuttx/arch/arm/src/lpc214x/lpc214x_irq.c
+++ b/nuttx/arch/arm/src/lpc214x/lpc214x_irq.c
@@ -46,7 +46,6 @@
 #include "arm.h"
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc214x_vic.h"
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c b/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c
index 214eb0347..e778dff70 100644
--- a/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c
+++ b/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c
@@ -54,7 +54,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc214x_pinsel.h"
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c b/nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c
index f80bce018..4307304bc 100644
--- a/nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c
+++ b/nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c
@@ -140,7 +140,6 @@ void up_timer_initialize(void)
   tmr_putreg32(0, LPC214X_TMR_PR_OFFSET);
 
   /* Set timer match registger to get a TICK_PER_SEC rate
-   * See arch/board.h and sched/os_internal.h
    */
 
   tmr_putreg32(LPC214X_PCLKFREQ/TICK_PER_SEC, LPC214X_TMR_MR0_OFFSET);
diff --git a/nuttx/arch/arm/src/lpc2378/lpc23xx_decodeirq.c b/nuttx/arch/arm/src/lpc2378/lpc23xx_decodeirq.c
index 75e6c98b4..85e0d3a1a 100644
--- a/nuttx/arch/arm/src/lpc2378/lpc23xx_decodeirq.c
+++ b/nuttx/arch/arm/src/lpc2378/lpc23xx_decodeirq.c
@@ -54,7 +54,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "internal.h"
 #include "lpc23xx_vic.h"
 
diff --git a/nuttx/arch/arm/src/lpc2378/lpc23xx_i2c.c b/nuttx/arch/arm/src/lpc2378/lpc23xx_i2c.c
index 950ab818a..2299eb841 100644
--- a/nuttx/arch/arm/src/lpc2378/lpc23xx_i2c.c
+++ b/nuttx/arch/arm/src/lpc2378/lpc23xx_i2c.c
@@ -70,7 +70,6 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "lpc23xx_pinsel.h"
 #include "lpc23xx_scb.h"
diff --git a/nuttx/arch/arm/src/lpc2378/lpc23xx_irq.c b/nuttx/arch/arm/src/lpc2378/lpc23xx_irq.c
index 24ed2e7a9..5274ee4ee 100644
--- a/nuttx/arch/arm/src/lpc2378/lpc23xx_irq.c
+++ b/nuttx/arch/arm/src/lpc2378/lpc23xx_irq.c
@@ -52,7 +52,6 @@
 #include "arm.h"
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 
 #include "internal.h"
 #include "lpc23xx_vic.h"
diff --git a/nuttx/arch/arm/src/lpc2378/lpc23xx_serial.c b/nuttx/arch/arm/src/lpc2378/lpc23xx_serial.c
index 17b6bc0b2..4e78690ef 100644
--- a/nuttx/arch/arm/src/lpc2378/lpc23xx_serial.c
+++ b/nuttx/arch/arm/src/lpc2378/lpc23xx_serial.c
@@ -60,7 +60,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 
 #include "internal.h"
 #include "lpc23xx_scb.h"
diff --git a/nuttx/arch/arm/src/lpc2378/lpc23xx_timerisr.c b/nuttx/arch/arm/src/lpc2378/lpc23xx_timerisr.c
index 9005283d1..594a6f761 100644
--- a/nuttx/arch/arm/src/lpc2378/lpc23xx_timerisr.c
+++ b/nuttx/arch/arm/src/lpc2378/lpc23xx_timerisr.c
@@ -172,7 +172,6 @@ void up_timer_initialize(void)
   tmr_putreg32(0, TMR_PC_OFFSET);
 
   /* Set timer match register to get a TICK_PER_SEC rate See arch/board.h and
-   * sched/os_internal.h
    */
 
   tmr_putreg32(T0_TICKS_COUNT, TMR_MR0_OFFSET); /* 10ms Intterrupt */
diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_decodeirq.c b/nuttx/arch/arm/src/lpc31xx/lpc31_decodeirq.c
index 1929d864d..054c8c2fa 100644
--- a/nuttx/arch/arm/src/lpc31xx/lpc31_decodeirq.c
+++ b/nuttx/arch/arm/src/lpc31xx/lpc31_decodeirq.c
@@ -49,7 +49,6 @@
 #include "chip.h"
 #include "up_arch.h"
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc31_intc.h"
diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_irq.c b/nuttx/arch/arm/src/lpc31xx/lpc31_irq.c
index ec1f7bbdb..6a992c69f 100644
--- a/nuttx/arch/arm/src/lpc31xx/lpc31_irq.c
+++ b/nuttx/arch/arm/src/lpc31xx/lpc31_irq.c
@@ -49,7 +49,6 @@
 
 #include "arm.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc31_intc.h"
diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_serial.c b/nuttx/arch/arm/src/lpc31xx/lpc31_serial.c
index e4d6941ca..eaab23268 100644
--- a/nuttx/arch/arm/src/lpc31xx/lpc31_serial.c
+++ b/nuttx/arch/arm/src/lpc31xx/lpc31_serial.c
@@ -54,7 +54,6 @@
 #include <arch/serial.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc31_cgudrvr.h"
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_i2c.c b/nuttx/arch/arm/src/lpc43xx/lpc43_i2c.c
index 1dc8b7679..5ba665ccf 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_i2c.c
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_i2c.c
@@ -70,7 +70,6 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "lpc43_syscon.h"
 #include "lpc43_pinconn.h"
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_irq.c b/nuttx/arch/arm/src/lpc43xx/lpc43_irq.c
index 0827b22cc..e5a7937a7 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_irq.c
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_irq.c
@@ -50,7 +50,6 @@
 #include "nvic.h"
 #include "ram_vectors.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc43_irq.h"
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_serial.c b/nuttx/arch/arm/src/lpc43xx/lpc43_serial.c
index 896e1f738..6aea82a43 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_serial.c
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_serial.c
@@ -61,7 +61,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc43_config.h"
diff --git a/nuttx/arch/arm/src/nuc1xx/nuc_irq.c b/nuttx/arch/arm/src/nuc1xx/nuc_irq.c
index ee4ce2bd9..ae1a84f8e 100644
--- a/nuttx/arch/arm/src/nuc1xx/nuc_irq.c
+++ b/nuttx/arch/arm/src/nuc1xx/nuc_irq.c
@@ -48,7 +48,6 @@
 
 #include "nvic.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "nuc_irq.h"
diff --git a/nuttx/arch/arm/src/nuc1xx/nuc_serial.c b/nuttx/arch/arm/src/nuc1xx/nuc_serial.c
index 25b7f6060..f068573a3 100644
--- a/nuttx/arch/arm/src/nuc1xx/nuc_serial.c
+++ b/nuttx/arch/arm/src/nuc1xx/nuc_serial.c
@@ -60,7 +60,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "chip.h"
diff --git a/nuttx/arch/arm/src/sam34/sam_irq.c b/nuttx/arch/arm/src/sam34/sam_irq.c
index 575caa3e4..9b84f031d 100644
--- a/nuttx/arch/arm/src/sam34/sam_irq.c
+++ b/nuttx/arch/arm/src/sam34/sam_irq.c
@@ -49,7 +49,6 @@
 #include "nvic.h"
 #include "ram_vectors.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #ifdef CONFIG_SAM34_GPIO_IRQ
diff --git a/nuttx/arch/arm/src/sam34/sam_serial.c b/nuttx/arch/arm/src/sam34/sam_serial.c
index 60d2a6b35..745fada33 100644
--- a/nuttx/arch/arm/src/sam34/sam_serial.c
+++ b/nuttx/arch/arm/src/sam34/sam_serial.c
@@ -57,7 +57,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "chip.h"
 
diff --git a/nuttx/arch/arm/src/sama5/sam_can.c b/nuttx/arch/arm/src/sama5/sam_can.c
index 77274526f..cb83d223f 100644
--- a/nuttx/arch/arm/src/sama5/sam_can.c
+++ b/nuttx/arch/arm/src/sama5/sam_can.c
@@ -65,7 +65,6 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "os_internal.h"
 
 #include "chip/sam_pinmap.h"
 #include "sam_periphclks.h"
diff --git a/nuttx/arch/arm/src/sama5/sam_dbgu.c b/nuttx/arch/arm/src/sama5/sam_dbgu.c
index 919260616..cccad0e0b 100644
--- a/nuttx/arch/arm/src/sama5/sam_dbgu.c
+++ b/nuttx/arch/arm/src/sama5/sam_dbgu.c
@@ -57,7 +57,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "chip.h"
 #include "chip/sam_dbgu.h"
diff --git a/nuttx/arch/arm/src/sama5/sam_irq.c b/nuttx/arch/arm/src/sama5/sam_irq.c
index 88d426ce1..f9e0d2f66 100644
--- a/nuttx/arch/arm/src/sama5/sam_irq.c
+++ b/nuttx/arch/arm/src/sama5/sam_irq.c
@@ -47,7 +47,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #ifdef CONFIG_SAMA5_PIO_IRQ
diff --git a/nuttx/arch/arm/src/sama5/sam_serial.c b/nuttx/arch/arm/src/sama5/sam_serial.c
index 479caf5b0..afa711dcd 100644
--- a/nuttx/arch/arm/src/sama5/sam_serial.c
+++ b/nuttx/arch/arm/src/sama5/sam_serial.c
@@ -57,7 +57,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "chip.h"
 #include "chip/sam_uart.h"
diff --git a/nuttx/arch/arm/src/samd/sam_irq.c b/nuttx/arch/arm/src/samd/sam_irq.c
index 000f58b62..9797a08bf 100644
--- a/nuttx/arch/arm/src/samd/sam_irq.c
+++ b/nuttx/arch/arm/src/samd/sam_irq.c
@@ -48,7 +48,6 @@
 
 #include "nvic.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "sam_irq.h"
diff --git a/nuttx/arch/arm/src/samd/sam_serial.c b/nuttx/arch/arm/src/samd/sam_serial.c
index d6c448e56..7e9c25396 100644
--- a/nuttx/arch/arm/src/samd/sam_serial.c
+++ b/nuttx/arch/arm/src/samd/sam_serial.c
@@ -57,7 +57,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "chip.h"
 #include "sam_config.h"
diff --git a/nuttx/arch/arm/src/stm32/stm32_can.c b/nuttx/arch/arm/src/stm32/stm32_can.c
index 6c88c6b33..31062b4b2 100644
--- a/nuttx/arch/arm/src/stm32/stm32_can.c
+++ b/nuttx/arch/arm/src/stm32/stm32_can.c
@@ -54,7 +54,6 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "os_internal.h"
 
 #include "chip.h"
 #include "stm32.h"
diff --git a/nuttx/arch/arm/src/stm32/stm32_irq.c b/nuttx/arch/arm/src/stm32/stm32_irq.c
index f815fe5be..318ab6c43 100644
--- a/nuttx/arch/arm/src/stm32/stm32_irq.c
+++ b/nuttx/arch/arm/src/stm32/stm32_irq.c
@@ -50,7 +50,6 @@
 #include "nvic.h"
 #include "ram_vectors.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 #include "stm32.h"
 
diff --git a/nuttx/arch/arm/src/stm32/stm32_serial.c b/nuttx/arch/arm/src/stm32/stm32_serial.c
index f5c4ce06d..097b2ec6e 100644
--- a/nuttx/arch/arm/src/stm32/stm32_serial.c
+++ b/nuttx/arch/arm/src/stm32/stm32_serial.c
@@ -66,7 +66,6 @@
 #include "stm32_rcc.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/arch/arm/src/str71x/str71x_decodeirq.c b/nuttx/arch/arm/src/str71x/str71x_decodeirq.c
index 2316c33e6..0eacccf9c 100644
--- a/nuttx/arch/arm/src/str71x/str71x_decodeirq.c
+++ b/nuttx/arch/arm/src/str71x/str71x_decodeirq.c
@@ -49,7 +49,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /********************************************************************************
diff --git a/nuttx/arch/arm/src/str71x/str71x_serial.c b/nuttx/arch/arm/src/str71x/str71x_serial.c
index d8f4ea1f1..bfa11b559 100644
--- a/nuttx/arch/arm/src/str71x/str71x_serial.c
+++ b/nuttx/arch/arm/src/str71x/str71x_serial.c
@@ -55,7 +55,6 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "str71x_internal.h"
 
diff --git a/nuttx/arch/arm/src/str71x/str71x_xti.c b/nuttx/arch/arm/src/str71x/str71x_xti.c
index 118b0448b..c61483fc7 100644
--- a/nuttx/arch/arm/src/str71x/str71x_xti.c
+++ b/nuttx/arch/arm/src/str71x/str71x_xti.c
@@ -50,7 +50,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 #include "str71x_internal.h"
 
diff --git a/nuttx/arch/arm/src/tiva/tiva_gpio.c b/nuttx/arch/arm/src/tiva/tiva_gpio.c
index e61d9f1b1..e8a7c524f 100644
--- a/nuttx/arch/arm/src/tiva/tiva_gpio.c
+++ b/nuttx/arch/arm/src/tiva/tiva_gpio.c
@@ -48,7 +48,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "tiva_gpio.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/tiva/tiva_gpioirq.c b/nuttx/arch/arm/src/tiva/tiva_gpioirq.c
index 1a284a2f7..9e99d5e43 100644
--- a/nuttx/arch/arm/src/tiva/tiva_gpioirq.c
+++ b/nuttx/arch/arm/src/tiva/tiva_gpioirq.c
@@ -47,7 +47,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "irq/irq.h"
 
 #include "tiva_gpio.h"
diff --git a/nuttx/arch/arm/src/tiva/tiva_irq.c b/nuttx/arch/arm/src/tiva/tiva_irq.c
index 501d8691c..dd36100c0 100644
--- a/nuttx/arch/arm/src/tiva/tiva_irq.c
+++ b/nuttx/arch/arm/src/tiva/tiva_irq.c
@@ -49,7 +49,6 @@
 #include "nvic.h"
 #include "ram_vectors.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "chip.h"
diff --git a/nuttx/arch/arm/src/tiva/tiva_serial.c b/nuttx/arch/arm/src/tiva/tiva_serial.c
index 868976b8a..161bd0da3 100644
--- a/nuttx/arch/arm/src/tiva/tiva_serial.c
+++ b/nuttx/arch/arm/src/tiva/tiva_serial.c
@@ -58,7 +58,6 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "tiva_lowputc.h"
 
diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_gpioirq.c b/nuttx/arch/avr/src/at32uc3/at32uc3_gpioirq.c
index 38dc93132..16e6cb5f0 100644
--- a/nuttx/arch/avr/src/at32uc3/at32uc3_gpioirq.c
+++ b/nuttx/arch/avr/src/at32uc3/at32uc3_gpioirq.c
@@ -50,7 +50,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "irq/irq.h"
 #include "at32uc3_internal.h"
 #include "at32uc3_gpio.h"
diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_irq.c b/nuttx/arch/avr/src/at32uc3/at32uc3_irq.c
index 78410ac2d..0c972cc43 100644
--- a/nuttx/arch/avr/src/at32uc3/at32uc3_irq.c
+++ b/nuttx/arch/avr/src/at32uc3/at32uc3_irq.c
@@ -50,7 +50,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 #include "at32uc3_internal.h"
 
diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_serial.c b/nuttx/arch/avr/src/at32uc3/at32uc3_serial.c
index 0425e7e04..13bdb5161 100644
--- a/nuttx/arch/avr/src/at32uc3/at32uc3_serial.c
+++ b/nuttx/arch/avr/src/at32uc3/at32uc3_serial.c
@@ -59,7 +59,6 @@
 #include "at32uc3_usart.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 #include "at32uc3_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/avr/src/at90usb/at90usb_serial.c b/nuttx/arch/avr/src/at90usb/at90usb_serial.c
index 854cbb4c3..bbc1e3465 100644
--- a/nuttx/arch/avr/src/at90usb/at90usb_serial.c
+++ b/nuttx/arch/avr/src/at90usb/at90usb_serial.c
@@ -58,7 +58,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 #include "at90usb_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/avr/src/atmega/atmega_serial.c b/nuttx/arch/avr/src/atmega/atmega_serial.c
index 90bb7f0d8..a6c43995d 100644
--- a/nuttx/arch/avr/src/atmega/atmega_serial.c
+++ b/nuttx/arch/avr/src/atmega/atmega_serial.c
@@ -58,7 +58,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 #include "atmega_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/avr/src/avr/up_doirq.c b/nuttx/arch/avr/src/avr/up_doirq.c
index 0303f68f4..ad242972b 100644
--- a/nuttx/arch/avr/src/avr/up_doirq.c
+++ b/nuttx/arch/avr/src/avr/up_doirq.c
@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/avr/src/avr/up_irq.c b/nuttx/arch/avr/src/avr/up_irq.c
index 6362fe66a..8dce2ef8a 100644
--- a/nuttx/arch/avr/src/avr/up_irq.c
+++ b/nuttx/arch/avr/src/avr/up_irq.c
@@ -49,7 +49,6 @@
 #include <avr/io.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/avr/src/avr32/up_doirq.c b/nuttx/arch/avr/src/avr32/up_doirq.c
index 770dd613e..5cd115de3 100644
--- a/nuttx/arch/avr/src/avr32/up_doirq.c
+++ b/nuttx/arch/avr/src/avr32/up_doirq.c
@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/avr/src/common/up_releasestack.c b/nuttx/arch/avr/src/common/up_releasestack.c
index ec172bd5e..11b5181c4 100644
--- a/nuttx/arch/avr/src/common/up_releasestack.c
+++ b/nuttx/arch/avr/src/common/up_releasestack.c
@@ -41,9 +41,10 @@
 
 #include <sched.h>
 #include <debug.h>
+
 #include <nuttx/arch.h>
+#include <nuttx/kmalloc.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/hc/src/common/up_copystate.c b/nuttx/arch/hc/src/common/up_copystate.c
index ed3fe331d..c9fe24b34 100644
--- a/nuttx/arch/hc/src/common/up_copystate.c
+++ b/nuttx/arch/hc/src/common/up_copystate.c
@@ -40,8 +40,8 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <arch/irq.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/hc/src/common/up_doirq.c b/nuttx/arch/hc/src/common/up_doirq.c
index 11adb4c6f..9dd5202e4 100644
--- a/nuttx/arch/hc/src/common/up_doirq.c
+++ b/nuttx/arch/hc/src/common/up_doirq.c
@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/hc/src/common/up_releasestack.c b/nuttx/arch/hc/src/common/up_releasestack.c
index 800e0ccb5..096108f86 100644
--- a/nuttx/arch/hc/src/common/up_releasestack.c
+++ b/nuttx/arch/hc/src/common/up_releasestack.c
@@ -43,8 +43,8 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
+#include <nuttx/kmalloc.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/hc/src/m9s12/m9s12_irq.c b/nuttx/arch/hc/src/m9s12/m9s12_irq.c
index ad859dc51..e11e90e1c 100644
--- a/nuttx/arch/hc/src/m9s12/m9s12_irq.c
+++ b/nuttx/arch/hc/src/m9s12/m9s12_irq.c
@@ -48,7 +48,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 #include "m9s12_internal.h"
 
diff --git a/nuttx/arch/mips/src/common/up_releasestack.c b/nuttx/arch/mips/src/common/up_releasestack.c
index f1cb44c23..6e510ed3d 100644
--- a/nuttx/arch/mips/src/common/up_releasestack.c
+++ b/nuttx/arch/mips/src/common/up_releasestack.c
@@ -41,9 +41,10 @@
 
 #include <sched.h>
 #include <debug.h>
+
 #include <nuttx/arch.h>
+#include <nuttx/kmalloc.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/mips/src/mips32/up_copystate.c b/nuttx/arch/mips/src/mips32/up_copystate.c
index 798e82b04..17ec401a4 100644
--- a/nuttx/arch/mips/src/mips32/up_copystate.c
+++ b/nuttx/arch/mips/src/mips32/up_copystate.c
@@ -40,8 +40,8 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <arch/irq.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/mips/src/mips32/up_doirq.c b/nuttx/arch/mips/src/mips32/up_doirq.c
index 090fdbae5..826642caf 100644
--- a/nuttx/arch/mips/src/mips32/up_doirq.c
+++ b/nuttx/arch/mips/src/mips32/up_doirq.c
@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-decodeirq.c b/nuttx/arch/mips/src/pic32mx/pic32mx-decodeirq.c
index 3c38610bd..9facbf310 100644
--- a/nuttx/arch/mips/src/pic32mx/pic32mx-decodeirq.c
+++ b/nuttx/arch/mips/src/pic32mx/pic32mx-decodeirq.c
@@ -49,7 +49,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 
 #include "pic32mx-int.h"
 #include "pic32mx-internal.h"
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-exception.c b/nuttx/arch/mips/src/pic32mx/pic32mx-exception.c
index 125bbbf88..500391022 100644
--- a/nuttx/arch/mips/src/pic32mx/pic32mx-exception.c
+++ b/nuttx/arch/mips/src/pic32mx/pic32mx-exception.c
@@ -50,7 +50,6 @@
 #include <arch/pic32mx/cp0.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 
 #include "pic32mx-int.h"
 #include "pic32mx-internal.h"
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-irq.c b/nuttx/arch/mips/src/pic32mx/pic32mx-irq.c
index 573a4cc55..59c6202ad 100644
--- a/nuttx/arch/mips/src/pic32mx/pic32mx-irq.c
+++ b/nuttx/arch/mips/src/pic32mx/pic32mx-irq.c
@@ -51,7 +51,6 @@
 #include <arch/pic32mx/cp0.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "pic32mx-int.h"
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-serial.c b/nuttx/arch/mips/src/pic32mx/pic32mx-serial.c
index d0d09d4a8..fd15a837e 100644
--- a/nuttx/arch/mips/src/pic32mx/pic32mx-serial.c
+++ b/nuttx/arch/mips/src/pic32mx/pic32mx-serial.c
@@ -60,7 +60,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "pic32mx-config.h"
 #include "chip.h"
diff --git a/nuttx/arch/rgmp/src/arm/arch_nuttx.c b/nuttx/arch/rgmp/src/arm/arch_nuttx.c
index 93d4e447a..0b6a63877 100644
--- a/nuttx/arch/rgmp/src/arm/arch_nuttx.c
+++ b/nuttx/arch/rgmp/src/arm/arch_nuttx.c
@@ -42,7 +42,6 @@
 
 #include <arch/arch.h>
 #include <nuttx/sched.h>
-#include <os_internal.h>
 
 
 void nuttx_arch_init(void)
diff --git a/nuttx/arch/rgmp/src/x86/arch_nuttx.c b/nuttx/arch/rgmp/src/x86/arch_nuttx.c
index c691784d9..2ca3d02e0 100644
--- a/nuttx/arch/rgmp/src/x86/arch_nuttx.c
+++ b/nuttx/arch/rgmp/src/x86/arch_nuttx.c
@@ -43,7 +43,6 @@
 
 #include <arch/arch.h>
 #include <nuttx/sched.h>
-#include <os_internal.h>
 
 
 void nuttx_arch_init(void)
diff --git a/nuttx/arch/sh/src/common/up_doirq.c b/nuttx/arch/sh/src/common/up_doirq.c
index c9ba18bad..c28d1ede4 100644
--- a/nuttx/arch/sh/src/common/up_doirq.c
+++ b/nuttx/arch/sh/src/common/up_doirq.c
@@ -46,7 +46,6 @@
 #include <nuttx/arch.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/sh/src/common/up_releasestack.c b/nuttx/arch/sh/src/common/up_releasestack.c
index e88e06d52..422f12f49 100644
--- a/nuttx/arch/sh/src/common/up_releasestack.c
+++ b/nuttx/arch/sh/src/common/up_releasestack.c
@@ -41,9 +41,10 @@
 
 #include <sched.h>
 #include <debug.h>
+
 #include <nuttx/arch.h>
+#include <nuttx/kmalloc.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/sh/src/m16c/m16c_copystate.c b/nuttx/arch/sh/src/m16c/m16c_copystate.c
index 5ba40e294..f8dfc843f 100644
--- a/nuttx/arch/sh/src/m16c/m16c_copystate.c
+++ b/nuttx/arch/sh/src/m16c/m16c_copystate.c
@@ -42,7 +42,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "os_internal.h"
+#include <arch/irq.h>
+
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/sh/src/m16c/m16c_serial.c b/nuttx/arch/sh/src/m16c/m16c_serial.c
index 4bfeb1194..a3bd6c07e 100644
--- a/nuttx/arch/sh/src/m16c/m16c_serial.c
+++ b/nuttx/arch/sh/src/m16c/m16c_serial.c
@@ -56,7 +56,6 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 #include "m16c_uart.h"
 
 /* Is there any serial support?  This might be the case if the board does
diff --git a/nuttx/arch/sh/src/sh1/sh1_copystate.c b/nuttx/arch/sh/src/sh1/sh1_copystate.c
index 323f96c4a..873088bee 100644
--- a/nuttx/arch/sh/src/sh1/sh1_copystate.c
+++ b/nuttx/arch/sh/src/sh1/sh1_copystate.c
@@ -40,8 +40,8 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <arch/irq.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/sh/src/sh1/sh1_serial.c b/nuttx/arch/sh/src/sh1/sh1_serial.c
index dac01e3ca..3d24e8556 100644
--- a/nuttx/arch/sh/src/sh1/sh1_serial.c
+++ b/nuttx/arch/sh/src/sh1/sh1_serial.c
@@ -56,7 +56,6 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/arch/sim/src/up_allocateheap.c b/nuttx/arch/sim/src/up_allocateheap.c
index ffdb69518..9f5dfd205 100644
--- a/nuttx/arch/sim/src/up_allocateheap.c
+++ b/nuttx/arch/sim/src/up_allocateheap.c
@@ -46,7 +46,6 @@
 
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/sim/src/up_usestack.c b/nuttx/arch/sim/src/up_usestack.c
index af2d8121d..5cb9dd265 100644
--- a/nuttx/arch/sim/src/up_usestack.c
+++ b/nuttx/arch/sim/src/up_usestack.c
@@ -41,7 +41,6 @@
 #include <sys/types.h>
 #include <debug.h>
 #include <nuttx/arch.h>
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/x86/src/common/up_copystate.c b/nuttx/arch/x86/src/common/up_copystate.c
index 5e53e3846..a92a1456b 100644
--- a/nuttx/arch/x86/src/common/up_copystate.c
+++ b/nuttx/arch/x86/src/common/up_copystate.c
@@ -40,8 +40,8 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <arch/irq.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/x86/src/i486/up_irq.c b/nuttx/arch/x86/src/i486/up_irq.c
index 6a56c361a..e8dc69c54 100644
--- a/nuttx/arch/x86/src/i486/up_irq.c
+++ b/nuttx/arch/x86/src/i486/up_irq.c
@@ -51,7 +51,6 @@
 #include <arch/io.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 #include "qemu_internal.h"
 
diff --git a/nuttx/arch/x86/src/i486/up_releasestack.c b/nuttx/arch/x86/src/i486/up_releasestack.c
index 8d264641f..89bf974c7 100644
--- a/nuttx/arch/x86/src/i486/up_releasestack.c
+++ b/nuttx/arch/x86/src/i486/up_releasestack.c
@@ -41,9 +41,10 @@
 
 #include <sched.h>
 #include <debug.h>
+
 #include <nuttx/arch.h>
+#include <nuttx/kmalloc.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z16/src/common/up_copystate.c b/nuttx/arch/z16/src/common/up_copystate.c
index d3a4d47a0..9da8c2589 100644
--- a/nuttx/arch/z16/src/common/up_copystate.c
+++ b/nuttx/arch/z16/src/common/up_copystate.c
@@ -41,7 +41,6 @@
 
 #include <arch/irq.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z16/src/common/up_doirq.c b/nuttx/arch/z16/src/common/up_doirq.c
index ffe15a114..7e9a3fd9f 100644
--- a/nuttx/arch/z16/src/common/up_doirq.c
+++ b/nuttx/arch/z16/src/common/up_doirq.c
@@ -46,7 +46,6 @@
 #include <arch/board/board.h>
 
 #include "chip/chip.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z16/src/common/up_registerdump.c b/nuttx/arch/z16/src/common/up_registerdump.c
index c56658f16..30b6227de 100644
--- a/nuttx/arch/z16/src/common/up_registerdump.c
+++ b/nuttx/arch/z16/src/common/up_registerdump.c
@@ -45,7 +45,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z16/src/common/up_releasestack.c b/nuttx/arch/z16/src/common/up_releasestack.c
index 3d0842a5b..d57f2c11a 100644
--- a/nuttx/arch/z16/src/common/up_releasestack.c
+++ b/nuttx/arch/z16/src/common/up_releasestack.c
@@ -41,9 +41,10 @@
 
 #include <sched.h>
 #include <debug.h>
+
 #include <nuttx/arch.h>
+#include <nuttx/kmalloc.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z16/src/z16f/z16f_irq.c b/nuttx/arch/z16/src/z16f/z16f_irq.c
index 1e48fcb69..317ec4a6f 100644
--- a/nuttx/arch/z16/src/z16f/z16f_irq.c
+++ b/nuttx/arch/z16/src/z16f/z16f_irq.c
@@ -45,7 +45,6 @@
 #include <arch/irq.h>
 
 #include "chip/chip.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z16/src/z16f/z16f_serial.c b/nuttx/arch/z16/src/z16f/z16f_serial.c
index 90fbafe9a..444021303 100644
--- a/nuttx/arch/z16/src/z16f/z16f_serial.c
+++ b/nuttx/arch/z16/src/z16f/z16f_serial.c
@@ -54,7 +54,6 @@
 #include <arch/serial.h>
 
 #include "chip/chip.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #ifdef USE_SERIALDRIVER
diff --git a/nuttx/arch/z16/src/z16f/z16f_sysexec.c b/nuttx/arch/z16/src/z16f/z16f_sysexec.c
index eb3c4065c..6a74f7ee4 100644
--- a/nuttx/arch/z16/src/z16f/z16f_sysexec.c
+++ b/nuttx/arch/z16/src/z16f/z16f_sysexec.c
@@ -45,7 +45,6 @@
 #include <nuttx/arch.h>
 
 #include "chip/chip.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /***************************************************************************
diff --git a/nuttx/arch/z80/src/common/up_doirq.c b/nuttx/arch/z80/src/common/up_doirq.c
index 947a02401..a92d3d774 100644
--- a/nuttx/arch/z80/src/common/up_doirq.c
+++ b/nuttx/arch/z80/src/common/up_doirq.c
@@ -47,7 +47,6 @@
 #include <nuttx/arch.h>
 
 #include "chip/switch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z80/src/common/up_releasestack.c b/nuttx/arch/z80/src/common/up_releasestack.c
index 92c7bbd0a..9ea249a63 100644
--- a/nuttx/arch/z80/src/common/up_releasestack.c
+++ b/nuttx/arch/z80/src/common/up_releasestack.c
@@ -41,9 +41,10 @@
 
 #include <sched.h>
 #include <debug.h>
+
 #include <nuttx/arch.h>
+#include <nuttx/kmalloc.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z80/src/ez80/ez80_copystate.c b/nuttx/arch/z80/src/ez80/ez80_copystate.c
index c85d2b716..85a389d56 100644
--- a/nuttx/arch/z80/src/ez80/ez80_copystate.c
+++ b/nuttx/arch/z80/src/ez80/ez80_copystate.c
@@ -42,7 +42,6 @@
 #include <arch/irq.h>
 
 #include "chip/switch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z80/src/ez80/ez80_registerdump.c b/nuttx/arch/z80/src/ez80/ez80_registerdump.c
index 82c8cc8ad..85ab0a42a 100644
--- a/nuttx/arch/z80/src/ez80/ez80_registerdump.c
+++ b/nuttx/arch/z80/src/ez80/ez80_registerdump.c
@@ -45,7 +45,6 @@
 #include <nuttx/arch.h>
 
 #include "chip/switch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z80/src/ez80/ez80_serial.c b/nuttx/arch/z80/src/ez80/ez80_serial.c
index f071b1e62..38a4aa5f8 100644
--- a/nuttx/arch/z80/src/ez80/ez80_serial.c
+++ b/nuttx/arch/z80/src/ez80/ez80_serial.c
@@ -55,7 +55,6 @@
 #include <arch/io.h>
 
 #include "chip/chip.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #ifdef USE_SERIALDRIVER
diff --git a/nuttx/arch/z80/src/z180/z180_copystate.c b/nuttx/arch/z80/src/z180/z180_copystate.c
index a088f8d40..6824438ca 100644
--- a/nuttx/arch/z80/src/z180/z180_copystate.c
+++ b/nuttx/arch/z80/src/z180/z180_copystate.c
@@ -42,7 +42,6 @@
 #include <arch/irq.h>
 
 #include "chip/switch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z80/src/z180/z180_registerdump.c b/nuttx/arch/z80/src/z180/z180_registerdump.c
index ad67f12a3..9b4ed60f9 100644
--- a/nuttx/arch/z80/src/z180/z180_registerdump.c
+++ b/nuttx/arch/z80/src/z180/z180_registerdump.c
@@ -45,7 +45,6 @@
 #include <nuttx/arch.h>
 
 #include "chip/switch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z80/src/z180/z180_scc.c b/nuttx/arch/z80/src/z180/z180_scc.c
index d0334258f..8655d907c 100644
--- a/nuttx/arch/z80/src/z180/z180_scc.c
+++ b/nuttx/arch/z80/src/z180/z180_scc.c
@@ -55,7 +55,6 @@
 #include <arch/io.h>
 
 #include "chip/chip.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "z180_config.h"
diff --git a/nuttx/arch/z80/src/z8/z8_registerdump.c b/nuttx/arch/z80/src/z8/z8_registerdump.c
index d1319f93b..c80b7da68 100644
--- a/nuttx/arch/z80/src/z8/z8_registerdump.c
+++ b/nuttx/arch/z80/src/z8/z8_registerdump.c
@@ -46,7 +46,6 @@
 #include <nuttx/arch.h>
 
 #include "chip/switch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z80/src/z8/z8_saveirqcontext.c b/nuttx/arch/z80/src/z8/z8_saveirqcontext.c
index ea206c9dd..0f23ef635 100644
--- a/nuttx/arch/z80/src/z8/z8_saveirqcontext.c
+++ b/nuttx/arch/z80/src/z8/z8_saveirqcontext.c
@@ -43,7 +43,6 @@
 #include <arch/irq.h>
 
 #include "chip/switch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z80/src/z8/z8_serial.c b/nuttx/arch/z80/src/z8/z8_serial.c
index 98fa554e6..758e6ae8e 100644
--- a/nuttx/arch/z80/src/z8/z8_serial.c
+++ b/nuttx/arch/z80/src/z8/z8_serial.c
@@ -55,7 +55,6 @@
 #include <arch/serial.h>
 
 #include "chip/chip.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #ifdef USE_SERIALDRIVER
diff --git a/nuttx/arch/z80/src/z80/z80_copystate.c b/nuttx/arch/z80/src/z80/z80_copystate.c
index ca2286a2b..16ed69e56 100644
--- a/nuttx/arch/z80/src/z80/z80_copystate.c
+++ b/nuttx/arch/z80/src/z80/z80_copystate.c
@@ -42,7 +42,6 @@
 #include <arch/irq.h>
 
 #include "chip/switch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z80/src/z80/z80_registerdump.c b/nuttx/arch/z80/src/z80/z80_registerdump.c
index a3271e61e..86b2e1895 100644
--- a/nuttx/arch/z80/src/z80/z80_registerdump.c
+++ b/nuttx/arch/z80/src/z80/z80_registerdump.c
@@ -45,7 +45,6 @@
 #include <nuttx/arch.h>
 
 #include "chip/switch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/configs/xtrs/src/xtr_irq.c b/nuttx/configs/xtrs/src/xtr_irq.c
index 6603cfaec..f8c3d65e1 100644
--- a/nuttx/configs/xtrs/src/xtr_irq.c
+++ b/nuttx/configs/xtrs/src/xtr_irq.c
@@ -42,7 +42,6 @@
 #include <nuttx/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/configs/xtrs/src/xtr_lowputc.c b/nuttx/configs/xtrs/src/xtr_lowputc.c
index 60f4db049..038fe9f40 100644
--- a/nuttx/configs/xtrs/src/xtr_lowputc.c
+++ b/nuttx/configs/xtrs/src/xtr_lowputc.c
@@ -48,7 +48,6 @@
 #include <assert.h>
 #include <debug.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /* Includes trs80-m3.h for assembler call addresses */
diff --git a/nuttx/configs/xtrs/src/xtr_serial.c b/nuttx/configs/xtrs/src/xtr_serial.c
index 7aa99a87d..f7ea11b0b 100644
--- a/nuttx/configs/xtrs/src/xtr_serial.c
+++ b/nuttx/configs/xtrs/src/xtr_serial.c
@@ -58,7 +58,6 @@
 #include <arch/z80/io.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #ifdef USE_SERIALDRIVER
diff --git a/nuttx/configs/z80sim/src/z80_irq.c b/nuttx/configs/z80sim/src/z80_irq.c
index 45d4eb962..4faea34e4 100644
--- a/nuttx/configs/z80sim/src/z80_irq.c
+++ b/nuttx/configs/z80sim/src/z80_irq.c
@@ -42,7 +42,6 @@
 #include <nuttx/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/configs/z80sim/src/z80_lowputc.c b/nuttx/configs/z80sim/src/z80_lowputc.c
index 9bfe266c1..10b3d9a61 100644
--- a/nuttx/configs/z80sim/src/z80_lowputc.c
+++ b/nuttx/configs/z80sim/src/z80_lowputc.c
@@ -44,7 +44,6 @@
 #include <assert.h>
 #include <debug.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /********************************************************************************
diff --git a/nuttx/configs/z80sim/src/z80_serial.c b/nuttx/configs/z80sim/src/z80_serial.c
index 7a13ea69b..56ca57b7f 100644
--- a/nuttx/configs/z80sim/src/z80_serial.c
+++ b/nuttx/configs/z80sim/src/z80_serial.c
@@ -53,7 +53,6 @@
 #include <arch/serial.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #ifdef USE_SERIALDRIVER
diff --git a/nuttx/sched/environ/env_release.c b/nuttx/sched/environ/env_release.c
index 32287f9f1..67db8eda9 100644
--- a/nuttx/sched/environ/env_release.c
+++ b/nuttx/sched/environ/env_release.c
@@ -43,7 +43,9 @@
 
 #include <sched.h>
 #include <errno.h>
-#include "os_internal.h"
+
+#include <nuttx/kmalloc.h>
+
 #include "environ/environ.h"
 
 /****************************************************************************
diff --git a/nuttx/sched/environ/environ.h b/nuttx/sched/environ/environ.h
index 5a994f8f4..63cea1e92 100644
--- a/nuttx/sched/environ/environ.h
+++ b/nuttx/sched/environ/environ.h
@@ -42,7 +42,6 @@
 
 #include <nuttx/config.h>
 #include <nuttx/sched.h>
-#include "os_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/exit.c b/nuttx/sched/exit.c
deleted file mode 100644
index 85cc99cba..000000000
--- a/nuttx/sched/exit.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/****************************************************************************
- * sched/exit.c
- *
- *   Copyright (C) 2007-2008, 2011-2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <debug.h>
-#include <errno.h>
-
-#include <nuttx/fs/fs.h>
-
-#include "task/task.h"
-#include "sched/sched.h"
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Type Declarations
- ****************************************************************************/
-
-/****************************************************************************
- * Global Variables
- ****************************************************************************/
-
-/****************************************************************************
- * Private Variables
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: exit
- *
- * Description:
- *   The exit() function causes normal process termination and the value of
- *   status & 0377 to be returned to the parent.
- *
- *   All functions registered with atexit() and on_exit() are called, in the
- *   reverse order of their registration.
- *
- *   All open streams are flushed and closed.
- *
- ****************************************************************************/
-
-void exit(int status)
-{
-  struct tcb_s *tcb = (struct tcb_s*)g_readytorun.head;
-
-  /* Only the lower 8-bits of status are used */
-
-  status &= 0xff;
-
-  /* Perform common task termination logic.  This will get called again later
-   * through logic kicked off by _exit().  However, we need to call it before
-   * calling _exit() in order to handle atexit() and on_exit() callbacks and
-   * so that we can flush buffered I/O (both of which may required suspending).
-   */
-
-  task_exithook(tcb, status, false);
-
-  /* Then "really" exit.  Only the lower 8 bits of the exit status are used. */
-
-  _exit(status);
-}
diff --git a/nuttx/sched/group/group_join.c b/nuttx/sched/group/group_join.c
index e188a9ee3..301d4481d 100644
--- a/nuttx/sched/group/group_join.c
+++ b/nuttx/sched/group/group_join.c
@@ -46,6 +46,7 @@
 
 #include <nuttx/kmalloc.h>
 
+#include "sched/sched.h"
 #include "group/group.h"
 #include "environ/environ.h"
 
diff --git a/nuttx/sched/group/group_setupidlefiles.c b/nuttx/sched/group/group_setupidlefiles.c
index f9261d060..55cd0ba02 100644
--- a/nuttx/sched/group/group_setupidlefiles.c
+++ b/nuttx/sched/group/group_setupidlefiles.c
@@ -49,7 +49,6 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/net/net.h>
 
-#include "os_internal.h"
 #include "group/group.h"
 
 #if CONFIG_NFILE_DESCRIPTORS > 0 || CONFIG_NSOCKET_DESCRIPTORS > 0
diff --git a/nuttx/sched/init/os_bringup.c b/nuttx/sched/init/os_bringup.c
index 4701b47ff..bb9889956 100644
--- a/nuttx/sched/init/os_bringup.c
+++ b/nuttx/sched/init/os_bringup.c
@@ -53,7 +53,6 @@
 #include <nuttx/kthread.h>
 #include <nuttx/userspace.h>
 
-#include "os_internal.h"
 #ifdef CONFIG_PAGING
 # include "paging/paging.h"
 #endif
diff --git a/nuttx/sched/irq/irq_unexpectedisr.c b/nuttx/sched/irq/irq_unexpectedisr.c
index 6d3c68193..9b79930aa 100644
--- a/nuttx/sched/irq/irq_unexpectedisr.c
+++ b/nuttx/sched/irq/irq_unexpectedisr.c
@@ -43,7 +43,6 @@
 
 #include <nuttx/irq.h>
 
-#include "os_internal.h"
 #include "irq/irq.h"
 
 /****************************************************************************
diff --git a/nuttx/sched/mqueue/mq_descreate.c b/nuttx/sched/mqueue/mq_descreate.c
index b22714791..e4af89e42 100644
--- a/nuttx/sched/mqueue/mq_descreate.c
+++ b/nuttx/sched/mqueue/mq_descreate.c
@@ -51,7 +51,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 
-#include "os_internal.h"
 #include "signal/signal.h"
 
 #include "mqueue/mqueue.h"
diff --git a/nuttx/sched/mqueue/mq_msgfree.c b/nuttx/sched/mqueue/mq_msgfree.c
index 33c06f09b..4183439b9 100644
--- a/nuttx/sched/mqueue/mq_msgfree.c
+++ b/nuttx/sched/mqueue/mq_msgfree.c
@@ -40,8 +40,10 @@
 #include <nuttx/config.h>
 
 #include <queue.h>
+
 #include <nuttx/arch.h>
-#include "os_internal.h"
+#include <nuttx/kmalloc.h>
+
 #include "mqueue/mqueue.h"
 
 /************************************************************************
diff --git a/nuttx/sched/mqueue/mq_send.c b/nuttx/sched/mqueue/mq_send.c
index 97f37c5c1..a365c6eba 100644
--- a/nuttx/sched/mqueue/mq_send.c
+++ b/nuttx/sched/mqueue/mq_send.c
@@ -46,7 +46,6 @@
 
 #include  <nuttx/arch.h>
 
-#include  "os_internal.h"
 #include  "mqueue/mqueue.h"
 
 /****************************************************************************
diff --git a/nuttx/sched/mqueue/mq_unlink.c b/nuttx/sched/mqueue/mq_unlink.c
index e63ce5a1c..5481ded83 100644
--- a/nuttx/sched/mqueue/mq_unlink.c
+++ b/nuttx/sched/mqueue/mq_unlink.c
@@ -43,7 +43,6 @@
 #include <mqueue.h>
 #include <sched.h>
 
-#include "os_internal.h"
 #include "mqueue/mqueue.h"
 
 /************************************************************************
diff --git a/nuttx/sched/pthread/pthread_release.c b/nuttx/sched/pthread/pthread_release.c
index 3f69c3991..d7d543b6a 100644
--- a/nuttx/sched/pthread/pthread_release.c
+++ b/nuttx/sched/pthread/pthread_release.c
@@ -42,7 +42,8 @@
 #include <sched.h>
 #include <debug.h>
 
-#include "os_internal.h"
+#include <nuttx/kmalloc.h>
+
 #include "pthread/pthread.h"
 
 /************************************************************************
diff --git a/nuttx/sched/semaphore/sem_close.c b/nuttx/sched/semaphore/sem_close.c
index 71689a468..1377c1a27 100644
--- a/nuttx/sched/semaphore/sem_close.c
+++ b/nuttx/sched/semaphore/sem_close.c
@@ -43,7 +43,8 @@
 #include <semaphore.h>
 #include <sched.h>
 
-#include "os_internal.h"
+#include <nuttx/kmalloc.h>
+
 #include "semaphore/semaphore.h"
 
 /****************************************************************************
diff --git a/nuttx/sched/semaphore/sem_unlink.c b/nuttx/sched/semaphore/sem_unlink.c
index 72c991c8b..dc51c2b1b 100644
--- a/nuttx/sched/semaphore/sem_unlink.c
+++ b/nuttx/sched/semaphore/sem_unlink.c
@@ -44,7 +44,8 @@
 #include <sched.h>
 #include <queue.h>
 
-#include "os_internal.h"
+#include <nuttx/kmalloc.h>
+
 #include "semaphore/semaphore.h"
 
 /****************************************************************************
diff --git a/nuttx/sched/signal/sig_allocatependingsigaction.c b/nuttx/sched/signal/sig_allocatependingsigaction.c
index 8fadfc97a..3e784bf1f 100644
--- a/nuttx/sched/signal/sig_allocatependingsigaction.c
+++ b/nuttx/sched/signal/sig_allocatependingsigaction.c
@@ -43,7 +43,6 @@
 #include <assert.h>
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
 #include "signal/signal.h"
 
 /************************************************************************
diff --git a/nuttx/sched/signal/sig_cleanup.c b/nuttx/sched/signal/sig_cleanup.c
index 7848c12f4..f6172ccd7 100644
--- a/nuttx/sched/signal/sig_cleanup.c
+++ b/nuttx/sched/signal/sig_cleanup.c
@@ -40,7 +40,6 @@
 #include <nuttx/config.h>
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
 #include "signal/signal.h"
 
 /************************************************************************
diff --git a/nuttx/sched/signal/sig_deliver.c b/nuttx/sched/signal/sig_deliver.c
index 3a39a5d1f..1c753defc 100644
--- a/nuttx/sched/signal/sig_deliver.c
+++ b/nuttx/sched/signal/sig_deliver.c
@@ -47,7 +47,6 @@
 #include <debug.h>
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
 #include "semaphore/semaphore.h"
 #include "signal/signal.h"
 
diff --git a/nuttx/sched/signal/sig_initialize.c b/nuttx/sched/signal/sig_initialize.c
index 2497962fe..aba6d37de 100644
--- a/nuttx/sched/signal/sig_initialize.c
+++ b/nuttx/sched/signal/sig_initialize.c
@@ -43,7 +43,6 @@
 #include <queue.h>
 #include <nuttx/kmalloc.h>
 
-#include "os_internal.h"
 #include "signal/signal.h"
 
 /************************************************************************
diff --git a/nuttx/sched/signal/sig_releasependingsigaction.c b/nuttx/sched/signal/sig_releasependingsigaction.c
index 33b0714bd..b557e0503 100644
--- a/nuttx/sched/signal/sig_releasependingsigaction.c
+++ b/nuttx/sched/signal/sig_releasependingsigaction.c
@@ -41,7 +41,6 @@
 
 #include <sched.h>
 
-#include "os_internal.h"
 #include "signal/signal.h"
 
 /************************************************************************
diff --git a/nuttx/sched/signal/sig_releasependingsignal.c b/nuttx/sched/signal/sig_releasependingsignal.c
index 90281e8bf..f97009807 100644
--- a/nuttx/sched/signal/sig_releasependingsignal.c
+++ b/nuttx/sched/signal/sig_releasependingsignal.c
@@ -50,7 +50,6 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
 #include "signal/signal.h"
 
 /************************************************************************
diff --git a/nuttx/sched/signal/sig_removependingsignal.c b/nuttx/sched/signal/sig_removependingsignal.c
index 0b4bebbb5..37d7239d2 100644
--- a/nuttx/sched/signal/sig_removependingsignal.c
+++ b/nuttx/sched/signal/sig_removependingsignal.c
@@ -50,7 +50,6 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
 #include "signal/signal.h"
 
 /************************************************************************
diff --git a/nuttx/sched/task/task_recover.c b/nuttx/sched/task/task_recover.c
index 76ac236bd..00085cd29 100644
--- a/nuttx/sched/task/task_recover.c
+++ b/nuttx/sched/task/task_recover.c
@@ -44,7 +44,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
 
-#include "os_internal.h"
 #include "mqueue/mqueue.h"
 #include "task/task.h"
 
diff --git a/nuttx/sched/timer/timer_settime.c b/nuttx/sched/timer/timer_settime.c
index 5ea4efca2..716d05caf 100644
--- a/nuttx/sched/timer/timer_settime.c
+++ b/nuttx/sched/timer/timer_settime.c
@@ -44,7 +44,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include "os_internal.h"
 #include "clock/clock.h"
 #include "signal/signal.h"
 #include "timer/timer.h"
diff --git a/nuttx/sched/wdog/wd_gettime.c b/nuttx/sched/wdog/wd_gettime.c
index d34c398b7..a2983527b 100644
--- a/nuttx/sched/wdog/wd_gettime.c
+++ b/nuttx/sched/wdog/wd_gettime.c
@@ -41,7 +41,6 @@
 
 #include <wdog.h>
 
-#include "os_internal.h"
 #include "wdog/wdog.h"
 
 /********************************************************************************
diff --git a/nuttx/sched/wdog/wd_initialize.c b/nuttx/sched/wdog/wd_initialize.c
index 6ae87ce41..dd81a74be 100644
--- a/nuttx/sched/wdog/wd_initialize.c
+++ b/nuttx/sched/wdog/wd_initialize.c
@@ -42,7 +42,6 @@
 #include <queue.h>
 #include <nuttx/kmalloc.h>
 
-#include "os_internal.h"
 #include "wdog/wdog.h"
 
 /************************************************************************