diff --git a/include/libwebsockets.h b/include/libwebsockets.h
index 3dba1a79d..980c60a78 100644
--- a/include/libwebsockets.h
+++ b/include/libwebsockets.h
@@ -431,7 +431,6 @@ int close(int fd);
 int atoi(const char *nptr);
 long long atoll(const char *nptr);
 
-void bzero(void *s, size_t n);
 int socket(int domain, int type, int protocol);
        int getaddrinfo(const char *node, const char *service,
                        const struct addrinfo *hints,
diff --git a/lib/core-net/network.c b/lib/core-net/network.c
index 44fb8d8c5..fc0ef71e1 100644
--- a/lib/core-net/network.c
+++ b/lib/core-net/network.c
@@ -231,7 +231,7 @@ lws_socket_bind(struct lws_vhost *vhost, lws_sockfd_type sockfd, int port,
 	if (LWS_UNIX_SOCK_ENABLED(vhost)) {
 		v = (struct sockaddr *)&serv_unix;
 		n = sizeof(struct sockaddr_un);
-		bzero((char *) &serv_unix, sizeof(serv_unix));
+		memset(&serv_unix, 0, sizeof(serv_unix));
 		serv_unix.sun_family = AF_UNIX;
 		if (!iface)
 			return LWS_ITOSA_NOT_EXIST;
@@ -252,7 +252,7 @@ lws_socket_bind(struct lws_vhost *vhost, lws_sockfd_type sockfd, int port,
 	if (ipv6_allowed && LWS_IPV6_ENABLED(vhost)) {
 		v = (struct sockaddr *)&serv_addr6;
 		n = sizeof(struct sockaddr_in6);
-		bzero((char *) &serv_addr6, sizeof(serv_addr6));
+		memset(&serv_addr6, 0, sizeof(serv_addr6));
 		if (iface) {
 			m = interface_to_sa(vhost, iface,
 				    (struct sockaddr_in *)v, n, 1);
@@ -276,7 +276,7 @@ lws_socket_bind(struct lws_vhost *vhost, lws_sockfd_type sockfd, int port,
 	{
 		v = (struct sockaddr *)&serv_addr4;
 		n = sizeof(serv_addr4);
-		bzero((char *) &serv_addr4, sizeof(serv_addr4));
+		memset(&serv_addr4, 0, sizeof(serv_addr4));
 		serv_addr4.sin_addr.s_addr = INADDR_ANY;
 		serv_addr4.sin_family = AF_INET;
 
diff --git a/lib/core/private.h b/lib/core/private.h
index 90fec4376..1d58cffbc 100644
--- a/lib/core/private.h
+++ b/lib/core/private.h
@@ -120,12 +120,6 @@
  #endif
 #endif
 
-#ifndef LWS_HAVE_BZERO
- #ifndef bzero
-  #define bzero(b, len) (memset((b), '\0', (len)), (void) 0)
- #endif
-#endif
-
  /*
   *
   *  ------ public api ------
diff --git a/lib/misc/sha-1.c b/lib/misc/sha-1.c
index 898f3f45b..c17a43729 100644
--- a/lib/misc/sha-1.c
+++ b/lib/misc/sha-1.c
@@ -183,7 +183,7 @@ sha1_step(struct sha1_ctxt *ctxt)
 	H(3) = H(3) + d;
 	H(4) = H(4) + e;
 
-	bzero(&ctxt->m.b8[0], 64);
+	memset(&ctxt->m.b8[0], 0, 64);
 }
 
 /*------------------------------------------------------------*/
@@ -191,7 +191,7 @@ sha1_step(struct sha1_ctxt *ctxt)
 static void
 _sha1_init(struct sha1_ctxt *ctxt)
 {
-	bzero(ctxt, sizeof(struct sha1_ctxt));
+	memset(ctxt, 0, sizeof(struct sha1_ctxt));
 	H(0) = 0x67452301;
 	H(1) = 0xefcdab89;
 	H(2) = 0x98badcfe;
@@ -210,14 +210,14 @@ sha1_pad(struct sha1_ctxt *ctxt)
 	padstart = COUNT % 64;
 	padlen = 64 - padstart;
 	if (padlen < 8) {
-		bzero(&ctxt->m.b8[padstart], padlen);
+		memset(&ctxt->m.b8[padstart], 0, padlen);
 		COUNT += (unsigned char)padlen;
 		COUNT %= 64;
 		sha1_step(ctxt);
 		padstart = COUNT % 64;	/* should be 0 */
 		padlen = 64 - padstart;	/* should be 64 */
 	}
-	bzero(&ctxt->m.b8[padstart], padlen - 8);
+	memset(&ctxt->m.b8[padstart], 0, padlen - 8);
 	COUNT += ((unsigned char)padlen - 8);
 	COUNT %= 64;
 #if BYTE_ORDER == BIG_ENDIAN
diff --git a/lib/plat/esp32/esp32-sockets.c b/lib/plat/esp32/esp32-sockets.c
index de7611a31..80b50c833 100644
--- a/lib/plat/esp32/esp32-sockets.c
+++ b/lib/plat/esp32/esp32-sockets.c
@@ -164,7 +164,7 @@ lws_interface_to_sa(int ipv6, const char *ifname, struct sockaddr_in *addr,
 #ifdef LWS_WITH_IPV6
 			if (ipv6) {
 				/* map IPv4 to IPv6 */
-				bzero((char *)&addr6->sin6_addr,
+				memset((char *)&addr6->sin6_addr, 0,
 						sizeof(struct in6_addr));
 				addr6->sin6_addr.s6_addr[10] = 0xff;
 				addr6->sin6_addr.s6_addr[11] = 0xff;
diff --git a/lib/plat/unix/unix-sockets.c b/lib/plat/unix/unix-sockets.c
index 63dc2374c..fb953f50b 100644
--- a/lib/plat/unix/unix-sockets.c
+++ b/lib/plat/unix/unix-sockets.c
@@ -203,7 +203,7 @@ lws_interface_to_sa(int ipv6, const char *ifname, struct sockaddr_in *addr,
 #ifdef LWS_WITH_IPV6
 			if (ipv6) {
 				/* map IPv4 to IPv6 */
-				bzero((char *)&addr6->sin6_addr,
+				memset((char *)&addr6->sin6_addr, 0,
 						sizeof(struct in6_addr));
 				addr6->sin6_addr.s6_addr[10] = 0xff;
 				addr6->sin6_addr.s6_addr[11] = 0xff;
diff --git a/lib/plat/windows/windows-sockets.c b/lib/plat/windows/windows-sockets.c
index 643e579a1..b4ff326b0 100644
--- a/lib/plat/windows/windows-sockets.c
+++ b/lib/plat/windows/windows-sockets.c
@@ -202,7 +202,7 @@ lws_plat_inet_ntop(int af, const void *src, char *dst, int cnt)
 
 	if (af == AF_INET) {
 		struct sockaddr_in srcaddr;
-		bzero(&srcaddr, sizeof(srcaddr));
+		memset(&srcaddr, 0, sizeof(srcaddr));
 		srcaddr.sin_family = AF_INET;
 		memcpy(&(srcaddr.sin_addr), src, sizeof(srcaddr.sin_addr));
 
@@ -211,7 +211,7 @@ lws_plat_inet_ntop(int af, const void *src, char *dst, int cnt)
 #ifdef LWS_WITH_IPV6
 	} else if (af == AF_INET6) {
 		struct sockaddr_in6 srcaddr;
-		bzero(&srcaddr, sizeof(srcaddr));
+		memset(&srcaddr, 0, sizeof(srcaddr));
 		srcaddr.sin6_family = AF_INET6;
 		memcpy(&(srcaddr.sin6_addr), src, sizeof(srcaddr.sin6_addr));
 
@@ -255,7 +255,8 @@ lws_plat_inet_pton(int af, const char *src, void *dst)
 	if (af == AF_INET) {
 		struct sockaddr_in dstaddr;
 		int dstaddrlen = sizeof(dstaddr);
-		bzero(&dstaddr, sizeof(dstaddr));
+
+		memset(&dstaddr, 0, sizeof(dstaddr));
 		dstaddr.sin_family = AF_INET;
 
 		if (!WSAStringToAddressW(buffer, af, 0, (struct sockaddr *) &dstaddr, &dstaddrlen)) {
@@ -266,7 +267,8 @@ lws_plat_inet_pton(int af, const char *src, void *dst)
 	} else if (af == AF_INET6) {
 		struct sockaddr_in6 dstaddr;
 		int dstaddrlen = sizeof(dstaddr);
-		bzero(&dstaddr, sizeof(dstaddr));
+
+		memset(&dstaddr, 0, sizeof(dstaddr));
 		dstaddr.sin6_family = AF_INET6;
 
 		if (!WSAStringToAddressW(buffer, af, 0, (struct sockaddr *) &dstaddr, &dstaddrlen)) {
diff --git a/lib/roles/http/client/client-handshake.c b/lib/roles/http/client/client-handshake.c
index 6b88cc885..3746fef4b 100644
--- a/lib/roles/http/client/client-handshake.c
+++ b/lib/roles/http/client/client-handshake.c
@@ -311,7 +311,7 @@ create_new_conn:
 			if (ipv6only)
 				break;
 			/* map IPv4 to IPv6 */
-			bzero((char *)&sa46.sa6.sin6_addr,
+			memset((char *)&sa46.sa6.sin6_addr, 0,
 						sizeof(sa46.sa6.sin6_addr));
 			sa46.sa6.sin6_addr.s6_addr[10] = 0xff;
 			sa46.sa6.sin6_addr.s6_addr[11] = 0xff;
@@ -384,7 +384,7 @@ create_new_conn:
 
 		sa46.sa4.sin_family = AF_INET;
 		sa46.sa4.sin_addr = *((struct in_addr *)p);
-		bzero(&sa46.sa4.sin_zero, sizeof(sa46.sa4.sin_zero));
+		memset(&sa46.sa4.sin_zero, 0, sizeof(sa46.sa4.sin_zero));
 	}
 
 	if (result)