Partial (non-working) checked in before the big, risky automated change

35 files changed, 71 insertions, 101 deletions

diff --git a/nuttx/sched/Makefile b/nuttx/sched/Makefile
index 5a9a9f629..ff497fe66 100644
--- a/nuttx/sched/Makefile
+++ b/nuttx/sched/Makefile
@@ -38,43 +38,11 @@
 VPATH =
 DEPPATH = --dep-path .
 
-ASRCS =
-
-SCHED_SRCS  = sched_garbage.c sched_getfiles.c
-SCHED_SRCS += sched_addreadytorun.c sched_removereadytorun.c sched_addprioritized.c
-SCHED_SRCS += sched_mergepending.c sched_addblocked.c sched_removeblocked.c
-SCHED_SRCS += sched_free.c sched_gettcb.c sched_verifytcb.c sched_releasetcb.c
-SCHED_SRCS += sched_getsockets.c sched_getstreams.c
-SCHED_SRCS += sched_setparam.c sched_setpriority.c sched_getparam.c
-SCHED_SRCS += sched_setscheduler.c sched_getscheduler.c
-SCHED_SRCS += sched_yield.c sched_rrgetinterval.c sched_foreach.c
-SCHED_SRCS += sched_lock.c sched_unlock.c sched_lockcount.c sched_self.c
-
-ifeq ($(CONFIG_PRIORITY_INHERITANCE),y)
-SCHED_SRCS += sched_reprioritize.c
-endif
-
-ifeq ($(CONFIG_SCHED_WAITPID),y)
-SCHED_SRCS += sched_waitpid.c
-ifeq ($(CONFIG_SCHED_HAVE_PARENT),y)
-SCHED_SRCS += sched_waitid.c sched_wait.c
-endif
-endif
-
-ifeq ($(CONFIG_SCHED_CPULOAD),y)
-SCHED_SRCS += sched_cpuload.c
-endif
-
-ifeq ($(CONFIG_SCHED_TICKLESS),y)
-SCHED_SRCS += sched_timerexpiration.c
-else
-SCHED_SRCS += sched_processtimer.c
-endif
-
 include init/Make.defs
 include irq/Make.defs
 include paging/Make.defs
 include group/Make.defs
+include sched/Make.defs
 include task/Make.defs
 include errno/Make.defs
 include wdog/Make.defs
@@ -89,6 +57,8 @@ include environ/Make.defs
 # REVISIT
 TSK_SRCS += exit.c
 
+ASRCS =
+
 CSRCS  = $(INIT_SRCS) $(IRQ_SRCS) $(PG_SRCS) $(GRP_SRCS) $(SCHED_SRCS)
 CSRCS += $(TSK_SRCS) $(ERRNO_SRCS) $(WDOG_SRCS) $(SEM_SRCS)
 CSRCS += $(SIGNAL_SRCS) $(PTHREAD_SRCS) $(MQUEUE_SRCS) $(CLOCK_SRCS)
diff --git a/nuttx/sched/os_internal.h b/nuttx/sched/sched/sched.h
index 9307fb313..47d6838f8 100644
--- a/nuttx/sched/os_internal.h
+++ b/nuttx/sched/sched/sched.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/os_internal.h
+ * sched/sched/sched.h
  *
  *   Copyright (C) 2007-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __SCHED_OS_INTERNAL_H
-#define __SCHED_OS_INTERNAL_H
+#ifndef __SCHED_SCHED_SCHED_H
+#define __SCHED_SCHED_SCHED_H
 
 /****************************************************************************
  * Included Files
@@ -247,4 +247,4 @@ void weak_function sched_process_cpuload(void);
 bool sched_verifytcb(FAR struct tcb_s *tcb);
 int  sched_releasetcb(FAR struct tcb_s *tcb, uint8_t ttype);
 
-#endif /* __SCHED_OS_INTERNAL_H */
+#endif /* __SCHED_SCHED_SCHED_H */
diff --git a/nuttx/sched/sched_addblocked.c b/nuttx/sched/sched/sched_addblocked.c
index 70191797e..1a3fc9098 100644
--- a/nuttx/sched/sched_addblocked.c
+++ b/nuttx/sched/sched/sched_addblocked.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_addblocked.c
+ * sched/sched/sched_addblocked.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -42,7 +42,7 @@
 #include <queue.h>
 #include <assert.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /************************************************************************
  * Definitions
diff --git a/nuttx/sched/sched_addprioritized.c b/nuttx/sched/sched/sched_addprioritized.c
index 9940e1874..d132f335e 100644
--- a/nuttx/sched/sched_addprioritized.c
+++ b/nuttx/sched/sched/sched_addprioritized.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_addprioritized.c
+ * sched/sched/sched_addprioritized.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,7 +44,7 @@
 #include <queue.h>
 #include <assert.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/sched/sched_addreadytorun.c b/nuttx/sched/sched/sched_addreadytorun.c
