Move all pthread files from sched/ to sched/pthread

61 files changed, 57 insertions, 85 deletions

diff --git a/nuttx/include/nuttx/sched.h b/nuttx/include/nuttx/sched.h
index 259e14f66..f0e52de3f 100644
--- a/nuttx/include/nuttx/sched.h
+++ b/nuttx/include/nuttx/sched.h
@@ -290,7 +290,7 @@ struct dspace_s
 
 #ifndef CONFIG_DISABLE_PTHREAD
 struct join_s;                      /* Forward reference                        */
-                                    /* Defined in pthread_internal.h            */
+                                    /* Defined in sched/pthread/pthread.h       */
 #endif
 
 struct task_group_s
diff --git a/nuttx/sched/Makefile b/nuttx/sched/Makefile
index 3030f3ab5..3e5b5fbee 100644
--- a/nuttx/sched/Makefile
+++ b/nuttx/sched/Makefile
@@ -136,31 +136,6 @@ CLOCK_SRCS  = clock_initialize.c clock_settime.c clock_gettime.c clock_getres.c
 CLOCK_SRCS += clock_time2ticks.c clock_abstime2ticks.c clock_ticks2time.c
 CLOCK_SRCS += clock_gettimeofday.c clock_systimer.c
 
-SIGNAL_SRCS  = sig_initialize.c
-SIGNAL_SRCS += sig_action.c sig_procmask.c sig_pending.c sig_suspend.c
-SIGNAL_SRCS += sig_kill.c sig_queue.c sig_waitinfo.c sig_timedwait.c
-SIGNAL_SRCS += sig_findaction.c sig_allocatependingsigaction.c
-SIGNAL_SRCS += sig_releasependingsigaction.c sig_unmaskpendingsignal.c
-SIGNAL_SRCS += sig_removependingsignal.c sig_releasependingsignal.c sig_lowest.c
-SIGNAL_SRCS += sig_mqnotempty.c sig_cleanup.c sig_dispatch.c sig_deliver.c
-SIGNAL_SRCS += pause.c
-
-PTHREAD_SRCS  = pthread_create.c pthread_exit.c pthread_join.c pthread_detach.c
-PTHREAD_SRCS += pthread_yield.c pthread_getschedparam.c pthread_setschedparam.c
-PTHREAD_SRCS += pthread_mutexinit.c pthread_mutexdestroy.c
-PTHREAD_SRCS += pthread_mutexlock.c pthread_mutextrylock.c pthread_mutexunlock.c
-PTHREAD_SRCS += pthread_condinit.c pthread_conddestroy.c
-PTHREAD_SRCS += pthread_condwait.c pthread_condsignal.c pthread_condbroadcast.c
-PTHREAD_SRCS += pthread_barrierinit.c pthread_barrierdestroy.c pthread_barrierwait.c
-PTHREAD_SRCS += pthread_cancel.c pthread_setcancelstate.c
-PTHREAD_SRCS += pthread_keycreate.c pthread_setspecific.c pthread_getspecific.c pthread_keydelete.c
-PTHREAD_SRCS += pthread_initialize.c pthread_completejoin.c pthread_findjoininfo.c
-PTHREAD_SRCS += pthread_once.c pthread_release.c pthread_setschedprio.c
-
-ifneq ($(CONFIG_DISABLE_SIGNALS),y)
-PTHREAD_SRCS += pthread_condtimedwait.c pthread_kill.c pthread_sigmask.c
-endif
-
 SEM_SRCS  = sem_initialize.c sem_destroy.c sem_open.c sem_close.c sem_unlink.c
 SEM_SRCS += sem_wait.c sem_trywait.c sem_timedwait.c sem_post.c sem_findnamed.c
 
@@ -184,15 +159,12 @@ endif
 IRQ_SRCS = irq_initialize.c irq_attach.c irq_dispatch.c irq_unexpectedisr.c
 
 include signal/Make.defs
+include pthread/Make.defs
 include mqueue/Make.defs
 
 CSRCS  = $(MISC_SRCS) $(TSK_SRCS) $(GRP_SRCS) $(SCHED_SRCS) $(WDOG_SRCS)
 CSRCS += $(TIME_SRCS) $(SEM_SRCS) $(TIMER_SRCS) $(PGFILL_SRCS)
