diff --git a/ChangeLog b/ChangeLog
index 1d9e54b250..9007ceaf98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2018-02-15  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #15105]
+	* include/argz.h (argz_next): Use libc_hidden_proto.
+	(__argz_next): Likewise.
+	* string-argz-next.c (__argz_next): Use libc_hidden_def.
+	(argz_next): Use libc_hidden_weak.
+
 	[BZ #15105]
 	* include/sys/socket.h [!_ISOMAC] (__cmsg_nxthdr): Use
 	libc_hidden_proto.
diff --git a/include/argz.h b/include/argz.h
index 770f02eefb..e081b2aceb 100644
--- a/include/argz.h
+++ b/include/argz.h
@@ -39,6 +39,8 @@ extern error_t __argz_replace (char **__restrict __argz,
 libc_hidden_proto (argz_delete)
 libc_hidden_proto (__argz_count)
 libc_hidden_proto (__argz_stringify)
+libc_hidden_proto (argz_next)
+libc_hidden_proto (__argz_next)
 
 # endif /* !_ISOMAC */
 #endif
diff --git a/string/argz-next.c b/string/argz-next.c
index abce45151a..9200eda4d9 100644
--- a/string/argz-next.c
+++ b/string/argz-next.c
@@ -36,4 +36,6 @@ __argz_next (const char *argz, size_t argz_len, const char *entry)
     else
       return NULL;
 }
+libc_hidden_def (__argz_next)
 weak_alias (__argz_next, argz_next)
+libc_hidden_weak (argz_next)