diff --git a/sched/Makefile b/sched/Makefile
index 0e07c5ba1b..9e862c3d68 100644
--- a/sched/Makefile
+++ b/sched/Makefile
@@ -100,9 +100,6 @@ ifeq ($(CONFIG_SCHED_CPULOAD),y)
 SCHED_SRCS += sched_cpuload.c
 endif
 
-WDOG_SRCS = wd_initialize.c wd_create.c wd_start.c wd_cancel.c wd_delete.c
-WDOG_SRCS += wd_gettime.c
-
 ifeq ($(CONFIG_SCHED_TICKLESS),y)
 TIME_SRCS += sched_timerexpiration.c
 else
@@ -129,16 +126,17 @@ endif
 IRQ_SRCS = irq_initialize.c irq_attach.c irq_dispatch.c irq_unexpectedisr.c
 
 include group/Make.defs
+include wdog/Make.defs
 include semaphore/Make.defs
 include signal/Make.defs
 include pthread/Make.defs
 include mqueue/Make.defs
 include environ/Make.defs
 
-CSRCS  = $(MISC_SRCS) $(TSK_SRCS) $(SCHED_SRCS) $(WDOG_SRCS)
+CSRCS  = $(MISC_SRCS) $(TSK_SRCS) $(SCHED_SRCS)
 CSRCS += $(TIME_SRCS)  $(TIMER_SRCS) $(PGFILL_SRCS)
 CSRCS += $(IRQ_SRCS) $(CLOCK_SRCS)
-CSRCS += $(GRP_SRCS) $(SEM_SRCS) $(SIGNAL_SRCS) $(PTHREAD_SRCS) $(MQUEUE_SRCS) $(ENV_SRCS)
+CSRCS += $(GRP_SRCS) $(WDOG_SRCS) $(SEM_SRCS) $(SIGNAL_SRCS) $(PTHREAD_SRCS) $(MQUEUE_SRCS) $(ENV_SRCS)
 
 COBJS = $(CSRCS:.c=$(OBJEXT))
 
diff --git a/sched/mqueue/mq_unlink.c b/sched/mqueue/mq_unlink.c
index 2da4780fca..e63ce5a1c8 100644
--- a/sched/mqueue/mq_unlink.c
+++ b/sched/mqueue/mq_unlink.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched.mq_unlink.c
+ * sched/mqueue/mq_unlink.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/os_start.c b/sched/os_start.c
index 618ddeb081..4fa096327e 100644
--- a/sched/os_start.c
+++ b/sched/os_start.c
@@ -53,7 +53,7 @@
 
 #include  "os_internal.h"
 #include  "signal/signal.h"
-#include  "wd_internal.h"
+#include  "wdog/wdog.h"
 #include  "semaphore/semaphore.h"
 #ifndef CONFIG_DISABLE_MQUEUE
 # include "mqueue/mqueue.h"