-CSRCS += $(IRQ_SRCS) $(CLOCK_SRCS) $(MQUEUE_SRCS) $(SIGNAL_SRCS)
-
-ifneq ($(CONFIG_DISABLE_PTHREAD),y)
-CSRCS += $(PTHREAD_SRCS)
-endif
+CSRCS += $(IRQ_SRCS) $(CLOCK_SRCS) $(MQUEUE_SRCS) $(SIGNAL_SRCS) $(PTHREAD_SRCS)
 
 ifneq ($(CONFIG_DISABLE_ENVIRON),y)
 CSRCS += $(ENV_SRCS)
diff --git a/nuttx/sched/group_leave.c b/nuttx/sched/group_leave.c
index 71eded8b1..5c5414f7f 100644
--- a/nuttx/sched/group_leave.c
+++ b/nuttx/sched/group_leave.c
@@ -50,7 +50,7 @@
 
 #include "env_internal.h"
 #include "signal/signal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 #include "mqueue/mqueue.h"
 #include "group_internal.h"
 
diff --git a/nuttx/sched/os_start.c b/nuttx/sched/os_start.c
index 9963cc3a1..e5feed422 100644
--- a/nuttx/sched/os_start.c
+++ b/nuttx/sched/os_start.c
@@ -59,7 +59,7 @@
 # include "mqueue/mqueue.h"
 #endif
 #ifndef CONFIG_DISABLE_PTHREAD
-# include "pthread_internal.h"
+# include "pthread/pthread.h"
 #endif
 #include  "clock_internal.h"
 #include  "timer_internal.h"
diff --git a/nuttx/sched/pthread_internal.h b/nuttx/sched/pthread/pthread.h
index d600e2481..a436bd090 100644
--- a/nuttx/sched/pthread_internal.h
+++ b/nuttx/sched/pthread/pthread.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * sched/pthread_internal.h
+ * sched/pthread/pthread.h
  *
- *   Copyright (C) 2007-2009, 2011, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011, 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __SCHED_PTHREAD_INTERNAL_H
-#define __SCHED_PTHREAD_INTERNAL_H
+#ifndef __SCHED_PTHREAD_PTHREAD_H
+#define __SCHED_PTHREAD_PTHREAD_H
 
 /****************************************************************************
  * Included Files
@@ -118,5 +118,5 @@ int pthread_mutexattr_verifytype(int type);
 }
 #endif
 
-#endif /* __SCHED_PTHREAD_INTERNAL_H */
+#endif /* __SCHED_PTHREAD_PTHREAD_H */
 
