diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index c41fc66bcdb..57a8c8aae24 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -681,7 +681,8 @@
   <td><br></td>
   <td>
     <p>
-      <li>Networking utilities (DHCP server and client, SMTP client, TELNET client, FTP server and client, TFTP client, HTTP server and client).  Inheritable TELNET sessions (as &quot;controlling terminal&quot;)</li>
+      <li>Networking utilities (DHCP server and client, SMTP client, TELNET client, FTP server and client, TFTP client, HTTP server and client, NTP client).
+      Inheritable TELNET sessions (as &quot;controlling terminal&quot;)</li>
     </p>
   </td>
 </tr>
diff --git a/include/nuttx/net/uip/uip.h b/include/nuttx/net/uip/uip.h
index 392793e68d7..bcd5a1c1323 100644
--- a/include/nuttx/net/uip/uip.h
+++ b/include/nuttx/net/uip/uip.h
@@ -409,7 +409,8 @@ extern void uip_send(struct uip_driver_s *dev, const void *buf, int len);
 
 #define uip_ipaddr(addr, addr0, addr1, addr2, addr3) \
   do { \
-    addr = HTONL((addr0) << 24 | (addr1) << 16 | (addr2) << 8 | (addr3)); \
+    addr = HTONL((uint32_t)(addr0) << 24 | (uint32_t)(addr1) << 16 | \
+                 (uint32_t)(addr2) << 8  | (uint32_t)(addr3)); \
   } while(0)
 
 /* Convert an IPv4 address of the form uint16_t[2] to an in_addr_t */
diff --git a/include/poll.h b/include/poll.h
index 4439710e906..106a6b23a6a 100644
--- a/include/poll.h
+++ b/include/poll.h
@@ -130,7 +130,7 @@ extern "C" {
  * Public Function Prototypes
  ****************************************************************************/
 
-EXTERN int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout);
+int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout);
 
 #undef EXTERN
 #if defined(__cplusplus)
diff --git a/include/wdog.h b/include/wdog.h
index 3179c06a4bc..21f1b826362 100644
--- a/include/wdog.h
+++ b/include/wdog.h
@@ -95,11 +95,11 @@ extern "C" {
 #define EXTERN extern
 #endif
 
-EXTERN WDOG_ID wd_create(void);
-EXTERN int     wd_delete(WDOG_ID wdog);
-EXTERN int     wd_start(WDOG_ID wdog, int delay, wdentry_t wdentry, int argc, ...);
-EXTERN int     wd_cancel(WDOG_ID wdog);
-EXTERN int     wd_gettime(WDOG_ID wdog);
+WDOG_ID wd_create(void);
+int     wd_delete(WDOG_ID wdog);
+int     wd_start(WDOG_ID wdog, int delay, wdentry_t wdentry, int argc, ...);
+int     wd_cancel(WDOG_ID wdog);
+int     wd_gettime(WDOG_ID wdog);
 
 #undef EXTERN
 #ifdef __cplusplus