diff --git a/sched/pthread/pthread_barrierdestroy.c b/sched/pthread/pthread_barrierdestroy.c
index 40e8e875cb..4501e80e7a 100644
--- a/sched/pthread/pthread_barrierdestroy.c
+++ b/sched/pthread/pthread_barrierdestroy.c
@@ -1,5 +1,5 @@
 /********************************************************************************
- * sched/pthread_barriedestroy.c
+ * sched/pthread/pthread_barriedestroy.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_barrierinit.c b/sched/pthread/pthread_barrierinit.c
index 73b974b180..aa9dad0891 100644
--- a/sched/pthread/pthread_barrierinit.c
+++ b/sched/pthread/pthread_barrierinit.c
@@ -1,5 +1,5 @@
 /********************************************************************************
- * sched/pthread_barrieinit.c
+ * sched/pthread/pthread_barrieinit.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_barrierwait.c b/sched/pthread/pthread_barrierwait.c
index 397c7bad24..16ad78ccd1 100644
--- a/sched/pthread/pthread_barrierwait.c
+++ b/sched/pthread/pthread_barrierwait.c
@@ -1,5 +1,5 @@
 /********************************************************************************
- * sched/pthread_barrierwait.c
+ * sched/pthread/pthread_barrierwait.c
  *
  *   Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_cancel.c b/sched/pthread/pthread_cancel.c
index 1b9e1e5729..9dea9ad695 100644
--- a/sched/pthread/pthread_cancel.c
+++ b/sched/pthread/pthread_cancel.c
@@ -1,5 +1,5 @@
 /**************************************************************************
- * sched/pthread_cancel.c
+ * sched/pthread/pthread_cancel.c
  *
  *   Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_completejoin.c b/sched/pthread/pthread_completejoin.c
index cb9f970de2..e0eceee6a3 100644
--- a/sched/pthread/pthread_completejoin.c
+++ b/sched/pthread/pthread_completejoin.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/pthread_completejoin.c
+ * sched/pthread/pthread_completejoin.c
  *
  *   Copyright (C) 2007, 2009, 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_condbroadcast.c b/sched/pthread/pthread_condbroadcast.c
index 1a7adae66f..7b010149df 100644
--- a/sched/pthread/pthread_condbroadcast.c
+++ b/sched/pthread/pthread_condbroadcast.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pthread_condbroadcast.c
+ * sched/pthread/pthread_condbroadcast.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_conddestroy.c b/sched/pthread/pthread_conddestroy.c
index 0788aaf934..1b144be728 100644
--- a/sched/pthread/pthread_conddestroy.c
+++ b/sched/pthread/pthread_conddestroy.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pthread_conddestroy.c
+ * sched/pthread/pthread_conddestroy.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_condinit.c b/sched/pthread/pthread_condinit.c
index 84f7d04052..358d267111 100644
--- a/sched/pthread/pthread_condinit.c
+++ b/sched/pthread/pthread_condinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pthread_condinit.c
+ * sched/pthread/pthread_condinit.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_condsignal.c b/sched/pthread/pthread_condsignal.c
index 5a6995b376..6d4740d38f 100644
--- a/sched/pthread/pthread_condsignal.c
+++ b/sched/pthread/pthread_condsignal.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pthread_condsignal.c
+ * sched/pthread/pthread_condsignal.c
  *
  *   Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_condtimedwait.c b/sched/pthread/pthread_condtimedwait.c
index 3cc4dc4eed..bd883d253c 100644
--- a/sched/pthread/pthread_condtimedwait.c
+++ b/sched/pthread/pthread_condtimedwait.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pthread_condtimedwait.c
+ * sched/pthread/pthread_condtimedwait.c
  *
  *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_condwait.c b/sched/pthread/pthread_condwait.c
index 9665193f5d..7b78be9e91 100644
--- a/sched/pthread/pthread_condwait.c
+++ b/sched/pthread/pthread_condwait.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pthread_condwait.c
+ * sched/pthread/pthread_condwait.c
  *
  *   Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_create.c b/sched/pthread/pthread_create.c
index c82ed08faf..a4b583e231 100644
--- a/sched/pthread/pthread_create.c
+++ b/sched/pthread/pthread_create.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pthread_create.c
+ * sched/pthread/pthread_create.c
  *
  *   Copyright (C) 2007-2009, 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_detach.c b/sched/pthread/pthread_detach.c
index 2f5a3be86f..95762b6c1a 100644
--- a/sched/pthread/pthread_detach.c
+++ b/sched/pthread/pthread_detach.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/pthread_detach.c
+ * sched/pthread/pthread_detach.c
  *
  *   Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_exit.c b/sched/pthread/pthread_exit.c
index 8e5c39670a..3ca5362f72 100644
--- a/sched/pthread/pthread_exit.c
+++ b/sched/pthread/pthread_exit.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/pthread_exit.c
+ * sched/pthread/pthread_exit.c
  *
  *   Copyright (C) 2007, 2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_getspecific.c b/sched/pthread/pthread_getspecific.c
index dbed372d5b..bc097372b5 100644
--- a/sched/pthread/pthread_getspecific.c
+++ b/sched/pthread/pthread_getspecific.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/pthread_getspecific.c
+ * sched/pthread/pthread_getspecific.c
  *
  *   Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_initialize.c b/sched/pthread/pthread_initialize.c
index cde71429e0..36b5c56539 100644
--- a/sched/pthread/pthread_initialize.c
+++ b/sched/pthread/pthread_initialize.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pthread_initialize.c
+ * sched/pthread/pthread_initialize.c
  *
  *   Copyright (C) 2007-2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_keycreate.c b/sched/pthread/pthread_keycreate.c
index 9d0e8f4e76..17ed16144d 100644
--- a/sched/pthread/pthread_keycreate.c
+++ b/sched/pthread/pthread_keycreate.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pthread_keycreate.c
+ * sched/pthread/pthread_keycreate.c
  *
  *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_keydelete.c b/sched/pthread/pthread_keydelete.c
index f70a15cbb5..56f09ca70b 100644
--- a/sched/pthread/pthread_keydelete.c
+++ b/sched/pthread/pthread_keydelete.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/pthread_keydelete.c
+ * sched/pthread/pthread_keydelete.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_kill.c b/sched/pthread/pthread_kill.c
index 5a1506c0c9..1759f75c8d 100644
--- a/sched/pthread/pthread_kill.c
+++ b/sched/pthread/pthread_kill.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/pthread_kill.c
+ * sched/pthread/pthread_kill.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_mutexdestroy.c b/sched/pthread/pthread_mutexdestroy.c
index ddbd662961..5f8c4dc729 100644
--- a/sched/pthread/pthread_mutexdestroy.c
+++ b/sched/pthread/pthread_mutexdestroy.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pthread_mutexdestroy.c
+ * sched/pthread/pthread_mutexdestroy.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_mutexinit.c b/sched/pthread/pthread_mutexinit.c
index 08715d4b06..45066b726a 100644
--- a/sched/pthread/pthread_mutexinit.c
+++ b/sched/pthread/pthread_mutexinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pthread_mutexinit.c
+ * sched/pthread/pthread_mutexinit.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_mutexlock.c b/sched/pthread/pthread_mutexlock.c
index 2e786ad7db..ebd4ea9e3e 100644
--- a/sched/pthread/pthread_mutexlock.c
+++ b/sched/pthread/pthread_mutexlock.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pthread_mutexlock.c
+ * sched/pthread/pthread_mutexlock.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_mutextrylock.c b/sched/pthread/pthread_mutextrylock.c
index a289bf8c3c..9b93f4378a 100644
--- a/sched/pthread/pthread_mutextrylock.c
+++ b/sched/pthread/pthread_mutextrylock.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pthread_mutextrylock.c
+ * sched/pthread/pthread_mutextrylock.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_mutexunlock.c b/sched/pthread/pthread_mutexunlock.c
index 04a02af9c8..76974fbf13 100644
--- a/sched/pthread/pthread_mutexunlock.c
+++ b/sched/pthread/pthread_mutexunlock.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pthread_mutexunlock.c
+ * sched/pthread/pthread_mutexunlock.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_once.c b/sched/pthread/pthread_once.c
index 46b37c5a5f..1854515110 100644
--- a/sched/pthread/pthread_once.c
+++ b/sched/pthread/pthread_once.c
@@ -1,5 +1,5 @@
 /********************************************************************************
- * sched/pthread_once.c
+ * sched/pthread/pthread_once.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_release.c b/sched/pthread/pthread_release.c
index b6afb5a2e5..3f69c39914 100644
--- a/sched/pthread/pthread_release.c
+++ b/sched/pthread/pthread_release.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/pthread_release.c
+ * sched/pthread/pthread_release.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_setcancelstate.c b/sched/pthread/pthread_setcancelstate.c
index 834dc4a594..7e3c5d84ee 100644
--- a/sched/pthread/pthread_setcancelstate.c
+++ b/sched/pthread/pthread_setcancelstate.c
@@ -1,5 +1,5 @@
 /******************************************************************************************
- * pthread_setcancelstate.c
+ * sched/pthread/pthread_setcancelstate.c
  *
  *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_setschedparam.c b/sched/pthread/pthread_setschedparam.c
index 3b24eb7f8d..8ddc61f255 100644
--- a/sched/pthread/pthread_setschedparam.c
+++ b/sched/pthread/pthread_setschedparam.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * pthread_setschedparam.c
+ * sched/pthread/pthread_setschedparam.c
  *
  *   Copyright (C) 2007, 2008, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_setschedprio.c b/sched/pthread/pthread_setschedprio.c
index a523b20ea4..7144fab96a 100644
--- a/sched/pthread/pthread_setschedprio.c
+++ b/sched/pthread/pthread_setschedprio.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * pthread_schedsetprio.c
+ * sched/pthread/pthread_setschedprio.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_setspecific.c b/sched/pthread/pthread_setspecific.c
index 32a26224f5..f4dac80b09 100644
--- a/sched/pthread/pthread_setspecific.c
+++ b/sched/pthread/pthread_setspecific.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pthread_setspecific.c
+ * sched/pthread/pthread_setspecific.c
  *
  *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_sigmask.c b/sched/pthread/pthread_sigmask.c
index c66b8591c1..b48370fce0 100644
--- a/sched/pthread/pthread_sigmask.c
+++ b/sched/pthread/pthread_sigmask.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/pthread_sigmask.c
+ * sched/pthread/pthread_sigmask.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/pthread/pthread_yield.c b/sched/pthread/pthread_yield.c
index c4535b9dbc..b5a5926e53 100644
--- a/sched/pthread/pthread_yield.c
+++ b/sched/pthread/pthread_yield.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/pthread_yield.c
+ * sched/pthread/pthread_yield.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/sched_processtimer.c b/sched/sched_processtimer.c
index a8a3b917f6..281bfe3856 100644
--- a/sched/sched_processtimer.c
+++ b/sched/sched_processtimer.c
@@ -47,7 +47,7 @@
 #endif
 
 #include "os_internal.h"
-#include "wd_internal.h"
+#include "wdog/wdog.h"
 #include "clock_internal.h"
 
 /************************************************************************
diff --git a/sched/sched_timerexpiration.c b/sched/sched_timerexpiration.c
index 03cdfceef9..d060b921bc 100644
--- a/sched/sched_timerexpiration.c
+++ b/sched/sched_timerexpiration.c
@@ -50,7 +50,7 @@
 #endif
 
 #include "os_internal.h"
-#include "wd_internal.h"
+#include "wdog/wdog.h"
 #include "clock_internal.h"
 
 #ifdef CONFIG_SCHED_TICKLESS
diff --git a/sched/semaphore/sem_destroy.c b/sched/semaphore/sem_destroy.c
index 19b2d4b8e4..790fe3ee48 100644
--- a/sched/semaphore/sem_destroy.c
+++ b/sched/semaphore/sem_destroy.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * lib/semaphore/sem_destroy.c
+ * sched/semaphore/sem_destroy.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/semaphore/sem_findnamed.c b/sched/semaphore/sem_findnamed.c
index 7fb09b0923..afd3e14f31 100644
--- a/sched/semaphore/sem_findnamed.c
+++ b/sched/semaphore/sem_findnamed.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sem_findnamed.c
+ * sched/semaphore/sem_findnamed.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/semaphore/sem_initialize.c b/sched/semaphore/sem_initialize.c
index 76732651ce..53fa1b8633 100644
--- a/sched/semaphore/sem_initialize.c
+++ b/sched/semaphore/sem_initialize.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * schec/sem_initialize.c
+ * sched/semaphore/sem_initialize.c
  *
  *   Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/signal/sig_pause.c b/sched/signal/sig_pause.c
index f75afa6c92..9fa92e261e 100644
--- a/sched/signal/sig_pause.c
+++ b/sched/signal/sig_pause.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/pause.c
+ * sched/signal/sig_pause.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/sched/wdog/Make.defs b/sched/wdog/Make.defs
new file mode 100644
index 0000000000..29ac9a52c5
--- /dev/null
+++ b/sched/wdog/Make.defs
@@ -0,0 +1,42 @@
+############################################################################
+# sched/wdog/Make.defs
+#
+#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+WDOG_SRCS = wd_initialize.c wd_create.c wd_start.c wd_cancel.c wd_delete.c
+WDOG_SRCS += wd_gettime.c
+
+# Include wdog build support
+
+DEPPATH += --dep-path wdog
+VPATH += :wdog
diff --git a/sched/wd_cancel.c b/sched/wdog/wd_cancel.c
similarity index 99%
rename from sched/wd_cancel.c
rename to sched/wdog/wd_cancel.c
index 8a258c35eb..6ce3df837d 100644
--- a/sched/wd_cancel.c
+++ b/sched/wdog/wd_cancel.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/wd_cancel.c
+ * sched/wdog/wd_cancel.c
  *
  *   Copyright (C) 2007-2009, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -45,7 +45,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "wd_internal.h"
+#include "wdog/wdog.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/sched/wd_create.c b/sched/wdog/wd_create.c
similarity index 98%
rename from sched/wd_create.c
rename to sched/wdog/wd_create.c
index 2f9108335b..f766aca9cd 100644
--- a/sched/wd_create.c
+++ b/sched/wdog/wd_create.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/wd_create.c
+ * sched/wdog/wd_create.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 "wd_internal.h"
+#include "wdog/wdog.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/sched/wd_delete.c b/sched/wdog/wd_delete.c
similarity index 98%
rename from sched/wd_delete.c
rename to sched/wdog/wd_delete.c
index ff9e0a1f03..8a1be3006b 100644
--- a/sched/wd_delete.c
+++ b/sched/wdog/wd_delete.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/wd_delete.c
+ * sched/wdog/wd_delete.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 "wd_internal.h"
+#include "wdog/wdog.h"
 
 /****************************************************************************
  * Definitions
diff --git a/sched/wd_gettime.c b/sched/wdog/wd_gettime.c
similarity index 98%
rename from sched/wd_gettime.c
rename to sched/wdog/wd_gettime.c
index caa4825497..d34c398b7b 100644
--- a/sched/wd_gettime.c
+++ b/sched/wdog/wd_gettime.c
@@ -1,5 +1,5 @@
 /********************************************************************************
- * sched/wd_gettime.c
+ * sched/wdog/wd_gettime.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -42,7 +42,7 @@
 #include <wdog.h>
 
 #include "os_internal.h"
-#include "wd_internal.h"
+#include "wdog/wdog.h"
 
 /********************************************************************************
  * Definitions
diff --git a/sched/wd_initialize.c b/sched/wdog/wd_initialize.c
similarity index 98%
rename from sched/wd_initialize.c
rename to sched/wdog/wd_initialize.c
index 9d65d840d1..6ae87ce41e 100644
--- a/sched/wd_initialize.c
+++ b/sched/wdog/wd_initialize.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/wd_initialize.c
+ * sched/wdog/wd_initialize.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -43,7 +43,7 @@
 #include <nuttx/kmalloc.h>
 
 #include "os_internal.h"
-#include "wd_internal.h"
+#include "wdog/wdog.h"
 
 /************************************************************************
  * Definitions
diff --git a/sched/wd_start.c b/sched/wdog/wd_start.c
similarity index 99%
rename from sched/wd_start.c
rename to sched/wdog/wd_start.c
index 6f519f915b..a88cdceb67 100644
--- a/sched/wd_start.c
+++ b/sched/wdog/wd_start.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/wd_start.c
+ * sched/wdog/wd_start.c
  *
  *   Copyright (C) 2007-2009, 2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +51,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "wd_internal.h"
+#include "wdog/wdog.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/sched/wd_internal.h b/sched/wdog/wdog.h
similarity index 97%
rename from sched/wd_internal.h
rename to sched/wdog/wdog.h
index 902edf4f6a..01c993bdc4 100644
--- a/sched/wd_internal.h
+++ b/sched/wdog/wdog.h
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/d_internal.h
+ * sched/wdog/wdog.h
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************/
 
-#ifndef __SCHED_WD_INTERNAL_H
-#define __SCHED_WD_INTERNAL_H
+#ifndef __SCHED_WDOG_WDOG_H
+#define __SCHED_WDOG_WDOG_H
 
 /************************************************************************
  * Included Files
@@ -166,4 +166,4 @@ void wd_timer(void);
 }
 #endif
 
-#endif /* __SCHED_WD_INTERNAL_H */
+#endif /* __SCHED_WDOG_WDOG_H */