diff --git a/nuttx/sched/pthread_barrierdestroy.c b/nuttx/sched/pthread/pthread_barrierdestroy.c
index 40e8e875c..40e8e875c 100644
--- a/nuttx/sched/pthread_barrierdestroy.c
+++ b/nuttx/sched/pthread/pthread_barrierdestroy.c
diff --git a/nuttx/sched/pthread_barrierinit.c b/nuttx/sched/pthread/pthread_barrierinit.c
index 73b974b18..73b974b18 100644
--- a/nuttx/sched/pthread_barrierinit.c
+++ b/nuttx/sched/pthread/pthread_barrierinit.c
diff --git a/nuttx/sched/pthread_barrierwait.c b/nuttx/sched/pthread/pthread_barrierwait.c
index 397c7bad2..397c7bad2 100644
--- a/nuttx/sched/pthread_barrierwait.c
+++ b/nuttx/sched/pthread/pthread_barrierwait.c
diff --git a/nuttx/sched/pthread_cancel.c b/nuttx/sched/pthread/pthread_cancel.c
index ec464ae15..1b9e1e572 100644
--- a/nuttx/sched/pthread_cancel.c
+++ b/nuttx/sched/pthread/pthread_cancel.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 
 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /**************************************************************************
  * Private Definitions
diff --git a/nuttx/sched/pthread_completejoin.c b/nuttx/sched/pthread/pthread_completejoin.c
index f3a5928e6..cfe65176f 100644
--- a/nuttx/sched/pthread_completejoin.c
+++ b/nuttx/sched/pthread/pthread_completejoin.c
@@ -47,7 +47,7 @@
 
 #include "os_internal.h"
 #include "group_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/sched/pthread_condbroadcast.c b/nuttx/sched/pthread/pthread_condbroadcast.c
index 05f4bb483..1a7adae66 100644
--- a/nuttx/sched/pthread_condbroadcast.c
+++ b/nuttx/sched/pthread/pthread_condbroadcast.c
@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_conddestroy.c b/nuttx/sched/pthread/pthread_conddestroy.c
index 11292e639..0788aaf93 100644
--- a/nuttx/sched/pthread_conddestroy.c
+++ b/nuttx/sched/pthread/pthread_conddestroy.c
@@ -42,7 +42,7 @@
 #include <pthread.h>
 #include <debug.h>
 #include <errno.h>
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/nuttx/sched/pthread_condinit.c b/nuttx/sched/pthread/pthread_condinit.c
index e49bb8658..84f7d0405 100644
--- a/nuttx/sched/pthread_condinit.c
+++ b/nuttx/sched/pthread/pthread_condinit.c
@@ -43,7 +43,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/nuttx/sched/pthread_condsignal.c b/nuttx/sched/pthread/pthread_condsignal.c
index c7120d104..5a6995b37 100644
--- a/nuttx/sched/pthread_condsignal.c
+++ b/nuttx/sched/pthread/pthread_condsignal.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_condtimedwait.c b/nuttx/sched/pthread/pthread_condtimedwait.c
index 0a53918b8..3cc4dc4ee 100644
--- a/nuttx/sched/pthread_condtimedwait.c
+++ b/nuttx/sched/pthread/pthread_condtimedwait.c
@@ -51,7 +51,7 @@
 #include <debug.h>
 
 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 #include "clock_internal.h"
 #include "signal/signal.h"
 
diff --git a/nuttx/sched/pthread_condwait.c b/nuttx/sched/pthread/pthread_condwait.c
index bf0164d2d..9665193f5 100644
--- a/nuttx/sched/pthread_condwait.c
+++ b/nuttx/sched/pthread/pthread_condwait.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_create.c b/nuttx/sched/pthread/pthread_create.c
index 78142a6ed..1484ef634 100644
--- a/nuttx/sched/pthread_create.c
+++ b/nuttx/sched/pthread/pthread_create.c
@@ -55,7 +55,7 @@
 #include "os_internal.h"
 #include "group_internal.h"
 #include "clock_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/sched/pthread_detach.c b/nuttx/sched/pthread/pthread_detach.c
index 78c0e4f94..5b7f4a611 100644
--- a/nuttx/sched/pthread_detach.c
+++ b/nuttx/sched/pthread/pthread_detach.c
@@ -48,7 +48,7 @@
 
 #include "os_internal.h"
 #include "group_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/sched/pthread_exit.c b/nuttx/sched/pthread/pthread_exit.c
index da4a6d149..8e5c39670 100644
--- a/nuttx/sched/pthread_exit.c
+++ b/nuttx/sched/pthread/pthread_exit.c
@@ -50,7 +50,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_findjoininfo.c b/nuttx/sched/pthread/pthread_findjoininfo.c
index 8bcb4e407..0f49becfe 100644
--- a/nuttx/sched/pthread_findjoininfo.c
+++ b/nuttx/sched/pthread/pthread_findjoininfo.c
@@ -42,7 +42,7 @@
 #include <sys/types.h>
 
 #include "group_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_getschedparam.c b/nuttx/sched/pthread/pthread_getschedparam.c
index c376fd400..9c0743020 100644
--- a/nuttx/sched/pthread_getschedparam.c
+++ b/nuttx/sched/pthread/pthread_getschedparam.c
@@ -42,7 +42,7 @@
 #include <sched.h>
 #include <errno.h>
 #include <debug.h>
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_getspecific.c b/nuttx/sched/pthread/pthread_getspecific.c
index 1c87c29eb..dbed372d5 100644
--- a/nuttx/sched/pthread_getspecific.c
+++ b/nuttx/sched/pthread/pthread_getspecific.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_initialize.c b/nuttx/sched/pthread/pthread_initialize.c
index 71b13ebdc..cde71429e 100644
--- a/nuttx/sched/pthread_initialize.c
+++ b/nuttx/sched/pthread/pthread_initialize.c
@@ -43,7 +43,7 @@
 #include <semaphore.h>
 #include <errno.h>
 
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_join.c b/nuttx/sched/pthread/pthread_join.c
index 7db332327..3aeb133f3 100644
--- a/nuttx/sched/pthread_join.c
+++ b/nuttx/sched/pthread/pthread_join.c
@@ -45,7 +45,7 @@
 
 #include "os_internal.h"
 #include "group_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/sched/pthread_keycreate.c b/nuttx/sched/pthread/pthread_keycreate.c
index f9845960d..9d0e8f4e7 100644
--- a/nuttx/sched/pthread_keycreate.c
+++ b/nuttx/sched/pthread/pthread_keycreate.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_keydelete.c b/nuttx/sched/pthread/pthread_keydelete.c
index 0cbf950c0..f70a15cbb 100644
--- a/nuttx/sched/pthread_keydelete.c
+++ b/nuttx/sched/pthread/pthread_keydelete.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_kill.c b/nuttx/sched/pthread/pthread_kill.c
index 5a1506c0c..5a1506c0c 100644
--- a/nuttx/sched/pthread_kill.c
+++ b/nuttx/sched/pthread/pthread_kill.c
diff --git a/nuttx/sched/pthread_mutexdestroy.c b/nuttx/sched/pthread/pthread_mutexdestroy.c
index f66358534..ddbd66296 100644
--- a/nuttx/sched/pthread_mutexdestroy.c
+++ b/nuttx/sched/pthread/pthread_mutexdestroy.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_mutexinit.c b/nuttx/sched/pthread/pthread_mutexinit.c
index 265f014e3..08715d4b0 100644
--- a/nuttx/sched/pthread_mutexinit.c
+++ b/nuttx/sched/pthread/pthread_mutexinit.c
@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_mutexlock.c b/nuttx/sched/pthread/pthread_mutexlock.c
index d4e4237a5..2e786ad7d 100644
--- a/nuttx/sched/pthread_mutexlock.c
+++ b/nuttx/sched/pthread/pthread_mutexlock.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_mutextrylock.c b/nuttx/sched/pthread/pthread_mutextrylock.c
index d88012b51..a289bf8c3 100644
--- a/nuttx/sched/pthread_mutextrylock.c
+++ b/nuttx/sched/pthread/pthread_mutextrylock.c
@@ -46,7 +46,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_mutexunlock.c b/nuttx/sched/pthread/pthread_mutexunlock.c
index 0a3757e98..04a02af9c 100644
--- a/nuttx/sched/pthread_mutexunlock.c
+++ b/nuttx/sched/pthread/pthread_mutexunlock.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_once.c b/nuttx/sched/pthread/pthread_once.c
index 46b37c5a5..46b37c5a5 100644
--- a/nuttx/sched/pthread_once.c
+++ b/nuttx/sched/pthread/pthread_once.c
diff --git a/nuttx/sched/pthread_release.c b/nuttx/sched/pthread/pthread_release.c
index c66ff5187..b6afb5a2e 100644
--- a/nuttx/sched/pthread_release.c
+++ b/nuttx/sched/pthread/pthread_release.c
@@ -43,7 +43,7 @@
 #include <debug.h>
 
 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_setcancelstate.c b/nuttx/sched/pthread/pthread_setcancelstate.c
index 834dc4a59..834dc4a59 100644
--- a/nuttx/sched/pthread_setcancelstate.c
+++ b/nuttx/sched/pthread/pthread_setcancelstate.c
diff --git a/nuttx/sched/pthread_setschedparam.c b/nuttx/sched/pthread/pthread_setschedparam.c
index 019a7c7a5..3b24eb7f8 100644
--- a/nuttx/sched/pthread_setschedparam.c
+++ b/nuttx/sched/pthread/pthread_setschedparam.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_setschedprio.c b/nuttx/sched/pthread/pthread_setschedprio.c
index a523b20ea..a523b20ea 100644
--- a/nuttx/sched/pthread_setschedprio.c
+++ b/nuttx/sched/pthread/pthread_setschedprio.c
diff --git a/nuttx/sched/pthread_setspecific.c b/nuttx/sched/pthread/pthread_setspecific.c
index 16401fbe6..32a26224f 100644
--- a/nuttx/sched/pthread_setspecific.c
+++ b/nuttx/sched/pthread/pthread_setspecific.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/pthread_sigmask.c b/nuttx/sched/pthread/pthread_sigmask.c
index c66b8591c..c66b8591c 100644
--- a/nuttx/sched/pthread_sigmask.c
+++ b/nuttx/sched/pthread/pthread_sigmask.c
diff --git a/nuttx/sched/pthread_yield.c b/nuttx/sched/pthread/pthread_yield.c
index c4535b9db..c4535b9db 100644
--- a/nuttx/sched/pthread_yield.c
+++ b/nuttx/sched/pthread/pthread_yield.c
diff --git a/nuttx/sched/signal/sig_action.c b/nuttx/sched/signal/sig_action.c
index bd17e4f9f..6f07226cf 100644
--- a/nuttx/sched/signal/sig_action.c
+++ b/nuttx/sched/signal/sig_action.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_action.c
+ * sched/signal/sig_action.c
  *
  *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_allocatependingsigaction.c b/nuttx/sched/signal/sig_allocatependingsigaction.c
index fa8236ee8..8fadfc97a 100644
--- a/nuttx/sched/signal/sig_allocatependingsigaction.c
+++ b/nuttx/sched/signal/sig_allocatependingsigaction.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_allocatependingsigaction.c
+ * sched/signal/sig_allocatependingsigaction.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_cleanup.c b/nuttx/sched/signal/sig_cleanup.c
index 535c6273a..7848c12f4 100644
--- a/nuttx/sched/signal/sig_cleanup.c
+++ b/nuttx/sched/signal/sig_cleanup.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_cleanup.c
+ * sched/signal/sig_cleanup.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_deliver.c b/nuttx/sched/signal/sig_deliver.c
index 6e40db179..442e6c61d 100644
--- a/nuttx/sched/signal/sig_deliver.c
+++ b/nuttx/sched/signal/sig_deliver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_deliver.c
+ * sched/signal/sig_deliver.c
  *
  *   Copyright (C) 2007, 2008, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_dispatch.c b/nuttx/sched/signal/sig_dispatch.c
index 6cada00af..af5339743 100644
--- a/nuttx/sched/signal/sig_dispatch.c
+++ b/nuttx/sched/signal/sig_dispatch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_dispatch.c
+ * sched/signal/sig_dispatch.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_findaction.c b/nuttx/sched/signal/sig_findaction.c
index be8149698..82a85c634 100644
--- a/nuttx/sched/signal/sig_findaction.c
+++ b/nuttx/sched/signal/sig_findaction.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_findaction.c
+ * sched/signal/sig_findaction.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_initialize.c b/nuttx/sched/signal/sig_initialize.c
index cd76c6795..2497962fe 100644
--- a/nuttx/sched/signal/sig_initialize.c
+++ b/nuttx/sched/signal/sig_initialize.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_initialize.c
+ * sched/signal/sig_initialize.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_kill.c b/nuttx/sched/signal/sig_kill.c
index e9d110b61..cceb38fe5 100644
--- a/nuttx/sched/signal/sig_kill.c
+++ b/nuttx/sched/signal/sig_kill.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_kill.c
+ * sched/signal/sig_kill.c
  *
  *   Copyright (C) 2007, 2009, 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_lowest.c b/nuttx/sched/signal/sig_lowest.c
index c84d7bfee..a556f45b7 100644
--- a/nuttx/sched/signal/sig_lowest.c
+++ b/nuttx/sched/signal/sig_lowest.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_lowest.c
+ * sched/signal/sig_lowest.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_mqnotempty.c b/nuttx/sched/signal/sig_mqnotempty.c
index 3e7412ecd..bee8270d6 100644
--- a/nuttx/sched/signal/sig_mqnotempty.c
+++ b/nuttx/sched/signal/sig_mqnotempty.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_mqnotempty.c
+ * sched/signal/sig_mqnotempty.c
  *
  *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_pending.c b/nuttx/sched/signal/sig_pending.c
index 916960475..5dadaca68 100644
--- a/nuttx/sched/signal/sig_pending.c
+++ b/nuttx/sched/signal/sig_pending.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_pending.c
+ * sched/signal/sig_pending.c
  *
  *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_procmask.c b/nuttx/sched/signal/sig_procmask.c
index eb065af3a..6a74c6fa7 100644
--- a/nuttx/sched/signal/sig_procmask.c
+++ b/nuttx/sched/signal/sig_procmask.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_procmask.c
+ * sched/signal/sig_procmask.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_queue.c b/nuttx/sched/signal/sig_queue.c
index 515662250..2933e7140 100644
--- a/nuttx/sched/signal/sig_queue.c
+++ b/nuttx/sched/signal/sig_queue.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_queue.c
+ * sched/signal/sig_queue.c
  *
  *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_releasependingsigaction.c b/nuttx/sched/signal/sig_releasependingsigaction.c
index e5fbf8a7a..33b0714bd 100644
--- a/nuttx/sched/signal/sig_releasependingsigaction.c
+++ b/nuttx/sched/signal/sig_releasependingsigaction.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_releasependingsigaction.c
+ * sched/signal/sig_releasependingsigaction.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_releasependingsignal.c b/nuttx/sched/signal/sig_releasependingsignal.c
index 392b825b3..90281e8bf 100644
--- a/nuttx/sched/signal/sig_releasependingsignal.c
+++ b/nuttx/sched/signal/sig_releasependingsignal.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_releasependingsignal.c
+ * sched/signal/sig_releasependingsignal.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_removependingsignal.c b/nuttx/sched/signal/sig_removependingsignal.c
index 723ab3b74..0b4bebbb5 100644
--- a/nuttx/sched/signal/sig_removependingsignal.c
+++ b/nuttx/sched/signal/sig_removependingsignal.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_removependingsignal.c
+ * sched/signal/sig_removependingsignal.c
  *
  *   Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_suspend.c b/nuttx/sched/signal/sig_suspend.c
index d434761c8..809f43b0b 100644
--- a/nuttx/sched/signal/sig_suspend.c
+++ b/nuttx/sched/signal/sig_suspend.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_suspend.c
+ * sched/signal/sig_suspend.c
  *
  *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_timedwait.c b/nuttx/sched/signal/sig_timedwait.c
index 0e4635ad6..e01f35807 100644
--- a/nuttx/sched/signal/sig_timedwait.c
+++ b/nuttx/sched/signal/sig_timedwait.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_timedwait.c
+ * sched/signal/sig_timedwait.c
  *
  *   Copyright (C) 2007-2009, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_unmaskpendingsignal.c b/nuttx/sched/signal/sig_unmaskpendingsignal.c
index 8d13b7a0f..9fe76762d 100644
--- a/nuttx/sched/signal/sig_unmaskpendingsignal.c
+++ b/nuttx/sched/signal/sig_unmaskpendingsignal.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/sig_unmaskpendingsignal.c
+ * sched/signal/sig_unmaskpendingsignal.c
  *
  *   Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/signal/sig_waitinfo.c b/nuttx/sched/signal/sig_waitinfo.c
index 0172ec47d..0ea81c578 100644
--- a/nuttx/sched/signal/sig_waitinfo.c
+++ b/nuttx/sched/signal/sig_waitinfo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/sig_waitinfo.c
+ * sched/signal/sig_waitinfo.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/sched/task_setup.c b/nuttx/sched/task_setup.c
index 3e798f407..28d5ecdd8 100644
--- a/nuttx/sched/task_setup.c
+++ b/nuttx/sched/task_setup.c
@@ -49,7 +49,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "pthread_internal.h"
+#include "pthread/pthread.h"
 #include "group_internal.h"
 
 /****************************************************************************