diff --git a/ChangeLog b/ChangeLog
index 4defdb6462..d81c823448 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
 	* mach/shortcut.awk: Make syscall stubs include
 	<mach-shortcuts-hidden.h> and add hidden definition.
 	* sysdeps/mach/include/mach.h: Include <mach-shortcuts-hidden.h>.
+	(__mach_msg): Add hidden prototype.
+	* mach/msg.c: Include <mach.h>.
+	(__mach_msg): Add hidden definition.
 
 2018-06-15  Joseph Myers  <joseph@codesourcery.com>
 
diff --git a/mach/msg.c b/mach/msg.c
index bccad7fd26..8eb252a16e 100644
--- a/mach/msg.c
+++ b/mach/msg.c
@@ -25,6 +25,7 @@
  */
 #include <mach/port.h>
 #include <mach/message.h>
+#include <mach.h>
 
 #ifdef MACH_MSG_OVERWRITE
 /* In variants with this feature, the actual system call is
@@ -125,6 +126,7 @@ __mach_msg (mach_msg_header_t *msg,
   return ret;
 }
 weak_alias (__mach_msg, mach_msg)
+libc_hidden_def (__mach_msg)
 
 mach_msg_return_t
 __mach_msg_send	(mach_msg_header_t *msg)
diff --git a/sysdeps/mach/include/mach.h b/sysdeps/mach/include/mach.h
index fff8349b82..65f8d9764b 100644
--- a/sysdeps/mach/include/mach.h
+++ b/sysdeps/mach/include/mach.h
@@ -3,5 +3,6 @@
 #include <mach-shortcuts-hidden.h>
 #ifndef _ISOMAC
 libc_hidden_proto (__mach_msg_destroy)
+libc_hidden_proto (__mach_msg)
 #endif
 #endif