diff --git a/ChangeLog b/ChangeLog
index 67c129b47d..efa8d39391 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2018-04-24  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/mach/hurd/dl-sysdep.c: Include <not-errno.h>.
+	(check_no_hidden): Use type of original function when declaring
+	alias.
+
 	* sysdeps/unix/sysv/linux/sys/ptrace.h
 	(PTRACE_SECCOMP_GET_METADATA): New enum value and macro.
 	* sysdeps/unix/sysv/linux/bits/ptrace-shared.h
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index cbf4e05862..547108805e 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -46,6 +46,7 @@
 #include <dl-procinfo.h>
 
 #include <dl-tunables.h>
+#include <not-errno.h>
 
 extern void __mach_init (void);
 
@@ -278,8 +279,9 @@ _dl_sysdep_start_cleanup (void)
 
 /* This macro checks that the function does not get renamed to be hidden: we do
    need these to be overridable by libc's.  */
-#define check_no_hidden(name) \
-static void __check_##name##_no_hidden(void) __attribute__((alias(#name)));
+#define check_no_hidden(name)				\
+  static __typeof (name) __check_##name##_no_hidden	\
+       __attribute__ ((alias (#name)));
 
 /* Open FILE_NAME and return a Hurd I/O for it in *PORT, or return an
    error.  If STAT is non-zero, stat the file into that stat buffer.  */