summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-08-08 17:53:55 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-08-08 17:53:55 -0600
commit5ddcab0d041b2a78c8d80d4d2daca6040816f259 (patch)
treecf028eaf29c3766da686b7141127962bbbf7be26
parent358f4f222b04afabaf043b84d74446fccaabb9d9 (diff)
downloadnuttx-5ddcab0d041b2a78c8d80d4d2daca6040816f259.tar.gz
nuttx-5ddcab0d041b2a78c8d80d4d2daca6040816f259.tar.bz2
nuttx-5ddcab0d041b2a78c8d80d4d2daca6040816f259.zip
Replace os_internal.h with sched/sched.h in files that actually reference something in sched.h
-rw-r--r--nuttx/arch/8051/src/up_assert.c2
-rw-r--r--nuttx/arch/8051/src/up_blocktask.c2
-rw-r--r--nuttx/arch/8051/src/up_exit.c2
-rw-r--r--nuttx/arch/8051/src/up_releasepending.c2
-rw-r--r--nuttx/arch/8051/src/up_reprioritizertr.c2
-rw-r--r--nuttx/arch/8051/src/up_unblocktask.c2
-rw-r--r--nuttx/arch/arm/src/arm/up_assert.c2
-rw-r--r--nuttx/arch/arm/src/arm/up_blocktask.c2
-rw-r--r--nuttx/arch/arm/src/arm/up_dataabort.c2
-rw-r--r--nuttx/arch/arm/src/arm/up_prefetchabort.c2
-rw-r--r--nuttx/arch/arm/src/arm/up_releasepending.c2
-rw-r--r--nuttx/arch/arm/src/arm/up_reprioritizertr.c2
-rw-r--r--nuttx/arch/arm/src/arm/up_schedulesigaction.c2
-rw-r--r--nuttx/arch/arm/src/arm/up_sigdeliver.c2
-rw-r--r--nuttx/arch/arm/src/arm/up_unblocktask.c2
-rw-r--r--nuttx/arch/arm/src/armv6-m/up_assert.c2
-rw-r--r--nuttx/arch/arm/src/armv6-m/up_blocktask.c2
-rw-r--r--nuttx/arch/arm/src/armv6-m/up_releasepending.c2
-rw-r--r--nuttx/arch/arm/src/armv6-m/up_reprioritizertr.c2
-rw-r--r--nuttx/arch/arm/src/armv6-m/up_schedulesigaction.c2
-rw-r--r--nuttx/arch/arm/src/armv6-m/up_sigdeliver.c2
-rw-r--r--nuttx/arch/arm/src/armv6-m/up_unblocktask.c2
-rw-r--r--nuttx/arch/arm/src/armv7-a/arm_assert.c2
-rw-r--r--nuttx/arch/arm/src/armv7-a/arm_blocktask.c2
-rw-r--r--nuttx/arch/arm/src/armv7-a/arm_dataabort.c2
-rw-r--r--nuttx/arch/arm/src/armv7-a/arm_prefetchabort.c2
-rw-r--r--nuttx/arch/arm/src/armv7-a/arm_releasepending.c2
-rw-r--r--nuttx/arch/arm/src/armv7-a/arm_reprioritizertr.c2
-rw-r--r--nuttx/arch/arm/src/armv7-a/arm_schedulesigaction.c2
-rw-r--r--nuttx/arch/arm/src/armv7-a/arm_sigdeliver.c2
-rw-r--r--nuttx/arch/arm/src/armv7-a/arm_unblocktask.c2
-rw-r--r--nuttx/arch/arm/src/armv7-m/up_assert.c2
-rw-r--r--nuttx/arch/arm/src/armv7-m/up_blocktask.c2
-rw-r--r--nuttx/arch/arm/src/armv7-m/up_releasepending.c2
-rw-r--r--nuttx/arch/arm/src/armv7-m/up_reprioritizertr.c2
-rw-r--r--nuttx/arch/arm/src/armv7-m/up_schedulesigaction.c2
-rw-r--r--nuttx/arch/arm/src/armv7-m/up_sigdeliver.c2
-rw-r--r--nuttx/arch/arm/src/armv7-m/up_unblocktask.c2
-rw-r--r--nuttx/arch/arm/src/common/up_checkstack.c2
-rw-r--r--nuttx/arch/arm/src/common/up_exit.c2
-rw-r--r--nuttx/arch/arm/src/common/up_vfork.c2
-rw-r--r--nuttx/arch/arm/src/sam34/sam_dmac.c2
-rw-r--r--nuttx/arch/arm/src/sama5/sam_dmac.c2
-rw-r--r--nuttx/arch/arm/src/sama5/sam_xdmac.c2
-rw-r--r--nuttx/arch/arm/src/stm32/stm32f10xxx_dma.c2
-rw-r--r--nuttx/arch/arm/src/stm32/stm32f20xxx_dma.c2
-rw-r--r--nuttx/arch/arm/src/stm32/stm32f40xxx_dma.c2
-rw-r--r--nuttx/arch/avr/src/avr/up_blocktask.c2
-rw-r--r--nuttx/arch/avr/src/avr/up_checkstack.c2
-rw-r--r--nuttx/arch/avr/src/avr/up_dumpstate.c2
-rw-r--r--nuttx/arch/avr/src/avr/up_releasepending.c2
-rw-r--r--nuttx/arch/avr/src/avr/up_reprioritizertr.c2
-rw-r--r--nuttx/arch/avr/src/avr/up_schedulesigaction.c2
-rw-r--r--nuttx/arch/avr/src/avr/up_sigdeliver.c2
-rw-r--r--nuttx/arch/avr/src/avr/up_unblocktask.c2
-rw-r--r--nuttx/arch/avr/src/avr32/up_blocktask.c2
-rw-r--r--nuttx/arch/avr/src/avr32/up_dumpstate.c2
-rw-r--r--nuttx/arch/avr/src/avr32/up_releasepending.c2
-rw-r--r--nuttx/arch/avr/src/avr32/up_reprioritizertr.c2
-rw-r--r--nuttx/arch/avr/src/avr32/up_schedulesigaction.c2
-rw-r--r--nuttx/arch/avr/src/avr32/up_sigdeliver.c2
-rw-r--r--nuttx/arch/avr/src/avr32/up_unblocktask.c2
-rw-r--r--nuttx/arch/avr/src/common/up_assert.c2
-rw-r--r--nuttx/arch/avr/src/common/up_exit.c2
-rw-r--r--nuttx/arch/hc/src/common/up_blocktask.c2
-rw-r--r--nuttx/arch/hc/src/common/up_exit.c2
-rw-r--r--nuttx/arch/hc/src/common/up_releasepending.c2
-rw-r--r--nuttx/arch/hc/src/common/up_reprioritizertr.c2
-rw-r--r--nuttx/arch/hc/src/common/up_unblocktask.c2
-rw-r--r--nuttx/arch/hc/src/m9s12/m9s12_assert.c2
-rw-r--r--nuttx/arch/mips/src/common/up_exit.c2
-rw-r--r--nuttx/arch/mips/src/mips32/up_assert.c2
-rw-r--r--nuttx/arch/mips/src/mips32/up_blocktask.c2
-rw-r--r--nuttx/arch/mips/src/mips32/up_dumpstate.c2
-rw-r--r--nuttx/arch/mips/src/mips32/up_releasepending.c2
-rw-r--r--nuttx/arch/mips/src/mips32/up_reprioritizertr.c2
-rw-r--r--nuttx/arch/mips/src/mips32/up_schedulesigaction.c2
-rw-r--r--nuttx/arch/mips/src/mips32/up_sigdeliver.c2
-rw-r--r--nuttx/arch/mips/src/mips32/up_unblocktask.c2
-rw-r--r--nuttx/arch/mips/src/mips32/up_vfork.c2
-rw-r--r--nuttx/arch/rgmp/src/nuttx.c2
-rw-r--r--nuttx/arch/rgmp/src/rgmp.c2
-rw-r--r--nuttx/arch/sh/src/common/up_assert.c2
-rw-r--r--nuttx/arch/sh/src/common/up_blocktask.c2
-rw-r--r--nuttx/arch/sh/src/common/up_exit.c2
-rw-r--r--nuttx/arch/sh/src/common/up_releasepending.c2
-rw-r--r--nuttx/arch/sh/src/common/up_reprioritizertr.c2
-rw-r--r--nuttx/arch/sh/src/common/up_unblocktask.c2
-rw-r--r--nuttx/arch/sh/src/m16c/m16c_dumpstate.c2
-rw-r--r--nuttx/arch/sh/src/m16c/m16c_schedulesigaction.c2
-rw-r--r--nuttx/arch/sh/src/m16c/m16c_sigdeliver.c2
-rw-r--r--nuttx/arch/sh/src/sh1/sh1_dumpstate.c2
-rw-r--r--nuttx/arch/sh/src/sh1/sh1_schedulesigaction.c2
-rw-r--r--nuttx/arch/sh/src/sh1/sh1_sigdeliver.c2
-rw-r--r--nuttx/arch/sim/src/up_blocktask.c2
-rw-r--r--nuttx/arch/sim/src/up_exit.c2
-rw-r--r--nuttx/arch/sim/src/up_releasepending.c2
-rw-r--r--nuttx/arch/sim/src/up_reprioritizertr.c2
-rw-r--r--nuttx/arch/sim/src/up_schedulesigaction.c2
-rw-r--r--nuttx/arch/sim/src/up_unblocktask.c2
-rw-r--r--nuttx/arch/x86/src/common/up_assert.c2
-rw-r--r--nuttx/arch/x86/src/common/up_blocktask.c2
-rw-r--r--nuttx/arch/x86/src/common/up_exit.c2
-rw-r--r--nuttx/arch/x86/src/common/up_releasepending.c2
-rw-r--r--nuttx/arch/x86/src/common/up_reprioritizertr.c2
-rw-r--r--nuttx/arch/x86/src/common/up_unblocktask.c2
-rw-r--r--nuttx/arch/x86/src/i486/up_schedulesigaction.c2
-rw-r--r--nuttx/arch/x86/src/i486/up_sigdeliver.c2
-rw-r--r--nuttx/arch/z16/src/common/up_assert.c2
-rw-r--r--nuttx/arch/z16/src/common/up_blocktask.c2
-rw-r--r--nuttx/arch/z16/src/common/up_exit.c2
-rw-r--r--nuttx/arch/z16/src/common/up_releasepending.c2
-rw-r--r--nuttx/arch/z16/src/common/up_reprioritizertr.c2
-rw-r--r--nuttx/arch/z16/src/common/up_schedulesigaction.c2
-rw-r--r--nuttx/arch/z16/src/common/up_sigdeliver.c2
-rw-r--r--nuttx/arch/z16/src/common/up_stackdump.c2
-rw-r--r--nuttx/arch/z16/src/common/up_unblocktask.c2
-rw-r--r--nuttx/arch/z80/src/common/up_assert.c2
-rw-r--r--nuttx/arch/z80/src/common/up_blocktask.c2
-rw-r--r--nuttx/arch/z80/src/common/up_exit.c2
-rw-r--r--nuttx/arch/z80/src/common/up_releasepending.c2
-rw-r--r--nuttx/arch/z80/src/common/up_reprioritizertr.c2
-rw-r--r--nuttx/arch/z80/src/common/up_stackdump.c2
-rw-r--r--nuttx/arch/z80/src/common/up_unblocktask.c2
-rw-r--r--nuttx/arch/z80/src/ez80/ez80_schedulesigaction.c2
-rw-r--r--nuttx/arch/z80/src/ez80/ez80_sigdeliver.c2
-rw-r--r--nuttx/arch/z80/src/z180/z180_schedulesigaction.c2
-rw-r--r--nuttx/arch/z80/src/z180/z180_sigdeliver.c2
-rw-r--r--nuttx/arch/z80/src/z8/z8_schedulesigaction.c2
-rw-r--r--nuttx/arch/z80/src/z8/z8_sigdeliver.c2
-rw-r--r--nuttx/arch/z80/src/z80/z80_schedulesigaction.c2
-rw-r--r--nuttx/arch/z80/src/z80/z80_sigdeliver.c2
-rw-r--r--nuttx/binfmt/binfmt_execmodule.c2
-rw-r--r--nuttx/sched/environ/env_clearenv.c2
-rw-r--r--nuttx/sched/environ/env_dup.c2
-rw-r--r--nuttx/sched/environ/env_getenv.c2
-rw-r--r--nuttx/sched/environ/env_getenvironptr.c2
-rw-r--r--nuttx/sched/environ/env_setenv.c2
-rw-r--r--nuttx/sched/environ/env_unsetenv.c2
-rw-r--r--nuttx/sched/errno/errno_getptr.c2
-rw-r--r--nuttx/sched/exit.c2
-rw-r--r--nuttx/sched/group/group_childstatus.c2
-rw-r--r--nuttx/sched/group/group_setuptaskfiles.c2
-rw-r--r--nuttx/sched/group/group_signal.c2
-rw-r--r--nuttx/sched/init/os_start.c2
-rw-r--r--nuttx/sched/mqueue/mq_close.c2
-rw-r--r--nuttx/sched/mqueue/mq_notify.c2
-rw-r--r--nuttx/sched/mqueue/mq_open.c2
-rw-r--r--nuttx/sched/mqueue/mq_rcvinternal.c2
-rw-r--r--nuttx/sched/mqueue/mq_sndinternal.c2
-rw-r--r--nuttx/sched/mqueue/mq_timedreceive.c2
-rw-r--r--nuttx/sched/mqueue/mq_timedsend.c2
-rw-r--r--nuttx/sched/paging/pg_miss.c2
-rw-r--r--nuttx/sched/paging/pg_worker.c2
-rw-r--r--nuttx/sched/pthread/pthread_cancel.c2
-rw-r--r--nuttx/sched/pthread/pthread_completejoin.c2
-rw-r--r--nuttx/sched/pthread/pthread_condtimedwait.c2
-rw-r--r--nuttx/sched/pthread/pthread_create.c2
-rw-r--r--nuttx/sched/pthread/pthread_detach.c2
-rw-r--r--nuttx/sched/pthread/pthread_exit.c2
-rw-r--r--nuttx/sched/pthread/pthread_getspecific.c2
-rw-r--r--nuttx/sched/pthread/pthread_join.c2
-rw-r--r--nuttx/sched/pthread/pthread_keycreate.c2
-rw-r--r--nuttx/sched/pthread/pthread_setcancelstate.c2
-rw-r--r--nuttx/sched/pthread/pthread_setschedprio.c2
-rw-r--r--nuttx/sched/pthread/pthread_setspecific.c2
-rw-r--r--nuttx/sched/semaphore/sem_holder.c2
-rw-r--r--nuttx/sched/semaphore/sem_post.c2
-rw-r--r--nuttx/sched/semaphore/sem_timedwait.c2
-rw-r--r--nuttx/sched/semaphore/sem_trywait.c2
-rw-r--r--nuttx/sched/semaphore/sem_wait.c2
-rw-r--r--nuttx/sched/signal/sig_action.c2
-rw-r--r--nuttx/sched/signal/sig_dispatch.c2
-rw-r--r--nuttx/sched/signal/sig_kill.c2
-rw-r--r--nuttx/sched/signal/sig_mqnotempty.c2
-rw-r--r--nuttx/sched/signal/sig_pending.c2
-rw-r--r--nuttx/sched/signal/sig_procmask.c2
-rw-r--r--nuttx/sched/signal/sig_queue.c2
-rw-r--r--nuttx/sched/signal/sig_suspend.c2
-rw-r--r--nuttx/sched/signal/sig_timedwait.c2
-rw-r--r--nuttx/sched/signal/sig_unmaskpendingsignal.c2
-rw-r--r--nuttx/sched/task/task_atexit.c2
-rw-r--r--nuttx/sched/task/task_create.c2
-rw-r--r--nuttx/sched/task/task_delete.c2
-rw-r--r--nuttx/sched/task/task_exit.c2
-rw-r--r--nuttx/sched/task/task_exithook.c2
-rw-r--r--nuttx/sched/task/task_getgroup.c2
-rw-r--r--nuttx/sched/task/task_getpid.c2
-rw-r--r--nuttx/sched/task/task_init.c2
-rw-r--r--nuttx/sched/task/task_onexit.c2
-rw-r--r--nuttx/sched/task/task_posixspawn.c2
-rw-r--r--nuttx/sched/task/task_prctl.c2
-rw-r--r--nuttx/sched/task/task_reparent.c2
-rw-r--r--nuttx/sched/task/task_restart.c2
-rw-r--r--nuttx/sched/task/task_setup.c2
-rw-r--r--nuttx/sched/task/task_spawn.c2
-rw-r--r--nuttx/sched/task/task_start.c2
-rw-r--r--nuttx/sched/task/task_terminate.c2
-rw-r--r--nuttx/sched/task/task_vfork.c2
-rw-r--r--nuttx/sched/wdog/wd_cancel.c2
-rw-r--r--nuttx/sched/wdog/wd_start.c2
201 files changed, 201 insertions, 201 deletions
diff --git a/nuttx/arch/8051/src/up_assert.c b/nuttx/arch/8051/src/up_assert.c
index 0be57a792..ca0be70bb 100644
--- a/nuttx/arch/8051/src/up_assert.c
+++ b/nuttx/arch/8051/src/up_assert.c
@@ -48,7 +48,7 @@
#include <8052.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_mem.h"
diff --git a/nuttx/arch/8051/src/up_blocktask.c b/nuttx/arch/8051/src/up_blocktask.c
index 1ae7a78a4..72a519b2b 100644
--- a/nuttx/arch/8051/src/up_blocktask.c
+++ b/nuttx/arch/8051/src/up_blocktask.c
@@ -44,7 +44,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/************************************************************************
diff --git a/nuttx/arch/8051/src/up_exit.c b/nuttx/arch/8051/src/up_exit.c
index 9ef273294..29fe790fb 100644
--- a/nuttx/arch/8051/src/up_exit.c
+++ b/nuttx/arch/8051/src/up_exit.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
#include "task/task.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************************
diff --git a/nuttx/arch/8051/src/up_releasepending.c b/nuttx/arch/8051/src/up_releasepending.c
index e26b4bcbb..ebb5271a6 100644
--- a/nuttx/arch/8051/src/up_releasepending.c
+++ b/nuttx/arch/8051/src/up_releasepending.c
@@ -44,7 +44,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/************************************************************************
diff --git a/nuttx/arch/8051/src/up_reprioritizertr.c b/nuttx/arch/8051/src/up_reprioritizertr.c
index 2807b1141..7f28c711b 100644
--- a/nuttx/arch/8051/src/up_reprioritizertr.c
+++ b/nuttx/arch/8051/src/up_reprioritizertr.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/8051/src/up_unblocktask.c b/nuttx/arch/8051/src/up_unblocktask.c
index 451487f1b..36d6ed1ef 100644
--- a/nuttx/arch/8051/src/up_unblocktask.c
+++ b/nuttx/arch/8051/src/up_unblocktask.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
#include "clock/clock.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/************************************************************************
diff --git a/nuttx/arch/arm/src/arm/up_assert.c b/nuttx/arch/arm/src/arm/up_assert.c
index f729d8550..c594a58de 100644
--- a/nuttx/arch/arm/src/arm/up_assert.c
+++ b/nuttx/arch/arm/src/arm/up_assert.c
@@ -51,7 +51,7 @@
#include <arch/board/board.h>
#include "up_arch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/arm/up_blocktask.c b/nuttx/arch/arm/src/arm/up_blocktask.c
index d0e35e558..99ec9cbdd 100644
--- a/nuttx/arch/arm/src/arm/up_blocktask.c
+++ b/nuttx/arch/arm/src/arm/up_blocktask.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/arm/up_dataabort.c b/nuttx/arch/arm/src/arm/up_dataabort.c
index 2b05abdeb..dc2a08a47 100644
--- a/nuttx/arch/arm/src/arm/up_dataabort.c
+++ b/nuttx/arch/arm/src/arm/up_dataabort.c
@@ -44,7 +44,7 @@
#include <nuttx/irq.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#ifdef CONFIG_PAGING
diff --git a/nuttx/arch/arm/src/arm/up_prefetchabort.c b/nuttx/arch/arm/src/arm/up_prefetchabort.c
index ae8af72bc..577bc1b8b 100644
--- a/nuttx/arch/arm/src/arm/up_prefetchabort.c
+++ b/nuttx/arch/arm/src/arm/up_prefetchabort.c
@@ -47,7 +47,7 @@
# include <nuttx/page.h>
#endif
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/arm/up_releasepending.c b/nuttx/arch/arm/src/arm/up_releasepending.c
index 215397706..2c58b735d 100644
--- a/nuttx/arch/arm/src/arm/up_releasepending.c
+++ b/nuttx/arch/arm/src/arm/up_releasepending.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/arm/up_reprioritizertr.c b/nuttx/arch/arm/src/arm/up_reprioritizertr.c
index cd5955c24..0a0c00aff 100644
--- a/nuttx/arch/arm/src/arm/up_reprioritizertr.c
+++ b/nuttx/arch/arm/src/arm/up_reprioritizertr.c
@@ -45,7 +45,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/arm/up_schedulesigaction.c b/nuttx/arch/arm/src/arm/up_schedulesigaction.c
index f7d33254b..f14263c6a 100644
--- a/nuttx/arch/arm/src/arm/up_schedulesigaction.c
+++ b/nuttx/arch/arm/src/arm/up_schedulesigaction.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
#include "arm.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/arm/src/arm/up_sigdeliver.c b/nuttx/arch/arm/src/arm/up_sigdeliver.c
index 1d1a20665..12a7c1760 100644
--- a/nuttx/arch/arm/src/arm/up_sigdeliver.c
+++ b/nuttx/arch/arm/src/arm/up_sigdeliver.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/arm/src/arm/up_unblocktask.c b/nuttx/arch/arm/src/arm/up_unblocktask.c
index 696007b80..eae0733da 100644
--- a/nuttx/arch/arm/src/arm/up_unblocktask.c
+++ b/nuttx/arch/arm/src/arm/up_unblocktask.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "clock/clock.h"
#include "up_internal.h"
diff --git a/nuttx/arch/arm/src/armv6-m/up_assert.c b/nuttx/arch/arm/src/armv6-m/up_assert.c
index 1becf4987..5bd9790d0 100644
--- a/nuttx/arch/arm/src/armv6-m/up_assert.c
+++ b/nuttx/arch/arm/src/armv6-m/up_assert.c
@@ -51,7 +51,7 @@
#include <arch/board/board.h>
#include "up_arch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/armv6-m/up_blocktask.c b/nuttx/arch/arm/src/armv6-m/up_blocktask.c
index c51308cfc..a3395e664 100644
--- a/nuttx/arch/arm/src/armv6-m/up_blocktask.c
+++ b/nuttx/arch/arm/src/armv6-m/up_blocktask.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/armv6-m/up_releasepending.c b/nuttx/arch/arm/src/armv6-m/up_releasepending.c
index 5300f7598..6c9812525 100644
--- a/nuttx/arch/arm/src/armv6-m/up_releasepending.c
+++ b/nuttx/arch/arm/src/armv6-m/up_releasepending.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/armv6-m/up_reprioritizertr.c b/nuttx/arch/arm/src/armv6-m/up_reprioritizertr.c
index a90aa9835..48629f57c 100644
--- a/nuttx/arch/arm/src/armv6-m/up_reprioritizertr.c
+++ b/nuttx/arch/arm/src/armv6-m/up_reprioritizertr.c
@@ -45,7 +45,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/armv6-m/up_schedulesigaction.c b/nuttx/arch/arm/src/armv6-m/up_schedulesigaction.c
index 308f395b8..e6e4314fd 100644
--- a/nuttx/arch/arm/src/armv6-m/up_schedulesigaction.c
+++ b/nuttx/arch/arm/src/armv6-m/up_schedulesigaction.c
@@ -47,7 +47,7 @@
#include "psr.h"
#include "exc_return.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/arm/src/armv6-m/up_sigdeliver.c b/nuttx/arch/arm/src/armv6-m/up_sigdeliver.c
index b38ed228a..e1e8589ea 100644
--- a/nuttx/arch/arm/src/armv6-m/up_sigdeliver.c
+++ b/nuttx/arch/arm/src/armv6-m/up_sigdeliver.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/arm/src/armv6-m/up_unblocktask.c b/nuttx/arch/arm/src/armv6-m/up_unblocktask.c
index fa6b8c652..b42c3841d 100644
--- a/nuttx/arch/arm/src/armv6-m/up_unblocktask.c
+++ b/nuttx/arch/arm/src/armv6-m/up_unblocktask.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "clock/clock.h"
#include "up_internal.h"
diff --git a/nuttx/arch/arm/src/armv7-a/arm_assert.c b/nuttx/arch/arm/src/armv7-a/arm_assert.c
index 12a5615a0..f490a518b 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_assert.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_assert.c
@@ -51,7 +51,7 @@
#include <arch/board/board.h>
#include "up_arch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-a/arm_blocktask.c b/nuttx/arch/arm/src/armv7-a/arm_blocktask.c
index 2cc52240e..df4f96b22 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_blocktask.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_blocktask.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-a/arm_dataabort.c b/nuttx/arch/arm/src/armv7-a/arm_dataabort.c
index 7a4d2bea1..073afe210 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_dataabort.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_dataabort.c
@@ -44,7 +44,7 @@
#include <nuttx/irq.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#ifdef CONFIG_PAGING
diff --git a/nuttx/arch/arm/src/armv7-a/arm_prefetchabort.c b/nuttx/arch/arm/src/armv7-a/arm_prefetchabort.c
index 4a8e820ab..089e6105c 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_prefetchabort.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_prefetchabort.c
@@ -47,7 +47,7 @@
# include <nuttx/page.h>
#endif
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-a/arm_releasepending.c b/nuttx/arch/arm/src/armv7-a/arm_releasepending.c
index 004ef51aa..45595b091 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_releasepending.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_releasepending.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-a/arm_reprioritizertr.c b/nuttx/arch/arm/src/armv7-a/arm_reprioritizertr.c
index e14b5744b..e90e83433 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_reprioritizertr.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_reprioritizertr.c
@@ -45,7 +45,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-a/arm_schedulesigaction.c b/nuttx/arch/arm/src/armv7-a/arm_schedulesigaction.c
index 819fe16fd..1a6d88b05 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_schedulesigaction.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_schedulesigaction.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
#include "arm.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/arm/src/armv7-a/arm_sigdeliver.c b/nuttx/arch/arm/src/armv7-a/arm_sigdeliver.c
index 2cfd72fad..cf800efc1 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_sigdeliver.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_sigdeliver.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/arm/src/armv7-a/arm_unblocktask.c b/nuttx/arch/arm/src/armv7-a/arm_unblocktask.c
index 71106fd25..750c900f9 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_unblocktask.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_unblocktask.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "clock/clock.h"
#include "up_internal.h"
diff --git a/nuttx/arch/arm/src/armv7-m/up_assert.c b/nuttx/arch/arm/src/armv7-m/up_assert.c
index 2c538f017..a01cc0b48 100644
--- a/nuttx/arch/arm/src/armv7-m/up_assert.c
+++ b/nuttx/arch/arm/src/armv7-m/up_assert.c
@@ -51,7 +51,7 @@
#include <arch/board/board.h>
#include "up_arch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-m/up_blocktask.c b/nuttx/arch/arm/src/armv7-m/up_blocktask.c
index d7965d4c4..3b316eca5 100644
--- a/nuttx/arch/arm/src/armv7-m/up_blocktask.c
+++ b/nuttx/arch/arm/src/armv7-m/up_blocktask.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-m/up_releasepending.c b/nuttx/arch/arm/src/armv7-m/up_releasepending.c
index 0b3fc6247..f29bca911 100644
--- a/nuttx/arch/arm/src/armv7-m/up_releasepending.c
+++ b/nuttx/arch/arm/src/armv7-m/up_releasepending.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-m/up_reprioritizertr.c b/nuttx/arch/arm/src/armv7-m/up_reprioritizertr.c
index c2cb07530..8e48ab8df 100644
--- a/nuttx/arch/arm/src/armv7-m/up_reprioritizertr.c
+++ b/nuttx/arch/arm/src/armv7-m/up_reprioritizertr.c
@@ -45,7 +45,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-m/up_schedulesigaction.c b/nuttx/arch/arm/src/armv7-m/up_schedulesigaction.c
index f1885d631..8110ef2da 100644
--- a/nuttx/arch/arm/src/armv7-m/up_schedulesigaction.c
+++ b/nuttx/arch/arm/src/armv7-m/up_schedulesigaction.c
@@ -47,7 +47,7 @@
#include "psr.h"
#include "exc_return.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/arm/src/armv7-m/up_sigdeliver.c b/nuttx/arch/arm/src/armv7-m/up_sigdeliver.c
index 135c44111..4fbfc02c5 100644
--- a/nuttx/arch/arm/src/armv7-m/up_sigdeliver.c
+++ b/nuttx/arch/arm/src/armv7-m/up_sigdeliver.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/arm/src/armv7-m/up_unblocktask.c b/nuttx/arch/arm/src/armv7-m/up_unblocktask.c
index bd83ace9f..bc5548e1b 100644
--- a/nuttx/arch/arm/src/armv7-m/up_unblocktask.c
+++ b/nuttx/arch/arm/src/armv7-m/up_unblocktask.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "clock/clock.h"
#include "up_internal.h"
diff --git a/nuttx/arch/arm/src/common/up_checkstack.c b/nuttx/arch/arm/src/common/up_checkstack.c
index 02f95f7ba..314a8c881 100644
--- a/nuttx/arch/arm/src/common/up_checkstack.c
+++ b/nuttx/arch/arm/src/common/up_checkstack.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/common/up_exit.c b/nuttx/arch/arm/src/common/up_exit.c
index 70358184d..1b67a0790 100644
--- a/nuttx/arch/arm/src/common/up_exit.c
+++ b/nuttx/arch/arm/src/common/up_exit.c
@@ -48,7 +48,7 @@
#endif
#include "task/task.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/arm/src/common/up_vfork.c b/nuttx/arch/arm/src/common/up_vfork.c
index 56b061b53..5d328a863 100644
--- a/nuttx/arch/arm/src/common/up_vfork.c
+++ b/nuttx/arch/arm/src/common/up_vfork.c
@@ -50,7 +50,7 @@
#include <arch/irq.h>
#include "up_vfork.h"
-#include "os_internal.h"
+#include "sched/sched.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/nuttx/arch/arm/src/sam34/sam_dmac.c b/nuttx/arch/arm/src/sam34/sam_dmac.c
index eee5722a4..528e74773 100644
--- a/nuttx/arch/arm/src/sam34/sam_dmac.c
+++ b/nuttx/arch/arm/src/sam34/sam_dmac.c
@@ -52,7 +52,7 @@
#include "up_arch.h"
#include "up_internal.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "chip.h"
#include "sam_dmac.h"
diff --git a/nuttx/arch/arm/src/sama5/sam_dmac.c b/nuttx/arch/arm/src/sama5/sam_dmac.c
index 9cf4a6c02..f248d5893 100644
--- a/nuttx/arch/arm/src/sama5/sam_dmac.c
+++ b/nuttx/arch/arm/src/sama5/sam_dmac.c
@@ -53,7 +53,7 @@
#include "up_arch.h"
#include "cache.h"
#include "up_internal.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "chip.h"
#include "sam_dmac.h"
diff --git a/nuttx/arch/arm/src/sama5/sam_xdmac.c b/nuttx/arch/arm/src/sama5/sam_xdmac.c
index 6e4ca9ed4..d91f6f721 100644
--- a/nuttx/arch/arm/src/sama5/sam_xdmac.c
+++ b/nuttx/arch/arm/src/sama5/sam_xdmac.c
@@ -53,7 +53,7 @@
#include "up_arch.h"
#include "cache.h"
#include "up_internal.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "chip.h"
#include "sam_dmac.h"
diff --git a/nuttx/arch/arm/src/stm32/stm32f10xxx_dma.c b/nuttx/arch/arm/src/stm32/stm32f10xxx_dma.c
index da21fceb5..67bfd1299 100644
--- a/nuttx/arch/arm/src/stm32/stm32f10xxx_dma.c
+++ b/nuttx/arch/arm/src/stm32/stm32f10xxx_dma.c
@@ -51,7 +51,7 @@
#include "up_arch.h"
#include "up_internal.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "chip.h"
#include "stm32_dma.h"
#include "stm32.h"
diff --git a/nuttx/arch/arm/src/stm32/stm32f20xxx_dma.c b/nuttx/arch/arm/src/stm32/stm32f20xxx_dma.c
index ea1a1f0ed..f6fc4818d 100644
--- a/nuttx/arch/arm/src/stm32/stm32f20xxx_dma.c
+++ b/nuttx/arch/arm/src/stm32/stm32f20xxx_dma.c
@@ -51,7 +51,7 @@
#include "up_arch.h"
#include "up_internal.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "chip.h"
#include "stm32_dma.h"
#include "stm32.h"
diff --git a/nuttx/arch/arm/src/stm32/stm32f40xxx_dma.c b/nuttx/arch/arm/src/stm32/stm32f40xxx_dma.c
index 12c59de46..9450dd0a7 100644
--- a/nuttx/arch/arm/src/stm32/stm32f40xxx_dma.c
+++ b/nuttx/arch/arm/src/stm32/stm32f40xxx_dma.c
@@ -51,7 +51,7 @@
#include "up_arch.h"
#include "up_internal.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "chip.h"
#include "stm32_dma.h"
#include "stm32.h"
diff --git a/nuttx/arch/avr/src/avr/up_blocktask.c b/nuttx/arch/avr/src/avr/up_blocktask.c
index 004bf6e44..243e883f1 100644
--- a/nuttx/arch/avr/src/avr/up_blocktask.c
+++ b/nuttx/arch/avr/src/avr/up_blocktask.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/avr/src/avr/up_checkstack.c b/nuttx/arch/avr/src/avr/up_checkstack.c
index 647b1c99b..dd24e0c75 100644
--- a/nuttx/arch/avr/src/avr/up_checkstack.c
+++ b/nuttx/arch/avr/src/avr/up_checkstack.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
#include "up_internal.h"
-#include "os_internal.h"
+#include "sched/sched.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/nuttx/arch/avr/src/avr/up_dumpstate.c b/nuttx/arch/avr/src/avr/up_dumpstate.c
index ba81eda2e..8802dd80c 100644
--- a/nuttx/arch/avr/src/avr/up_dumpstate.c
+++ b/nuttx/arch/avr/src/avr/up_dumpstate.c
@@ -49,7 +49,7 @@
#include <arch/board/board.h>
#include "up_arch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#ifdef CONFIG_ARCH_STACKDUMP
diff --git a/nuttx/arch/avr/src/avr/up_releasepending.c b/nuttx/arch/avr/src/avr/up_releasepending.c
index a3646f6f9..c2f651de8 100644
--- a/nuttx/arch/avr/src/avr/up_releasepending.c
+++ b/nuttx/arch/avr/src/avr/up_releasepending.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/avr/src/avr/up_reprioritizertr.c b/nuttx/arch/avr/src/avr/up_reprioritizertr.c
index 773b0ede8..74b7ab48e 100644
--- a/nuttx/arch/avr/src/avr/up_reprioritizertr.c
+++ b/nuttx/arch/avr/src/avr/up_reprioritizertr.c
@@ -45,7 +45,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/avr/src/avr/up_schedulesigaction.c b/nuttx/arch/avr/src/avr/up_schedulesigaction.c
index 304f2dc22..ebd40eba5 100644
--- a/nuttx/arch/avr/src/avr/up_schedulesigaction.c
+++ b/nuttx/arch/avr/src/avr/up_schedulesigaction.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
#include <avr/io.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/avr/src/avr/up_sigdeliver.c b/nuttx/arch/avr/src/avr/up_sigdeliver.c
index 7a26f9fc6..ec6c35331 100644
--- a/nuttx/arch/avr/src/avr/up_sigdeliver.c
+++ b/nuttx/arch/avr/src/avr/up_sigdeliver.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/avr/src/avr/up_unblocktask.c b/nuttx/arch/avr/src/avr/up_unblocktask.c
index 3947c3e8b..1558af146 100644
--- a/nuttx/arch/avr/src/avr/up_unblocktask.c
+++ b/nuttx/arch/avr/src/avr/up_unblocktask.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "clock/clock.h"
#include "up_internal.h"
diff --git a/nuttx/arch/avr/src/avr32/up_blocktask.c b/nuttx/arch/avr/src/avr32/up_blocktask.c
index 955d3b1d2..2889addde 100644
--- a/nuttx/arch/avr/src/avr32/up_blocktask.c
+++ b/nuttx/arch/avr/src/avr32/up_blocktask.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/avr/src/avr32/up_dumpstate.c b/nuttx/arch/avr/src/avr32/up_dumpstate.c
index bc74d9bb0..345eb3486 100644
--- a/nuttx/arch/avr/src/avr32/up_dumpstate.c
+++ b/nuttx/arch/avr/src/avr32/up_dumpstate.c
@@ -49,7 +49,7 @@
#include <arch/board/board.h>
#include "up_arch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#ifdef CONFIG_ARCH_STACKDUMP
diff --git a/nuttx/arch/avr/src/avr32/up_releasepending.c b/nuttx/arch/avr/src/avr32/up_releasepending.c
index e144ca904..19f0e15ff 100644
--- a/nuttx/arch/avr/src/avr32/up_releasepending.c
+++ b/nuttx/arch/avr/src/avr32/up_releasepending.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/avr/src/avr32/up_reprioritizertr.c b/nuttx/arch/avr/src/avr32/up_reprioritizertr.c
index 07ee9c6a4..535134d51 100644
--- a/nuttx/arch/avr/src/avr32/up_reprioritizertr.c
+++ b/nuttx/arch/avr/src/avr32/up_reprioritizertr.c
@@ -45,7 +45,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/avr/src/avr32/up_schedulesigaction.c b/nuttx/arch/avr/src/avr32/up_schedulesigaction.c
index a710672dc..c877ba244 100644
--- a/nuttx/arch/avr/src/avr32/up_schedulesigaction.c
+++ b/nuttx/arch/avr/src/avr32/up_schedulesigaction.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
#include <arch/avr32/avr32.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/avr/src/avr32/up_sigdeliver.c b/nuttx/arch/avr/src/avr32/up_sigdeliver.c
index 7e0d9918a..88e3d5392 100644
--- a/nuttx/arch/avr/src/avr32/up_sigdeliver.c
+++ b/nuttx/arch/avr/src/avr32/up_sigdeliver.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/avr/src/avr32/up_unblocktask.c b/nuttx/arch/avr/src/avr32/up_unblocktask.c
index c124d9733..fbbd00c8e 100644
--- a/nuttx/arch/avr/src/avr32/up_unblocktask.c
+++ b/nuttx/arch/avr/src/avr32/up_unblocktask.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "clock/clock.h"
#include "up_internal.h"
diff --git a/nuttx/arch/avr/src/common/up_assert.c b/nuttx/arch/avr/src/common/up_assert.c
index 7aac46c2a..ee180f17f 100644
--- a/nuttx/arch/avr/src/common/up_assert.c
+++ b/nuttx/arch/avr/src/common/up_assert.c
@@ -51,7 +51,7 @@
#include <arch/board/board.h>
#include "up_arch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/avr/src/common/up_exit.c b/nuttx/arch/avr/src/common/up_exit.c
index db422b410..9b89b3a73 100644
--- a/nuttx/arch/avr/src/common/up_exit.c
+++ b/nuttx/arch/avr/src/common/up_exit.c
@@ -48,7 +48,7 @@
#endif
#include "task/task.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/hc/src/common/up_blocktask.c b/nuttx/arch/hc/src/common/up_blocktask.c
index 58dd3360c..450a1cebc 100644
--- a/nuttx/arch/hc/src/common/up_blocktask.c
+++ b/nuttx/arch/hc/src/common/up_blocktask.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/hc/src/common/up_exit.c b/nuttx/arch/hc/src/common/up_exit.c
index 1e8bdca2e..507d69b34 100644
--- a/nuttx/arch/hc/src/common/up_exit.c
+++ b/nuttx/arch/hc/src/common/up_exit.c
@@ -48,7 +48,7 @@
#endif
#include "task/task.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/hc/src/common/up_releasepending.c b/nuttx/arch/hc/src/common/up_releasepending.c
index 7a55254e7..694dfcc1d 100644
--- a/nuttx/arch/hc/src/common/up_releasepending.c
+++ b/nuttx/arch/hc/src/common/up_releasepending.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/hc/src/common/up_reprioritizertr.c b/nuttx/arch/hc/src/common/up_reprioritizertr.c
index ee8ed4e3c..8ed2f60e9 100644
--- a/nuttx/arch/hc/src/common/up_reprioritizertr.c
+++ b/nuttx/arch/hc/src/common/up_reprioritizertr.c
@@ -45,7 +45,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/hc/src/common/up_unblocktask.c b/nuttx/arch/hc/src/common/up_unblocktask.c
index 379ccdde2..bb232c0bf 100644
--- a/nuttx/arch/hc/src/common/up_unblocktask.c
+++ b/nuttx/arch/hc/src/common/up_unblocktask.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "clock/clock.h"
#include "up_internal.h"
diff --git a/nuttx/arch/hc/src/m9s12/m9s12_assert.c b/nuttx/arch/hc/src/m9s12/m9s12_assert.c
index 7834d9800..89c4c953f 100644
--- a/nuttx/arch/hc/src/m9s12/m9s12_assert.c
+++ b/nuttx/arch/hc/src/m9s12/m9s12_assert.c
@@ -51,7 +51,7 @@
#include <arch/board/board.h>
#include "up_arch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/mips/src/common/up_exit.c b/nuttx/arch/mips/src/common/up_exit.c
index 585a667a7..abcfbad6e 100644
--- a/nuttx/arch/mips/src/common/up_exit.c
+++ b/nuttx/arch/mips/src/common/up_exit.c
@@ -50,7 +50,7 @@
#endif
#include "task/task.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/mips/src/mips32/up_assert.c b/nuttx/arch/mips/src/mips32/up_assert.c
index da789ad81..a5af9dabc 100644
--- a/nuttx/arch/mips/src/mips32/up_assert.c
+++ b/nuttx/arch/mips/src/mips32/up_assert.c
@@ -51,7 +51,7 @@
#include <arch/board/board.h>
#include "up_arch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/mips/src/mips32/up_blocktask.c b/nuttx/arch/mips/src/mips32/up_blocktask.c
index 62c0c126e..756b2f24f 100644
--- a/nuttx/arch/mips/src/mips32/up_blocktask.c
+++ b/nuttx/arch/mips/src/mips32/up_blocktask.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/mips/src/mips32/up_dumpstate.c b/nuttx/arch/mips/src/mips32/up_dumpstate.c
index dc2a50d29..f4b35e54d 100644
--- a/nuttx/arch/mips/src/mips32/up_dumpstate.c
+++ b/nuttx/arch/mips/src/mips32/up_dumpstate.c
@@ -49,7 +49,7 @@
#include <arch/board/board.h>
#include "up_arch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#ifdef CONFIG_ARCH_STACKDUMP
diff --git a/nuttx/arch/mips/src/mips32/up_releasepending.c b/nuttx/arch/mips/src/mips32/up_releasepending.c
index 1c2ac638d..8823d3493 100644
--- a/nuttx/arch/mips/src/mips32/up_releasepending.c
+++ b/nuttx/arch/mips/src/mips32/up_releasepending.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/mips/src/mips32/up_reprioritizertr.c b/nuttx/arch/mips/src/mips32/up_reprioritizertr.c
index 71a082fd8..1d957e2c2 100644
--- a/nuttx/arch/mips/src/mips32/up_reprioritizertr.c
+++ b/nuttx/arch/mips/src/mips32/up_reprioritizertr.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/mips/src/mips32/up_schedulesigaction.c b/nuttx/arch/mips/src/mips32/up_schedulesigaction.c
index 1ab8c2b56..1173bf2c4 100644
--- a/nuttx/arch/mips/src/mips32/up_schedulesigaction.c
+++ b/nuttx/arch/mips/src/mips32/up_schedulesigaction.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
#include <arch/mips32/cp0.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/mips/src/mips32/up_sigdeliver.c b/nuttx/arch/mips/src/mips32/up_sigdeliver.c
index 7ad80f733..97c786184 100644
--- a/nuttx/arch/mips/src/mips32/up_sigdeliver.c
+++ b/nuttx/arch/mips/src/mips32/up_sigdeliver.c
@@ -48,7 +48,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/mips/src/mips32/up_unblocktask.c b/nuttx/arch/mips/src/mips32/up_unblocktask.c
index 470942b84..16da9ab81 100644
--- a/nuttx/arch/mips/src/mips32/up_unblocktask.c
+++ b/nuttx/arch/mips/src/mips32/up_unblocktask.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "clock/clock.h"
#include "up_internal.h"
diff --git a/nuttx/arch/mips/src/mips32/up_vfork.c b/nuttx/arch/mips/src/mips32/up_vfork.c
index af76c0779..948abefb3 100644
--- a/nuttx/arch/mips/src/mips32/up_vfork.c
+++ b/nuttx/arch/mips/src/mips32/up_vfork.c
@@ -50,7 +50,7 @@
#include <arch/irq.h>
#include "up_vfork.h"
-#include "os_internal.h"
+#include "sched/sched.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/nuttx/arch/rgmp/src/nuttx.c b/nuttx/arch/rgmp/src/nuttx.c
index 2b20cad64..029263ea7 100644
--- a/nuttx/arch/rgmp/src/nuttx.c
+++ b/nuttx/arch/rgmp/src/nuttx.c
@@ -54,7 +54,7 @@
#include <arch/arch.h>
#include "task/task.h"
-#include "os_internal.h"
+#include "sched/sched.h"
struct tcb_s *current_task = NULL;
diff --git a/nuttx/arch/rgmp/src/rgmp.c b/nuttx/arch/rgmp/src/rgmp.c
index 652e11cca..177e452c0 100644
--- a/nuttx/arch/rgmp/src/rgmp.c
+++ b/nuttx/arch/rgmp/src/rgmp.c
@@ -52,7 +52,7 @@
#include <queue.h>
#include <stdlib.h>
#include <arch/arch.h>
-#include <os_internal.h>
+#include <sched/sched.h>
int nest_irq = 0;
diff --git a/nuttx/arch/sh/src/common/up_assert.c b/nuttx/arch/sh/src/common/up_assert.c
index 77dfae286..1aab5b7ee 100644
--- a/nuttx/arch/sh/src/common/up_assert.c
+++ b/nuttx/arch/sh/src/common/up_assert.c
@@ -51,7 +51,7 @@
#include <nuttx/usb/usbdev_trace.h>
#include "up_arch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/sh/src/common/up_blocktask.c b/nuttx/arch/sh/src/common/up_blocktask.c
index 81e1789fc..0cfe03267 100644
--- a/nuttx/arch/sh/src/common/up_blocktask.c
+++ b/nuttx/arch/sh/src/common/up_blocktask.c
@@ -44,7 +44,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/sh/src/common/up_exit.c b/nuttx/arch/sh/src/common/up_exit.c
index bdb1c520e..bfe56dcb7 100644
--- a/nuttx/arch/sh/src/common/up_exit.c
+++ b/nuttx/arch/sh/src/common/up_exit.c
@@ -49,7 +49,7 @@
#endif
#include "task/task.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/sh/src/common/up_releasepending.c b/nuttx/arch/sh/src/common/up_releasepending.c
index f1cde5075..b4685ded9 100644
--- a/nuttx/arch/sh/src/common/up_releasepending.c
+++ b/nuttx/arch/sh/src/common/up_releasepending.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/sh/src/common/up_reprioritizertr.c b/nuttx/arch/sh/src/common/up_reprioritizertr.c
index 8ef6c06c4..93a577a92 100644
--- a/nuttx/arch/sh/src/common/up_reprioritizertr.c
+++ b/nuttx/arch/sh/src/common/up_reprioritizertr.c
@@ -45,7 +45,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/sh/src/common/up_unblocktask.c b/nuttx/arch/sh/src/common/up_unblocktask.c
index 3978594cf..04832386f 100644
--- a/nuttx/arch/sh/src/common/up_unblocktask.c
+++ b/nuttx/arch/sh/src/common/up_unblocktask.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "clock/clock.h"
#include "up_internal.h"
diff --git a/nuttx/arch/sh/src/m16c/m16c_dumpstate.c b/nuttx/arch/sh/src/m16c/m16c_dumpstate.c
index d0ee37b04..41363322e 100644
--- a/nuttx/arch/sh/src/m16c/m16c_dumpstate.c
+++ b/nuttx/arch/sh/src/m16c/m16c_dumpstate.c
@@ -47,7 +47,7 @@
#include "up_arch.h"
#include "up_internal.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "chip.h"
#ifdef CONFIG_ARCH_STACKDUMP
diff --git a/nuttx/arch/sh/src/m16c/m16c_schedulesigaction.c b/nuttx/arch/sh/src/m16c/m16c_schedulesigaction.c
index d7af7e477..fc4fd0b7b 100644
--- a/nuttx/arch/sh/src/m16c/m16c_schedulesigaction.c
+++ b/nuttx/arch/sh/src/m16c/m16c_schedulesigaction.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/sh/src/m16c/m16c_sigdeliver.c b/nuttx/arch/sh/src/m16c/m16c_sigdeliver.c
index 003dde8ab..ddfae0f2c 100644
--- a/nuttx/arch/sh/src/m16c/m16c_sigdeliver.c
+++ b/nuttx/arch/sh/src/m16c/m16c_sigdeliver.c
@@ -46,7 +46,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/sh/src/sh1/sh1_dumpstate.c b/nuttx/arch/sh/src/sh1/sh1_dumpstate.c
index 849c406df..5472261b3 100644
--- a/nuttx/arch/sh/src/sh1/sh1_dumpstate.c
+++ b/nuttx/arch/sh/src/sh1/sh1_dumpstate.c
@@ -47,7 +47,7 @@
#include "up_arch.h"
#include "up_internal.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#ifdef CONFIG_ARCH_STACKDUMP
diff --git a/nuttx/arch/sh/src/sh1/sh1_schedulesigaction.c b/nuttx/arch/sh/src/sh1/sh1_schedulesigaction.c
index 1c05d669c..22649b71a 100644
--- a/nuttx/arch/sh/src/sh1/sh1_schedulesigaction.c
+++ b/nuttx/arch/sh/src/sh1/sh1_schedulesigaction.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/sh/src/sh1/sh1_sigdeliver.c b/nuttx/arch/sh/src/sh1/sh1_sigdeliver.c
index 00c7fd340..b8cdfd502 100644
--- a/nuttx/arch/sh/src/sh1/sh1_sigdeliver.c
+++ b/nuttx/arch/sh/src/sh1/sh1_sigdeliver.c
@@ -46,7 +46,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/sim/src/up_blocktask.c b/nuttx/arch/sim/src/up_blocktask.c
index 6e0f94015..ef1e940f0 100644
--- a/nuttx/arch/sim/src/up_blocktask.c
+++ b/nuttx/arch/sim/src/up_blocktask.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/sim/src/up_exit.c b/nuttx/arch/sim/src/up_exit.c
index b70a91154..332d1ff61 100644
--- a/nuttx/arch/sim/src/up_exit.c
+++ b/nuttx/arch/sim/src/up_exit.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
#include "task/task.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/sim/src/up_releasepending.c b/nuttx/arch/sim/src/up_releasepending.c
index a1c2eb544..4859ef332 100644
--- a/nuttx/arch/sim/src/up_releasepending.c
+++ b/nuttx/arch/sim/src/up_releasepending.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/sim/src/up_reprioritizertr.c b/nuttx/arch/sim/src/up_reprioritizertr.c
index 578fd5a97..4abb34802 100644
--- a/nuttx/arch/sim/src/up_reprioritizertr.c
+++ b/nuttx/arch/sim/src/up_reprioritizertr.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/sim/src/up_schedulesigaction.c b/nuttx/arch/sim/src/up_schedulesigaction.c
index 485f720ca..11c7bdde9 100644
--- a/nuttx/arch/sim/src/up_schedulesigaction.c
+++ b/nuttx/arch/sim/src/up_schedulesigaction.c
@@ -44,7 +44,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/sim/src/up_unblocktask.c b/nuttx/arch/sim/src/up_unblocktask.c
index 66f7a6d34..42f943352 100644
--- a/nuttx/arch/sim/src/up_unblocktask.c
+++ b/nuttx/arch/sim/src/up_unblocktask.c
@@ -44,7 +44,7 @@
#include <nuttx/arch.h>
#include "clock/clock.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/x86/src/common/up_assert.c b/nuttx/arch/x86/src/common/up_assert.c
index ed9b0cdb2..30aee2b23 100644
--- a/nuttx/arch/x86/src/common/up_assert.c
+++ b/nuttx/arch/x86/src/common/up_assert.c
@@ -52,7 +52,7 @@
#include <arch/board/board.h>
#include "up_arch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/x86/src/common/up_blocktask.c b/nuttx/arch/x86/src/common/up_blocktask.c
index f436c006f..b0a11790b 100644
--- a/nuttx/arch/x86/src/common/up_blocktask.c
+++ b/nuttx/arch/x86/src/common/up_blocktask.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/x86/src/common/up_exit.c b/nuttx/arch/x86/src/common/up_exit.c
index bf2548214..8af643fcd 100644
--- a/nuttx/arch/x86/src/common/up_exit.c
+++ b/nuttx/arch/x86/src/common/up_exit.c
@@ -48,7 +48,7 @@
#endif
#include "task/task.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/x86/src/common/up_releasepending.c b/nuttx/arch/x86/src/common/up_releasepending.c
index 9507ff898..2f7db7618 100644
--- a/nuttx/arch/x86/src/common/up_releasepending.c
+++ b/nuttx/arch/x86/src/common/up_releasepending.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/x86/src/common/up_reprioritizertr.c b/nuttx/arch/x86/src/common/up_reprioritizertr.c
index 3c5115b72..5579ad349 100644
--- a/nuttx/arch/x86/src/common/up_reprioritizertr.c
+++ b/nuttx/arch/x86/src/common/up_reprioritizertr.c
@@ -45,7 +45,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/x86/src/common/up_unblocktask.c b/nuttx/arch/x86/src/common/up_unblocktask.c
index 89dcf5418..677813575 100644
--- a/nuttx/arch/x86/src/common/up_unblocktask.c
+++ b/nuttx/arch/x86/src/common/up_unblocktask.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "clock/clock.h"
#include "up_internal.h"
diff --git a/nuttx/arch/x86/src/i486/up_schedulesigaction.c b/nuttx/arch/x86/src/i486/up_schedulesigaction.c
index 1eb773ce8..150324ece 100644
--- a/nuttx/arch/x86/src/i486/up_schedulesigaction.c
+++ b/nuttx/arch/x86/src/i486/up_schedulesigaction.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/x86/src/i486/up_sigdeliver.c b/nuttx/arch/x86/src/i486/up_sigdeliver.c
index 1e87e78c6..15a33380d 100644
--- a/nuttx/arch/x86/src/i486/up_sigdeliver.c
+++ b/nuttx/arch/x86/src/i486/up_sigdeliver.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/z16/src/common/up_assert.c b/nuttx/arch/z16/src/common/up_assert.c
index 051d8ca01..df7121c04 100644
--- a/nuttx/arch/z16/src/common/up_assert.c
+++ b/nuttx/arch/z16/src/common/up_assert.c
@@ -51,7 +51,7 @@
#include <arch/board/board.h>
#include "chip/chip.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/z16/src/common/up_blocktask.c b/nuttx/arch/z16/src/common/up_blocktask.c
index c8a8fae99..b4728fd78 100644
--- a/nuttx/arch/z16/src/common/up_blocktask.c
+++ b/nuttx/arch/z16/src/common/up_blocktask.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/z16/src/common/up_exit.c b/nuttx/arch/z16/src/common/up_exit.c
index 99d50bab8..66a606456 100644
--- a/nuttx/arch/z16/src/common/up_exit.c
+++ b/nuttx/arch/z16/src/common/up_exit.c
@@ -50,7 +50,7 @@
#include "chip/chip.h"
#include "task/task.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/z16/src/common/up_releasepending.c b/nuttx/arch/z16/src/common/up_releasepending.c
index 7db0cd614..8e9c95cd6 100644
--- a/nuttx/arch/z16/src/common/up_releasepending.c
+++ b/nuttx/arch/z16/src/common/up_releasepending.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
#include "chip/chip.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/z16/src/common/up_reprioritizertr.c b/nuttx/arch/z16/src/common/up_reprioritizertr.c
index 456d39010..27052396c 100644
--- a/nuttx/arch/z16/src/common/up_reprioritizertr.c
+++ b/nuttx/arch/z16/src/common/up_reprioritizertr.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
#include "chip/chip.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/z16/src/common/up_schedulesigaction.c b/nuttx/arch/z16/src/common/up_schedulesigaction.c
index b241d0a5b..a56ce322a 100644
--- a/nuttx/arch/z16/src/common/up_schedulesigaction.c
+++ b/nuttx/arch/z16/src/common/up_schedulesigaction.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
#include <arch/irq.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#ifndef CONFIG_DISABLE_SIGNALS
diff --git a/nuttx/arch/z16/src/common/up_sigdeliver.c b/nuttx/arch/z16/src/common/up_sigdeliver.c
index bc72fd56a..284f7dce4 100644
--- a/nuttx/arch/z16/src/common/up_sigdeliver.c
+++ b/nuttx/arch/z16/src/common/up_sigdeliver.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#ifndef CONFIG_DISABLE_SIGNALS
diff --git a/nuttx/arch/z16/src/common/up_stackdump.c b/nuttx/arch/z16/src/common/up_stackdump.c
index fd16cf238..a1271b2d9 100644
--- a/nuttx/arch/z16/src/common/up_stackdump.c
+++ b/nuttx/arch/z16/src/common/up_stackdump.c
@@ -42,7 +42,7 @@
#include <debug.h>
#include "chip/chip.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/z16/src/common/up_unblocktask.c b/nuttx/arch/z16/src/common/up_unblocktask.c
index fab6e9a84..44988f76b 100644
--- a/nuttx/arch/z16/src/common/up_unblocktask.c
+++ b/nuttx/arch/z16/src/common/up_unblocktask.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
#include "chip/chip.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "clock/clock.h"
#include "up_internal.h"
diff --git a/nuttx/arch/z80/src/common/up_assert.c b/nuttx/arch/z80/src/common/up_assert.c
index 55561db33..473423262 100644
--- a/nuttx/arch/z80/src/common/up_assert.c
+++ b/nuttx/arch/z80/src/common/up_assert.c
@@ -50,7 +50,7 @@
#include "chip/chip.h"
#include "up_arch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/z80/src/common/up_blocktask.c b/nuttx/arch/z80/src/common/up_blocktask.c
index 418a09cc0..dd037ca9a 100644
--- a/nuttx/arch/z80/src/common/up_blocktask.c
+++ b/nuttx/arch/z80/src/common/up_blocktask.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
#include "chip/switch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/z80/src/common/up_exit.c b/nuttx/arch/z80/src/common/up_exit.c
index 124ee1035..fb79e3641 100644
--- a/nuttx/arch/z80/src/common/up_exit.c
+++ b/nuttx/arch/z80/src/common/up_exit.c
@@ -51,7 +51,7 @@
#include "chip/chip.h"
#include "task/task.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/z80/src/common/up_releasepending.c b/nuttx/arch/z80/src/common/up_releasepending.c
index 81a2f2413..6acc6f760 100644
--- a/nuttx/arch/z80/src/common/up_releasepending.c
+++ b/nuttx/arch/z80/src/common/up_releasepending.c
@@ -46,7 +46,7 @@
#include "chip/chip.h"
#include "chip/switch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/z80/src/common/up_reprioritizertr.c b/nuttx/arch/z80/src/common/up_reprioritizertr.c
index 0f0ca2fb6..c470c0863 100644
--- a/nuttx/arch/z80/src/common/up_reprioritizertr.c
+++ b/nuttx/arch/z80/src/common/up_reprioritizertr.c
@@ -48,7 +48,7 @@
#include "chip/chip.h"
#include "chip/switch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/z80/src/common/up_stackdump.c b/nuttx/arch/z80/src/common/up_stackdump.c
index 21707889b..93dfb7291 100644
--- a/nuttx/arch/z80/src/common/up_stackdump.c
+++ b/nuttx/arch/z80/src/common/up_stackdump.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include "up_arch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
/****************************************************************************
diff --git a/nuttx/arch/z80/src/common/up_unblocktask.c b/nuttx/arch/z80/src/common/up_unblocktask.c
index 3ce1e5a17..688bb03f1 100644
--- a/nuttx/arch/z80/src/common/up_unblocktask.c
+++ b/nuttx/arch/z80/src/common/up_unblocktask.c
@@ -46,7 +46,7 @@
#include "chip/chip.h"
#include "chip/switch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "clock/clock.h"
#include "up_internal.h"
diff --git a/nuttx/arch/z80/src/ez80/ez80_schedulesigaction.c b/nuttx/arch/z80/src/ez80/ez80_schedulesigaction.c
index c519fb18b..6f2a19f47 100644
--- a/nuttx/arch/z80/src/ez80/ez80_schedulesigaction.c
+++ b/nuttx/arch/z80/src/ez80/ez80_schedulesigaction.c
@@ -47,7 +47,7 @@
#include <arch/irq.h>
#include "chip/switch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#ifndef CONFIG_DISABLE_SIGNALS
diff --git a/nuttx/arch/z80/src/ez80/ez80_sigdeliver.c b/nuttx/arch/z80/src/ez80/ez80_sigdeliver.c
index 0f2409b9c..797f4a745 100644
--- a/nuttx/arch/z80/src/ez80/ez80_sigdeliver.c
+++ b/nuttx/arch/z80/src/ez80/ez80_sigdeliver.c
@@ -47,7 +47,7 @@
#include <arch/board/board.h>
#include "chip/switch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#ifndef CONFIG_DISABLE_SIGNALS
diff --git a/nuttx/arch/z80/src/z180/z180_schedulesigaction.c b/nuttx/arch/z80/src/z180/z180_schedulesigaction.c
index 39344e51f..e0bd1b050 100644
--- a/nuttx/arch/z80/src/z180/z180_schedulesigaction.c
+++ b/nuttx/arch/z80/src/z180/z180_schedulesigaction.c
@@ -47,7 +47,7 @@
#include <arch/irq.h>
#include "chip/switch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#ifndef CONFIG_DISABLE_SIGNALS
diff --git a/nuttx/arch/z80/src/z180/z180_sigdeliver.c b/nuttx/arch/z80/src/z180/z180_sigdeliver.c
index bd28980de..44de18fcb 100644
--- a/nuttx/arch/z80/src/z180/z180_sigdeliver.c
+++ b/nuttx/arch/z80/src/z180/z180_sigdeliver.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
#include "chip/switch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#ifndef CONFIG_DISABLE_SIGNALS
diff --git a/nuttx/arch/z80/src/z8/z8_schedulesigaction.c b/nuttx/arch/z80/src/z8/z8_schedulesigaction.c
index daae09008..c7f308454 100644
--- a/nuttx/arch/z80/src/z8/z8_schedulesigaction.c
+++ b/nuttx/arch/z80/src/z8/z8_schedulesigaction.c
@@ -47,7 +47,7 @@
#include <arch/irq.h>
#include "chip/switch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#ifndef CONFIG_DISABLE_SIGNALS
diff --git a/nuttx/arch/z80/src/z8/z8_sigdeliver.c b/nuttx/arch/z80/src/z8/z8_sigdeliver.c
index b2e11b080..099b511db 100644
--- a/nuttx/arch/z80/src/z8/z8_sigdeliver.c
+++ b/nuttx/arch/z80/src/z8/z8_sigdeliver.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
#include "chip/switch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#ifndef CONFIG_DISABLE_SIGNALS
diff --git a/nuttx/arch/z80/src/z80/z80_schedulesigaction.c b/nuttx/arch/z80/src/z80/z80_schedulesigaction.c
index 893589726..cac85781b 100644
--- a/nuttx/arch/z80/src/z80/z80_schedulesigaction.c
+++ b/nuttx/arch/z80/src/z80/z80_schedulesigaction.c
@@ -47,7 +47,7 @@
#include <arch/irq.h>
#include "chip/switch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#ifndef CONFIG_DISABLE_SIGNALS
diff --git a/nuttx/arch/z80/src/z80/z80_sigdeliver.c b/nuttx/arch/z80/src/z80/z80_sigdeliver.c
index c6355097f..c16f37242 100644
--- a/nuttx/arch/z80/src/z80/z80_sigdeliver.c
+++ b/nuttx/arch/z80/src/z80/z80_sigdeliver.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
#include "chip/switch.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "up_internal.h"
#ifndef CONFIG_DISABLE_SIGNALS
diff --git a/nuttx/binfmt/binfmt_execmodule.c b/nuttx/binfmt/binfmt_execmodule.c
index c98490359..13c692018 100644
--- a/nuttx/binfmt/binfmt_execmodule.c
+++ b/nuttx/binfmt/binfmt_execmodule.c
@@ -50,7 +50,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/binfmt/binfmt.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "binfmt_internal.h"
#ifndef CONFIG_BINFMT_DISABLE
diff --git a/nuttx/sched/environ/env_clearenv.c b/nuttx/sched/environ/env_clearenv.c
index 832d6d8ad..e45939ce0 100644
--- a/nuttx/sched/environ/env_clearenv.c
+++ b/nuttx/sched/environ/env_clearenv.c
@@ -43,7 +43,7 @@
#include <sched.h>
#include <stdlib.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "environ/environ.h"
/****************************************************************************
diff --git a/nuttx/sched/environ/env_dup.c b/nuttx/sched/environ/env_dup.c
index fc529eafe..91dcaa1dc 100644
--- a/nuttx/sched/environ/env_dup.c
+++ b/nuttx/sched/environ/env_dup.c
@@ -48,7 +48,7 @@
#include <nuttx/kmalloc.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "environ/environ.h"
/****************************************************************************
diff --git a/nuttx/sched/environ/env_getenv.c b/nuttx/sched/environ/env_getenv.c
index 6a030e3f6..51f886fe0 100644
--- a/nuttx/sched/environ/env_getenv.c
+++ b/nuttx/sched/environ/env_getenv.c
@@ -46,7 +46,7 @@
#include <stdlib.h>
#include <errno.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "environ/environ.h"
/****************************************************************************
diff --git a/nuttx/sched/environ/env_getenvironptr.c b/nuttx/sched/environ/env_getenvironptr.c
index 5808dc5dd..f56a08a1b 100644
--- a/nuttx/sched/environ/env_getenvironptr.c
+++ b/nuttx/sched/environ/env_getenvironptr.c
@@ -43,7 +43,7 @@
#include <sched.h>
#include <stdlib.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#undef get_environ_ptr
diff --git a/nuttx/sched/environ/env_setenv.c b/nuttx/sched/environ/env_setenv.c
index bdf87a9c5..c00efb304 100644
--- a/nuttx/sched/environ/env_setenv.c
+++ b/nuttx/sched/environ/env_setenv.c
@@ -49,7 +49,7 @@
#include <nuttx/kmalloc.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "environ/environ.h"
/****************************************************************************
diff --git a/nuttx/sched/environ/env_unsetenv.c b/nuttx/sched/environ/env_unsetenv.c
index 70bd04881..5ed1ed697 100644
--- a/nuttx/sched/environ/env_unsetenv.c
+++ b/nuttx/sched/environ/env_unsetenv.c
@@ -47,7 +47,7 @@
#include <nuttx/kmalloc.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "environ/environ.h"
/****************************************************************************
diff --git a/nuttx/sched/errno/errno_getptr.c b/nuttx/sched/errno/errno_getptr.c
index 50b1e085e..50a753d02 100644
--- a/nuttx/sched/errno/errno_getptr.c
+++ b/nuttx/sched/errno/errno_getptr.c
@@ -41,7 +41,7 @@
#include <sched.h>
#include <errno.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/nuttx/sched/exit.c b/nuttx/sched/exit.c
index db922d89f..85cc99cba 100644
--- a/nuttx/sched/exit.c
+++ b/nuttx/sched/exit.c
@@ -47,7 +47,7 @@
#include <nuttx/fs/fs.h>
#include "task/task.h"
-#include "os_internal.h"
+#include "sched/sched.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/nuttx/sched/group/group_childstatus.c b/nuttx/sched/group/group_childstatus.c
index bac8dac9f..d67aad606 100644
--- a/nuttx/sched/group/group_childstatus.c
+++ b/nuttx/sched/group/group_childstatus.c
@@ -43,7 +43,7 @@
#include <errno.h>
#include <debug.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#if defined(CONFIG_SCHED_HAVE_PARENT) && defined(CONFIG_SCHED_CHILD_STATUS)
diff --git a/nuttx/sched/group/group_setuptaskfiles.c b/nuttx/sched/group/group_setuptaskfiles.c
index 91b4bf218..978dc4400 100644
--- a/nuttx/sched/group/group_setuptaskfiles.c
+++ b/nuttx/sched/group/group_setuptaskfiles.c
@@ -45,7 +45,7 @@
#include <nuttx/fs/fs.h>
#include <nuttx/net/net.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#if CONFIG_NFILE_DESCRIPTORS > 0 || CONFIG_NSOCKET_DESCRIPTORS > 0
diff --git a/nuttx/sched/group/group_signal.c b/nuttx/sched/group/group_signal.c
index b1fafdc57..4569fdb9c 100644
--- a/nuttx/sched/group/group_signal.c
+++ b/nuttx/sched/group/group_signal.c
@@ -45,7 +45,7 @@
#include <errno.h>
#include <debug.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "signal/signal.h"
diff --git a/nuttx/sched/init/os_start.c b/nuttx/sched/init/os_start.c
index 57ef6d5fa..be319ca02 100644
--- a/nuttx/sched/init/os_start.c
+++ b/nuttx/sched/init/os_start.c
@@ -51,7 +51,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/init.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "signal/signal.h"
#include "wdog/wdog.h"
#include "semaphore/semaphore.h"
diff --git a/nuttx/sched/mqueue/mq_close.c b/nuttx/sched/mqueue/mq_close.c
index 237754173..36caf05eb 100644
--- a/nuttx/sched/mqueue/mq_close.c
+++ b/nuttx/sched/mqueue/mq_close.c
@@ -43,7 +43,7 @@
#include <sched.h>
#include <assert.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "mqueue/mqueue.h"
/****************************************************************************
diff --git a/nuttx/sched/mqueue/mq_notify.c b/nuttx/sched/mqueue/mq_notify.c
index ffb159af0..891cb46f4 100644
--- a/nuttx/sched/mqueue/mq_notify.c
+++ b/nuttx/sched/mqueue/mq_notify.c
@@ -44,7 +44,7 @@
#include <sched.h>
#include <errno.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "mqueue/mqueue.h"
/************************************************************************
diff --git a/nuttx/sched/mqueue/mq_open.c b/nuttx/sched/mqueue/mq_open.c
index e11761736..c7de6c745 100644
--- a/nuttx/sched/mqueue/mq_open.c
+++ b/nuttx/sched/mqueue/mq_open.c
@@ -51,7 +51,7 @@
#include <nuttx/kmalloc.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "mqueue/mqueue.h"
/****************************************************************************
diff --git a/nuttx/sched/mqueue/mq_rcvinternal.c b/nuttx/sched/mqueue/mq_rcvinternal.c
index ecd451344..9a355aa0b 100644
--- a/nuttx/sched/mqueue/mq_rcvinternal.c
+++ b/nuttx/sched/mqueue/mq_rcvinternal.c
@@ -50,7 +50,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "mqueue/mqueue.h"
/****************************************************************************
diff --git a/nuttx/sched/mqueue/mq_sndinternal.c b/nuttx/sched/mqueue/mq_sndinternal.c
index 270f5ab7a..033b2095c 100644
--- a/nuttx/sched/mqueue/mq_sndinternal.c
+++ b/nuttx/sched/mqueue/mq_sndinternal.c
@@ -51,7 +51,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#ifndef CONFIG_DISABLE_SIGNALS
# include "signal/signal.h"
#endif
diff --git a/nuttx/sched/mqueue/mq_timedreceive.c b/nuttx/sched/mqueue/mq_timedreceive.c
index 9ff42c86d..a0fc97860 100644
--- a/nuttx/sched/mqueue/mq_timedreceive.c
+++ b/nuttx/sched/mqueue/mq_timedreceive.c
@@ -50,7 +50,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "clock/clock.h"
#include "mqueue/mqueue.h"
diff --git a/nuttx/sched/mqueue/mq_timedsend.c b/nuttx/sched/mqueue/mq_timedsend.c
index 3174c341b..d78b720b7 100644
--- a/nuttx/sched/mqueue/mq_timedsend.c
+++ b/nuttx/sched/mqueue/mq_timedsend.c
@@ -50,7 +50,7 @@
#include <nuttx/arch.h>
#include "clock/clock.h"
-#include "os_internal.h"
+#include "sched/sched.h"
#include "mqueue/mqueue.h"
/****************************************************************************
diff --git a/nuttx/sched/paging/pg_miss.c b/nuttx/sched/paging/pg_miss.c
index f134fc08e..21717231a 100644
--- a/nuttx/sched/paging/pg_miss.c
+++ b/nuttx/sched/paging/pg_miss.c
@@ -48,7 +48,7 @@
#ifdef CONFIG_PAGING
-#include "os_internal.h"
+#include "sched/sched.h"
#include "paging/paging.h"
/****************************************************************************
diff --git a/nuttx/sched/paging/pg_worker.c b/nuttx/sched/paging/pg_worker.c
index 10e4ba4f3..e15320160 100644
--- a/nuttx/sched/paging/pg_worker.c
+++ b/nuttx/sched/paging/pg_worker.c
@@ -52,7 +52,7 @@
#include <nuttx/page.h>
#include <nuttx/clock.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "paging/paging.h"
#ifdef CONFIG_PAGING
diff --git a/nuttx/sched/pthread/pthread_cancel.c b/nuttx/sched/pthread/pthread_cancel.c
index 9dea9ad69..606825b16 100644
--- a/nuttx/sched/pthread/pthread_cancel.c
+++ b/nuttx/sched/pthread/pthread_cancel.c
@@ -44,7 +44,7 @@
#include <pthread.h>
#include <errno.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "pthread/pthread.h"
/**************************************************************************
diff --git a/nuttx/sched/pthread/pthread_completejoin.c b/nuttx/sched/pthread/pthread_completejoin.c
index e0eceee6a..0546edf5b 100644
--- a/nuttx/sched/pthread/pthread_completejoin.c
+++ b/nuttx/sched/pthread/pthread_completejoin.c
@@ -45,7 +45,7 @@
#include <errno.h>
#include <debug.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "pthread/pthread.h"
diff --git a/nuttx/sched/pthread/pthread_condtimedwait.c b/nuttx/sched/pthread/pthread_condtimedwait.c
index 16cce8690..4505225b2 100644
--- a/nuttx/sched/pthread/pthread_condtimedwait.c
+++ b/nuttx/sched/pthread/pthread_condtimedwait.c
@@ -50,7 +50,7 @@
#include <wdog.h>
#include <debug.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "pthread/pthread.h"
#include "clock/clock.h"
#include "signal/signal.h"
diff --git a/nuttx/sched/pthread/pthread_create.c b/nuttx/sched/pthread/pthread_create.c
index b3969e4f7..9ee5cc5d9 100644
--- a/nuttx/sched/pthread/pthread_create.c
+++ b/nuttx/sched/pthread/pthread_create.c
@@ -52,7 +52,7 @@
#include <nuttx/pthread.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "clock/clock.h"
#include "pthread/pthread.h"
diff --git a/nuttx/sched/pthread/pthread_detach.c b/nuttx/sched/pthread/pthread_detach.c
index 95762b6c1..450ff76a5 100644
--- a/nuttx/sched/pthread/pthread_detach.c
+++ b/nuttx/sched/pthread/pthread_detach.c
@@ -46,7 +46,7 @@
#include <assert.h>
#include <debug.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "pthread/pthread.h"
diff --git a/nuttx/sched/pthread/pthread_exit.c b/nuttx/sched/pthread/pthread_exit.c
index ebc7fb262..5fb57c8df 100644
--- a/nuttx/sched/pthread/pthread_exit.c
+++ b/nuttx/sched/pthread/pthread_exit.c
@@ -49,7 +49,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "task/task.h"
#include "pthread/pthread.h"
diff --git a/nuttx/sched/pthread/pthread_getspecific.c b/nuttx/sched/pthread/pthread_getspecific.c
index bc097372b..c02dcde3e 100644
--- a/nuttx/sched/pthread/pthread_getspecific.c
+++ b/nuttx/sched/pthread/pthread_getspecific.c
@@ -44,7 +44,7 @@
#include <assert.h>
#include <debug.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "pthread/pthread.h"
/************************************************************************
diff --git a/nuttx/sched/pthread/pthread_join.c b/nuttx/sched/pthread/pthread_join.c
index a9b9d9e88..43843deed 100644
--- a/nuttx/sched/pthread/pthread_join.c
+++ b/nuttx/sched/pthread/pthread_join.c
@@ -43,7 +43,7 @@
#include <errno.h>
#include <debug.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "pthread/pthread.h"
diff --git a/nuttx/sched/pthread/pthread_keycreate.c b/nuttx/sched/pthread/pthread_keycreate.c
index 17ed16144..628f0d6af 100644
--- a/nuttx/sched/pthread/pthread_keycreate.c
+++ b/nuttx/sched/pthread/pthread_keycreate.c
@@ -44,7 +44,7 @@
#include <assert.h>
#include <debug.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "pthread/pthread.h"
/****************************************************************************
diff --git a/nuttx/sched/pthread/pthread_setcancelstate.c b/nuttx/sched/pthread/pthread_setcancelstate.c
index 7e3c5d84e..dcca9f3de 100644
--- a/nuttx/sched/pthread/pthread_setcancelstate.c
+++ b/nuttx/sched/pthread/pthread_setcancelstate.c
@@ -39,7 +39,7 @@
#include <pthread.h>
#include <errno.h>
-#include "os_internal.h"
+#include "sched/sched.h"
/******************************************************************************************
* Private Definitions
diff --git a/nuttx/sched/pthread/pthread_setschedprio.c b/nuttx/sched/pthread/pthread_setschedprio.c
index 7144fab96..4d8c6c731 100644
--- a/nuttx/sched/pthread/pthread_setschedprio.c
+++ b/nuttx/sched/pthread/pthread_setschedprio.c
@@ -42,7 +42,7 @@
#include <sched.h>
#include <errno.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
/****************************************************************************
* Definitions
diff --git a/nuttx/sched/pthread/pthread_setspecific.c b/nuttx/sched/pthread/pthread_setspecific.c
index f4dac80b0..8edd9c675 100644
--- a/nuttx/sched/pthread/pthread_setspecific.c
+++ b/nuttx/sched/pthread/pthread_setspecific.c
@@ -44,7 +44,7 @@
#include <assert.h>
#include <debug.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "pthread/pthread.h"
/****************************************************************************
diff --git a/nuttx/sched/semaphore/sem_holder.c b/nuttx/sched/semaphore/sem_holder.c
index 82e7e80a3..3f636b835 100644
--- a/nuttx/sched/semaphore/sem_holder.c
+++ b/nuttx/sched/semaphore/sem_holder.c
@@ -45,7 +45,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "semaphore/semaphore.h"
#ifdef CONFIG_PRIORITY_INHERITANCE
diff --git a/nuttx/sched/semaphore/sem_post.c b/nuttx/sched/semaphore/sem_post.c
index 50ff42811..454016082 100644
--- a/nuttx/sched/semaphore/sem_post.c
+++ b/nuttx/sched/semaphore/sem_post.c
@@ -44,7 +44,7 @@
#include <sched.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "semaphore/semaphore.h"
/****************************************************************************
diff --git a/nuttx/sched/semaphore/sem_timedwait.c b/nuttx/sched/semaphore/sem_timedwait.c
index c18ddf3fe..f5053bdf8 100644
--- a/nuttx/sched/semaphore/sem_timedwait.c
+++ b/nuttx/sched/semaphore/sem_timedwait.c
@@ -49,7 +49,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "clock/clock.h"
#include "semaphore/semaphore.h"
diff --git a/nuttx/sched/semaphore/sem_trywait.c b/nuttx/sched/semaphore/sem_trywait.c
index 8fe1629a8..f7f6303a1 100644
--- a/nuttx/sched/semaphore/sem_trywait.c
+++ b/nuttx/sched/semaphore/sem_trywait.c
@@ -45,7 +45,7 @@
#include <errno.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "semaphore/semaphore.h"
/****************************************************************************
diff --git a/nuttx/sched/semaphore/sem_wait.c b/nuttx/sched/semaphore/sem_wait.c
index e6e896c80..6756599fa 100644
--- a/nuttx/sched/semaphore/sem_wait.c
+++ b/nuttx/sched/semaphore/sem_wait.c
@@ -45,7 +45,7 @@
#include <assert.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "semaphore/semaphore.h"
/****************************************************************************
diff --git a/nuttx/sched/signal/sig_action.c b/nuttx/sched/signal/sig_action.c
index 055f5ec96..e73f7344d 100644
--- a/nuttx/sched/signal/sig_action.c
+++ b/nuttx/sched/signal/sig_action.c
@@ -45,7 +45,7 @@
#include <sched.h>
#include <errno.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "signal/signal.h"
diff --git a/nuttx/sched/signal/sig_dispatch.c b/nuttx/sched/signal/sig_dispatch.c
index e26922863..1cffefb36 100644
--- a/nuttx/sched/signal/sig_dispatch.c
+++ b/nuttx/sched/signal/sig_dispatch.c
@@ -48,7 +48,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "semaphore/semaphore.h"
#include "signal/signal.h"
diff --git a/nuttx/sched/signal/sig_kill.c b/nuttx/sched/signal/sig_kill.c
index cceb38fe5..3a65535e7 100644
--- a/nuttx/sched/signal/sig_kill.c
+++ b/nuttx/sched/signal/sig_kill.c
@@ -44,7 +44,7 @@
#include <errno.h>
#include <debug.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "signal/signal.h"
/************************************************************************
diff --git a/nuttx/sched/signal/sig_mqnotempty.c b/nuttx/sched/signal/sig_mqnotempty.c
index bee8270d6..6516a7211 100644
--- a/nuttx/sched/signal/sig_mqnotempty.c
+++ b/nuttx/sched/signal/sig_mqnotempty.c
@@ -45,7 +45,7 @@
#include <errno.h>
#include <debug.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "signal/signal.h"
/****************************************************************************
diff --git a/nuttx/sched/signal/sig_pending.c b/nuttx/sched/signal/sig_pending.c
index 5dadaca68..a1fa41698 100644
--- a/nuttx/sched/signal/sig_pending.c
+++ b/nuttx/sched/signal/sig_pending.c
@@ -42,7 +42,7 @@
#include <signal.h>
#include <sched.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "signal/signal.h"
/****************************************************************************
diff --git a/nuttx/sched/signal/sig_procmask.c b/nuttx/sched/signal/sig_procmask.c
index 6a74c6fa7..c56fdf5aa 100644
--- a/nuttx/sched/signal/sig_procmask.c
+++ b/nuttx/sched/signal/sig_procmask.c
@@ -49,7 +49,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "signal/signal.h"
/****************************************************************************
diff --git a/nuttx/sched/signal/sig_queue.c b/nuttx/sched/signal/sig_queue.c
index 2933e7140..2cc46142e 100644
--- a/nuttx/sched/signal/sig_queue.c
+++ b/nuttx/sched/signal/sig_queue.c
@@ -45,7 +45,7 @@
#include <sched.h>
#include <errno.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "signal/signal.h"
/****************************************************************************
diff --git a/nuttx/sched/signal/sig_suspend.c b/nuttx/sched/signal/sig_suspend.c
index 809f43b0b..7e9ad11b4 100644
--- a/nuttx/sched/signal/sig_suspend.c
+++ b/nuttx/sched/signal/sig_suspend.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "signal/signal.h"
/****************************************************************************
diff --git a/nuttx/sched/signal/sig_timedwait.c b/nuttx/sched/signal/sig_timedwait.c
index a71b78c6b..e592f8e2e 100644
--- a/nuttx/sched/signal/sig_timedwait.c
+++ b/nuttx/sched/signal/sig_timedwait.c
@@ -52,7 +52,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "signal/signal.h"
#include "clock/clock.h"
diff --git a/nuttx/sched/signal/sig_unmaskpendingsignal.c b/nuttx/sched/signal/sig_unmaskpendingsignal.c
index 9fe76762d..9ed670bba 100644
--- a/nuttx/sched/signal/sig_unmaskpendingsignal.c
+++ b/nuttx/sched/signal/sig_unmaskpendingsignal.c
@@ -41,7 +41,7 @@
#include <sched.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "signal/signal.h"
/************************************************************************
diff --git a/nuttx/sched/task/task_atexit.c b/nuttx/sched/task/task_atexit.c
index 0365abd62..cd18e0c59 100644
--- a/nuttx/sched/task/task_atexit.c
+++ b/nuttx/sched/task/task_atexit.c
@@ -47,7 +47,7 @@
#include <nuttx/fs/fs.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "task/task.h"
#ifdef CONFIG_SCHED_ATEXIT
diff --git a/nuttx/sched/task/task_create.c b/nuttx/sched/task/task_create.c
index d6663e45c..6289085fa 100644
--- a/nuttx/sched/task/task_create.c
+++ b/nuttx/sched/task/task_create.c
@@ -48,7 +48,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/kthread.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "task/task.h"
diff --git a/nuttx/sched/task/task_delete.c b/nuttx/sched/task/task_delete.c
index bdae89208..1cf0c37d2 100644
--- a/nuttx/sched/task/task_delete.c
+++ b/nuttx/sched/task/task_delete.c
@@ -43,7 +43,7 @@
#include <nuttx/sched.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "task/task.h"
/****************************************************************************
diff --git a/nuttx/sched/task/task_exit.c b/nuttx/sched/task/task_exit.c
index 838eac460..71a3233d4 100644
--- a/nuttx/sched/task/task_exit.c
+++ b/nuttx/sched/task/task_exit.c
@@ -41,7 +41,7 @@
#include <sched.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#ifndef CONFIG_DISABLE_SIGNALS
# include "signal/signal.h"
diff --git a/nuttx/sched/task/task_exithook.c b/nuttx/sched/task/task_exithook.c
index 7d086c52e..78a44ec50 100644
--- a/nuttx/sched/task/task_exithook.c
+++ b/nuttx/sched/task/task_exithook.c
@@ -48,7 +48,7 @@
#include <nuttx/sched.h>
#include <nuttx/fs/fs.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "signal/signal.h"
#include "task/task.h"
diff --git a/nuttx/sched/task/task_getgroup.c b/nuttx/sched/task/task_getgroup.c
index abb3e23c5..0145709c5 100644
--- a/nuttx/sched/task/task_getgroup.c
+++ b/nuttx/sched/task/task_getgroup.c
@@ -41,7 +41,7 @@
#include <sched.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "task/task.h"
diff --git a/nuttx/sched/task/task_getpid.c b/nuttx/sched/task/task_getpid.c
index 524dd1486..7f538bd1b 100644
--- a/nuttx/sched/task/task_getpid.c
+++ b/nuttx/sched/task/task_getpid.c
@@ -41,7 +41,7 @@
#include <unistd.h>
#include <sched.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "task/task.h"
/************************************************************************
diff --git a/nuttx/sched/task/task_init.c b/nuttx/sched/task/task_init.c
index a0ff9e750..f1fa91edf 100644
--- a/nuttx/sched/task/task_init.c
+++ b/nuttx/sched/task/task_init.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "task/task.h"
diff --git a/nuttx/sched/task/task_onexit.c b/nuttx/sched/task/task_onexit.c
index aa131c5af..71d671026 100644
--- a/nuttx/sched/task/task_onexit.c
+++ b/nuttx/sched/task/task_onexit.c
@@ -47,7 +47,7 @@
#include <nuttx/fs/fs.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "task/task.h"
#ifdef CONFIG_SCHED_ONEXIT
diff --git a/nuttx/sched/task/task_posixspawn.c b/nuttx/sched/task/task_posixspawn.c
index 9d4f8f9a3..2973cb544 100644
--- a/nuttx/sched/task/task_posixspawn.c
+++ b/nuttx/sched/task/task_posixspawn.c
@@ -45,7 +45,7 @@
#include <nuttx/binfmt/binfmt.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "task/spawn.h"
#include "task/task.h"
diff --git a/nuttx/sched/task/task_prctl.c b/nuttx/sched/task/task_prctl.c
index f0f1f2ebb..b0e00f316 100644
--- a/nuttx/sched/task/task_prctl.c
+++ b/nuttx/sched/task/task_prctl.c
@@ -47,7 +47,7 @@
#include <nuttx/sched.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "task/task.h"
/************************************************************************
diff --git a/nuttx/sched/task/task_reparent.c b/nuttx/sched/task/task_reparent.c
index 81a449bad..424356457 100644
--- a/nuttx/sched/task/task_reparent.c
+++ b/nuttx/sched/task/task_reparent.c
@@ -41,7 +41,7 @@
#include <errno.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "task/task.h"
diff --git a/nuttx/sched/task/task_restart.c b/nuttx/sched/task/task_restart.c
index dd3a78547..a62d723fb 100644
--- a/nuttx/sched/task/task_restart.c
+++ b/nuttx/sched/task/task_restart.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "signal/signal.h"
#include "task/task.h"
diff --git a/nuttx/sched/task/task_setup.c b/nuttx/sched/task/task_setup.c
index 89b0ec1d2..aece0a30e 100644
--- a/nuttx/sched/task/task_setup.c
+++ b/nuttx/sched/task/task_setup.c
@@ -48,7 +48,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "pthread/pthread.h"
#include "group/group.h"
#include "task/task.h"
diff --git a/nuttx/sched/task/task_spawn.c b/nuttx/sched/task/task_spawn.c
index 7678455fa..bc0eef13f 100644
--- a/nuttx/sched/task/task_spawn.c
+++ b/nuttx/sched/task/task_spawn.c
@@ -44,7 +44,7 @@
#include <spawn.h>
#include <debug.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "task/spawn.h"
#include "task/task.h"
diff --git a/nuttx/sched/task/task_start.c b/nuttx/sched/task/task_start.c
index 653e2794a..8cc7973f1 100644
--- a/nuttx/sched/task/task_start.c
+++ b/nuttx/sched/task/task_start.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
#include <nuttx/sched.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "task/task.h"
/****************************************************************************
diff --git a/nuttx/sched/task/task_terminate.c b/nuttx/sched/task/task_terminate.c
index 4c41e51e4..510883ce2 100644
--- a/nuttx/sched/task/task_terminate.c
+++ b/nuttx/sched/task/task_terminate.c
@@ -47,7 +47,7 @@
#include <nuttx/sched.h>
#include <arch/irq.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#ifndef CONFIG_DISABLE_SIGNALS
# include "signal/signal.h"
#endif
diff --git a/nuttx/sched/task/task_vfork.c b/nuttx/sched/task/task_vfork.c
index 963633964..35f464a21 100644
--- a/nuttx/sched/task/task_vfork.c
+++ b/nuttx/sched/task/task_vfork.c
@@ -48,7 +48,7 @@
#include <nuttx/sched.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "group/group.h"
#include "task/task.h"
diff --git a/nuttx/sched/wdog/wd_cancel.c b/nuttx/sched/wdog/wd_cancel.c
index 6ce3df837..9093deed8 100644
--- a/nuttx/sched/wdog/wd_cancel.c
+++ b/nuttx/sched/wdog/wd_cancel.c
@@ -44,7 +44,7 @@
#include <wdog.h>
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "wdog/wdog.h"
/****************************************************************************
diff --git a/nuttx/sched/wdog/wd_start.c b/nuttx/sched/wdog/wd_start.c
index a88cdceb6..88df3c276 100644
--- a/nuttx/sched/wdog/wd_start.c
+++ b/nuttx/sched/wdog/wd_start.c
@@ -50,7 +50,7 @@
#include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
#include "wdog/wdog.h"
/****************************************************************************