diff --git a/sysdeps/mach/hurd/bits/errno.h b/sysdeps/mach/hurd/bits/errno.h
index 069865189f..a0794f96aa 100644
--- a/sysdeps/mach/hurd/bits/errno.h
+++ b/sysdeps/mach/hurd/bits/errno.h
@@ -4,11 +4,8 @@
      libc-symbols.h
      mach/message.h
      mach/kern_return.h
-     mach/i386/kern_return.h
      mach/port.h
      mach/boolean.h
-     mach/i386/boolean.h
-     mach/i386/vm_types.h
      stdint.h
      ../stdlib/stdint.h
      ../bits/libc-header-start.h
diff --git a/sysdeps/mach/hurd/errnos.awk b/sysdeps/mach/hurd/errnos.awk
index 22c9ceef65..b9f717c1af 100644
--- a/sysdeps/mach/hurd/errnos.awk
+++ b/sysdeps/mach/hurd/errnos.awk
@@ -25,6 +25,10 @@ BEGIN {
 	arg = ARGV[i];
 	sub(/.*(manual|include)\//, "", arg);
 	if (arg ~ /.*errnos.d/) continue;
+	# Those not not actually define anything for errno.h
+	if (arg ~ /mach\/.*\/kern_return.h/) continue;
+	if (arg ~ /mach\/.*\/boolean.h/) continue;
+	if (arg ~ /mach\/.*\/vm_types.h/) continue;
 	print "     " arg;
       }
     print "   Do not edit this file; edit errnos.awk and regenerate it.  */";