diff --git a/examples/buttons/buttons_main.c b/examples/buttons/buttons_main.c
index de50afd0a..a8632795f 100644
--- a/examples/buttons/buttons_main.c
+++ b/examples/buttons/buttons_main.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * examples/buttons/buttons_main.c
  *
- *   Copyright (C) 2016-2027 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/examples/tcpecho/tcpecho_main.c b/examples/tcpecho/tcpecho_main.c
index 6ad37b880..1172f87e1 100644
--- a/examples/tcpecho/tcpecho_main.c
+++ b/examples/tcpecho/tcpecho_main.c
@@ -212,7 +212,7 @@ static int tcpecho_server(void)
       return ERROR;
     }
 
-  bzero(&servaddr, sizeof(servaddr));
+  memset(&servaddr, 0, sizeof(servaddr));
   servaddr.sin_family      = AF_INET;
   servaddr.sin_addr.s_addr = htonl(INADDR_ANY);
   servaddr.sin_port        = htons(CONFIG_EXAMPLES_TCPECHO_PORT);
diff --git a/examples/xmlrpc/xmlrpc_main.c b/examples/xmlrpc/xmlrpc_main.c
index 1461fd25f..0e4ca851e 100644
--- a/examples/xmlrpc/xmlrpc_main.c
+++ b/examples/xmlrpc/xmlrpc_main.c
@@ -390,7 +390,7 @@ int xmlrpc_main(int argc, char *argv[])
 
   setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
 
-  bzero((void *)&servaddr, sizeof(servaddr));
+  memset((void *)&servaddr, 0, sizeof(servaddr));
   servaddr.sin_family = AF_INET;
   servaddr.sin_addr.s_addr = htonl(INADDR_ANY);
   servaddr.sin_port = htons(80);
diff --git a/fsutils/inifile/inifile.c b/fsutils/inifile/inifile.c
index cd212eb30..03f698f6a 100644
--- a/fsutils/inifile/inifile.c
+++ b/fsutils/inifile/inifile.c
@@ -41,7 +41,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 #include <debug.h>
 
 #include "fsutils/inifile.h"
diff --git a/graphics/traveler/tools/libwld/wld_inifile.c b/graphics/traveler/tools/libwld/wld_inifile.c
index 8aa2ee01b..030a95aef 100644
--- a/graphics/traveler/tools/libwld/wld_inifile.c
+++ b/graphics/traveler/tools/libwld/wld_inifile.c
@@ -40,7 +40,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include "wld_inifile.h"
 
diff --git a/interpreters/bas/bas.c b/interpreters/bas/bas.c
index b69c6b8ab..3e6a35d90 100644
--- a/interpreters/bas/bas.c
+++ b/interpreters/bas/bas.c
@@ -75,7 +75,7 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <math.h>
-#include <string.h>
+#include <strings.h>
 #include <time.h>
 #include <unistd.h>
 
diff --git a/interpreters/bas/bas_statement.c b/interpreters/bas/bas_statement.c
index aeb0dc211..9ac2f9e93 100644
--- a/interpreters/bas/bas_statement.c
+++ b/interpreters/bas/bas_statement.c
@@ -63,6 +63,7 @@
 #include <nuttx/config.h>
 
 #include <stdlib.h>
+#include <strings.h>
 
 #include "bas_statement.h"
 
diff --git a/modbus/nuttx/portserial.c b/modbus/nuttx/portserial.c
index a33a13a3b..f227ed890 100644
--- a/modbus/nuttx/portserial.c
+++ b/modbus/nuttx/portserial.c
@@ -231,7 +231,7 @@ bool xMBPortSerialInit(uint8_t ucPort, speed_t ulBaudRate,
     }
   else
     {
-      bzero(&xNewTIO, sizeof(struct termios));
+      memset(&xNewTIO, 0, sizeof(struct termios));
 
       xNewTIO.c_iflag |= IGNBRK | INPCK;
       xNewTIO.c_cflag |= CREAD | CLOCAL;
diff --git a/modbus/nuttx/portserial_m.c b/modbus/nuttx/portserial_m.c
index ae62d665e..784837049 100644
--- a/modbus/nuttx/portserial_m.c
+++ b/modbus/nuttx/portserial_m.c
@@ -237,7 +237,7 @@ bool xMBMasterPortSerialInit(uint8_t ucPort, speed_t ulBaudRate,
     }
   else
     {
-      bzero(&xNewTIO, sizeof(struct termios));
+      memset(&xNewTIO, 0, sizeof(struct termios));
 
       xNewTIO.c_iflag |= IGNBRK | INPCK;
       xNewTIO.c_cflag |= CREAD | CLOCAL;
diff --git a/netutils/ftpc/ftpc_cmd.c b/netutils/ftpc/ftpc_cmd.c
index b6a2bd598..157e1c786 100644
--- a/netutils/ftpc/ftpc_cmd.c
+++ b/netutils/ftpc/ftpc_cmd.c
@@ -40,6 +40,7 @@
 #include "ftpc_config.h"
 
 #include <stdlib.h>
+#include <strings.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <debug.h>
diff --git a/netutils/ftpd/ftpd.c b/netutils/ftpd/ftpd.c
index 54655073a..e6c35fd83 100644
--- a/netutils/ftpd/ftpd.c
+++ b/netutils/ftpd/ftpd.c
@@ -52,7 +52,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <dirent.h>
-#include <string.h>
+#include <strings.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <poll.h>
diff --git a/netutils/thttpd/libhttpd.c b/netutils/thttpd/libhttpd.c
index 621791ee3..f1df7a090 100644
--- a/netutils/thttpd/libhttpd.c
+++ b/netutils/thttpd/libhttpd.c
@@ -50,7 +50,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
-#include <string.h>
+#include <strings.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <fcntl.h>
diff --git a/netutils/webclient/webclient.c b/netutils/webclient/webclient.c
index 9747292d2..18626b6c6 100644
--- a/netutils/webclient/webclient.c
+++ b/netutils/webclient/webclient.c
@@ -61,7 +61,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 #include <netdb.h>
-#include <string.h>
+#include <strings.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
diff --git a/netutils/xmlrpc/xmlparser.c b/netutils/xmlrpc/xmlparser.c
index 2752d7306..5db9c0ea6 100644
--- a/netutils/xmlrpc/xmlparser.c
+++ b/netutils/xmlrpc/xmlparser.c
@@ -304,7 +304,7 @@ static int xmlrpc_parsemethod(struct parsebuf_s * pbuf)
 {
   int type, ret = XMLRPC_PARSE_ERROR;
 
-  bzero((void *)&g_xmlcall, sizeof(struct xmlrpc_s));
+  memset((void *)&g_xmlcall, 0, sizeof(struct xmlrpc_s));
 
   /* Look for the methodName tag */
 
diff --git a/nshlib/nsh_timcmds.c b/nshlib/nsh_timcmds.c
index 2b08fcd5a..d6a6b3d1c 100644
--- a/nshlib/nsh_timcmds.c
+++ b/nshlib/nsh_timcmds.c
@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include <time.h>