index 156598cd2..5cd535940 100644
--- a/nuttx/sched/sched_addreadytorun.c
+++ b/nuttx/sched/sched/sched_addreadytorun.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sched_addreadytorun.c
+ * sched/sched/sched_addreadytorun.c
  *
  *   Copyright (C) 2007-2009, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -43,7 +43,7 @@
 #include <queue.h>
 #include <assert.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/sched/sched_cpuload.c b/nuttx/sched/sched/sched_cpuload.c
index 5a6bf6cc6..fe9305b3d 100644
--- a/nuttx/sched/sched_cpuload.c
+++ b/nuttx/sched/sched/sched_cpuload.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_cpuload.c
+ * sched/sched/sched_cpuload.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -45,7 +45,7 @@
 #include <nuttx/clock.h>
 #include <arch/irq.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 #ifdef CONFIG_SCHED_CPULOAD
 
diff --git a/nuttx/sched/sched_foreach.c b/nuttx/sched/sched/sched_foreach.c
index e2e079889..67badcedd 100644
--- a/nuttx/sched/sched_foreach.c
+++ b/nuttx/sched/sched/sched_foreach.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_foreach.c
+ * sched/sched/sched_foreach.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -38,7 +38,7 @@
  ************************************************************************/
 
 #include <sched.h>
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /************************************************************************
  * Global Functions
diff --git a/nuttx/sched/sched_free.c b/nuttx/sched/sched/sched_free.c
index 7442a4d09..93d7dea1b 100644
--- a/nuttx/sched/sched_free.c
+++ b/nuttx/sched/sched/sched_free.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_free.c
+ * sched/sched/sched_free.c
  *
  *   Copyright (C) 2007, 2009, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -45,7 +45,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /************************************************************************
  * Definitions
diff --git a/nuttx/sched/sched_garbage.c b/nuttx/sched/sched/sched_garbage.c
index 8609bb27d..7a6839cb1 100644
--- a/nuttx/sched/sched_garbage.c
+++ b/nuttx/sched/sched/sched_garbage.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sched_garbage.c
+ * sched/sched/sched_garbage.c
  *
  *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 #include <nuttx/kmalloc.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/sched/sched_getfiles.c b/nuttx/sched/sched/sched_getfiles.c
index abb051ef3..b31999371 100644
--- a/nuttx/sched/sched_getfiles.c
+++ b/nuttx/sched/sched/sched_getfiles.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_getfiles.c
+ * sched/sched/sched_getfiles.c
  *
  *   Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 #include <sched.h>
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /************************************************************************
  * Private Functions
diff --git a/nuttx/sched/sched_getparam.c b/nuttx/sched/sched/sched_getparam.c
index 9fb829474..f4d5dbb9b 100644
--- a/nuttx/sched/sched_getparam.c
+++ b/nuttx/sched/sched/sched_getparam.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_getparam.c
+ * sched/sched/sched_getparam.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -42,7 +42,7 @@
 #include <sys/types.h>
 #include <sched.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /************************************************************************
  * Definitions
diff --git a/nuttx/sched/sched_getscheduler.c b/nuttx/sched/sched/sched_getscheduler.c
index 4d0ed950a..6fde0d499 100644
--- a/nuttx/sched/sched_getscheduler.c
+++ b/nuttx/sched/sched/sched_getscheduler.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_getscheduler.c
+ * sched/sched/sched_getscheduler.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -45,7 +45,7 @@
 
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /************************************************************************
  * Definitions
diff --git a/nuttx/sched/sched_getsockets.c b/nuttx/sched/sched/sched_getsockets.c
index 17d1382ce..764e2ffd2 100644
--- a/nuttx/sched/sched_getsockets.c
+++ b/nuttx/sched/sched/sched_getsockets.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_getsockets.c
+ * sched/sched/sched_getsockets.c
  *
  *   Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 
 #include <sched.h>
-#include "os_internal.h"
+#include "sched/sched.h"
 
 #if CONFIG_NSOCKET_DESCRIPTORS > 0
 
diff --git a/nuttx/sched/sched_getstreams.c b/nuttx/sched/sched/sched_getstreams.c
index 3d9e0e3d1..f11015b57 100644
--- a/nuttx/sched/sched_getstreams.c
+++ b/nuttx/sched/sched/sched_getstreams.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sched_getstreams.c
+ * sched/sched/sched_getstreams.c
  *
  *   Copyright (C) 2007, 2008, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 #include <sched.h>
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /****************************************************************************
  * Private Functions
diff --git a/nuttx/sched/sched_gettcb.c b/nuttx/sched/sched/sched_gettcb.c
index 101f6d413..d46a15604 100644
--- a/nuttx/sched/sched_gettcb.c
+++ b/nuttx/sched/sched/sched_gettcb.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sched_gettcb.c
+ * sched/sched/sched_gettcb.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -41,7 +41,7 @@
 
 #include <sched.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/sched_lock.c b/nuttx/sched/sched/sched_lock.c
index 90a39d27d..1837a1e5e 100644
--- a/nuttx/sched/sched_lock.c
+++ b/nuttx/sched/sched/sched_lock.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_lock.c
+ * sched/sched/sched_lock.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -43,7 +43,7 @@
 #include <assert.h>
 
 #include <nuttx/arch.h>
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /************************************************************************
  * Definitions
diff --git a/nuttx/sched/sched_lockcount.c b/nuttx/sched/sched/sched_lockcount.c
index d1eccab40..bfb70e9d1 100644
--- a/nuttx/sched/sched_lockcount.c
+++ b/nuttx/sched/sched/sched_lockcount.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_lockcount.c
+ * sched/sched/sched_lockcount.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -41,7 +41,7 @@
 
 #include <stdint.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /************************************************************************
  * Definitions
diff --git a/nuttx/sched/sched_mergepending.c b/nuttx/sched/sched/sched_mergepending.c
index 885fec832..6ba03662a 100644
--- a/nuttx/sched/sched_mergepending.c
+++ b/nuttx/sched/sched/sched_mergepending.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_mergepending.c
+ * sched/sched/sched_mergepending.c
  *
  *   Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,7 +44,7 @@
 #include <queue.h>
 #include <assert.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/sched/sched_processtimer.c b/nuttx/sched/sched/sched_processtimer.c
index 86bee80b8..3c31a2559 100644
--- a/nuttx/sched/sched_processtimer.c
+++ b/nuttx/sched/sched/sched_processtimer.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_processtimer.c
+ * sched/sched/sched_processtimer.c
  *
  *   Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -46,7 +46,7 @@
 # include <nuttx/arch.h>
 #endif
 
-#include "os_internal.h"
+#include "sched/sched.h"
 #include "wdog/wdog.h"
 #include "clock/clock.h"
 
diff --git a/nuttx/sched/sched_releasetcb.c b/nuttx/sched/sched/sched_releasetcb.c
index 69d7d99d3..7c7eeae3a 100644
--- a/nuttx/sched/sched_releasetcb.c
+++ b/nuttx/sched/sched/sched_releasetcb.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_releasetcb.c
+ * sched/sched/sched_releasetcb.c
  *
  *   Copyright (C) 2007, 2009, 2012-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 #include "group/group.h"
 #include "timer/timer.h"
 
diff --git a/nuttx/sched/sched_removeblocked.c b/nuttx/sched/sched/sched_removeblocked.c
index c21f555ec..216b26273 100644
--- a/nuttx/sched/sched_removeblocked.c
+++ b/nuttx/sched/sched/sched_removeblocked.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_removeblocked.c
+ * sched/sched/sched_removeblocked.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -42,7 +42,7 @@
 #include <queue.h>
 #include <assert.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /************************************************************************
  * Definitions
diff --git a/nuttx/sched/sched_removereadytorun.c b/nuttx/sched/sched/sched_removereadytorun.c
index b1f215a92..d89ecb9e3 100644
--- a/nuttx/sched/sched_removereadytorun.c
+++ b/nuttx/sched/sched/sched_removereadytorun.c
@@ -43,7 +43,7 @@
 #include <queue.h>
 #include <assert.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/sched/sched_reprioritize.c b/nuttx/sched/sched/sched_reprioritize.c
index 66a29c42b..917ec8715 100644
--- a/nuttx/sched/sched_reprioritize.c
+++ b/nuttx/sched/sched/sched_reprioritize.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sched_reprioritize.c
+ * sched/sched/sched_reprioritize.c
  *
  *   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -43,7 +43,7 @@
 #include <sched.h>
 #include <errno.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 #ifdef CONFIG_PRIORITY_INHERITANCE
 
diff --git a/nuttx/sched/sched_rrgetinterval.c b/nuttx/sched/sched/sched_rrgetinterval.c
index 9790f461d..61d8c6bc5 100644
--- a/nuttx/sched/sched_rrgetinterval.c
+++ b/nuttx/sched/sched/sched_rrgetinterval.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_rrgetinterval.c
+ * sched/sched/sched_rrgetinterval.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -45,7 +45,7 @@
 
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 #include "clock/clock.h"
 
 /************************************************************************
diff --git a/nuttx/sched/sched_self.c b/nuttx/sched/sched/sched_self.c
index 901fb6e69..75c417706 100644
--- a/nuttx/sched/sched_self.c
+++ b/nuttx/sched/sched/sched_self.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sched_self.c
+ * sched/sched/sched_self.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -39,7 +39,7 @@
 
 #include <sys/types.h>
 #include <sched.h>
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/sched_setparam.c b/nuttx/sched/sched/sched_setparam.c
index 828f38101..2d954a23b 100644
--- a/nuttx/sched/sched_setparam.c
+++ b/nuttx/sched/sched/sched_setparam.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sched_setparam.c
+ * sched/sched/sched_setparam.c
  *
  *   Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -45,7 +45,7 @@
 
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/sched_setpriority.c b/nuttx/sched/sched/sched_setpriority.c
index 13f177271..ab2b0ec8e 100644
--- a/nuttx/sched/sched_setpriority.c
+++ b/nuttx/sched/sched/sched_setpriority.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sched_setpriority.c
+ * sched/sched/sched_setpriority.c
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/sched_setscheduler.c b/nuttx/sched/sched/sched_setscheduler.c
index 3aaae4013..62aa9cac2 100644
--- a/nuttx/sched/sched_setscheduler.c
+++ b/nuttx/sched/sched/sched_setscheduler.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sched_setscheduler.c
+ * sched/sched/sched_setscheduler.c
  *
  *   Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -46,7 +46,7 @@
 
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 #include "clock/clock.h"
 
 /****************************************************************************
diff --git a/nuttx/sched/sched_timerexpiration.c b/nuttx/sched/sched/sched_timerexpiration.c
index 60acda509..c721005d9 100644
--- a/nuttx/sched/sched_timerexpiration.c
+++ b/nuttx/sched/sched/sched_timerexpiration.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_timerexpiration.c
+ * sched/sched/sched_timerexpiration.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,7 +49,7 @@
 # include <nuttx/arch.h>
 #endif
 
-#include "os_internal.h"
+#include "sched/sched.h"
 #include "wdog/wdog.h"
 #include "clock/clock.h"
 
diff --git a/nuttx/sched/sched_unlock.c b/nuttx/sched/sched/sched_unlock.c
index df3b966e7..2673d32af 100644
--- a/nuttx/sched/sched_unlock.c
+++ b/nuttx/sched/sched/sched_unlock.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sched_unlock.c
+ * sched/sched/sched_unlock.c
  *
  *   Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -42,7 +42,7 @@
 #include <nuttx/clock.h>
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/sched/sched_verifytcb.c b/nuttx/sched/sched/sched_verifytcb.c
index 638acb361..d9fb34f2d 100644
--- a/nuttx/sched/sched_verifytcb.c
+++ b/nuttx/sched/sched/sched_verifytcb.c
@@ -42,7 +42,7 @@
 #include <stdbool.h>
 #include <sched.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/sched_wait.c b/nuttx/sched/sched/sched_wait.c
index 9a6265e70..d2efd8ee2 100644
--- a/nuttx/sched/sched_wait.c
+++ b/nuttx/sched/sched/sched_wait.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * sched/sched_wait.c
+ * sched/sched/sched_wait.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -45,7 +45,7 @@
 
 #include <nuttx/sched.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 #if defined(CONFIG_SCHED_WAITPID) && defined(CONFIG_SCHED_HAVE_PARENT)
 
diff --git a/nuttx/sched/sched_waitid.c b/nuttx/sched/sched/sched_waitid.c
index 7329ef946..b1b0587f6 100644
--- a/nuttx/sched/sched_waitid.c
+++ b/nuttx/sched/sched/sched_waitid.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * sched/sched_waitid.c
+ * sched/sched/sched_waitid.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -45,7 +45,7 @@
 
 #include <nuttx/sched.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 #include "group/group.h"
 
 #if defined(CONFIG_SCHED_WAITPID) && defined(CONFIG_SCHED_HAVE_PARENT)
diff --git a/nuttx/sched/sched_waitpid.c b/nuttx/sched/sched/sched_waitpid.c
index 48f932878..61c846e82 100644
--- a/nuttx/sched/sched_waitpid.c
+++ b/nuttx/sched/sched/sched_waitpid.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * sched/sched_waitpid.c
+ * sched/sched/sched_waitpid.c
  *
  *   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -46,7 +46,7 @@
 
 #include <nuttx/sched.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 #include "group/group.h"
 
 #ifdef CONFIG_SCHED_WAITPID
diff --git a/nuttx/sched/sched_yield.c b/nuttx/sched/sched/sched_yield.c
index 4972668c7..a4a3c744e 100644
--- a/nuttx/sched/sched_yield.c
+++ b/nuttx/sched/sched/sched_yield.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sched_yield.c
+ * sched/sched/sched_yield.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -41,7 +41,7 @@
 
 #include <nuttx/arch.h>
 
-#include "os_internal.h"
+#include "sched/sched.h"
 
 /****************************************************************************
  * Definitions