Move include/nuttx/timer.h, rtc.h and watchdog.h to include/nuttx/timers/.

configs/cloudctrl/src/stm32_watchdog.c

@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include "stm32_wdg.h"

configs/fire-stm32v2/src/stm32_watchdog.c

@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include "stm32_wdg.h"

configs/hymini-stm32v/src/stm32_watchdog.c

@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include "stm32_wdg.h"

configs/maple/src/stm32_watchdog.c

@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include "stm32_wdg.h"

configs/mikroe-stm32f4/src/stm32_watchdog.c

@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include "stm32_wdg.h"

configs/sam4s-xplained-pro/src/sam_boot.c

@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include "sam4s-xplained-pro.h"

configs/sam4s-xplained-pro/src/sam_nsh.c

@@ -60,7 +60,7 @@
 #endif
 
 #ifdef CONFIG_TIMER
-#  include <nuttx/timer.h>
+#  include <nuttx/timers/timer.h>
 #endif
 
 #ifdef CONFIG_SYSTEM_USBMONITOR

configs/sam4s-xplained-pro/src/sam_tc.c

@@ -49,7 +49,7 @@
 #include <fcntl.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/timer.h>
+#include <nuttx/timers/timer.h>
 #include <nuttx/clock.h>
 #include <nuttx/kthread.h>
 

configs/sam4s-xplained-pro/src/sam_wdt.c

@@ -48,7 +48,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include <nuttx/kthread.h>

configs/shenzhou/src/stm32_watchdog.c

@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include "stm32_wdg.h"

configs/spark/src/stm32_watchdog.c

@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include "stm32_wdg.h"

configs/stm3210e-eval/src/stm32_watchdog.c

@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include "stm32_wdg.h"

configs/stm3220g-eval/src/stm32_watchdog.c

@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include "stm32_wdg.h"

configs/stm3240g-eval/src/stm32_watchdog.c

@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include "stm32_wdg.h"

configs/stm32_tiny/src/stm32_watchdog.c

@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include "stm32_wdg.h"

configs/stm32f3discovery/src/stm32_watchdog.c

@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include "stm32_wdg.h"

configs/stm32f4discovery/src/stm32_bringup.c

@@ -62,7 +62,7 @@
  */
 
 #ifdef HAVE_RTC_DRIVER
-#  include <nuttx/rtc.h>
+#  include <nuttx/timers/rtc.h>
 #  include "stm32_rtc.h"
 #endif
 

configs/stm32f4discovery/src/stm32_watchdog.c

@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include "stm32_wdg.h"

configs/stm32ldiscovery/src/stm32_watchdog.c

@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
 #include "stm32_wdg.h"