diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h
index fccb0b1183..1accf8cc2a 100644
--- a/include/nuttx/sched.h
+++ b/include/nuttx/sched.h
@@ -278,7 +278,7 @@ struct sporadic_s;
 struct replenishment_s
 {
   FAR struct tcb_s *tcb;            /* The parent TCB structure                 */
-  struct wdog_s timer;              /* Timer dedicated to this interval         */
+  WDOG_ID timer;                    /* Timer dedicated to this interval         */
   uint32_t budget;                  /* Current budget time                      */
   uint8_t  flags;                   /* See SPORADIC_FLAG_* definitions          */
 };
@@ -571,8 +571,6 @@ struct task_group_s
  * that includes these common definitions.
  */
 
-FAR struct wdog_s;                       /* Forward reference                   */
-
 struct tcb_s
 {
   /* Fields used to support list management *************************************/
@@ -622,7 +620,7 @@ struct tcb_s
   FAR struct sporadic_s *sporadic;       /* Sporadic scheduling parameters      */
 #endif
 
-  FAR struct wdog_s *waitdog;            /* All timed waits use this timer      */
+  WDOG_ID waitdog;                       /* All timed waits use this timer      */
 
   /* Stack-Related Fields *******************************************************/
 
diff --git a/include/stdio.h b/include/stdio.h
index 035cf0e54f..ac3a63b33a 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -187,7 +187,7 @@ int    vasprintf(FAR char **ptr, FAR const IPTR char *fmt, va_list ap);
 int    vfprintf(FAR FILE *stream, FAR const IPTR char *fmt,
          va_list ap);
 int    vfscanf(FAR FILE *stream, FAR const IPTR char *fmt, va_list ap);
-int    vprintf(FAR const IPTR FAR char *fmt, va_list ap);
+int    vprintf(FAR const IPTR char *fmt, va_list ap);
 int    vsnprintf(FAR char *buf, size_t size, FAR const IPTR char *fmt,
          va_list ap);
 int    vsprintf(FAR char *buf, FAR const IPTR char *fmt, va_list ap);