diff --git a/ChangeLog b/ChangeLog
index bfc5cce407..a1a7a04927 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,413 @@
-012-11-04  Pino Toscano  <toscano.pino@tiscali.it>
+2012-11-04  Thomas Schwinge  <thomas@codesourcery.com>
+
+	[BZ #157]
+
+	* include/stub-tag.h: Remove file.
+	* sysdeps/unix/Makefile ($(objpfx)stub-syscalls.c): Don't emit
+	'#include' of it.
+	* manual/maint.texi (Porting): Don't reference it.
+	* Makerules ($(objpfx)stubs): Likewise.
+	* dirent/closedir.c: Don't include <stub-tag.h>.
+	* dirent/dirfd.c: Likewise.
+	* dirent/fdopendir.c: Likewise.
+	* dirent/getdents.c: Likewise.
+	* dirent/getdents64.c: Likewise.
+	* dirent/opendir.c: Likewise.
+	* dirent/readdir.c: Likewise.
+	* dirent/readdir64.c: Likewise.
+	* dirent/readdir64_r.c: Likewise.
+	* dirent/readdir_r.c: Likewise.
+	* dirent/rewinddir.c: Likewise.
+	* dirent/seekdir.c: Likewise.
+	* dirent/telldir.c: Likewise.
+	* gmon/profil.c: Likewise.
+	* grp/setgroups.c: Likewise.
+	* inet/if_index.c: Likewise.
+	* io/access.c: Likewise.
+	* io/chdir.c: Likewise.
+	* io/chmod.c: Likewise.
+	* io/chown.c: Likewise.
+	* io/close.c: Likewise.
+	* io/dup.c: Likewise.
+	* io/dup2.c: Likewise.
+	* io/dup3.c: Likewise.
+	* io/euidaccess.c: Likewise.
+	* io/faccessat.c: Likewise.
+	* io/fchdir.c: Likewise.
+	* io/fchmod.c: Likewise.
+	* io/fchmodat.c: Likewise.
+	* io/fchown.c: Likewise.
+	* io/fchownat.c: Likewise.
+	* io/fcntl.c: Likewise.
+	* io/flock.c: Likewise.
+	* io/fstatfs.c: Likewise.
+	* io/fstatfs64.c: Likewise.
+	* io/fstatvfs.c: Likewise.
+	* io/fstatvfs64.c: Likewise.
+	* io/futimens.c: Likewise.
+	* io/fxstat.c: Likewise.
+	* io/fxstat64.c: Likewise.
+	* io/fxstatat.c: Likewise.
+	* io/fxstatat64.c: Likewise.
+	* io/getcwd.c: Likewise.
+	* io/isatty.c: Likewise.
+	* io/lchmod.c: Likewise.
+	* io/lchown.c: Likewise.
+	* io/link.c: Likewise.
+	* io/linkat.c: Likewise.
+	* io/lseek.c: Likewise.
+	* io/lseek64.c: Likewise.
+	* io/lxstat64.c: Likewise.
+	* io/mkdir.c: Likewise.
+	* io/mkdirat.c: Likewise.
+	* io/mkfifo.c: Likewise.
+	* io/mkfifoat.c: Likewise.
+	* io/open.c: Likewise.
+	* io/open64.c: Likewise.
+	* io/openat.c: Likewise.
+	* io/openat64.c: Likewise.
+	* io/pipe.c: Likewise.
+	* io/pipe2.c: Likewise.
+	* io/poll.c: Likewise.
+	* io/posix_fadvise.c: Likewise.
+	* io/posix_fadvise64.c: Likewise.
+	* io/posix_fallocate.c: Likewise.
+	* io/posix_fallocate64.c: Likewise.
+	* io/read.c: Likewise.
+	* io/readlink.c: Likewise.
+	* io/readlinkat.c: Likewise.
+	* io/rmdir.c: Likewise.
+	* io/sendfile.c: Likewise.
+	* io/sendfile64.c: Likewise.
+	* io/statfs.c: Likewise.
+	* io/statfs64.c: Likewise.
+	* io/statvfs.c: Likewise.
+	* io/statvfs64.c: Likewise.
+	* io/symlink.c: Likewise.
+	* io/symlinkat.c: Likewise.
+	* io/ttyname.c: Likewise.
+	* io/ttyname_r.c: Likewise.
+	* io/umask.c: Likewise.
+	* io/unlink.c: Likewise.
+	* io/unlinkat.c: Likewise.
+	* io/utime.c: Likewise.
+	* io/utimensat.c: Likewise.
+	* io/write.c: Likewise.
+	* io/xmknod.c: Likewise.
+	* io/xmknodat.c: Likewise.
+	* io/xstat.c: Likewise.
+	* io/xstat64.c: Likewise.
+	* login/getpt.c: Likewise.
+	* login/grantpt.c: Likewise.
+	* login/unlockpt.c: Likewise.
+	* math/e_acoshl.c: Likewise.
+	* math/e_acosl.c: Likewise.
+	* math/e_asinl.c: Likewise.
+	* math/e_atan2l.c: Likewise.
+	* math/e_atanhl.c: Likewise.
+	* math/e_coshl.c: Likewise.
+	* math/e_expl.c: Likewise.
+	* math/e_fmodl.c: Likewise.
+	* math/e_gammal_r.c: Likewise.
+	* math/e_hypotl.c: Likewise.
+	* math/e_j0l.c: Likewise.
+	* math/e_j1l.c: Likewise.
+	* math/e_jnl.c: Likewise.
+	* math/e_lgammal_r.c: Likewise.
+	* math/e_log10l.c: Likewise.
+	* math/e_log2l.c: Likewise.
+	* math/e_logl.c: Likewise.
+	* math/e_powl.c: Likewise.
+	* math/e_rem_pio2l.c: Likewise.
+	* math/e_sinhl.c: Likewise.
+	* math/e_sqrtl.c: Likewise.
+	* math/fclrexcpt.c: Likewise.
+	* math/fedisblxcpt.c: Likewise.
+	* math/feenablxcpt.c: Likewise.
+	* math/fegetenv.c: Likewise.
+	* math/fegetexcept.c: Likewise.
+	* math/fegetround.c: Likewise.
+	* math/feholdexcpt.c: Likewise.
+	* math/fesetenv.c: Likewise.
+	* math/fesetround.c: Likewise.
+	* math/feupdateenv.c: Likewise.
+	* math/fgetexcptflg.c: Likewise.
+	* math/fraiseexcpt.c: Likewise.
+	* math/fsetexcptflg.c: Likewise.
+	* math/ftestexcept.c: Likewise.
+	* math/k_cosl.c: Likewise.
+	* math/k_rem_pio2l.c: Likewise.
+	* math/k_sinl.c: Likewise.
+	* math/k_tanl.c: Likewise.
+	* math/s_asinhl.c: Likewise.
+	* math/s_atanl.c: Likewise.
+	* math/s_cbrtl.c: Likewise.
+	* math/s_erfl.c: Likewise.
+	* math/s_expm1l.c: Likewise.
+	* math/s_log1pl.c: Likewise.
+	* math/s_tanhl.c: Likewise.
+	* misc/acct.c: Likewise.
+	* misc/brk.c: Likewise.
+	* misc/chflags.c: Likewise.
+	* misc/chroot.c: Likewise.
+	* misc/fchflags.c: Likewise.
+	* misc/fgetxattr.c: Likewise.
+	* misc/flistxattr.c: Likewise.
+	* misc/fremovexattr.c: Likewise.
+	* misc/fsetxattr.c: Likewise.
+	* misc/fsync.c: Likewise.
+	* misc/ftruncate.c: Likewise.
+	* misc/futimes.c: Likewise.
+	* misc/futimesat.c: Likewise.
+	* misc/getdomain.c: Likewise.
+	* misc/getdtsz.c: Likewise.
+	* misc/gethostid.c: Likewise.
+	* misc/gethostname.c: Likewise.
+	* misc/getloadavg.c: Likewise.
+	* misc/getpagesize.c: Likewise.
+	* misc/getsysstats.c: Likewise.
+	* misc/getxattr.c: Likewise.
+	* misc/gtty.c: Likewise.
+	* misc/ioctl.c: Likewise.
+	* misc/lgetxattr.c: Likewise.
+	* misc/listxattr.c: Likewise.
+	* misc/llistxattr.c: Likewise.
+	* misc/lremovexattr.c: Likewise.
+	* misc/lsetxattr.c: Likewise.
+	* misc/lutimes.c: Likewise.
+	* misc/madvise.c: Likewise.
+	* misc/mincore.c: Likewise.
+	* misc/mlock.c: Likewise.
+	* misc/mlockall.c: Likewise.
+	* misc/mmap.c: Likewise.
+	* misc/mprotect.c: Likewise.
+	* misc/msync.c: Likewise.
+	* misc/munlock.c: Likewise.
+	* misc/munlockall.c: Likewise.
+	* misc/munmap.c: Likewise.
+	* misc/preadv.c: Likewise.
+	* misc/preadv64.c: Likewise.
+	* misc/ptrace.c: Likewise.
+	* misc/pwritev.c: Likewise.
+	* misc/pwritev64.c: Likewise.
+	* misc/readv.c: Likewise.
+	* misc/reboot.c: Likewise.
+	* misc/remap_file_pages.c: Likewise.
+	* misc/removexattr.c: Likewise.
+	* misc/revoke.c: Likewise.
+	* misc/select.c: Likewise.
+	* misc/setdomain.c: Likewise.
+	* misc/setegid.c: Likewise.
+	* misc/seteuid.c: Likewise.
+	* misc/sethostid.c: Likewise.
+	* misc/sethostname.c: Likewise.
+	* misc/setregid.c: Likewise.
+	* misc/setreuid.c: Likewise.
+	* misc/setxattr.c: Likewise.
+	* misc/sstk.c: Likewise.
+	* misc/stty.c: Likewise.
+	* misc/swapoff.c: Likewise.
+	* misc/swapon.c: Likewise.
+	* misc/sync.c: Likewise.
+	* misc/syncfs.c: Likewise.
+	* misc/syscall.c: Likewise.
+	* misc/truncate.c: Likewise.
+	* misc/ualarm.c: Likewise.
+	* misc/usleep.c: Likewise.
+	* misc/ustat.c: Likewise.
+	* misc/utimes.c: Likewise.
+	* misc/vhangup.c: Likewise.
+	* misc/writev.c: Likewise.
+	* posix/_exit.c: Likewise.
+	* posix/alarm.c: Likewise.
+	* posix/execve.c: Likewise.
+	* posix/fexecve.c: Likewise.
+	* posix/fork.c: Likewise.
+	* posix/fpathconf.c: Likewise.
+	* posix/getaddrinfo.c: Likewise.
+	* posix/getegid.c: Likewise.
+	* posix/geteuid.c: Likewise.
+	* posix/getgid.c: Likewise.
+	* posix/getgroups.c: Likewise.
+	* posix/getlogin.c: Likewise.
+	* posix/getlogin_r.c: Likewise.
+	* posix/getpgid.c: Likewise.
+	* posix/getpid.c: Likewise.
+	* posix/getppid.c: Likewise.
+	* posix/getresgid.c: Likewise.
+	* posix/getresuid.c: Likewise.
+	* posix/getsid.c: Likewise.
+	* posix/getuid.c: Likewise.
+	* posix/glob64.c: Likewise.
+	* posix/nanosleep.c: Likewise.
+	* posix/pathconf.c: Likewise.
+	* posix/pause.c: Likewise.
+	* posix/posix_madvise.c: Likewise.
+	* posix/pread.c: Likewise.
+	* posix/pread64.c: Likewise.
+	* posix/pwrite.c: Likewise.
+	* posix/pwrite64.c: Likewise.
+	* posix/sched_getaffinity.c: Likewise.
+	* posix/sched_getp.c: Likewise.
+	* posix/sched_gets.c: Likewise.
+	* posix/sched_primax.c: Likewise.
+	* posix/sched_primin.c: Likewise.
+	* posix/sched_rr_gi.c: Likewise.
+	* posix/sched_setaffinity.c: Likewise.
+	* posix/sched_setp.c: Likewise.
+	* posix/sched_sets.c: Likewise.
+	* posix/sched_yield.c: Likewise.
+	* posix/setgid.c: Likewise.
+	* posix/setlogin.c: Likewise.
+	* posix/setpgid.c: Likewise.
+	* posix/setresgid.c: Likewise.
+	* posix/setresuid.c: Likewise.
+	* posix/setsid.c: Likewise.
+	* posix/setuid.c: Likewise.
+	* posix/sleep.c: Likewise.
+	* posix/spawni.c: Likewise.
+	* posix/sysconf.c: Likewise.
+	* posix/times.c: Likewise.
+	* posix/wait.c: Likewise.
+	* posix/wait3.c: Likewise.
+	* posix/wait4.c: Likewise.
+	* posix/waitpid.c: Likewise.
+	* resolv/gai_sigqueue.c: Likewise.
+	* resource/getpriority.c: Likewise.
+	* resource/getrlimit.c: Likewise.
+	* resource/getrusage.c: Likewise.
+	* resource/nice.c: Likewise.
+	* resource/setpriority.c: Likewise.
+	* resource/setrlimit.c: Likewise.
+	* resource/ulimit.c: Likewise.
+	* rt/aio_cancel.c: Likewise.
+	* rt/aio_fsync.c: Likewise.
+	* rt/aio_read.c: Likewise.
+	* rt/aio_sigqueue.c: Likewise.
+	* rt/aio_suspend.c: Likewise.
+	* rt/aio_write.c: Likewise.
+	* rt/clock_getres.c: Likewise.
+	* rt/clock_gettime.c: Likewise.
+	* rt/clock_nanosleep.c: Likewise.
+	* rt/clock_settime.c: Likewise.
+	* rt/lio_listio.c: Likewise.
+	* rt/mq_close.c: Likewise.
+	* rt/mq_getattr.c: Likewise.
+	* rt/mq_notify.c: Likewise.
+	* rt/mq_open.c: Likewise.
+	* rt/mq_receive.c: Likewise.
+	* rt/mq_send.c: Likewise.
+	* rt/mq_setattr.c: Likewise.
+	* rt/mq_timedreceive.c: Likewise.
+	* rt/mq_timedsend.c: Likewise.
+	* rt/mq_unlink.c: Likewise.
+	* rt/shm_open.c: Likewise.
+	* rt/shm_unlink.c: Likewise.
+	* rt/timer_create.c: Likewise.
+	* rt/timer_delete.c: Likewise.
+	* rt/timer_getoverr.c: Likewise.
+	* rt/timer_gettime.c: Likewise.
+	* rt/timer_settime.c: Likewise.
+	* setjmp/__longjmp.c: Likewise.
+	* setjmp/setjmp.c: Likewise.
+	* signal/kill.c: Likewise.
+	* signal/killpg.c: Likewise.
+	* signal/raise.c: Likewise.
+	* signal/sigaction.c: Likewise.
+	* signal/sigaltstack.c: Likewise.
+	* signal/sigblock.c: Likewise.
+	* signal/sigignore.c: Likewise.
+	* signal/sigintr.c: Likewise.
+	* signal/signal.c: Likewise.
+	* signal/sigpause.c: Likewise.
+	* signal/sigpending.c: Likewise.
+	* signal/sigqueue.c: Likewise.
+	* signal/sigreturn.c: Likewise.
+	* signal/sigset.c: Likewise.
+	* signal/sigsetmask.c: Likewise.
+	* signal/sigstack.c: Likewise.
+	* signal/sigsuspend.c: Likewise.
+	* signal/sigtimedwait.c: Likewise.
+	* signal/sigvec.c: Likewise.
+	* signal/sigwait.c: Likewise.
+	* signal/sigwaitinfo.c: Likewise.
+	* signal/sysv_signal.c: Likewise.
+	* socket/accept.c: Likewise.
+	* socket/accept4.c: Likewise.
+	* socket/bind.c: Likewise.
+	* socket/connect.c: Likewise.
+	* socket/getpeername.c: Likewise.
+	* socket/getsockname.c: Likewise.
+	* socket/getsockopt.c: Likewise.
+	* socket/isfdtype.c: Likewise.
+	* socket/listen.c: Likewise.
+	* socket/recv.c: Likewise.
+	* socket/recvfrom.c: Likewise.
+	* socket/recvmsg.c: Likewise.
+	* socket/send.c: Likewise.
+	* socket/sendmsg.c: Likewise.
+	* socket/sendto.c: Likewise.
+	* socket/setsockopt.c: Likewise.
+	* socket/shutdown.c: Likewise.
+	* socket/sockatmark.c: Likewise.
+	* socket/socket.c: Likewise.
+	* socket/socketpair.c: Likewise.
+	* stdio-common/ctermid.c: Likewise.
+	* stdio-common/cuserid.c: Likewise.
+	* stdio-common/remove.c: Likewise.
+	* stdio-common/rename.c: Likewise.
+	* stdio-common/renameat.c: Likewise.
+	* stdio-common/tempname.c: Likewise.
+	* stdlib/getcontext.c: Likewise.
+	* stdlib/makecontext.c: Likewise.
+	* stdlib/setcontext.c: Likewise.
+	* stdlib/swapcontext.c: Likewise.
+	* stdlib/system.c: Likewise.
+	* streams/fattach.c: Likewise.
+	* streams/fdetach.c: Likewise.
+	* streams/getmsg.c: Likewise.
+	* streams/getpmsg.c: Likewise.
+	* streams/putmsg.c: Likewise.
+	* streams/putpmsg.c: Likewise.
+	* sysdeps/unix/bsd/getpt.c: Likewise.
+	* sysdeps/unix/sysv/linux/epoll_pwait.c: Likewise.
+	* sysdeps/unix/sysv/linux/futimens.c: Likewise.
+	* sysdeps/unix/sysv/linux/lutimes.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c:
+	Likewise.
+	* sysdeps/unix/sysv/linux/readahead.c: Likewise.
+	* sysdeps/unix/sysv/linux/sync_file_range.c: Likewise.
+	* sysdeps/unix/sysv/linux/utimensat.c: Likewise.
+	* sysvipc/msgctl.c: Likewise.
+	* sysvipc/msgget.c: Likewise.
+	* sysvipc/msgrcv.c: Likewise.
+	* sysvipc/msgsnd.c: Likewise.
+	* sysvipc/semctl.c: Likewise.
+	* sysvipc/semget.c: Likewise.
+	* sysvipc/semop.c: Likewise.
+	* sysvipc/semtimedop.c: Likewise.
+	* sysvipc/shmat.c: Likewise.
+	* sysvipc/shmctl.c: Likewise.
+	* sysvipc/shmdt.c: Likewise.
+	* sysvipc/shmget.c: Likewise.
+	* termios/tcdrain.c: Likewise.
+	* termios/tcflow.c: Likewise.
+	* termios/tcflush.c: Likewise.
+	* termios/tcgetattr.c: Likewise.
+	* termios/tcgetpgrp.c: Likewise.
+	* termios/tcsendbrk.c: Likewise.
+	* termios/tcsetattr.c: Likewise.
+	* termios/tcsetpgrp.c: Likewise.
+	* time/adjtime.c: Likewise.
+	* time/clock.c: Likewise.
+	* time/getitimer.c: Likewise.
+	* time/gettimeofday.c: Likewise.
+	* time/setitimer.c: Likewise.
+	* time/settimeofday.c: Likewise.
+	* time/stime.c: Likewise.
+	* time/time.c: Likewise.
+
+2012-11-04  Pino Toscano  <toscano.pino@tiscali.it>
 
 	* sysdeps/generic/paths.h (_PATH_STDPATH): Remove /usr/contrib/bin and
 	/usr/old/bin.
diff --git a/Makerules b/Makerules
index ebb9895039..56dc60b11f 100644
--- a/Makerules
+++ b/Makerules
@@ -1310,9 +1310,7 @@ common-clean: common-mostlyclean
 	-rm -f $(gen-as-const-headers:%.sym=$(common-objpfx)%.h)
 
 # Produce a file `stubs' which contains `#define __stub_FUNCTION'
-# for each function which is a stub.  We grovel over all the .d files
-# looking for references to <stub-tag.h>.  Then we grovel over each
-# referenced source file to see what stub function it defines.
+# for each function which is a stub.
 
 ifdef objpfx
 .PHONY: stubs # The parent Makefile calls this target.
diff --git a/dirent/closedir.c b/dirent/closedir.c
index 745062b40e..63ce52c043 100644
--- a/dirent/closedir.c
+++ b/dirent/closedir.c
@@ -31,4 +31,3 @@ __closedir (DIR *dirp)
 weak_alias (__closedir, closedir)
 
 stub_warning (closedir)
-#include <stub-tag.h>
diff --git a/dirent/dirfd.c b/dirent/dirfd.c
index 026421f33b..2cab938ad3 100644
--- a/dirent/dirfd.c
+++ b/dirent/dirfd.c
@@ -29,4 +29,3 @@ dirfd (dirp)
 }
 
 stub_warning (dirfd)
-#include <stub-tag.h>
diff --git a/dirent/fdopendir.c b/dirent/fdopendir.c
index fd6e2741f1..0894a08581 100644
--- a/dirent/fdopendir.c
+++ b/dirent/fdopendir.c
@@ -31,4 +31,3 @@ __fdopendir (int fd)
 weak_alias (__fdopendir, fdopendir)
 
 stub_warning (fdopendir)
-#include <stub-tag.h>
diff --git a/dirent/getdents.c b/dirent/getdents.c
index a5277ebea6..3b52227f74 100644
--- a/dirent/getdents.c
+++ b/dirent/getdents.c
@@ -33,4 +33,3 @@ __getdirentries (fd, buf, nbytes, basep)
 weak_alias (__getdirentries, getdirentries)
 
 stub_warning (getdirentries)
-#include <stub-tag.h>
diff --git a/dirent/getdents64.c b/dirent/getdents64.c
index ce013ca0e0..63b0435db5 100644
--- a/dirent/getdents64.c
+++ b/dirent/getdents64.c
@@ -32,4 +32,3 @@ getdirentries64 (fd, buf, nbytes, basep)
 }
 
 stub_warning (getdirentries64)
-#include <stub-tag.h>
diff --git a/dirent/opendir.c b/dirent/opendir.c
index ce7084c9c1..beb9d10767 100644
--- a/dirent/opendir.c
+++ b/dirent/opendir.c
@@ -38,4 +38,3 @@ __opendir (const char *name)
 weak_alias (__opendir, opendir)
 
 stub_warning (opendir)
-#include <stub-tag.h>
diff --git a/dirent/readdir.c b/dirent/readdir.c
index da4ecb4b1a..5a7fa4200f 100644
--- a/dirent/readdir.c
+++ b/dirent/readdir.c
@@ -29,4 +29,3 @@ __readdir (DIR *dirp)
 weak_alias (__readdir, readdir)
 
 stub_warning (readdir)
-#include <stub-tag.h>
diff --git a/dirent/readdir64.c b/dirent/readdir64.c
index 8fb7bfcd8e..484d983ce6 100644
--- a/dirent/readdir64.c
+++ b/dirent/readdir64.c
@@ -28,4 +28,3 @@ __readdir64 (DIR *dirp)
 }
 weak_alias (__readdir64, readdir64)
 stub_warning (readdir64)
-#include <stub-tag.h>
diff --git a/dirent/readdir64_r.c b/dirent/readdir64_r.c
index 6b178d5d50..648d5ef213 100644
--- a/dirent/readdir64_r.c
+++ b/dirent/readdir64_r.c
@@ -29,4 +29,3 @@ readdir64_r (DIR *dirp, struct dirent64 *entry, struct dirent64 **result)
   return -1;
 }
 stub_warning (readdir64_r)
-#include <stub-tag.h>
diff --git a/dirent/readdir_r.c b/dirent/readdir_r.c
index 115a3ceaf7..3a2fa6e2c6 100644
--- a/dirent/readdir_r.c
+++ b/dirent/readdir_r.c
@@ -31,4 +31,3 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
 weak_alias (__readdir_r, readdir_r)
 
 stub_warning (readdir_r)
-#include <stub-tag.h>
diff --git a/dirent/rewinddir.c b/dirent/rewinddir.c
index 5519e6761d..78e4d5399d 100644
--- a/dirent/rewinddir.c
+++ b/dirent/rewinddir.c
@@ -32,4 +32,3 @@ libc_hidden_def (rewinddir)
 
 
 stub_warning (rewinddir)
-#include <stub-tag.h>
diff --git a/dirent/seekdir.c b/dirent/seekdir.c
index a6e2685c1b..a274bcdeb0 100644
--- a/dirent/seekdir.c
+++ b/dirent/seekdir.c
@@ -37,4 +37,3 @@ seekdir (dirp, pos)
 
 
 stub_warning (seekdir)
-#include <stub-tag.h>
diff --git a/dirent/telldir.c b/dirent/telldir.c
index f255a0e9b5..a00e750063 100644
--- a/dirent/telldir.c
+++ b/dirent/telldir.c
@@ -37,4 +37,3 @@ telldir (dirp)
 
 
 stub_warning (telldir)
-#include <stub-tag.h>
diff --git a/gmon/profil.c b/gmon/profil.c
index 53c2263c49..a48ef71e0b 100644
--- a/gmon/profil.c
+++ b/gmon/profil.c
@@ -38,4 +38,3 @@ __profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
 }
 weak_alias (__profil, profil)
 stub_warning (profil)
-#include <stub-tag.h>
diff --git a/grp/setgroups.c b/grp/setgroups.c
index 7ef0da2702..2de0c8fd9a 100644
--- a/grp/setgroups.c
+++ b/grp/setgroups.c
@@ -31,4 +31,3 @@ setgroups (n, groups)
 libc_hidden_def (setgroups)
 
 stub_warning (setgroups)
-#include <stub-tag.h>
diff --git a/include/stub-tag.h b/include/stub-tag.h
deleted file mode 100644
index d4d10c8341..0000000000
--- a/include/stub-tag.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* This header is included into every file that declares a stub function.
-   It is obsolete now, but hasn't died to avoid removing all those
-   #include's.  Every such file should use the `stub_warning' macro for
-   each of its functions, and that is sufficient.  */
diff --git a/inet/if_index.c b/inet/if_index.c
index ba25ec6a6f..3d706766be 100644
--- a/inet/if_index.c
+++ b/inet/if_index.c
@@ -50,7 +50,6 @@ if_nameindex (void)
   return NULL;
 }
 stub_warning (if_nameindex)
-#include <stub-tag.h>
 
 #if 0
 void
diff --git a/io/access.c b/io/access.c
index b8f7300486..9b82a99a56 100644
--- a/io/access.c
+++ b/io/access.c
@@ -37,4 +37,3 @@ __access (file, type)
 stub_warning (access)
 
 weak_alias (__access, access)
-#include <stub-tag.h>
diff --git a/io/chdir.c b/io/chdir.c
index 9f52097563..251afd3ce6 100644
--- a/io/chdir.c
+++ b/io/chdir.c
@@ -36,4 +36,3 @@ __chdir (path)
 stub_warning (chdir)
 
 weak_alias (__chdir, chdir)
-#include <stub-tag.h>
diff --git a/io/chmod.c b/io/chmod.c
index 7d45cc8de9..8e4be3dfb1 100644
--- a/io/chmod.c
+++ b/io/chmod.c
@@ -38,4 +38,3 @@ __chmod (file, mode)
 stub_warning (chmod)
 
 weak_alias (__chmod, chmod)
-#include <stub-tag.h>
diff --git a/io/chown.c b/io/chown.c
index e91bd1b128..45bd9e2484 100644
--- a/io/chown.c
+++ b/io/chown.c
@@ -41,4 +41,3 @@ libc_hidden_def (__chown)
 stub_warning (chown)
 
 weak_alias (__chown, chown)
-#include <stub-tag.h>
diff --git a/io/close.c b/io/close.c
index 41c37d8c06..ce9276ff7d 100644
--- a/io/close.c
+++ b/io/close.c
@@ -36,4 +36,3 @@ libc_hidden_def (__close)
 stub_warning (close)
 
 weak_alias (__close, close)
-#include <stub-tag.h>
diff --git a/io/dup.c b/io/dup.c
index d28e318941..c659de3d0a 100644
--- a/io/dup.c
+++ b/io/dup.c
@@ -30,4 +30,3 @@ __dup (fd)
 stub_warning (dup)
 
 weak_alias (__dup, dup)
-#include <stub-tag.h>
diff --git a/io/dup2.c b/io/dup2.c
index aeeebd5b17..a043af5a08 100644
--- a/io/dup2.c
+++ b/io/dup2.c
@@ -44,4 +44,3 @@ libc_hidden_def (__dup2)
 stub_warning (dup2)
 
 weak_alias (__dup2, dup2)
-#include <stub-tag.h>
diff --git a/io/dup3.c b/io/dup3.c
index 7e97bf733c..4df7e9bc4b 100644
--- a/io/dup3.c
+++ b/io/dup3.c
@@ -45,5 +45,3 @@ __dup3 (fd, fd2, flags)
 libc_hidden_def (__dup3)
 weak_alias (__dup3, dup3)
 stub_warning (dup3)
-
-#include <stub-tag.h>
diff --git a/io/euidaccess.c b/io/euidaccess.c
index 82ddd377eb..d71d22139d 100644
--- a/io/euidaccess.c
+++ b/io/euidaccess.c
@@ -38,4 +38,3 @@ weak_alias (__euidaccess, euidaccess)
 weak_alias (__euidaccess, eaccess)
 stub_warning (euidaccess)
 stub_warning (eaccess)
-#include <stub-tag.h>
diff --git a/io/faccessat.c b/io/faccessat.c
index 3e30ddec01..4e8e46c053 100644
--- a/io/faccessat.c
+++ b/io/faccessat.c
@@ -46,5 +46,3 @@ faccessat (fd, file, type, flag)
   return -1;
 }
 stub_warning (faccessat)
-
-#include <stub-tag.h>
diff --git a/io/fchdir.c b/io/fchdir.c
index de4ebefe36..c7ce4a9c36 100644
--- a/io/fchdir.c
+++ b/io/fchdir.c
@@ -29,4 +29,3 @@ fchdir (fd)
 }
 
 stub_warning (fchdir)
-#include <stub-tag.h>
diff --git a/io/fchmod.c b/io/fchmod.c
index 89087b61d3..b5dc512dd0 100644
--- a/io/fchmod.c
+++ b/io/fchmod.c
@@ -38,4 +38,3 @@ __fchmod (fd, mode)
 stub_warning (fchmod)
 
 weak_alias (__fchmod, fchmod)
-#include <stub-tag.h>
diff --git a/io/fchmodat.c b/io/fchmodat.c
index d171f363b0..1bbe63edcf 100644
--- a/io/fchmodat.c
+++ b/io/fchmodat.c
@@ -46,5 +46,3 @@ fchmodat (fd, file, mode, flag)
   return -1;
 }
 stub_warning (fchmodat)
-
-#include <stub-tag.h>
diff --git a/io/fchown.c b/io/fchown.c
index 5b15f90f66..c98b84e27a 100644
--- a/io/fchown.c
+++ b/io/fchown.c
@@ -39,4 +39,3 @@ __fchown (fd, owner, group)
 stub_warning (fchown)
 
 weak_alias (__fchown, fchown)
-#include <stub-tag.h>
diff --git a/io/fchownat.c b/io/fchownat.c
index c779f28c21..8f82ce6f4b 100644
--- a/io/fchownat.c
+++ b/io/fchownat.c
@@ -46,5 +46,3 @@ fchownat (fd, file, owner, group, flag)
   return -1;
 }
 stub_warning (fchownat)
-
-#include <stub-tag.h>
diff --git a/io/fcntl.c b/io/fcntl.c
index 550eb11944..766f605e31 100644
--- a/io/fcntl.c
+++ b/io/fcntl.c
@@ -37,4 +37,3 @@ libc_hidden_def (__fcntl)
 stub_warning (fcntl)
 
 weak_alias (__fcntl, fcntl)
-#include <stub-tag.h>
diff --git a/io/flock.c b/io/flock.c
index 6da0b6b36b..68f1b448ba 100644
--- a/io/flock.c
+++ b/io/flock.c
@@ -32,4 +32,3 @@ __flock (fd, operation)
 weak_alias (__flock, flock)
 
 stub_warning (flock)
-#include <stub-tag.h>
diff --git a/io/fstatfs.c b/io/fstatfs.c
index 9579fcc548..1bca3d546d 100644
--- a/io/fstatfs.c
+++ b/io/fstatfs.c
@@ -30,4 +30,3 @@ __fstatfs (int fd, struct statfs *buf)
 stub_warning (fstatfs)
 
 weak_alias (__fstatfs, fstatfs)
-#include <stub-tag.h>
diff --git a/io/fstatfs64.c b/io/fstatfs64.c
index 640be9f550..031a81fbdb 100644
--- a/io/fstatfs64.c
+++ b/io/fstatfs64.c
@@ -28,4 +28,3 @@ __fstatfs64 (int fd, struct statfs64 *buf)
 weak_alias (__fstatfs64, fstatfs64)
 
 stub_warning (fstatfs64)
-#include <stub-tag.h>
diff --git a/io/fstatvfs.c b/io/fstatvfs.c
index 4b64949f91..fd4936ca5a 100644
--- a/io/fstatvfs.c
+++ b/io/fstatvfs.c
@@ -29,4 +29,3 @@ __fstatvfs (int fd, struct statvfs *buf)
 stub_warning (fstatvfs)
 weak_alias (__fstatvfs, fstatvfs)
 libc_hidden_weak (fstatvfs)
-#include <stub-tag.h>
diff --git a/io/fstatvfs64.c b/io/fstatvfs64.c
index 9eb62a36ce..a8374dd2d1 100644
--- a/io/fstatvfs64.c
+++ b/io/fstatvfs64.c
@@ -28,4 +28,3 @@ __fstatvfs64 (int fd, struct statvfs64 *buf)
 weak_alias (__fstatvfs64, fstatvfs64)
 
 stub_warning (fstatvfs64)
-#include <stub-tag.h>
diff --git a/io/futimens.c b/io/futimens.c
index df3ddf3d10..b80de08008 100644
--- a/io/futimens.c
+++ b/io/futimens.c
@@ -32,4 +32,3 @@ futimens (int fd, const struct timespec tsp[2])
   return -1;
 }
 stub_warning (futimens)
-#include <stub-tag.h>
diff --git a/io/fxstat.c b/io/fxstat.c
index 216a14cac6..50c06570d4 100644
--- a/io/fxstat.c
+++ b/io/fxstat.c
@@ -46,4 +46,3 @@ __fxstat (int vers, int fd, struct stat *buf)
 stub_warning (fstat)
 hidden_def (__fxstat)
 weak_alias (__fxstat, _fxstat)
-#include <stub-tag.h>
diff --git a/io/fxstat64.c b/io/fxstat64.c
index dd0c56948c..56755f8266 100644
--- a/io/fxstat64.c
+++ b/io/fxstat64.c
@@ -45,4 +45,3 @@ __fxstat64 (int vers, int fd, struct stat64 *buf)
 }
 hidden_def (__fxstat64)
 stub_warning (fstat64)
-#include <stub-tag.h>
diff --git a/io/fxstatat.c b/io/fxstatat.c
index a6e79d0378..fff4be2931 100644
--- a/io/fxstatat.c
+++ b/io/fxstatat.c
@@ -46,4 +46,3 @@ __fxstatat (int vers, int fd, const char *filename, struct stat *buf, int flag)
 }
 libc_hidden_def (__fxstatat)
 stub_warning (fstatat)
-#include <stub-tag.h>
diff --git a/io/fxstatat64.c b/io/fxstatat64.c
index 950e267387..43fd53e2cf 100644
--- a/io/fxstatat64.c
+++ b/io/fxstatat64.c
@@ -47,4 +47,3 @@ __fxstatat64 (int vers, int fd, const char *filename, struct stat64 *buf,
 }
 libc_hidden_def (__fxstatat64)
 stub_warning (fstatat64)
-#include <stub-tag.h>
diff --git a/io/getcwd.c b/io/getcwd.c
index 5984a353a9..3aba719c56 100644
--- a/io/getcwd.c
+++ b/io/getcwd.c
@@ -36,4 +36,3 @@ weak_alias (__getcwd, getcwd)
 
 stub_warning (__getcwd)
 stub_warning (getcwd)
-#include <stub-tag.h>
diff --git a/io/isatty.c b/io/isatty.c
index f8e793b1ed..eb532711cc 100644
--- a/io/isatty.c
+++ b/io/isatty.c
@@ -30,4 +30,3 @@ __isatty (fd)
 weak_alias (__isatty, isatty)
 
 stub_warning (isatty)
-#include <stub-tag.h>
diff --git a/io/lchmod.c b/io/lchmod.c
index 8d9b79fb23..5044f4c2df 100644
--- a/io/lchmod.c
+++ b/io/lchmod.c
@@ -29,4 +29,3 @@ lchmod (const char *file, mode_t mode)
 }
 
 stub_warning (lchmod)
-#include <stub-tag.h>
diff --git a/io/lchown.c b/io/lchown.c
index 7ecf3345ac..682083c9e4 100644
--- a/io/lchown.c
+++ b/io/lchown.c
@@ -39,4 +39,3 @@ __lchown (file, owner, group)
 stub_warning (lchown)
 
 weak_alias (__lchown, lchown)
-#include <stub-tag.h>
diff --git a/io/link.c b/io/link.c
index 3b039657c2..b43f5eb2a8 100644
--- a/io/link.c
+++ b/io/link.c
@@ -38,4 +38,3 @@ __link (from, to)
 stub_warning (link)
 
 weak_alias (__link, link)
-#include <stub-tag.h>
diff --git a/io/linkat.c b/io/linkat.c
index 2fa8cde93d..6274d09390 100644
--- a/io/linkat.c
+++ b/io/linkat.c
@@ -47,5 +47,3 @@ linkat (fromfd, from, tofd, to, flags)
   return -1;
 }
 stub_warning (linkat)
-
-#include <stub-tag.h>
diff --git a/io/lseek.c b/io/lseek.c
index 0729cb66ee..7fd6188a76 100644
--- a/io/lseek.c
+++ b/io/lseek.c
@@ -49,4 +49,3 @@ stub_warning (lseek)
 libc_hidden_def (__lseek)
 
 weak_alias (__lseek, lseek)
-#include <stub-tag.h>
diff --git a/io/lseek64.c b/io/lseek64.c
index acea3f3cb4..21b853a968 100644
--- a/io/lseek64.c
+++ b/io/lseek64.c
@@ -45,4 +45,3 @@ __libc_lseek64 (int fd, off64_t offset, int whence)
 weak_alias (__libc_lseek64, __lseek64)
 weak_alias (__libc_lseek64, lseek64)
 stub_warning (lseek64)
-#include <stub-tag.h>
diff --git a/io/lxstat64.c b/io/lxstat64.c
index 38d78a8065..84993c2561 100644
--- a/io/lxstat64.c
+++ b/io/lxstat64.c
@@ -35,4 +35,3 @@ __lxstat64 (int vers, const char *file, struct stat64 *buf)
 }
 hidden_def (__lxstat64)
 stub_warning (__lxstat64)
-#include <stub-tag.h>
diff --git a/io/mkdir.c b/io/mkdir.c
index ac95d36e17..39c3db175a 100644
--- a/io/mkdir.c
+++ b/io/mkdir.c
@@ -39,4 +39,3 @@ __mkdir (path, mode)
 stub_warning (mkdir)
 
 weak_alias (__mkdir, mkdir)
-#include <stub-tag.h>
diff --git a/io/mkdirat.c b/io/mkdirat.c
index 04533fcd29..e8d10aea4b 100644
--- a/io/mkdirat.c
+++ b/io/mkdirat.c
@@ -53,5 +53,3 @@ mkdirat (fd, path, mode)
   return -1;
 }
 stub_warning (mkdirat)
-
-#include <stub-tag.h>
diff --git a/io/mkfifo.c b/io/mkfifo.c
index 1b55921c3f..8fdd0214f2 100644
--- a/io/mkfifo.c
+++ b/io/mkfifo.c
@@ -39,4 +39,3 @@ mkfifo (path, mode)
 
 
 stub_warning (mkfifo)
-#include <stub-tag.h>
diff --git a/io/mkfifoat.c b/io/mkfifoat.c
index 30cea31619..850d5671fb 100644
--- a/io/mkfifoat.c
+++ b/io/mkfifoat.c
@@ -56,4 +56,3 @@ mkfifoat (fd, path, mode)
 
 
 stub_warning (mkfifoat)
-#include <stub-tag.h>
diff --git a/io/open.c b/io/open.c
index b6911206a0..a388b33867 100644
--- a/io/open.c
+++ b/io/open.c
@@ -69,5 +69,3 @@ __open_2 (file, oflag)
   return __open (file, oflag);
 }
 stub_warning (__open_2)
-
-#include <stub-tag.h>
diff --git a/io/open64.c b/io/open64.c
index b4ce18d325..704491dff4 100644
--- a/io/open64.c
+++ b/io/open64.c
@@ -66,5 +66,3 @@ __open64_2 (file, oflag)
   return __open64 (file, oflag);
 }
 stub_warning (__open64_2)
-
-#include <stub-tag.h>
diff --git a/io/openat.c b/io/openat.c
index b496539361..efcbaa90c9 100644
--- a/io/openat.c
+++ b/io/openat.c
@@ -88,5 +88,3 @@ __openat_2 (fd, file, oflag)
   return __openat (fd, file, oflag);
 }
 stub_warning (__openat_2)
-
-#include <stub-tag.h>
diff --git a/io/openat64.c b/io/openat64.c
index 2071760893..7de0e69670 100644
--- a/io/openat64.c
+++ b/io/openat64.c
@@ -81,5 +81,3 @@ __openat64_2 (fd, file, oflag)
   return __openat64 (fd, file, oflag);
 }
 stub_warning (__openat_2)
-
-#include <stub-tag.h>
diff --git a/io/pipe.c b/io/pipe.c
index 07a37ae778..1f1c03f0d5 100644
--- a/io/pipe.c
+++ b/io/pipe.c
@@ -40,4 +40,3 @@ libc_hidden_def (__pipe)
 stub_warning (pipe)
 
 weak_alias (__pipe, pipe)
-#include <stub-tag.h>
diff --git a/io/pipe2.c b/io/pipe2.c
index 8a15e840fd..2478fc3c61 100644
--- a/io/pipe2.c
+++ b/io/pipe2.c
@@ -39,5 +39,3 @@ __pipe2 (pipedes, flags)
 }
 weak_alias (__pipe2, pipe2)
 stub_warning (pipe2)
-
-#include <stub-tag.h>
diff --git a/io/poll.c b/io/poll.c
index 15539ea0ae..2dc7fc6a33 100644
--- a/io/poll.c
+++ b/io/poll.c
@@ -35,4 +35,3 @@ poll (fds, nfds, timeout)
 }
 
 stub_warning (poll)
-#include <stub-tag.h>
diff --git a/io/posix_fadvise.c b/io/posix_fadvise.c
index 3733601647..70d0700b5a 100644
--- a/io/posix_fadvise.c
+++ b/io/posix_fadvise.c
@@ -27,4 +27,3 @@ posix_fadvise (int fd, __off_t offset, __off_t len, int advise)
   return ENOSYS;
 }
 stub_warning (posix_fadvise)
-#include <stub-tag.h>
diff --git a/io/posix_fadvise64.c b/io/posix_fadvise64.c
index 645ed6cac7..3398c8eef1 100644
--- a/io/posix_fadvise64.c
+++ b/io/posix_fadvise64.c
@@ -27,4 +27,3 @@ posix_fadvise64 (int fd, __off64_t offset, __off64_t len, int advise)
   return ENOSYS;
 }
 stub_warning (posix_fadvise64)
-#include <stub-tag.h>
diff --git a/io/posix_fallocate.c b/io/posix_fallocate.c
index 3f8a3cb104..d5138f08b3 100644
--- a/io/posix_fallocate.c
+++ b/io/posix_fallocate.c
@@ -27,4 +27,3 @@ posix_fallocate (int fd, __off_t offset, __off_t len)
   return -1;
 }
 stub_warning (posix_fallocate)
-#include <stub-tag.h>
diff --git a/io/posix_fallocate64.c b/io/posix_fallocate64.c
index 07b08ae85f..486646addc 100644
--- a/io/posix_fallocate64.c
+++ b/io/posix_fallocate64.c
@@ -27,4 +27,3 @@ posix_fallocate64 (int fd, __off64_t offset, __off64_t len)
   return -1;
 }
 stub_warning (posix_fallocate64)
-#include <stub-tag.h>
diff --git a/io/read.c b/io/read.c
index 681f16eb50..f676d4929d 100644
--- a/io/read.c
+++ b/io/read.c
@@ -45,4 +45,3 @@ stub_warning (read)
 weak_alias (__libc_read, __read)
 libc_hidden_weak (__read)
 weak_alias (__libc_read, read)
-#include <stub-tag.h>
diff --git a/io/readlink.c b/io/readlink.c
index de4040b0a6..4a1811b5cf 100644
--- a/io/readlink.c
+++ b/io/readlink.c
@@ -33,4 +33,3 @@ __readlink (path, buf, len)
 stub_warning (readlink)
 
 weak_alias (__readlink, readlink)
-#include <stub-tag.h>
diff --git a/io/readlinkat.c b/io/readlinkat.c
index d4e6ba2905..473f4e9c5b 100644
--- a/io/readlinkat.c
+++ b/io/readlinkat.c
@@ -46,5 +46,3 @@ readlinkat (fd, path, buf, len)
 }
 stub_warning (readlinkat)
 libc_hidden_def (readlinkat)
-
-#include <stub-tag.h>
diff --git a/io/rmdir.c b/io/rmdir.c
index c244ecc2ca..83c76369e3 100644
--- a/io/rmdir.c
+++ b/io/rmdir.c
@@ -37,4 +37,3 @@ __rmdir (path)
 stub_warning (rmdir)
 
 weak_alias (__rmdir, rmdir)
-#include <stub-tag.h>
diff --git a/io/sendfile.c b/io/sendfile.c
index 22222db4eb..4823c8032f 100644
--- a/io/sendfile.c
+++ b/io/sendfile.c
@@ -28,5 +28,3 @@ sendfile (int out_fd, int in_fd, off_t *offset, size_t count)
   return -1;
 }
 stub_warning (sendfile)
-
-#include <stub-tag.h>
diff --git a/io/sendfile64.c b/io/sendfile64.c
index 05b13a3311..8fddcc8fad 100644
--- a/io/sendfile64.c
+++ b/io/sendfile64.c
@@ -28,5 +28,3 @@ sendfile64 (int out_fd, int in_fd, off64_t *offset, size_t count)
   return -1;
 }
 stub_warning (sendfile64)
-
-#include <stub-tag.h>
diff --git a/io/statfs.c b/io/statfs.c
index 50cf3f3a73..0bb674a5de 100644
--- a/io/statfs.c
+++ b/io/statfs.c
@@ -31,4 +31,3 @@ libc_hidden_def (__statfs)
 weak_alias (__statfs, statfs)
 
 stub_warning (statfs)
-#include <stub-tag.h>
diff --git a/io/statfs64.c b/io/statfs64.c
index 12394959b9..a895d43984 100644
--- a/io/statfs64.c
+++ b/io/statfs64.c
@@ -28,4 +28,3 @@ __statfs64 (const char *file, struct statfs64 *buf)
 weak_alias (__statfs64, statfs64)
 
 stub_warning (statfs64)
-#include <stub-tag.h>
diff --git a/io/statvfs.c b/io/statvfs.c
index b66d027676..0ff847fb79 100644
--- a/io/statvfs.c
+++ b/io/statvfs.c
@@ -30,4 +30,3 @@ __statvfs (const char *file, struct statvfs *buf)
 weak_alias (__statvfs, statvfs)
 libc_hidden_weak (statvfs)
 stub_warning (statvfs)
-#include <stub-tag.h>
diff --git a/io/statvfs64.c b/io/statvfs64.c
index 1101acd7a3..7e57bc7824 100644
--- a/io/statvfs64.c
+++ b/io/statvfs64.c
@@ -28,4 +28,3 @@ __statvfs64 (const char *file, struct statvfs64 *buf)
 weak_alias (__statvfs64, statvfs64)
 
 stub_warning (statvfs64)
-#include <stub-tag.h>
diff --git a/io/symlink.c b/io/symlink.c
index 6e135d9551..298854f3b3 100644
--- a/io/symlink.c
+++ b/io/symlink.c
@@ -38,4 +38,3 @@ __symlink (from, to)
 stub_warning (symlink)
 
 weak_alias (__symlink, symlink)
-#include <stub-tag.h>
diff --git a/io/symlinkat.c b/io/symlinkat.c
index d5affb9b49..4937a2eaec 100644
--- a/io/symlinkat.c
+++ b/io/symlinkat.c
@@ -44,5 +44,3 @@ symlinkat (from, fd, to)
   return -1;
 }
 stub_warning (symlinkat)
-
-#include <stub-tag.h>
diff --git a/io/ttyname.c b/io/ttyname.c
index 5473b5e04b..8df1fd46bf 100644
--- a/io/ttyname.c
+++ b/io/ttyname.c
@@ -34,4 +34,3 @@ ttyname (fd)
 
 
 stub_warning (ttyname)
-#include <stub-tag.h>
diff --git a/io/ttyname_r.c b/io/ttyname_r.c
index 5acbbd59e4..6d7dfabd69 100644
--- a/io/ttyname_r.c
+++ b/io/ttyname_r.c
@@ -33,4 +33,3 @@ __ttyname_r (fd, buf, buflen)
 weak_alias (__ttyname_r, ttyname_r)
 
 stub_warning (ttyname_r)
-#include <stub-tag.h>
diff --git a/io/umask.c b/io/umask.c
index 1e71aae42a..07d7150e35 100644
--- a/io/umask.c
+++ b/io/umask.c
@@ -30,4 +30,3 @@ __umask (mask)
 stub_warning (umask)
 
 weak_alias (__umask, umask)
-#include <stub-tag.h>
diff --git a/io/unlink.c b/io/unlink.c
index 04d69f867b..b7a6d7cce4 100644
--- a/io/unlink.c
+++ b/io/unlink.c
@@ -37,4 +37,3 @@ __unlink (name)
 stub_warning (unlink)
 
 weak_alias (__unlink, unlink)
-#include <stub-tag.h>
diff --git a/io/unlinkat.c b/io/unlinkat.c
index f059611036..afa505380d 100644
--- a/io/unlinkat.c
+++ b/io/unlinkat.c
@@ -44,5 +44,3 @@ unlinkat (fd, name, flag)
   return -1;
 }
 stub_warning (unlinkat)
-
-#include <stub-tag.h>
diff --git a/io/utime.c b/io/utime.c
index 865628f5a3..7b307762df 100644
--- a/io/utime.c
+++ b/io/utime.c
@@ -39,4 +39,3 @@ utime (file, times)
 libc_hidden_def (utime)
 
 stub_warning (utime)
-#include <stub-tag.h>
diff --git a/io/utimensat.c b/io/utimensat.c
index d103d45648..b1d3b0354e 100644
--- a/io/utimensat.c
+++ b/io/utimensat.c
@@ -30,4 +30,3 @@ utimensat (int fd, const char *file, const struct timespec tsp[2],
   return -1;
 }
 stub_warning (utimensat)
-#include <stub-tag.h>
diff --git a/io/write.c b/io/write.c
index a5f907a34b..8c9523dec7 100644
--- a/io/write.c
+++ b/io/write.c
@@ -46,4 +46,3 @@ stub_warning (write)
 weak_alias (__libc_write, __write)
 libc_hidden_weak (__write)
 weak_alias (__libc_write, write)
-#include <stub-tag.h>
diff --git a/io/xmknod.c b/io/xmknod.c
index 78bbf5a1a8..bea68e1069 100644
--- a/io/xmknod.c
+++ b/io/xmknod.c
@@ -38,4 +38,3 @@ stub_warning (__xmknod)
 
 weak_alias (__xmknod, _xmknod)
 libc_hidden_def (__xmknod)
-#include <stub-tag.h>
diff --git a/io/xmknodat.c b/io/xmknodat.c
index a743cced36..1be6ffae2d 100644
--- a/io/xmknodat.c
+++ b/io/xmknodat.c
@@ -60,4 +60,3 @@ __xmknodat (int vers, int fd, const char *path, mode_t mode, dev_t *dev)
 stub_warning (__xmknodat)
 
 libc_hidden_def (__xmknodat)
-#include <stub-tag.h>
diff --git a/io/xstat.c b/io/xstat.c
index 6871189917..806604e67d 100644
--- a/io/xstat.c
+++ b/io/xstat.c
@@ -35,4 +35,3 @@ __xstat (int vers, const char *file, struct stat *buf)
 hidden_def (__xstat)
 stub_warning (stat)
 weak_alias (__xstat, _xstat)
-#include <stub-tag.h>
diff --git a/io/xstat64.c b/io/xstat64.c
index 9d153442bf..aad1352875 100644
--- a/io/xstat64.c
+++ b/io/xstat64.c
@@ -34,4 +34,3 @@ __xstat64 (int vers, const char *file, struct stat64 *buf)
 }
 hidden_def (__xstat64)
 stub_warning (stat64)
-#include <stub-tag.h>
diff --git a/login/getpt.c b/login/getpt.c
index 34218a63ac..4b9b037b98 100644
--- a/login/getpt.c
+++ b/login/getpt.c
@@ -41,4 +41,3 @@ weak_alias (__posix_openpt, posix_openpt)
 
 stub_warning (getpt)
 stub_warning (posix_openpt)
-#include <stub-tag.h>
diff --git a/login/grantpt.c b/login/grantpt.c
index a076112fcf..fd7ee6c0bc 100644
--- a/login/grantpt.c
+++ b/login/grantpt.c
@@ -31,4 +31,3 @@ grantpt (fd)
 }
 
 stub_warning (grantpt)
-#include <stub-tag.h>
diff --git a/login/unlockpt.c b/login/unlockpt.c
index 1f3bf14ce2..f00d88f9c1 100644
--- a/login/unlockpt.c
+++ b/login/unlockpt.c
@@ -31,4 +31,3 @@ unlockpt (fd)
 }
 
 stub_warning (unlockpt)
-#include <stub-tag.h>
diff --git a/manual/maint.texi b/manual/maint.texi
index e6fedcfa7c..0f4b959815 100644
--- a/manual/maint.texi
+++ b/manual/maint.texi
@@ -247,8 +247,7 @@ particular machine or operating system.  Stub functions always return an
 error, and set @code{errno} to @code{ENOSYS} (Function not implemented).
 @xref{Error Reporting}.  If you define a stub function, you must place
 the statement @code{stub_warning(@var{function})}, where @var{function}
-is the name of your function, after its definition; also, you must
-include the file @code{<stub-tag.h>} into your file.  This causes the
+is the name of your function, after its definition.  This causes the
 function to be listed in the installed @code{<gnu/stubs.h>}, and
 makes GNU ld warn when the function is used.
 
diff --git a/math/e_acoshl.c b/math/e_acoshl.c
index 490fd10fd7..cd426ed4f5 100644
--- a/math/e_acoshl.c
+++ b/math/e_acoshl.c
@@ -12,4 +12,3 @@ __ieee754_acoshl (long double x)
 strong_alias (__ieee754_acoshl, __acoshl_finite)
 
 stub_warning (acoshl)
-#include <stub-tag.h>
diff --git a/math/e_acosl.c b/math/e_acosl.c
index 55d9ab0f68..e5b6971197 100644
--- a/math/e_acosl.c
+++ b/math/e_acosl.c
@@ -12,4 +12,3 @@ __ieee754_acosl (long double x)
 strong_alias (__ieee754_acosl, __acosl_finite)
 
 stub_warning (acosl)
-#include <stub-tag.h>
diff --git a/math/e_asinl.c b/math/e_asinl.c
index 8e6c47e702..d6a6d14bd1 100644
--- a/math/e_asinl.c
+++ b/math/e_asinl.c
@@ -12,4 +12,3 @@ __ieee754_asinl (long double x)
 strong_alias (__ieee754_asinl, __asinl_finite)
 
 stub_warning (asinl)
-#include <stub-tag.h>
diff --git a/math/e_atan2l.c b/math/e_atan2l.c
index 8ca37622fc..2602c98f39 100644
--- a/math/e_atan2l.c
+++ b/math/e_atan2l.c
@@ -12,4 +12,3 @@ __ieee754_atan2l (long double x, long double y)
 strong_alias (__ieee754_atan2l, __atan2l_finite)
 
 stub_warning (atan2l)
-#include <stub-tag.h>
diff --git a/math/e_atanhl.c b/math/e_atanhl.c
index 26c52e7936..a6cb507246 100644
--- a/math/e_atanhl.c
+++ b/math/e_atanhl.c
@@ -12,4 +12,3 @@ __ieee754_atanhl (long double x)
 strong_alias (__ieee754_atanhl, __atanhl_finite)
 
 stub_warning (__ieee754_atanhl)
-#include <stub-tag.h>
diff --git a/math/e_coshl.c b/math/e_coshl.c
index 92bfd7a188..8bf7b20644 100644
--- a/math/e_coshl.c
+++ b/math/e_coshl.c
@@ -12,4 +12,3 @@ __ieee754_coshl (long double x)
 strong_alias (__ieee754_coshl, __coshl_finite)
 
 stub_warning (__ieee754_coshl)
-#include <stub-tag.h>
diff --git a/math/e_expl.c b/math/e_expl.c
index 5ba6eb5847..407d8188a2 100644
--- a/math/e_expl.c
+++ b/math/e_expl.c
@@ -12,4 +12,3 @@ __ieee754_expl (long double x)
 strong_alias (__ieee754_expl, __expl_finite)
 
 stub_warning (expl)
-#include <stub-tag.h>
diff --git a/math/e_fmodl.c b/math/e_fmodl.c
index dbd361ebc9..61587e9f41 100644
--- a/math/e_fmodl.c
+++ b/math/e_fmodl.c
@@ -12,4 +12,3 @@ __ieee754_fmodl (long double x, long double y)
 strong_alias (__ieee754_fmodl, __fmodl_finite)
 
 stub_warning (fmodl)
-#include <stub-tag.h>
diff --git a/math/e_gammal_r.c b/math/e_gammal_r.c
index c0ae70426a..9dbce67efb 100644
--- a/math/e_gammal_r.c
+++ b/math/e_gammal_r.c
@@ -13,4 +13,3 @@ __ieee754_gammal_r (long double x, int *signgamp)
 strong_alias (__ieee754_gammal_r, __gammal_r_finite)
 
 stub_warning (__ieee754_gammal_r)
-#include <stub-tag.h>
diff --git a/math/e_hypotl.c b/math/e_hypotl.c
index 73bad62775..6f3eb5f476 100644
--- a/math/e_hypotl.c
+++ b/math/e_hypotl.c
@@ -12,4 +12,3 @@ __ieee754_hypotl (long double x, long double y)
 strong_alias (__ieee754_hypotl, __hypotl_finite)
 
 stub_warning (__ieee754_hypotl)
-#include <stub-tag.h>
diff --git a/math/e_j0l.c b/math/e_j0l.c
index eb01ba67c7..1451efd2a2 100644
--- a/math/e_j0l.c
+++ b/math/e_j0l.c
@@ -24,4 +24,3 @@ __ieee754_y0l (long double x)
 strong_alias (__ieee754_y0l, __y0l_finite)
 
 stub_warning (y0l)
-#include <stub-tag.h>
diff --git a/math/e_j1l.c b/math/e_j1l.c
index 7701f49ff9..6bb3017543 100644
--- a/math/e_j1l.c
+++ b/math/e_j1l.c
@@ -24,4 +24,3 @@ __ieee754_y1l (long double x)
 strong_alias (__ieee754_y1l, __y1l_finite)
 
 stub_warning (y1l)
-#include <stub-tag.h>
diff --git a/math/e_jnl.c b/math/e_jnl.c
index 059b1db6bc..d9fddd059e 100644
--- a/math/e_jnl.c
+++ b/math/e_jnl.c
@@ -24,4 +24,3 @@ __ieee754_ynl (int n, long double x)
 strong_alias (__ieee754_ynl, __ynl_finite)
 
 stub_warning (ynl)
-#include <stub-tag.h>
diff --git a/math/e_lgammal_r.c b/math/e_lgammal_r.c
index 92e7700e2e..3babf7f668 100644
--- a/math/e_lgammal_r.c
+++ b/math/e_lgammal_r.c
@@ -15,4 +15,3 @@ strong_alias (__ieee754_lgammal_r, __lgammal_r_finite)
 
 stub_warning (lgammal)
 stub_warning (lgammal_r)
-#include <stub-tag.h>
diff --git a/math/e_log10l.c b/math/e_log10l.c
index 2c7ff72c2c..c0b7dfdd40 100644
--- a/math/e_log10l.c
+++ b/math/e_log10l.c
@@ -12,4 +12,3 @@ __ieee754_log10l (long double x)
 strong_alias (__ieee754_log10l, __log10l_finite)
 
 stub_warning (log10l)
-#include <stub-tag.h>
diff --git a/math/e_log2l.c b/math/e_log2l.c
index 95929c3606..af7d039c9a 100644
--- a/math/e_log2l.c
+++ b/math/e_log2l.c
@@ -12,4 +12,3 @@ __ieee754_log2l (long double x)
 strong_alias (__ieee754_log2l, __log2l_finite)
 
 stub_warning (log2l)
-#include <stub-tag.h>
diff --git a/math/e_logl.c b/math/e_logl.c
index 95608ab553..7a4ea1b07f 100644
--- a/math/e_logl.c
+++ b/math/e_logl.c
@@ -12,4 +12,3 @@ __ieee754_logl (long double x)
 strong_alias (__ieee754_logl, __logl_finite)
 
 stub_warning (logl)
-#include <stub-tag.h>
diff --git a/math/e_powl.c b/math/e_powl.c
index ab79b1a4b7..1013e2aa97 100644
--- a/math/e_powl.c
+++ b/math/e_powl.c
@@ -12,4 +12,3 @@ __ieee754_powl (long double x, long double y)
 strong_alias (__ieee754_powl, __powl_finite)
 
 stub_warning (powl)
-#include <stub-tag.h>
diff --git a/math/e_rem_pio2l.c b/math/e_rem_pio2l.c
index 7fa515df24..03ac2efbc3 100644
--- a/math/e_rem_pio2l.c
+++ b/math/e_rem_pio2l.c
@@ -12,4 +12,3 @@ __ieee754_rem_pio2l (long double x, long double *y)
 }
 
 stub_warning (__ieee754_rem_pio2l)
-#include <stub-tag.h>
diff --git a/math/e_sinhl.c b/math/e_sinhl.c
index fc756c9eba..4bc4ac9080 100644
--- a/math/e_sinhl.c
+++ b/math/e_sinhl.c
@@ -12,4 +12,3 @@ __ieee754_sinhl (long double x)
 strong_alias (__ieee754_sinhl, __sinhl_finite)
 
 stub_warning (__ieee754_sinhl)
-#include <stub-tag.h>
diff --git a/math/e_sqrtl.c b/math/e_sqrtl.c
index af9c2b51bf..acbe74f05a 100644
--- a/math/e_sqrtl.c
+++ b/math/e_sqrtl.c
@@ -12,4 +12,3 @@ __ieee754_sqrtl (long double x)
 strong_alias (__ieee754_sqrtl, __sqrtl_finite)
 
 stub_warning (sqrtl)
-#include <stub-tag.h>
diff --git a/math/fclrexcpt.c b/math/fclrexcpt.c
index bbf1011a65..b38070d8ff 100644
--- a/math/fclrexcpt.c
+++ b/math/fclrexcpt.c
@@ -34,4 +34,3 @@ libm_hidden_ver (__feclearexcept, feclearexcept)
 versioned_symbol (libm, __feclearexcept, feclearexcept, GLIBC_2_2);
 
 stub_warning (feclearexcept)
-#include <stub-tag.h>
diff --git a/math/fedisblxcpt.c b/math/fedisblxcpt.c
index f05c319100..610f62df97 100644
--- a/math/fedisblxcpt.c
+++ b/math/fedisblxcpt.c
@@ -26,4 +26,3 @@ fedisableexcept (int excepts)
   return -1;
 }
 stub_warning (fedisableexcept)
-#include <stub-tag.h>
diff --git a/math/feenablxcpt.c b/math/feenablxcpt.c
index 9db93c5447..f05e1aa647 100644
--- a/math/feenablxcpt.c
+++ b/math/feenablxcpt.c
@@ -26,4 +26,3 @@ feenableexcept (int excepts)
   return -1;
 }
 stub_warning (feenableexcept)
-#include <stub-tag.h>
diff --git a/math/fegetenv.c b/math/fegetenv.c
index 3166d7279c..f8fbdffdb3 100644
--- a/math/fegetenv.c
+++ b/math/fegetenv.c
@@ -35,4 +35,3 @@ libm_hidden_ver (__fegetenv, fegetenv)
 versioned_symbol (libm, BP_SYM (__fegetenv), BP_SYM (fegetenv), GLIBC_2_2);
 
 stub_warning (fegetenv)
-#include <stub-tag.h>
diff --git a/math/fegetexcept.c b/math/fegetexcept.c
index 0ea5184508..e55f22d0b5 100644
--- a/math/fegetexcept.c
+++ b/math/fegetexcept.c
@@ -26,4 +26,3 @@ fegetexcept (void)
   return -1;
 }
 stub_warning (fegetexcept)
-#include <stub-tag.h>
diff --git a/math/fegetround.c b/math/fegetround.c
index 366ef23c33..9c5c408047 100644
--- a/math/fegetround.c
+++ b/math/fegetround.c
@@ -25,4 +25,3 @@ fegetround (void)
   return 0;
 }
 stub_warning (fegetround)
-#include <stub-tag.h>
diff --git a/math/feholdexcpt.c b/math/feholdexcpt.c
index 9abfc6c9ee..a3909bd274 100644
--- a/math/feholdexcpt.c
+++ b/math/feholdexcpt.c
@@ -26,4 +26,3 @@ feholdexcept (fenv_t *envp)
 }
 libm_hidden_def (feholdexcept)
 stub_warning (feholdexcept)
-#include <stub-tag.h>
diff --git a/math/fesetenv.c b/math/fesetenv.c
index d285c927ca..c12d19f34b 100644
--- a/math/fesetenv.c
+++ b/math/fesetenv.c
@@ -34,4 +34,3 @@ libm_hidden_ver (__fesetenv, fesetenv)
 versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2);
 
 stub_warning (fesetenv)
-#include <stub-tag.h>
diff --git a/math/fesetround.c b/math/fesetround.c
index b70b531644..9742033b8f 100644
--- a/math/fesetround.c
+++ b/math/fesetround.c
@@ -26,4 +26,3 @@ fesetround (int round)
 }
 libm_hidden_def (fesetround)
 stub_warning (fesetround)
-#include <stub-tag.h>
diff --git a/math/feupdateenv.c b/math/feupdateenv.c
index 49674bc2a9..c31f8ad422 100644
--- a/math/feupdateenv.c
+++ b/math/feupdateenv.c
@@ -34,4 +34,3 @@ libm_hidden_ver (__feupdateenv, feupdateenv)
 versioned_symbol (libm, __feupdateenv, feupdateenv, GLIBC_2_2);
 
 stub_warning (feupdateenv)
-#include <stub-tag.h>
diff --git a/math/fgetexcptflg.c b/math/fgetexcptflg.c
index f079336806..1b8a589cc4 100644
--- a/math/fgetexcptflg.c
+++ b/math/fgetexcptflg.c
@@ -33,4 +33,3 @@ compat_symbol (libm, __old_fegetexceptflag, fegetexceptflag, GLIBC_2_1);
 versioned_symbol (libm, __fegetexceptflag, fegetexceptflag, GLIBC_2_2);
 
 stub_warning (fegetexceptflag)
-#include <stub-tag.h>
diff --git a/math/fraiseexcpt.c b/math/fraiseexcpt.c
index 83a488b456..9b3fbfd197 100644
--- a/math/fraiseexcpt.c
+++ b/math/fraiseexcpt.c
@@ -34,4 +34,3 @@ libm_hidden_ver (__feraiseexcept, feraiseexcept)
 versioned_symbol (libm, __feraiseexcept, feraiseexcept, GLIBC_2_2);
 
 stub_warning (feraiseexcept)
-#include <stub-tag.h>
diff --git a/math/fsetexcptflg.c b/math/fsetexcptflg.c
index 7d27d7f226..a90f54e13b 100644
--- a/math/fsetexcptflg.c
+++ b/math/fsetexcptflg.c
@@ -33,4 +33,3 @@ compat_symbol (libm, __old_fesetexceptflag, fesetexceptflag, GLIBC_2_1);
 versioned_symbol (libm, __fesetexceptflag, fesetexceptflag, GLIBC_2_2);
 
 stub_warning (fesetexceptflag)
-#include <stub-tag.h>
diff --git a/math/ftestexcept.c b/math/ftestexcept.c
index c396002e83..bea48e37e6 100644
--- a/math/ftestexcept.c
+++ b/math/ftestexcept.c
@@ -26,4 +26,3 @@ fetestexcept (int excepts)
 }
 libm_hidden_def (fetestexcept)
 stub_warning (fetestexcept)
-#include <stub-tag.h>
diff --git a/math/k_cosl.c b/math/k_cosl.c
index bf3708b157..6dc72b408e 100644
--- a/math/k_cosl.c
+++ b/math/k_cosl.c
@@ -12,4 +12,3 @@ __kernel_cosl (long double x, long double y)
 }
 
 stub_warning (__kernel_cosl)
-#include <stub-tag.h>
diff --git a/math/k_rem_pio2l.c b/math/k_rem_pio2l.c
index 236eb30dd9..01bf158249 100644
--- a/math/k_rem_pio2l.c
+++ b/math/k_rem_pio2l.c
@@ -13,4 +13,3 @@ __kernel_rem_pio2l (long double *x, long double *y, int e0, int nx, int prec,
 }
 
 stub_warning (__kernel_rem_pio2l)
-#include <stub-tag.h>
diff --git a/math/k_sinl.c b/math/k_sinl.c
index e95c71c4c1..004794275e 100644
--- a/math/k_sinl.c
+++ b/math/k_sinl.c
@@ -12,4 +12,3 @@ __kernel_sinl (long double x, long double y, int iy)
 }
 
 stub_warning (__kernel_sinl)
-#include <stub-tag.h>
diff --git a/math/k_tanl.c b/math/k_tanl.c
index 891d3ab407..8831f62889 100644
--- a/math/k_tanl.c
+++ b/math/k_tanl.c
@@ -12,4 +12,3 @@ __kernel_tanl (long double x, long double y, int iy)
 }
 
 stub_warning (__kernel_tanl)
-#include <stub-tag.h>
diff --git a/math/s_asinhl.c b/math/s_asinhl.c
index 1d5cf47a4f..8232fcd38d 100644
--- a/math/s_asinhl.c
+++ b/math/s_asinhl.c
@@ -12,4 +12,3 @@ __asinhl(long double x)
 
 weak_alias (__asinhl, asinhl)
 stub_warning (asinhl)
-#include <stub-tag.h>
diff --git a/math/s_atanl.c b/math/s_atanl.c
index d9a7eb6f8f..2957d702d5 100644
--- a/math/s_atanl.c
+++ b/math/s_atanl.c
@@ -12,4 +12,3 @@ __atanl (long double x)
 weak_alias (__atanl, atanl)
 
 stub_warning (atanl)
-#include <stub-tag.h>
diff --git a/math/s_cbrtl.c b/math/s_cbrtl.c
index d668e377af..803010b344 100644
--- a/math/s_cbrtl.c
+++ b/math/s_cbrtl.c
@@ -12,4 +12,3 @@ __cbrtl(long double x)
 
 weak_alias (__cbrtl, cbrtl)
 stub_warning (cbrtl)
-#include <stub-tag.h>
diff --git a/math/s_erfl.c b/math/s_erfl.c
index f329d58809..7ae25d6252 100644
--- a/math/s_erfl.c
+++ b/math/s_erfl.c
@@ -23,4 +23,3 @@ __erfcl (long double x)
 weak_alias (__erfcl, erfcl)
 
 stub_warning (erfcl)
-#include <stub-tag.h>
diff --git a/math/s_expm1l.c b/math/s_expm1l.c
index b69d6aeb97..070d06825f 100644
--- a/math/s_expm1l.c
+++ b/math/s_expm1l.c
@@ -13,4 +13,3 @@ libm_hidden_def (__expm1l)
 weak_alias (__expm1l, expm1l)
 
 stub_warning (expm1l)
-#include <stub-tag.h>
diff --git a/math/s_log1pl.c b/math/s_log1pl.c
index e5db9078bf..9e51ce2d43 100644
--- a/math/s_log1pl.c
+++ b/math/s_log1pl.c
@@ -12,4 +12,3 @@ __log1pl (long double x)
 weak_alias (__log1pl, log1pl)
 
 stub_warning (log1pl)
-#include <stub-tag.h>
diff --git a/math/s_tanhl.c b/math/s_tanhl.c
index bc9a2d7f48..ece9a4c5b3 100644
--- a/math/s_tanhl.c
+++ b/math/s_tanhl.c
@@ -12,4 +12,3 @@ __tanhl(long double x)
 
 weak_alias (__tanhl, tanhl)
 stub_warning (tanhl)
-#include <stub-tag.h>
diff --git a/misc/acct.c b/misc/acct.c
index 0ae8d7fe11..8e4713bf13 100644
--- a/misc/acct.c
+++ b/misc/acct.c
@@ -30,4 +30,3 @@ acct (name)
 }
 
 stub_warning (acct)
-#include <stub-tag.h>
diff --git a/misc/brk.c b/misc/brk.c
index 097645679a..bcbac64399 100644
--- a/misc/brk.c
+++ b/misc/brk.c
@@ -33,4 +33,3 @@ __brk (addr)
 stub_warning (brk)
 
 weak_alias (__brk, brk)
-#include <stub-tag.h>
diff --git a/misc/chflags.c b/misc/chflags.c
index ea6e742cf5..d1a44b24c1 100644
--- a/misc/chflags.c
+++ b/misc/chflags.c
@@ -39,4 +39,3 @@ chflags (file, flags)
 }
 
 stub_warning (chflags)
-#include <stub-tag.h>
diff --git a/misc/chroot.c b/misc/chroot.c
index db301ad6ac..1c1bbd8be7 100644
--- a/misc/chroot.c
+++ b/misc/chroot.c
@@ -30,4 +30,3 @@ chroot (path)
 
 
 stub_warning (chroot)
-#include <stub-tag.h>
diff --git a/misc/fchflags.c b/misc/fchflags.c
index ebb50dbfcb..8277134199 100644
--- a/misc/fchflags.c
+++ b/misc/fchflags.c
@@ -39,4 +39,3 @@ fchflags (fd, flags)
 }
 
 stub_warning (fchflags)
-#include <stub-tag.h>
diff --git a/misc/fgetxattr.c b/misc/fgetxattr.c
index 049fd28d43..86df9a4504 100644
--- a/misc/fgetxattr.c
+++ b/misc/fgetxattr.c
@@ -27,4 +27,3 @@ fgetxattr (int __fd, const char *__name,
 }
 
 stub_warning (fgetxattr)
-#include <stub-tag.h>
diff --git a/misc/flistxattr.c b/misc/flistxattr.c
index dbbe20a3b1..8f5667f86a 100644
--- a/misc/flistxattr.c
+++ b/misc/flistxattr.c
@@ -26,4 +26,3 @@ flistxattr (int __fd, char *__list, size_t __size)
 }
 
 stub_warning (flistxattr)
-#include <stub-tag.h>
diff --git a/misc/fremovexattr.c b/misc/fremovexattr.c
index 8f38e0a398..f21da5ae9f 100644
--- a/misc/fremovexattr.c
+++ b/misc/fremovexattr.c
@@ -26,4 +26,3 @@ fremovexattr (int __fd, const char *__name)
 }
 
 stub_warning (fremovexattr)
-#include <stub-tag.h>
diff --git a/misc/fsetxattr.c b/misc/fsetxattr.c
index 706e4bb54a..2d62a177cf 100644
--- a/misc/fsetxattr.c
+++ b/misc/fsetxattr.c
@@ -27,4 +27,3 @@ fsetxattr (int __fd, const char *__name, const void *__value,
 }
 
 stub_warning (fsetxattr)
-#include <stub-tag.h>
diff --git a/misc/fsync.c b/misc/fsync.c
index d94a0592d1..a927f72d31 100644
--- a/misc/fsync.c
+++ b/misc/fsync.c
@@ -29,4 +29,3 @@ fsync (fd)
 
 
 stub_warning (fsync)
-#include <stub-tag.h>
diff --git a/misc/ftruncate.c b/misc/ftruncate.c
index f2b2e27eea..79bf287941 100644
--- a/misc/ftruncate.c
+++ b/misc/ftruncate.c
@@ -32,4 +32,3 @@ __ftruncate (fd, length)
 weak_alias (__ftruncate, ftruncate)
      
 stub_warning (ftruncate)
-#include <stub-tag.h>
diff --git a/misc/futimes.c b/misc/futimes.c
index b644fd190e..1204a9c28f 100644
--- a/misc/futimes.c
+++ b/misc/futimes.c
@@ -30,4 +30,3 @@ __futimes (int fd, const struct timeval tvp[2])
 weak_alias (__futimes, futimes)
 
 stub_warning (futimes)
-#include <stub-tag.h>
diff --git a/misc/futimesat.c b/misc/futimesat.c
index 5d895bc0b5..b33939e0a1 100644
--- a/misc/futimesat.c
+++ b/misc/futimesat.c
@@ -42,4 +42,3 @@ futimesat (fd, file, tvp)
 }
 
 stub_warning (futimesat)
-#include <stub-tag.h>
diff --git a/misc/getdomain.c b/misc/getdomain.c
index c8d1527a72..7fb8da241d 100644
--- a/misc/getdomain.c
+++ b/misc/getdomain.c
@@ -56,7 +56,6 @@ getdomainname (name, len)
 }
 
 stub_warning (getdomainname)
-#include <stub-tag.h>
 
 #endif
 
diff --git a/misc/getdtsz.c b/misc/getdtsz.c
index 020ec9d022..7c6f7e6339 100644
--- a/misc/getdtsz.c
+++ b/misc/getdtsz.c
@@ -29,4 +29,3 @@ __getdtablesize ()
 stub_warning (getdtablesize)
 
 weak_alias (__getdtablesize, getdtablesize)
-#include <stub-tag.h>
diff --git a/misc/gethostid.c b/misc/gethostid.c
index 8854cf4419..876c83c691 100644
--- a/misc/gethostid.c
+++ b/misc/gethostid.c
@@ -28,4 +28,3 @@ gethostid ()
 
 
 stub_warning (gethostid)
-#include <stub-tag.h>
diff --git a/misc/gethostname.c b/misc/gethostname.c
index 6e70da9815..40d3027ec0 100644
--- a/misc/gethostname.c
+++ b/misc/gethostname.c
@@ -32,4 +32,3 @@ __gethostname (name, len)
 stub_warning (gethostname)
 
 weak_alias (__gethostname, gethostname)
-#include <stub-tag.h>
diff --git a/misc/getloadavg.c b/misc/getloadavg.c
index 768fe32985..6e39939a78 100644
--- a/misc/getloadavg.c
+++ b/misc/getloadavg.c
@@ -33,4 +33,3 @@ getloadavg (double loadavg[], int nelem)
   return -1;
 }
 stub_warning (getloadavg)
-#include <stub-tag.h>
diff --git a/misc/getpagesize.c b/misc/getpagesize.c
index 0ec823d96e..6d3821aef1 100644
--- a/misc/getpagesize.c
+++ b/misc/getpagesize.c
@@ -29,4 +29,3 @@ libc_hidden_def (__getpagesize)
 stub_warning (getpagesize)
 
 weak_alias (__getpagesize, getpagesize)
-#include <stub-tag.h>
diff --git a/misc/getsysstats.c b/misc/getsysstats.c
index d03e75b38b..c5ce2fdb9f 100644
--- a/misc/getsysstats.c
+++ b/misc/getsysstats.c
@@ -65,4 +65,3 @@ __get_avphys_pages ()
 weak_alias (__get_avphys_pages, get_avphys_pages)
 
 stub_warning (get_avphys_pages)
-#include <stub-tag.h>
diff --git a/misc/getxattr.c b/misc/getxattr.c
index bde3619c1a..1e5b2bb448 100644
--- a/misc/getxattr.c
+++ b/misc/getxattr.c
@@ -27,4 +27,3 @@ getxattr (const char *__path, const char *__name,
 }
 
 stub_warning (getxattr)
-#include <stub-tag.h>
diff --git a/misc/gtty.c b/misc/gtty.c
index e1a2668d0f..2c6ae3f970 100644
--- a/misc/gtty.c
+++ b/misc/gtty.c
@@ -36,4 +36,3 @@ gtty (fd, params)
 }
 
 stub_warning (gtty)
-#include <stub-tag.h>
diff --git a/misc/ioctl.c b/misc/ioctl.c
index 616ee2d90d..f47d90ec44 100644
--- a/misc/ioctl.c
+++ b/misc/ioctl.c
@@ -31,4 +31,3 @@ __ioctl (fd, request)
 stub_warning (ioctl)
 
 weak_alias (__ioctl, ioctl)
-#include <stub-tag.h>
diff --git a/misc/lgetxattr.c b/misc/lgetxattr.c
index fcdf53c6c6..44e23d99f2 100644
--- a/misc/lgetxattr.c
+++ b/misc/lgetxattr.c
@@ -27,4 +27,3 @@ lgetxattr (const char *__path, const char *__name,
 }
 
 stub_warning (lgetxattr)
-#include <stub-tag.h>
diff --git a/misc/listxattr.c b/misc/listxattr.c
index a58f21742f..5de7d301f6 100644
--- a/misc/listxattr.c
+++ b/misc/listxattr.c
@@ -26,4 +26,3 @@ listxattr (const char *__path, char *__list, size_t __size)
 }
 
 stub_warning (listxattr)
-#include <stub-tag.h>
diff --git a/misc/llistxattr.c b/misc/llistxattr.c
index f133579ea3..da3bfee3a2 100644
--- a/misc/llistxattr.c
+++ b/misc/llistxattr.c
@@ -26,4 +26,3 @@ llistxattr (const char *__path, char *__list, size_t __size)
 }
 
 stub_warning (llistxattr)
-#include <stub-tag.h>
diff --git a/misc/lremovexattr.c b/misc/lremovexattr.c
index 541e22d279..a04853f72f 100644
--- a/misc/lremovexattr.c
+++ b/misc/lremovexattr.c
@@ -26,4 +26,3 @@ lremovexattr (const char *__path, const char *__name)
 }
 
 stub_warning (lremovexattr)
-#include <stub-tag.h>
diff --git a/misc/lsetxattr.c b/misc/lsetxattr.c
index bc43e1758d..f433fe4e56 100644
--- a/misc/lsetxattr.c
+++ b/misc/lsetxattr.c
@@ -27,4 +27,3 @@ lsetxattr (const char *__path, const char *__name,
 }
 
 stub_warning (lsetxattr)
-#include <stub-tag.h>
diff --git a/misc/lutimes.c b/misc/lutimes.c
index ed7e842e80..57faae479c 100644
--- a/misc/lutimes.c
+++ b/misc/lutimes.c
@@ -31,4 +31,3 @@ __lutimes (const char *file, const struct timeval tvp[2])
 weak_alias (__lutimes, lutimes)
 
 stub_warning (lutimes)
-#include <stub-tag.h>
diff --git a/misc/madvise.c b/misc/madvise.c
index 4e9681a521..188a20e536 100644
--- a/misc/madvise.c
+++ b/misc/madvise.c
@@ -33,4 +33,3 @@ libc_hidden_def (__madvise)
 weak_alias (__madvise, madvise)
 
 stub_warning (madvise)
-#include <stub-tag.h>
diff --git a/misc/mincore.c b/misc/mincore.c
index e85ebceefd..8e8045c710 100644
--- a/misc/mincore.c
+++ b/misc/mincore.c
@@ -26,4 +26,3 @@ mincore (void *__start, size_t __len, unsigned char *__vec)
 }
 
 stub_warning (mincore)
-#include <stub-tag.h>
diff --git a/misc/mlock.c b/misc/mlock.c
index 588495c6af..0d81d0457d 100644
--- a/misc/mlock.c
+++ b/misc/mlock.c
@@ -31,4 +31,3 @@ mlock (const void *addr, size_t len)
 }
 
 stub_warning (mlock)
-#include <stub-tag.h>
diff --git a/misc/mlockall.c b/misc/mlockall.c
index a7403889fb..e51b953e62 100644
--- a/misc/mlockall.c
+++ b/misc/mlockall.c
@@ -32,4 +32,3 @@ mlockall (int flags)
 }
 
 stub_warning (mlockall)
-#include <stub-tag.h>
diff --git a/misc/mmap.c b/misc/mmap.c
index b77856dec0..dbe6255802 100644
--- a/misc/mmap.c
+++ b/misc/mmap.c
@@ -36,5 +36,4 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
 }
 
 stub_warning (mmap)
-#include <stub-tag.h>
 weak_alias (__mmap, mmap)
diff --git a/misc/mprotect.c b/misc/mprotect.c
index e6cb623535..bef7efc442 100644
--- a/misc/mprotect.c
+++ b/misc/mprotect.c
@@ -32,4 +32,3 @@ __mprotect (__ptr_t addr, size_t len, int prot)
 weak_alias (__mprotect, mprotect)
 
 stub_warning (mprotect)
-#include <stub-tag.h>
diff --git a/misc/msync.c b/misc/msync.c
index c1639940e1..aa3d0ce0b5 100644
--- a/misc/msync.c
+++ b/misc/msync.c
@@ -31,4 +31,3 @@ msync (__ptr_t addr, size_t len, int flags)
 }
 
 stub_warning (msync)
-#include <stub-tag.h>
diff --git a/misc/munlock.c b/misc/munlock.c
index 0a02e5b23e..37fd5189d3 100644
--- a/misc/munlock.c
+++ b/misc/munlock.c
@@ -30,4 +30,3 @@ munlock (const void *addr, size_t len)
 }
 
 stub_warning (munlock)
-#include <stub-tag.h>
diff --git a/misc/munlockall.c b/misc/munlockall.c
index 8094ab6e56..bceb944645 100644
--- a/misc/munlockall.c
+++ b/misc/munlockall.c
@@ -30,4 +30,3 @@ munlockall (void)
 }
 
 stub_warning (munlockall)
-#include <stub-tag.h>
diff --git a/misc/munmap.c b/misc/munmap.c
index 8c3c37c706..97c6ef94fe 100644
--- a/misc/munmap.c
+++ b/misc/munmap.c
@@ -30,5 +30,4 @@ __munmap (__ptr_t addr, size_t len)
 }
 
 stub_warning (munmap)
-#include <stub-tag.h>
 weak_alias (__munmap, munmap)
diff --git a/misc/preadv.c b/misc/preadv.c
index 0e5138cec2..9ef32a6494 100644
--- a/misc/preadv.c
+++ b/misc/preadv.c
@@ -37,4 +37,3 @@ preadv (fd, vector, count, offset)
 }
 
 stub_warning (preadv)
-#include <stub-tag.h>
diff --git a/misc/preadv64.c b/misc/preadv64.c
index c7c9dd14cc..dd4949038b 100644
--- a/misc/preadv64.c
+++ b/misc/preadv64.c
@@ -37,4 +37,3 @@ preadv64 (fd, vector, count, offset)
 }
 
 stub_warning (preadv64)
-#include <stub-tag.h>
diff --git a/misc/ptrace.c b/misc/ptrace.c
index a70f1952bc..4f600d89fc 100644
--- a/misc/ptrace.c
+++ b/misc/ptrace.c
@@ -99,4 +99,3 @@ ptrace (request)
 
 
 stub_warning (ptrace)
-#include <stub-tag.h>
diff --git a/misc/pwritev.c b/misc/pwritev.c
index 2e10ca8157..fba8a5760d 100644
--- a/misc/pwritev.c
+++ b/misc/pwritev.c
@@ -37,4 +37,3 @@ pwritev (fd, vector, count, offset)
 }
 
 stub_warning (pwritev)
-#include <stub-tag.h>
diff --git a/misc/pwritev64.c b/misc/pwritev64.c
index 650abd6d83..c5995111e6 100644
--- a/misc/pwritev64.c
+++ b/misc/pwritev64.c
@@ -37,4 +37,3 @@ pwritev64 (fd, vector, count, offset)
 }
 
 stub_warning (pwritev64)
-#include <stub-tag.h>
diff --git a/misc/readv.c b/misc/readv.c
index 74fb3a9c7a..6b165d782b 100644
--- a/misc/readv.c
+++ b/misc/readv.c
@@ -37,4 +37,3 @@ strong_alias (__libc_readv, __readv)
 weak_alias (__libc_readv, readv)
 
 stub_warning (readv)
-#include <stub-tag.h>
diff --git a/misc/reboot.c b/misc/reboot.c
index c8a4c04c1d..455a6bd264 100644
--- a/misc/reboot.c
+++ b/misc/reboot.c
@@ -30,4 +30,3 @@ reboot (howto)
 
 
 stub_warning (reboot)
-#include <stub-tag.h>
diff --git a/misc/remap_file_pages.c b/misc/remap_file_pages.c
index 2ad057d5ee..08a2d4c02a 100644
--- a/misc/remap_file_pages.c
+++ b/misc/remap_file_pages.c
@@ -30,5 +30,4 @@ __remap_file_pages (void *start, size_t size, int prot, size_t pgoff,
 }
 
 stub_warning (remap_file_pages)
-#include <stub-tag.h>
 weak_alias (__remap_file_pages, remap_file_pages)
diff --git a/misc/removexattr.c b/misc/removexattr.c
index 56a9014e42..aede787fda 100644
--- a/misc/removexattr.c
+++ b/misc/removexattr.c
@@ -26,4 +26,3 @@ removexattr (const char *__path, const char *__name)
 }
 
 stub_warning (removexattr)
-#include <stub-tag.h>
diff --git a/misc/revoke.c b/misc/revoke.c
index ed1659e759..2e42a423d2 100644
--- a/misc/revoke.c
+++ b/misc/revoke.c
@@ -27,4 +27,3 @@ revoke (file)
   return -1;
 }
 stub_warning (revoke)
-#include <stub-tag.h>
diff --git a/misc/select.c b/misc/select.c
index ce08f0c4ba..8f5cb0d2af 100644
--- a/misc/select.c
+++ b/misc/select.c
@@ -39,4 +39,3 @@ libc_hidden_def (__select)
 stub_warning (select)
 
 weak_alias (__select, select)
-#include <stub-tag.h>
diff --git a/misc/setdomain.c b/misc/setdomain.c
index b19e20be2c..7e6665b4fb 100644
--- a/misc/setdomain.c
+++ b/misc/setdomain.c
@@ -30,4 +30,3 @@ setdomainname (name, len)
 }
 
 stub_warning (setdomainname)
-#include <stub-tag.h>
diff --git a/misc/setegid.c b/misc/setegid.c
index 22a0bc8a74..219c1b9b08 100644
--- a/misc/setegid.c
+++ b/misc/setegid.c
@@ -28,4 +28,3 @@ setegid (gid)
 }
 libc_hidden_def (setegid)
 stub_warning (setegid)
-#include <stub-tag.h>
diff --git a/misc/seteuid.c b/misc/seteuid.c
index b338f71535..648b77a429 100644
--- a/misc/seteuid.c
+++ b/misc/seteuid.c
@@ -28,4 +28,3 @@ seteuid (uid)
 }
 libc_hidden_def (seteuid)
 stub_warning (seteuid)
-#include <stub-tag.h>
diff --git a/misc/sethostid.c b/misc/sethostid.c
index fd4483e15a..73dfb33e02 100644
--- a/misc/sethostid.c
+++ b/misc/sethostid.c
@@ -30,4 +30,3 @@ sethostid (id)
 
 
 stub_warning (sethostid)
-#include <stub-tag.h>
diff --git a/misc/sethostname.c b/misc/sethostname.c
index ff31900fbc..9641358620 100644
--- a/misc/sethostname.c
+++ b/misc/sethostname.c
@@ -31,4 +31,3 @@ sethostname (name, len)
 
 
 stub_warning (sethostname)
-#include <stub-tag.h>
diff --git a/misc/setregid.c b/misc/setregid.c
index d73260da85..ad7ca4b0fd 100644
--- a/misc/setregid.c
+++ b/misc/setregid.c
@@ -32,4 +32,3 @@ __setregid (effective_gid, real_gid)
 stub_warning (setregid)
 
 weak_alias (__setregid, setregid)
-#include <stub-tag.h>
diff --git a/misc/setreuid.c b/misc/setreuid.c
index 3a97788c18..87fcfc6f33 100644
--- a/misc/setreuid.c
+++ b/misc/setreuid.c
@@ -32,4 +32,3 @@ __setreuid (effective_uid, real_uid)
 stub_warning (setreuid)
 
 weak_alias (__setreuid, setreuid)
-#include <stub-tag.h>
diff --git a/misc/setxattr.c b/misc/setxattr.c
index d0f803591e..6409751c4c 100644
--- a/misc/setxattr.c
+++ b/misc/setxattr.c
@@ -27,4 +27,3 @@ setxattr (const char *__path, const char *__name,
 }
 
 stub_warning (setxattr)
-#include <stub-tag.h>
diff --git a/misc/sstk.c b/misc/sstk.c
index 34019366f5..3a4580b8fa 100644
--- a/misc/sstk.c
+++ b/misc/sstk.c
@@ -31,4 +31,3 @@ sstk (increment)
 }
 
 stub_warning (sstk)
-#include <stub-tag.h>
diff --git a/misc/stty.c b/misc/stty.c
index 66c475c55a..5ce9e23768 100644
--- a/misc/stty.c
+++ b/misc/stty.c
@@ -36,4 +36,3 @@ stty (fd, params)
 }
 
 stub_warning (stty)
-#include <stub-tag.h>
diff --git a/misc/swapoff.c b/misc/swapoff.c
index f4e59f85c5..d887c43ca9 100644
--- a/misc/swapoff.c
+++ b/misc/swapoff.c
@@ -27,4 +27,3 @@ swapoff (const char *path)
 }
 
 stub_warning (swapoff)
-#include <stub-tag.h>
diff --git a/misc/swapon.c b/misc/swapon.c
index 095f79d9f0..f4bdf13ca2 100644
--- a/misc/swapon.c
+++ b/misc/swapon.c
@@ -30,4 +30,3 @@ swapon (path)
 }
 
 stub_warning (swapon)
-#include <stub-tag.h>
diff --git a/misc/sync.c b/misc/sync.c
index 45e7187c77..01a1696ce2 100644
--- a/misc/sync.c
+++ b/misc/sync.c
@@ -27,4 +27,3 @@ sync ()
 
 
 stub_warning (sync)
-#include <stub-tag.h>
diff --git a/misc/syncfs.c b/misc/syncfs.c
index 4dc5340112..b94911104b 100644
--- a/misc/syncfs.c
+++ b/misc/syncfs.c
@@ -29,4 +29,3 @@ syncfs (int fd)
 
 
 stub_warning (syncfs)
-#include <stub-tag.h>
diff --git a/misc/syscall.c b/misc/syscall.c
index ad44d2bc00..f6dae57509 100644
--- a/misc/syscall.c
+++ b/misc/syscall.c
@@ -31,4 +31,3 @@ syscall (callno)
 }
 
 stub_warning (syscall)
-#include <stub-tag.h>
diff --git a/misc/truncate.c b/misc/truncate.c
index 29f72fa9c3..c92acd1491 100644
--- a/misc/truncate.c
+++ b/misc/truncate.c
@@ -30,4 +30,3 @@ __truncate (path, length)
 weak_alias (__truncate, truncate)
 
 stub_warning (truncate)
-#include <stub-tag.h>
diff --git a/misc/ualarm.c b/misc/ualarm.c
index ac7c7a4128..ca66d79a13 100644
--- a/misc/ualarm.c
+++ b/misc/ualarm.c
@@ -33,4 +33,3 @@ ualarm (value, interval)
 }
 
 stub_warning (ualarm)
-#include <stub-tag.h>
diff --git a/misc/usleep.c b/misc/usleep.c
index f67346e7ab..674a025646 100644
--- a/misc/usleep.c
+++ b/misc/usleep.c
@@ -28,4 +28,3 @@ usleep (useconds)
 }
 
 stub_warning (usleep)
-#include <stub-tag.h>
diff --git a/misc/ustat.c b/misc/ustat.c
index 135afe22d8..2dd92e768c 100644
--- a/misc/ustat.c
+++ b/misc/ustat.c
@@ -29,4 +29,3 @@ ustat (dev, ust)
   return -1;
 }
 stub_warning (ustat)
-#include <stub-tag.h>
diff --git a/misc/utimes.c b/misc/utimes.c
index 3d0e868acf..5cdfe6ca5e 100644
--- a/misc/utimes.c
+++ b/misc/utimes.c
@@ -39,4 +39,3 @@ __utimes (file, tvp)
 weak_alias (__utimes, utimes)
 
 stub_warning (utimes)
-#include <stub-tag.h>
diff --git a/misc/vhangup.c b/misc/vhangup.c
index 02d85040b4..0d8ce287c9 100644
--- a/misc/vhangup.c
+++ b/misc/vhangup.c
@@ -29,4 +29,3 @@ vhangup ()
 }
 
 stub_warning (vhangup)
-#include <stub-tag.h>
diff --git a/misc/writev.c b/misc/writev.c
index 0bf1cb3de9..19bc02889e 100644
--- a/misc/writev.c
+++ b/misc/writev.c
@@ -37,4 +37,3 @@ strong_alias (__libc_writev, __writev)
 weak_alias (__libc_writev, writev)
 
 stub_warning (writev)
-#include <stub-tag.h>
diff --git a/ports/ChangeLog.linux-generic b/ports/ChangeLog.linux-generic
index 0dfb8402c6..d3f0e5b75d 100644
--- a/ports/ChangeLog.linux-generic
+++ b/ports/ChangeLog.linux-generic
@@ -1,3 +1,9 @@
+2012-11-04  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* sysdeps/unix/sysv/linux/generic/sysctl.c: Don't include
+	<stub-tag.h>.
+	* sysdeps/unix/sysv/linux/generic/ustat.c: Likewise.
+
 2012-10-27  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/unix/sysv/linux/generic/bits/fcntl.h: (__O_LARGEFILE)
diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips
index 548d95e1d4..3380b125b8 100644
--- a/ports/ChangeLog.mips
+++ b/ports/ChangeLog.mips
@@ -1,3 +1,8 @@
+2012-11-04  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c: Don't
+	include <stub-tag.h>.
+
 2012-11-03  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/mips/fpu/fclrexcpt.c (feclearexcept): Add
diff --git a/ports/sysdeps/unix/sysv/linux/generic/sysctl.c b/ports/sysdeps/unix/sysv/linux/generic/sysctl.c
index 0bdb78660b..0212e1a8a3 100644
--- a/ports/sysdeps/unix/sysv/linux/generic/sysctl.c
+++ b/ports/sysdeps/unix/sysv/linux/generic/sysctl.c
@@ -30,4 +30,3 @@ sysctl (int *name, int nlen, void *oldval, size_t *oldlenp,
   return -1;
 }
 stub_warning (sysctl)
-#include <stub-tag.h>
diff --git a/ports/sysdeps/unix/sysv/linux/generic/ustat.c b/ports/sysdeps/unix/sysv/linux/generic/ustat.c
index 7611e82f0f..d6a23090ca 100644
--- a/ports/sysdeps/unix/sysv/linux/generic/ustat.c
+++ b/ports/sysdeps/unix/sysv/linux/generic/ustat.c
@@ -30,4 +30,3 @@ ustat (dev_t dev, struct ustat *ubuf)
   return -1;
 }
 stub_warning (ustat)
-#include <stub-tag.h>
diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c b/ports/sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c
index 2dc110ba7e..1d345efcf0 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c
+++ b/ports/sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c
@@ -54,6 +54,4 @@ sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
   return -1;
 }
 stub_warning (sync_file_range)
-
-# include <stub-tag.h>
 #endif
diff --git a/posix/_exit.c b/posix/_exit.c
index a8f1b58e41..ef2b7d719e 100644
--- a/posix/_exit.c
+++ b/posix/_exit.c
@@ -32,4 +32,3 @@ libc_hidden_def (_exit)
 weak_alias (_exit, _Exit)
 
 stub_warning (_exit)
-#include <stub-tag.h>
diff --git a/posix/alarm.c b/posix/alarm.c
index 0b0194836d..3fda9b0c85 100644
--- a/posix/alarm.c
+++ b/posix/alarm.c
@@ -35,4 +35,3 @@ alarm (seconds)
 libc_hidden_def (alarm)
 
 stub_warning (alarm)
-#include <stub-tag.h>
diff --git a/posix/execve.c b/posix/execve.c
index 63a234fc95..893cec2b19 100644
--- a/posix/execve.c
+++ b/posix/execve.c
@@ -40,4 +40,3 @@ __execve (path, argv, envp)
 stub_warning (execve)
 
 weak_alias (__execve, execve)
-#include <stub-tag.h>
diff --git a/posix/fexecve.c b/posix/fexecve.c
index c7b43c578e..6a22a194e3 100644
--- a/posix/fexecve.c
+++ b/posix/fexecve.c
@@ -39,4 +39,3 @@ fexecve (fd, argv, envp)
 }
 
 stub_warning (fexecve)
-#include <stub-tag.h>
diff --git a/posix/fork.c b/posix/fork.c
index e499c11ed4..08c69b69bd 100644
--- a/posix/fork.c
+++ b/posix/fork.c
@@ -32,4 +32,3 @@ libc_hidden_def (__fork)
 stub_warning (fork)
 
 weak_alias (__fork, fork)
-#include <stub-tag.h>
diff --git a/posix/fpathconf.c b/posix/fpathconf.c
index 07d868440c..01a08cab82 100644
--- a/posix/fpathconf.c
+++ b/posix/fpathconf.c
@@ -58,4 +58,3 @@ __fpathconf (fd, name)
 weak_alias (__fpathconf, fpathconf)
 
 stub_warning (fpathconf)
-#include <stub-tag.h>
diff --git a/posix/getaddrinfo.c b/posix/getaddrinfo.c
index b5e8362935..bdb79c89b5 100644
--- a/posix/getaddrinfo.c
+++ b/posix/getaddrinfo.c
@@ -36,5 +36,3 @@ freeaddrinfo (struct addrinfo *ai)
 }
 stub_warning (freeaddrinfo)
 libc_hidden_def (freeaddrinfo)
-
-#include <stub-tag.h>
diff --git a/posix/getegid.c b/posix/getegid.c
index 482e4343bd..6692bc0837 100644
--- a/posix/getegid.c
+++ b/posix/getegid.c
@@ -28,4 +28,3 @@ __getegid ()
 stub_warning (getegid)
 
 weak_alias (__getegid, getegid)
-#include <stub-tag.h>
diff --git a/posix/geteuid.c b/posix/geteuid.c
index 5fc0ee5b36..eb59db35d8 100644
--- a/posix/geteuid.c
+++ b/posix/geteuid.c
@@ -29,4 +29,3 @@ __geteuid ()
 stub_warning (geteuid)
 
 weak_alias (__geteuid, geteuid)
-#include <stub-tag.h>
diff --git a/posix/getgid.c b/posix/getgid.c
index 6fa3d25ada..54c7d18705 100644
--- a/posix/getgid.c
+++ b/posix/getgid.c
@@ -29,4 +29,3 @@ __getgid ()
 stub_warning (getgid)
 
 weak_alias (__getgid, getgid)
-#include <stub-tag.h>
diff --git a/posix/getgroups.c b/posix/getgroups.c
index e3910a8362..eed9152eaa 100644
--- a/posix/getgroups.c
+++ b/posix/getgroups.c
@@ -44,4 +44,3 @@ stub_warning (getgroups);
 #endif
 
 weak_alias (__getgroups, getgroups)
-#include <stub-tag.h>
diff --git a/posix/getlogin.c b/posix/getlogin.c
index beab0f0a02..58bc93f77d 100644
--- a/posix/getlogin.c
+++ b/posix/getlogin.c
@@ -29,4 +29,3 @@ getlogin (void)
 }
 
 stub_warning (getlogin)
-#include <stub-tag.h>
diff --git a/posix/getlogin_r.c b/posix/getlogin_r.c
index b3ddd56250..7cd7be9159 100644
--- a/posix/getlogin_r.c
+++ b/posix/getlogin_r.c
@@ -33,4 +33,3 @@ getlogin_r (name, name_len)
 libc_hidden_def (getlogin_r)
 
 stub_warning (getlogin_r)
-#include <stub-tag.h>
diff --git a/posix/getpgid.c b/posix/getpgid.c
index 198a313ade..fd1bc5a01a 100644
--- a/posix/getpgid.c
+++ b/posix/getpgid.c
@@ -29,4 +29,3 @@ libc_hidden_def (__getpgid)
 weak_alias (__getpgid, getpgid)
 
 stub_warning (getpgid)
-#include <stub-tag.h>
diff --git a/posix/getpid.c b/posix/getpid.c
index 301da5f943..3c3bb6a2af 100644
--- a/posix/getpid.c
+++ b/posix/getpid.c
@@ -30,4 +30,3 @@ stub_warning (getpid)
 
 weak_alias (__getpid, getpid)
 libc_hidden_weak (getpid)
-#include <stub-tag.h>
diff --git a/posix/getppid.c b/posix/getppid.c
index 2650ed4f00..92c8b9b6df 100644
--- a/posix/getppid.c
+++ b/posix/getppid.c
@@ -29,4 +29,3 @@ __getppid ()
 stub_warning (getppid)
 
 weak_alias (__getppid, getppid)
-#include <stub-tag.h>
diff --git a/posix/getresgid.c b/posix/getresgid.c
index 7f5bdb38b2..0baec6ae7c 100644
--- a/posix/getresgid.c
+++ b/posix/getresgid.c
@@ -31,4 +31,3 @@ libc_hidden_def (__getresgid)
 stub_warning (getresgid)
 
 weak_alias (__getresgid, getresgid)
-#include <stub-tag.h>
diff --git a/posix/getresuid.c b/posix/getresuid.c
index bf56fbaa99..7da3173965 100644
--- a/posix/getresuid.c
+++ b/posix/getresuid.c
@@ -31,4 +31,3 @@ libc_hidden_def (__getresuid)
 stub_warning (getresuid)
 
 weak_alias (__getresuid, getresuid)
-#include <stub-tag.h>
diff --git a/posix/getsid.c b/posix/getsid.c
index 6b4caf0314..3283d8cb73 100644
--- a/posix/getsid.c
+++ b/posix/getsid.c
@@ -28,4 +28,3 @@ getsid (pid_t pid)
 }
 libc_hidden_def (getsid)
 stub_warning (getsid)
-#include <stub-tag.h>
diff --git a/posix/getuid.c b/posix/getuid.c
index d3ff49ef0f..2afbe583fd 100644
--- a/posix/getuid.c
+++ b/posix/getuid.c
@@ -29,4 +29,3 @@ __getuid ()
 stub_warning (getuid)
 
 weak_alias (__getuid, getuid)
-#include <stub-tag.h>
diff --git a/posix/glob64.c b/posix/glob64.c
index e329270ea7..2d98cd978b 100644
--- a/posix/glob64.c
+++ b/posix/glob64.c
@@ -50,4 +50,3 @@ globfree64 (glob64_t *pglob)
 libc_hidden_def (globfree64)
 
 stub_warning (glob64)
-#include <stub-tag.h>
diff --git a/posix/nanosleep.c b/posix/nanosleep.c
index 2f44b16a0a..b29e694609 100644
--- a/posix/nanosleep.c
+++ b/posix/nanosleep.c
@@ -32,4 +32,3 @@ stub_warning (nanosleep)
 weak_alias (__libc_nanosleep, __nanosleep)
 libc_hidden_def (__nanosleep)
 weak_alias (__libc_nanosleep, nanosleep)
-#include <stub-tag.h>
diff --git a/posix/pathconf.c b/posix/pathconf.c
index e36ba62eff..6f48b0b575 100644
--- a/posix/pathconf.c
+++ b/posix/pathconf.c
@@ -37,4 +37,3 @@ __pathconf (path, name)
 weak_alias (__pathconf, pathconf)
 
 stub_warning (pathconf)
-#include <stub-tag.h>
diff --git a/posix/pause.c b/posix/pause.c
index af239bec76..095051002b 100644
--- a/posix/pause.c
+++ b/posix/pause.c
@@ -30,4 +30,3 @@ pause ()
 }
 
 stub_warning (pause)
-#include <stub-tag.h>
diff --git a/posix/posix_madvise.c b/posix/posix_madvise.c
index 271dd475ea..4b9cc1e2e2 100644
--- a/posix/posix_madvise.c
+++ b/posix/posix_madvise.c
@@ -28,4 +28,3 @@ posix_madvise (__ptr_t addr, size_t len, int advice)
   return ENOSYS;
 }
 stub_warning (posix_madvise)
-#include <stub-tag.h>
diff --git a/posix/pread.c b/posix/pread.c
index bc81f1a441..b62fd943ce 100644
--- a/posix/pread.c
+++ b/posix/pread.c
@@ -42,4 +42,3 @@ __libc_pread (int fd, void *buf, size_t nbytes, off_t offset)
 strong_alias (__libc_pread, __pread)
 weak_alias (__libc_pread, pread)
 stub_warning (pread)
-#include <stub-tag.h>
diff --git a/posix/pread64.c b/posix/pread64.c
index 18c4f022f1..f6b7a35fc0 100644
--- a/posix/pread64.c
+++ b/posix/pread64.c
@@ -42,4 +42,3 @@ __libc_pread64 (int fd, void *buf, size_t nbytes, off64_t offset)
 strong_alias (__libc_pread64, __pread64)
 weak_alias (__libc_pread64, pread64)
 stub_warning (pread64)
-#include <stub-tag.h>
diff --git a/posix/pwrite.c b/posix/pwrite.c
index 0e8481d6f0..43619ed4f2 100644
--- a/posix/pwrite.c
+++ b/posix/pwrite.c
@@ -42,4 +42,3 @@ __libc_pwrite (int fd, const void *buf, size_t nbytes, off_t offset)
 strong_alias (__libc_pwrite, __pwrite)
 weak_alias (__libc_pwrite, pwrite)
 stub_warning (pwrite)
-#include <stub-tag.h>
diff --git a/posix/pwrite64.c b/posix/pwrite64.c
index c0dadfe30c..819cfd6392 100644
--- a/posix/pwrite64.c
+++ b/posix/pwrite64.c
@@ -43,4 +43,3 @@ strong_alias (__libc_pwrite64, __pwrite64)
 libc_hidden_def (__pwrite64)
 weak_alias (__libc_pwrite64, pwrite64)
 stub_warning (pwrite64)
-#include <stub-tag.h>
diff --git a/posix/sched_getaffinity.c b/posix/sched_getaffinity.c
index da70878c4d..8641b4eac7 100644
--- a/posix/sched_getaffinity.c
+++ b/posix/sched_getaffinity.c
@@ -31,4 +31,3 @@ sched_getaffinity (pid, cpusetsize, cpuset)
   return -1;
 }
 stub_warning (sched_getaffinity)
-#include <stub-tag.h>
diff --git a/posix/sched_getp.c b/posix/sched_getp.c
index 551d071053..d6a7ac6ed0 100644
--- a/posix/sched_getp.c
+++ b/posix/sched_getp.c
@@ -30,4 +30,3 @@ __sched_getparam (pid_t pid, struct sched_param *param)
 stub_warning (sched_getparam)
 
 weak_alias (__sched_getparam, sched_getparam)
-#include <stub-tag.h>
diff --git a/posix/sched_gets.c b/posix/sched_gets.c
index 874b171d24..dd3f51e6f9 100644
--- a/posix/sched_gets.c
+++ b/posix/sched_gets.c
@@ -30,4 +30,3 @@ __sched_getscheduler (pid_t pid)
 stub_warning (sched_getscheduler)
 
 weak_alias (__sched_getscheduler, sched_getscheduler)
-#include <stub-tag.h>
diff --git a/posix/sched_primax.c b/posix/sched_primax.c
index 436e35362d..ef35e11f48 100644
--- a/posix/sched_primax.c
+++ b/posix/sched_primax.c
@@ -29,4 +29,3 @@ __sched_get_priority_max (int algorithm)
 stub_warning (sched_get_priority_max)
 
 weak_alias (__sched_get_priority_max, sched_get_priority_max)
-#include <stub-tag.h>
diff --git a/posix/sched_primin.c b/posix/sched_primin.c
index 411e8fb558..cffa3f93a6 100644
--- a/posix/sched_primin.c
+++ b/posix/sched_primin.c
@@ -29,4 +29,3 @@ __sched_get_priority_min (int algorithm)
 stub_warning (sched_get_priority_min)
 
 weak_alias (__sched_get_priority_min, sched_get_priority_min)
-#include <stub-tag.h>
diff --git a/posix/sched_rr_gi.c b/posix/sched_rr_gi.c
index 82962228c4..3011050fc7 100644
--- a/posix/sched_rr_gi.c
+++ b/posix/sched_rr_gi.c
@@ -30,4 +30,3 @@ __sched_rr_get_interval (pid_t pid, struct timespec *t)
 stub_warning (sched_rr_get_interval)
 
 weak_alias (__sched_rr_get_interval, sched_rr_get_interval)
-#include <stub-tag.h>
diff --git a/posix/sched_setaffinity.c b/posix/sched_setaffinity.c
index 9d0ac0385f..3cc9bb72cf 100644
--- a/posix/sched_setaffinity.c
+++ b/posix/sched_setaffinity.c
@@ -31,4 +31,3 @@ sched_setaffinity (pid, cpusetsize, cpuset)
   return -1;
 }
 stub_warning (sched_setaffinity)
-#include <stub-tag.h>
diff --git a/posix/sched_setp.c b/posix/sched_setp.c
index 4c8888c819..90de454727 100644
--- a/posix/sched_setp.c
+++ b/posix/sched_setp.c
@@ -30,4 +30,3 @@ __sched_setparam (pid_t pid, const struct sched_param *param)
 stub_warning (sched_setparam)
 
 weak_alias (__sched_setparam, sched_setparam)
-#include <stub-tag.h>
diff --git a/posix/sched_sets.c b/posix/sched_sets.c
index a52ae45f9c..205471b547 100644
--- a/posix/sched_sets.c
+++ b/posix/sched_sets.c
@@ -31,4 +31,3 @@ libc_hidden_def (__sched_setscheduler)
 stub_warning (sched_setscheduler)
 
 weak_alias (__sched_setscheduler, sched_setscheduler)
-#include <stub-tag.h>
diff --git a/posix/sched_yield.c b/posix/sched_yield.c
index 2335c85154..2257eb3446 100644
--- a/posix/sched_yield.c
+++ b/posix/sched_yield.c
@@ -30,4 +30,3 @@ stub_warning (sched_yield)
 libc_hidden_def (__sched_yield)
 
 weak_alias (__sched_yield, sched_yield)
-#include <stub-tag.h>
diff --git a/posix/setgid.c b/posix/setgid.c
index 82546f2205..3e384aecdd 100644
--- a/posix/setgid.c
+++ b/posix/setgid.c
@@ -33,4 +33,3 @@ __setgid (gid)
 stub_warning (setgid)
 
 weak_alias (__setgid, setgid)
-#include <stub-tag.h>
diff --git a/posix/setlogin.c b/posix/setlogin.c
index fd09f51945..8a8362bdc8 100644
--- a/posix/setlogin.c
+++ b/posix/setlogin.c
@@ -28,4 +28,3 @@ setlogin (name)
 }
 
 stub_warning (setlogin)
-#include <stub-tag.h>
diff --git a/posix/setpgid.c b/posix/setpgid.c
index ad073f84ff..146fb745b8 100644
--- a/posix/setpgid.c
+++ b/posix/setpgid.c
@@ -33,4 +33,3 @@ libc_hidden_def (__setpgid)
 stub_warning (setpgid)
 
 weak_alias (__setpgid, setpgid)
-#include <stub-tag.h>
diff --git a/posix/setresgid.c b/posix/setresgid.c
index c4420d9966..ba1cce452f 100644
--- a/posix/setresgid.c
+++ b/posix/setresgid.c
@@ -31,4 +31,3 @@ libc_hidden_def (__setresgid)
 stub_warning (setresgid)
 
 weak_alias (__setresgid, setresgid)
-#include <stub-tag.h>
diff --git a/posix/setresuid.c b/posix/setresuid.c
index 1a33cac3cf..edb99a9a05 100644
--- a/posix/setresuid.c
+++ b/posix/setresuid.c
@@ -31,4 +31,3 @@ libc_hidden_def (__setresuid)
 stub_warning (setresuid)
 
 weak_alias (__setresuid, setresuid)
-#include <stub-tag.h>
diff --git a/posix/setsid.c b/posix/setsid.c
index 879b0ca70a..a4f05254e1 100644
--- a/posix/setsid.c
+++ b/posix/setsid.c
@@ -31,4 +31,3 @@ __setsid ()
 stub_warning (setsid)
 
 weak_alias (__setsid, setsid)
-#include <stub-tag.h>
diff --git a/posix/setuid.c b/posix/setuid.c
index a421cb97f7..5892d23579 100644
--- a/posix/setuid.c
+++ b/posix/setuid.c
@@ -33,4 +33,3 @@ __setuid (uid)
 stub_warning (setuid)
 
 weak_alias (__setuid, setuid)
-#include <stub-tag.h>
diff --git a/posix/sleep.c b/posix/sleep.c
index f5aa751f99..d7ca5f9c89 100644
--- a/posix/sleep.c
+++ b/posix/sleep.c
@@ -37,4 +37,3 @@ __sleep (seconds)
 weak_alias (__sleep, sleep)
 
 stub_warning (sleep)
-#include <stub-tag.h>
diff --git a/posix/spawni.c b/posix/spawni.c
index 4835c71be5..c8c6127e67 100644
--- a/posix/spawni.c
+++ b/posix/spawni.c
@@ -42,4 +42,3 @@ __spawni (pid_t *pid, const char *file,
 }
 
 stub_warning (__spawni)
-#include <stub-tag.h>
diff --git a/posix/sysconf.c b/posix/sysconf.c
index 331aa27b39..8428f79ab3 100644
--- a/posix/sysconf.c
+++ b/posix/sysconf.c
@@ -279,4 +279,3 @@ weak_alias (__sysconf, sysconf)
 libc_hidden_def (__sysconf)
 
 stub_warning (sysconf)
-#include <stub-tag.h>
diff --git a/posix/times.c b/posix/times.c
index 5a47517b7a..e6f6003006 100644
--- a/posix/times.c
+++ b/posix/times.c
@@ -39,4 +39,3 @@ __times (buffer)
 stub_warning (times)
 
 weak_alias (__times, times)
-#include <stub-tag.h>
diff --git a/posix/wait.c b/posix/wait.c
index 5d6cbbf957..1f78fa2ee8 100644
--- a/posix/wait.c
+++ b/posix/wait.c
@@ -29,4 +29,3 @@ __wait (__WAIT_STATUS_DEFN stat_loc)
 stub_warning (wait)
 
 weak_alias (__wait, wait)
-#include <stub-tag.h>
diff --git a/posix/wait3.c b/posix/wait3.c
index 5491ddf90b..943ad4bccf 100644
--- a/posix/wait3.c
+++ b/posix/wait3.c
@@ -39,4 +39,3 @@ __wait3 (__WAIT_STATUS_DEFN stat_loc, int options, struct rusage *usage)
 stub_warning (wait3)
 
 weak_alias (__wait3, wait3)
-#include <stub-tag.h>
diff --git a/posix/wait4.c b/posix/wait4.c
index c53bba4d28..b805cb5ac9 100644
--- a/posix/wait4.c
+++ b/posix/wait4.c
@@ -29,4 +29,3 @@ __wait4 (__pid_t pid, __WAIT_STATUS stat_loc, int options,
 stub_warning (wait4)
 
 weak_alias (__wait4, wait4)
-#include <stub-tag.h>
diff --git a/posix/waitpid.c b/posix/waitpid.c
index 20e6f68b26..4253e7b466 100644
--- a/posix/waitpid.c
+++ b/posix/waitpid.c
@@ -49,4 +49,3 @@ libc_hidden_weak (__waitpid)
 weak_alias (__libc_waitpid, waitpid)
 
 stub_warning (waitpid)
-#include <stub-tag.h>
diff --git a/resolv/gai_sigqueue.c b/resolv/gai_sigqueue.c
index 22aff54ec4..56f00b9fbb 100644
--- a/resolv/gai_sigqueue.c
+++ b/resolv/gai_sigqueue.c
@@ -32,4 +32,3 @@ __gai_sigqueue (sig, val, caller_pid)
 }
 
 stub_warning (__gai_sigqueue)
-#include <stub-tag.h>
diff --git a/resource/getpriority.c b/resource/getpriority.c
index ae7521cd89..6809c5cf01 100644
--- a/resource/getpriority.c
+++ b/resource/getpriority.c
@@ -33,4 +33,3 @@ getpriority (which, who)
 libc_hidden_def (getpriority)
 
 stub_warning (getpriority)
-#include <stub-tag.h>
diff --git a/resource/getrlimit.c b/resource/getrlimit.c
index 2ba589c9d4..544c1552d3 100644
--- a/resource/getrlimit.c
+++ b/resource/getrlimit.c
@@ -30,4 +30,3 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
 weak_alias (__getrlimit, getrlimit)
 
 stub_warning (getrlimit)
-#include <stub-tag.h>
diff --git a/resource/getrusage.c b/resource/getrusage.c
index 94797588af..93cf4c95e2 100644
--- a/resource/getrusage.c
+++ b/resource/getrusage.c
@@ -31,4 +31,3 @@ __getrusage (who, usage)
 stub_warning (getrusage)
 
 weak_alias (__getrusage, getrusage)
-#include <stub-tag.h>
diff --git a/resource/nice.c b/resource/nice.c
index 1e938cfe83..febf7c066f 100644
--- a/resource/nice.c
+++ b/resource/nice.c
@@ -29,4 +29,3 @@ nice (incr)
 }
 
 stub_warning (nice)
-#include <stub-tag.h>
diff --git a/resource/setpriority.c b/resource/setpriority.c
index 8d68fdbffc..5a5b6cc441 100644
--- a/resource/setpriority.c
+++ b/resource/setpriority.c
@@ -32,4 +32,3 @@ setpriority (which, who, prio)
 libc_hidden_def (setpriority)
 
 stub_warning (setpriority)
-#include <stub-tag.h>
diff --git a/resource/setrlimit.c b/resource/setrlimit.c
index 539cd6faab..f92513b1ce 100644
--- a/resource/setrlimit.c
+++ b/resource/setrlimit.c
@@ -33,4 +33,3 @@ setrlimit (resource, rlimits)
 
 
 stub_warning (setrlimit)
-#include <stub-tag.h>
diff --git a/resource/ulimit.c b/resource/ulimit.c
index 1ca2f2b7c9..802136ca63 100644
--- a/resource/ulimit.c
+++ b/resource/ulimit.c
@@ -35,4 +35,3 @@ __ulimit (int cmd, ...)
 weak_alias (__ulimit, ulimit)
 
 stub_warning (ulimit)
-#include <stub-tag.h>
diff --git a/rt/aio_cancel.c b/rt/aio_cancel.c
index e6af7afa6a..b7d36a2455 100644
--- a/rt/aio_cancel.c
+++ b/rt/aio_cancel.c
@@ -40,4 +40,3 @@ weak_alias (aio_cancel, aio_cancel64)
 
 stub_warning (aio_cancel)
 stub_warning (aio_cancel64)
-#include <stub-tag.h>
diff --git a/rt/aio_fsync.c b/rt/aio_fsync.c
index 3893e07576..0db17b4dcf 100644
--- a/rt/aio_fsync.c
+++ b/rt/aio_fsync.c
@@ -47,4 +47,3 @@ weak_alias (aio_fsync, aio_fsync64)
 
 stub_warning (aio_fsync)
 stub_warning (aio_fsync64)
-#include <stub-tag.h>
diff --git a/rt/aio_read.c b/rt/aio_read.c
index 213a43ce9b..57e4f78868 100644
--- a/rt/aio_read.c
+++ b/rt/aio_read.c
@@ -32,4 +32,3 @@ aio_read (struct aiocb *aiocbp)
 }
 
 stub_warning (aio_read)
-#include <stub-tag.h>
diff --git a/rt/aio_sigqueue.c b/rt/aio_sigqueue.c
index c3d7adb820..28431468d0 100644
--- a/rt/aio_sigqueue.c
+++ b/rt/aio_sigqueue.c
@@ -32,4 +32,3 @@ __aio_sigqueue (sig, val, caller_pid)
 }
 
 stub_warning (__aio_sigqueue)
-#include <stub-tag.h>
diff --git a/rt/aio_suspend.c b/rt/aio_suspend.c
index ce882fb82e..8453b8f275 100644
--- a/rt/aio_suspend.c
+++ b/rt/aio_suspend.c
@@ -42,4 +42,3 @@ weak_alias (aio_suspend, aio_suspend64)
 
 stub_warning (aio_suspend)
 stub_warning (aio_suspend64)
-#include <stub-tag.h>
diff --git a/rt/aio_write.c b/rt/aio_write.c
index 398e9dbd57..bd428ba04a 100644
--- a/rt/aio_write.c
+++ b/rt/aio_write.c
@@ -32,4 +32,3 @@ aio_write (struct aiocb *aiocbp)
 }
 
 stub_warning (aio_write)
-#include <stub-tag.h>
diff --git a/rt/clock_getres.c b/rt/clock_getres.c
index 162c8a5697..dfd4d76831 100644
--- a/rt/clock_getres.c
+++ b/rt/clock_getres.c
@@ -28,4 +28,3 @@ clock_getres (clockid_t clock_id, struct timespec *res)
 }
 strong_alias (clock_getres, __clock_getres)
 stub_warning (clock_getres)
-#include <stub-tag.h>
diff --git a/rt/clock_gettime.c b/rt/clock_gettime.c
index 5139e8724c..7456bdfef0 100644
--- a/rt/clock_gettime.c
+++ b/rt/clock_gettime.c
@@ -28,4 +28,3 @@ clock_gettime (clockid_t clock_id, struct timespec *tp)
 }
 strong_alias (clock_gettime, __clock_gettime)
 stub_warning (clock_gettime)
-#include <stub-tag.h>
diff --git a/rt/clock_nanosleep.c b/rt/clock_nanosleep.c
index d9a0e92d4b..d4946a5c89 100644
--- a/rt/clock_nanosleep.c
+++ b/rt/clock_nanosleep.c
@@ -35,4 +35,3 @@ clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
 }
 strong_alias (clock_nanosleep, __clock_nanosleep)
 stub_warning (clock_nanosleep)
-#include <stub-tag.h>
diff --git a/rt/clock_settime.c b/rt/clock_settime.c
index 6f7cdd6edc..72d81cb000 100644
--- a/rt/clock_settime.c
+++ b/rt/clock_settime.c
@@ -28,4 +28,3 @@ clock_settime (clockid_t clock_id, const struct timespec *tp)
 }
 strong_alias (clock_settime, __clock_settime)
 stub_warning (clock_settime)
-#include <stub-tag.h>
diff --git a/rt/lio_listio.c b/rt/lio_listio.c
index 867a20eca7..a807c47fdd 100644
--- a/rt/lio_listio.c
+++ b/rt/lio_listio.c
@@ -38,4 +38,3 @@ lio_listio (int mode,
 }
 
 stub_warning (lio_listio)
-#include <stub-tag.h>
diff --git a/rt/mq_close.c b/rt/mq_close.c
index 9c5f9bfd61..1a3c06fec3 100644
--- a/rt/mq_close.c
+++ b/rt/mq_close.c
@@ -27,4 +27,3 @@ mq_close (mqd_t mqdes)
   return -1;
 }
 stub_warning (mq_close)
-#include <stub-tag.h>
diff --git a/rt/mq_getattr.c b/rt/mq_getattr.c
index 3c35fdd6da..d37328f689 100644
--- a/rt/mq_getattr.c
+++ b/rt/mq_getattr.c
@@ -26,4 +26,3 @@ mq_getattr (mqd_t mqdes, struct mq_attr *mqstat)
   return -1;
 }
 stub_warning (mq_getattr)
-#include <stub-tag.h>
diff --git a/rt/mq_notify.c b/rt/mq_notify.c
index 7b89a65434..8241b41dc4 100644
--- a/rt/mq_notify.c
+++ b/rt/mq_notify.c
@@ -27,4 +27,3 @@ mq_notify (mqd_t mqdes, const struct sigevent *notification)
   return -1;
 }
 stub_warning (mq_notify)
-#include <stub-tag.h>
diff --git a/rt/mq_open.c b/rt/mq_open.c
index d7986fbc0b..af67ef5f8d 100644
--- a/rt/mq_open.c
+++ b/rt/mq_open.c
@@ -44,4 +44,3 @@ __mq_open_2 (const char *name, int oflag)
   return __mq_open (name, oflag);
 }
 stub_warning (__mq_open_2)
-#include <stub-tag.h>
diff --git a/rt/mq_receive.c b/rt/mq_receive.c
index c72802f365..e764800a21 100644
--- a/rt/mq_receive.c
+++ b/rt/mq_receive.c
@@ -28,4 +28,3 @@ mq_receive (mqd_t mqdes, char *msg_ptr, size_t msg_len,
   return -1;
 }
 stub_warning (mq_receive)
-#include <stub-tag.h>
diff --git a/rt/mq_send.c b/rt/mq_send.c
index 748ee41620..591782fab0 100644
--- a/rt/mq_send.c
+++ b/rt/mq_send.c
@@ -27,4 +27,3 @@ mq_send (mqd_t mqdes, const char *msg_ptr, size_t msg_len,
   return -1;
 }
 stub_warning (mq_send)
-#include <stub-tag.h>
diff --git a/rt/mq_setattr.c b/rt/mq_setattr.c
index 58a1e34aaa..658d423b8a 100644
--- a/rt/mq_setattr.c
+++ b/rt/mq_setattr.c
@@ -29,4 +29,3 @@ mq_setattr (mqd_t mqdes, const struct mq_attr *__restrict mqstat,
 }
 hidden_def (mq_setattr)
 stub_warning (mq_setattr)
-#include <stub-tag.h>
diff --git a/rt/mq_timedreceive.c b/rt/mq_timedreceive.c
index 6c3188a06f..652d4ec911 100644
--- a/rt/mq_timedreceive.c
+++ b/rt/mq_timedreceive.c
@@ -30,4 +30,3 @@ mq_timedreceive (mqd_t mqdes, char *__restrict msg_ptr, size_t msg_len,
 }
 hidden_def (mq_timedreceive)
 stub_warning (mq_timedreceive)
-#include <stub-tag.h>
diff --git a/rt/mq_timedsend.c b/rt/mq_timedsend.c
index a3590c35f7..65ef63480e 100644
--- a/rt/mq_timedsend.c
+++ b/rt/mq_timedsend.c
@@ -29,4 +29,3 @@ mq_timedsend (mqd_t mqdes, const char *msg_ptr, size_t msg_len,
 }
 hidden_def (mq_timedsend)
 stub_warning (mq_timedsend)
-#include <stub-tag.h>
diff --git a/rt/mq_unlink.c b/rt/mq_unlink.c
index f9f9733683..92f484ae97 100644
--- a/rt/mq_unlink.c
+++ b/rt/mq_unlink.c
@@ -26,4 +26,3 @@ mq_unlink (const char *name)
   return -1;
 }
 stub_warning (mq_unlink)
-#include <stub-tag.h>
diff --git a/rt/shm_open.c b/rt/shm_open.c
index 03a67e8ca8..8b45e1edab 100644
--- a/rt/shm_open.c
+++ b/rt/shm_open.c
@@ -26,5 +26,3 @@ shm_open (const char *name, int oflag, mode_t mode)
   return -1;
 }
 stub_warning (shm_open)
-
-#include <stub-tag.h>
diff --git a/rt/shm_unlink.c b/rt/shm_unlink.c
index 4183577768..d0cfa05b65 100644
--- a/rt/shm_unlink.c
+++ b/rt/shm_unlink.c
@@ -26,5 +26,3 @@ shm_unlink (const char *name)
   return -1;
 }
 stub_warning (shm_unlink)
-
-#include <stub-tag.h>
diff --git a/rt/timer_create.c b/rt/timer_create.c
index d595d6e3f6..ff28e7250c 100644
--- a/rt/timer_create.c
+++ b/rt/timer_create.c
@@ -26,4 +26,3 @@ timer_create (clockid_t clock_id, struct sigevent *evp, timer_t *timerid)
   return -1;
 }
 stub_warning (timer_create)
-#include <stub-tag.h>
diff --git a/rt/timer_delete.c b/rt/timer_delete.c
index 80fb3fc5da..cf2c9b6bf7 100644
--- a/rt/timer_delete.c
+++ b/rt/timer_delete.c
@@ -26,4 +26,3 @@ timer_delete (timer_t timerid)
   return -1;
 }
 stub_warning (timer_delete)
-#include <stub-tag.h>
diff --git a/rt/timer_getoverr.c b/rt/timer_getoverr.c
index 1338de74dd..bea366d8da 100644
--- a/rt/timer_getoverr.c
+++ b/rt/timer_getoverr.c
@@ -26,4 +26,3 @@ timer_getoverrun (timer_t timerid)
   return -1;
 }
 stub_warning (timer_getoverrun)
-#include <stub-tag.h>
diff --git a/rt/timer_gettime.c b/rt/timer_gettime.c
index 0510731771..2f1eef08bc 100644
--- a/rt/timer_gettime.c
+++ b/rt/timer_gettime.c
@@ -26,4 +26,3 @@ timer_gettime (timer_t timerid, struct itimerspec *value)
   return -1;
 }
 stub_warning (timer_gettime)
-#include <stub-tag.h>
diff --git a/rt/timer_settime.c b/rt/timer_settime.c
index 0c5090cd5e..549dc15a0a 100644
--- a/rt/timer_settime.c
+++ b/rt/timer_settime.c
@@ -27,4 +27,3 @@ timer_settime (timer_t timerid, int flags, const struct itimerspec *value,
   return -1;
 }
 stub_warning (timer_settime)
-#include <stub-tag.h>
diff --git a/setjmp/__longjmp.c b/setjmp/__longjmp.c
index 6a5780a32b..43cd13b184 100644
--- a/setjmp/__longjmp.c
+++ b/setjmp/__longjmp.c
@@ -32,4 +32,3 @@ __longjmp (__jmp_buf env, int val)
 }
 
 stub_warning (longjmp)
-#include <stub-tag.h>
diff --git a/setjmp/setjmp.c b/setjmp/setjmp.c
index 11a4fea209..c3de551ce2 100644
--- a/setjmp/setjmp.c
+++ b/setjmp/setjmp.c
@@ -33,4 +33,3 @@ __libc_sigsetjmp (jmp_buf env, int savemask)
 
 weak_alias (__libc_sigsetjmp, __sigsetjmp)
 stub_warning (__sigsetjmp)
-#include <stub-tag.h>
diff --git a/signal/kill.c b/signal/kill.c
index 3e991813e6..da6b49fbd8 100644
--- a/signal/kill.c
+++ b/signal/kill.c
@@ -33,4 +33,3 @@ __kill (pid, sig)
 stub_warning (kill)
 
 weak_alias (__kill, kill)
-#include <stub-tag.h>
diff --git a/signal/killpg.c b/signal/killpg.c
index a2beea9dd3..36bc5baef0 100644
--- a/signal/killpg.c
+++ b/signal/killpg.c
@@ -32,4 +32,3 @@ killpg (pgrp, sig)
 }
 
 stub_warning (killpg)
-#include <stub-tag.h>
diff --git a/signal/raise.c b/signal/raise.c
index aa98a1a84b..d8d0914665 100644
--- a/signal/raise.c
+++ b/signal/raise.c
@@ -30,4 +30,3 @@ weak_alias (raise, gsignal)
 
 stub_warning (raise)
 stub_warning (gsignal)
-#include <stub-tag.h>
diff --git a/signal/sigaction.c b/signal/sigaction.c
index 2ca3150f8d..743724dbce 100644
--- a/signal/sigaction.c
+++ b/signal/sigaction.c
@@ -40,4 +40,3 @@ libc_hidden_def (__sigaction)
 stub_warning (sigaction)
 
 weak_alias (__sigaction, sigaction)
-#include <stub-tag.h>
diff --git a/signal/sigaltstack.c b/signal/sigaltstack.c
index ce519799e1..a540aedb44 100644
--- a/signal/sigaltstack.c
+++ b/signal/sigaltstack.c
@@ -30,4 +30,3 @@ sigaltstack (ss, oss)
 }
 
 stub_warning (sigaltstack)
-#include <stub-tag.h>
diff --git a/signal/sigblock.c b/signal/sigblock.c
index 9b5c442684..7294629541 100644
--- a/signal/sigblock.c
+++ b/signal/sigblock.c
@@ -29,4 +29,3 @@ __sigblock (mask)
 stub_warning (sigblock)
 
 weak_alias (__sigblock, sigblock)
-#include <stub-tag.h>
diff --git a/signal/sigignore.c b/signal/sigignore.c
index d0320e8612..637dc94895 100644
--- a/signal/sigignore.c
+++ b/signal/sigignore.c
@@ -29,4 +29,3 @@ sigignore (sig)
 }
 
 stub_warning (sigignore)
-#include <stub-tag.h>
diff --git a/signal/sigintr.c b/signal/sigintr.c
index 231ef4dea7..44959509d0 100644
--- a/signal/sigintr.c
+++ b/signal/sigintr.c
@@ -31,4 +31,3 @@ siginterrupt (sig, interrupt)
 }
 
 stub_warning (siginterrupt)
-#include <stub-tag.h>
diff --git a/signal/signal.c b/signal/signal.c
index 4cc4734739..bc78d6f5c0 100644
--- a/signal/signal.c
+++ b/signal/signal.c
@@ -34,4 +34,3 @@ weak_alias (signal, ssignal)
 
 stub_warning (signal)
 stub_warning (ssignal)
-#include <stub-tag.h>
diff --git a/signal/sigpause.c b/signal/sigpause.c
index a7b5cd4d3d..78e61fc960 100644
--- a/signal/sigpause.c
+++ b/signal/sigpause.c
@@ -40,7 +40,6 @@ __default_sigpause (int mask)
 }
 weak_alias (__default_sigpause, sigpause)
 stub_warning (sigpause)
-#include <stub-tag.h>
 
 
 int
diff --git a/signal/sigpending.c b/signal/sigpending.c
index 480455a0a8..7b48bfebd7 100644
--- a/signal/sigpending.c
+++ b/signal/sigpending.c
@@ -36,4 +36,3 @@ sigpending (set)
 }
 
 stub_warning (sigpending)
-#include <stub-tag.h>
diff --git a/signal/sigqueue.c b/signal/sigqueue.c
index 6cfab4f6ff..48aae580dd 100644
--- a/signal/sigqueue.c
+++ b/signal/sigqueue.c
@@ -29,4 +29,3 @@ __sigqueue (pid_t pid, int sig, const union sigval val)
 weak_alias (__sigqueue, sigqueue)
 
 stub_warning (sigqueue)
-#include <stub-tag.h>
diff --git a/signal/sigreturn.c b/signal/sigreturn.c
index a650786639..901404ca86 100644
--- a/signal/sigreturn.c
+++ b/signal/sigreturn.c
@@ -28,4 +28,3 @@ __sigreturn (context)
 stub_warning (sigreturn)
 
 weak_alias (__sigreturn, sigreturn)
-#include <stub-tag.h>
diff --git a/signal/sigset.c b/signal/sigset.c
index 7ad11da09f..a87cbcef7a 100644
--- a/signal/sigset.c
+++ b/signal/sigset.c
@@ -30,4 +30,3 @@ sigset (sig, disp)
 }
 
 stub_warning (sigset)
-#include <stub-tag.h>
diff --git a/signal/sigsetmask.c b/signal/sigsetmask.c
index f3b90de6c8..495f30e88e 100644
--- a/signal/sigsetmask.c
+++ b/signal/sigsetmask.c
@@ -28,4 +28,3 @@ __sigsetmask (mask)
 stub_warning (sigsetmask)
 
 weak_alias (__sigsetmask, sigsetmask)
-#include <stub-tag.h>
diff --git a/signal/sigstack.c b/signal/sigstack.c
index 1164933937..9b6f2b1d9b 100644
--- a/signal/sigstack.c
+++ b/signal/sigstack.c
@@ -30,4 +30,3 @@ sigstack (ss, oss)
 }
 
 stub_warning (sigstack)
-#include <stub-tag.h>
diff --git a/signal/sigsuspend.c b/signal/sigsuspend.c
index 560daaa78e..35be5c6d0c 100644
--- a/signal/sigsuspend.c
+++ b/signal/sigsuspend.c
@@ -33,4 +33,3 @@ weak_alias (__sigsuspend, sigsuspend)
 
 stub_warning (sigsuspend)
 stub_warning (__sigsuspend)
-#include <stub-tag.h>
diff --git a/signal/sigtimedwait.c b/signal/sigtimedwait.c
index b5e334cbd1..96bbc6c474 100644
--- a/signal/sigtimedwait.c
+++ b/signal/sigtimedwait.c
@@ -30,4 +30,3 @@ libc_hidden_def (__sigtimedwait)
 weak_alias (__sigtimedwait, sigtimedwait)
 
 stub_warning (sigtimedwait)
-#include <stub-tag.h>
diff --git a/signal/sigvec.c b/signal/sigvec.c
index a8fb46baa4..e44daf1ab6 100644
--- a/signal/sigvec.c
+++ b/signal/sigvec.c
@@ -35,4 +35,3 @@ __sigvec (sig, vec, ovec)
 stub_warning (sigvec)
 
 weak_alias (__sigvec, sigvec)
-#include <stub-tag.h>
diff --git a/signal/sigwait.c b/signal/sigwait.c
index 4226f66d8f..27820157f5 100644
--- a/signal/sigwait.c
+++ b/signal/sigwait.c
@@ -28,4 +28,3 @@ __sigwait (const sigset_t *set, int *sig)
 weak_alias (__sigwait, sigwait)
 
 stub_warning (sigwait)
-#include <stub-tag.h>
diff --git a/signal/sigwaitinfo.c b/signal/sigwaitinfo.c
index 19b8c02b43..a266b3684a 100644
--- a/signal/sigwaitinfo.c
+++ b/signal/sigwaitinfo.c
@@ -29,4 +29,3 @@ libc_hidden_def (__sigwaitinfo)
 weak_alias (__sigwaitinfo, sigwaitinfo)
 
 stub_warning (sigwaitinfo)
-#include <stub-tag.h>
diff --git a/signal/sysv_signal.c b/signal/sysv_signal.c
index 574b94ec5b..aaf940b857 100644
--- a/signal/sysv_signal.c
+++ b/signal/sysv_signal.c
@@ -39,4 +39,3 @@ __sysv_signal (sig, handler)
 weak_alias (__sysv_signal, sysv_signal)
 
 stub_warning (sysv_signal)
-#include <stub-tag.h>
diff --git a/socket/accept.c b/socket/accept.c
index b9df1ac74e..c1837956da 100644
--- a/socket/accept.c
+++ b/socket/accept.c
@@ -36,4 +36,3 @@ libc_hidden_def (accept)
 
 
 stub_warning (accept)
-#include <stub-tag.h>
diff --git a/socket/accept4.c b/socket/accept4.c
index fad2cc696f..d65482c116 100644
--- a/socket/accept4.c
+++ b/socket/accept4.c
@@ -38,4 +38,3 @@ weak_alias (__libc_accept4, accept4)
 
 
 stub_warning (accept4)
-#include <stub-tag.h>
diff --git a/socket/bind.c b/socket/bind.c
index e87351d556..a1d6fc6521 100644
--- a/socket/bind.c
+++ b/socket/bind.c
@@ -32,4 +32,3 @@ __bind (fd, addr, len)
 weak_alias (__bind, bind)
 
 stub_warning (bind)
-#include <stub-tag.h>
diff --git a/socket/connect.c b/socket/connect.c
index 79f5cd82b7..4f421f8f3e 100644
--- a/socket/connect.c
+++ b/socket/connect.c
@@ -35,4 +35,3 @@ weak_alias (__connect, connect)
 libc_hidden_def (__connect)
 
 stub_warning (connect)
-#include <stub-tag.h>
diff --git a/socket/getpeername.c b/socket/getpeername.c
index 9562814e75..72e44234ff 100644
--- a/socket/getpeername.c
+++ b/socket/getpeername.c
@@ -32,4 +32,3 @@ getpeername (fd, addr, len)
 
 
 stub_warning (getpeername)
-#include <stub-tag.h>
diff --git a/socket/getsockname.c b/socket/getsockname.c
index 03d97652e9..14df9bce5b 100644
--- a/socket/getsockname.c
+++ b/socket/getsockname.c
@@ -32,4 +32,3 @@ __getsockname (fd, addr, len)
 weak_alias (__getsockname, getsockname)
 
 stub_warning (getsockname)
-#include <stub-tag.h>
diff --git a/socket/getsockopt.c b/socket/getsockopt.c
index 661bcf3ffd..f172f20df9 100644
--- a/socket/getsockopt.c
+++ b/socket/getsockopt.c
@@ -34,4 +34,3 @@ getsockopt (fd, level, optname, optval, optlen)
 }
 
 stub_warning (getsockopt)
-#include <stub-tag.h>
diff --git a/socket/isfdtype.c b/socket/isfdtype.c
index 188d516d7f..012b0ff1ff 100644
--- a/socket/isfdtype.c
+++ b/socket/isfdtype.c
@@ -27,4 +27,3 @@ isfdtype (int fildes, int fdtype)
   return -1;
 }
 stub_warning (isfdtype)
-#include <stub-tag.h>
diff --git a/socket/listen.c b/socket/listen.c
index 0c1af82316..f657d87905 100644
--- a/socket/listen.c
+++ b/socket/listen.c
@@ -33,4 +33,3 @@ __listen (fd, n)
 weak_alias (__listen, listen)
 
 stub_warning (listen)
-#include <stub-tag.h>
diff --git a/socket/recv.c b/socket/recv.c
index 43fdcfcdee..6efeb4d92a 100644
--- a/socket/recv.c
+++ b/socket/recv.c
@@ -33,4 +33,3 @@ __recv (fd, buf, n, flags)
 weak_alias (__recv, recv)
 
 stub_warning (recv)
-#include <stub-tag.h>
diff --git a/socket/recvfrom.c b/socket/recvfrom.c
index 654d2e93ac..b99774f368 100644
--- a/socket/recvfrom.c
+++ b/socket/recvfrom.c
@@ -37,4 +37,3 @@ __recvfrom (fd, buf, n, flags, addr, addr_len)
 weak_alias (__recvfrom, recvfrom)
 
 stub_warning (recvfrom)
-#include <stub-tag.h>
diff --git a/socket/recvmsg.c b/socket/recvmsg.c
index 7cd6ff3dda..0afcc0faf5 100644
--- a/socket/recvmsg.c
+++ b/socket/recvmsg.c
@@ -33,4 +33,3 @@ __recvmsg (fd, message, flags)
 weak_alias (__recvmsg, recvmsg)
 
 stub_warning (recvmsg)
-#include <stub-tag.h>
diff --git a/socket/send.c b/socket/send.c
index 2b87baea07..1f5220db24 100644
--- a/socket/send.c
+++ b/socket/send.c
@@ -33,4 +33,3 @@ libc_hidden_def (__send)
 weak_alias (__send, send)
 
 stub_warning (send)
-#include <stub-tag.h>
diff --git a/socket/sendmsg.c b/socket/sendmsg.c
index 249bb5af34..8fce470ad7 100644
--- a/socket/sendmsg.c
+++ b/socket/sendmsg.c
@@ -33,4 +33,3 @@ __sendmsg (fd, message, flags)
 weak_alias (__sendmsg, sendmsg)
 
 stub_warning (sendmsg)
-#include <stub-tag.h>
diff --git a/socket/sendto.c b/socket/sendto.c
index 040caf8fa8..ae06a54cc6 100644
--- a/socket/sendto.c
+++ b/socket/sendto.c
@@ -36,4 +36,3 @@ __sendto (fd, buf, n, flags, addr, addr_len)
 weak_alias (__sendto, sendto)
 
 stub_warning (sendto)
-#include <stub-tag.h>
diff --git a/socket/setsockopt.c b/socket/setsockopt.c
index 21824f625d..9e1e7a3d80 100644
--- a/socket/setsockopt.c
+++ b/socket/setsockopt.c
@@ -36,4 +36,3 @@ __setsockopt (fd, level, optname, optval, optlen)
 weak_alias (__setsockopt, setsockopt)
 
 stub_warning (setsockopt)
-#include <stub-tag.h>
diff --git a/socket/shutdown.c b/socket/shutdown.c
index 8ce992c472..5c35cc3b3d 100644
--- a/socket/shutdown.c
+++ b/socket/shutdown.c
@@ -35,4 +35,3 @@ shutdown (fd, how)
 
 
 stub_warning (shutdown)
-#include <stub-tag.h>
diff --git a/socket/sockatmark.c b/socket/sockatmark.c
index dd11b42a05..7970961ee4 100644
--- a/socket/sockatmark.c
+++ b/socket/sockatmark.c
@@ -29,4 +29,3 @@ sockatmark (fd)
 
 
 stub_warning (sockatmark)
-#include <stub-tag.h>
diff --git a/socket/socket.c b/socket/socket.c
index 273924a05c..8cb014edb7 100644
--- a/socket/socket.c
+++ b/socket/socket.c
@@ -34,4 +34,3 @@ __socket (domain, type, protocol)
 
 weak_alias (__socket, socket)
 stub_warning (socket)
-#include <stub-tag.h>
diff --git a/socket/socketpair.c b/socket/socketpair.c
index 7933d44d6c..031674831f 100644
--- a/socket/socketpair.c
+++ b/socket/socketpair.c
@@ -35,4 +35,3 @@ socketpair (domain, type, protocol, fds)
 
 
 stub_warning (socketpair)
-#include <stub-tag.h>
diff --git a/stdio-common/ctermid.c b/stdio-common/ctermid.c
index b1bc4c9835..e78c3d083c 100644
--- a/stdio-common/ctermid.c
+++ b/stdio-common/ctermid.c
@@ -32,4 +32,3 @@ ctermid (s)
 
 
 stub_warning (ctermid)
-#include <stub-tag.h>
diff --git a/stdio-common/cuserid.c b/stdio-common/cuserid.c
index 758574b607..68056dcfc8 100644
--- a/stdio-common/cuserid.c
+++ b/stdio-common/cuserid.c
@@ -31,4 +31,3 @@ cuserid (s)
 
 
 stub_warning (cuserid)
-#include <stub-tag.h>
diff --git a/stdio-common/remove.c b/stdio-common/remove.c
index 17e3ed6057..8563b71875 100644
--- a/stdio-common/remove.c
+++ b/stdio-common/remove.c
@@ -29,4 +29,3 @@ remove (file)
 libc_hidden_def (remove)
 
 stub_warning (remove)
-#include <stub-tag.h>
diff --git a/stdio-common/rename.c b/stdio-common/rename.c
index af84bed00c..2b3cbcfa14 100644
--- a/stdio-common/rename.c
+++ b/stdio-common/rename.c
@@ -37,4 +37,3 @@ rename (old, new)
 
 
 stub_warning (rename)
-#include <stub-tag.h>
diff --git a/stdio-common/renameat.c b/stdio-common/renameat.c
index 821e107a82..ab2cf428f2 100644
--- a/stdio-common/renameat.c
+++ b/stdio-common/renameat.c
@@ -46,4 +46,3 @@ renameat (oldfd, old, newfd, new)
 
 
 stub_warning (renameat)
-#include <stub-tag.h>
diff --git a/stdio-common/tempname.c b/stdio-common/tempname.c
index cdcdaaa86f..30b9fd4455 100644
--- a/stdio-common/tempname.c
+++ b/stdio-common/tempname.c
@@ -57,4 +57,3 @@ __gen_tempname (tmpl, suffixlen, flags, kind)
 }
 
 stub_warning (__gen_tempname)
-#include <stub-tag.h>
diff --git a/stdlib/getcontext.c b/stdlib/getcontext.c
index aa65e5ea6d..b197438e42 100644
--- a/stdlib/getcontext.c
+++ b/stdlib/getcontext.c
@@ -28,4 +28,3 @@ getcontext (ucp)
 
 
 stub_warning (getcontext)
-#include <stub-tag.h>
diff --git a/stdlib/makecontext.c b/stdlib/makecontext.c
index 1f08b18c35..71fad95067 100644
--- a/stdlib/makecontext.c
+++ b/stdlib/makecontext.c
@@ -26,4 +26,3 @@ makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...)
 
 
 stub_warning (makecontext)
-#include <stub-tag.h>
diff --git a/stdlib/setcontext.c b/stdlib/setcontext.c
index 6a7517c679..470f238c14 100644
--- a/stdlib/setcontext.c
+++ b/stdlib/setcontext.c
@@ -28,4 +28,3 @@ setcontext (ucp)
 
 
 stub_warning (setcontext)
-#include <stub-tag.h>
diff --git a/stdlib/swapcontext.c b/stdlib/swapcontext.c
index 275bc658d3..ee3acb478c 100644
--- a/stdlib/swapcontext.c
+++ b/stdlib/swapcontext.c
@@ -29,4 +29,3 @@ swapcontext (oucp, ucp)
 
 
 stub_warning (swapcontext)
-#include <stub-tag.h>
diff --git a/stdlib/system.c b/stdlib/system.c
index b2f7d6d624..9bc7e82c6f 100644
--- a/stdlib/system.c
+++ b/stdlib/system.c
@@ -34,4 +34,3 @@ weak_alias (__libc_system, system)
 
 
 stub_warning (system)
-#include <stub-tag.h>
diff --git a/streams/fattach.c b/streams/fattach.c
index 22e36df948..9c84127c18 100644
--- a/streams/fattach.c
+++ b/streams/fattach.c
@@ -29,4 +29,3 @@ fattach (fildes, path)
 
 
 stub_warning (fattach)
-#include <stub-tag.h>
diff --git a/streams/fdetach.c b/streams/fdetach.c
index 9c872caae4..0463736734 100644
--- a/streams/fdetach.c
+++ b/streams/fdetach.c
@@ -28,4 +28,3 @@ fdetach (path)
 
 
 stub_warning (fdetach)
-#include <stub-tag.h>
diff --git a/streams/getmsg.c b/streams/getmsg.c
index 20c32aa8a4..2da0ab6eb3 100644
--- a/streams/getmsg.c
+++ b/streams/getmsg.c
@@ -31,4 +31,3 @@ getmsg (fildes, ctlptr, dataptr, flagsp)
 
 
 stub_warning (getmsg)
-#include <stub-tag.h>
diff --git a/streams/getpmsg.c b/streams/getpmsg.c
index 7d97f5c242..acb25b585f 100644
--- a/streams/getpmsg.c
+++ b/streams/getpmsg.c
@@ -32,4 +32,3 @@ getpmsg (fildes, ctlptr, dataptr, bandp, flagsp)
 
 
 stub_warning (getpmsg)
-#include <stub-tag.h>
diff --git a/streams/putmsg.c b/streams/putmsg.c
index 80f9f0b92a..2d776bc96a 100644
--- a/streams/putmsg.c
+++ b/streams/putmsg.c
@@ -31,4 +31,3 @@ putmsg (fildes, ctlptr, dataptr, flags)
 
 
 stub_warning (putmsg)
-#include <stub-tag.h>
diff --git a/streams/putpmsg.c b/streams/putpmsg.c
index b85e14283a..c2fa820e6f 100644
--- a/streams/putpmsg.c
+++ b/streams/putpmsg.c
@@ -32,4 +32,3 @@ putpmsg (fildes, ctlptr, dataptr, band, flags)
 
 
 stub_warning (putpmsg)
-#include <stub-tag.h>
diff --git a/sysdeps/unix/Makefile b/sysdeps/unix/Makefile
index dda3a3ee02..c5eb87e4fb 100644
--- a/sysdeps/unix/Makefile
+++ b/sysdeps/unix/Makefile
@@ -64,7 +64,6 @@ $(objpfx)stub-syscalls.c: $(common-objpfx)sysd-syscalls \
 	      echo "stub_warning ($$call)"; \
 	      echo "weak_alias (_no_syscall, __GI_$$call)" ;; \
 	   esac; \
-	 echo '#include <stub-tag.h>'; \
 	 done) > $@T
 	mv -f $@T $@
 generated += stub-syscalls.c
diff --git a/sysdeps/unix/bsd/getpt.c b/sysdeps/unix/bsd/getpt.c
index 2c566cbd4f..5573bab016 100644
--- a/sysdeps/unix/bsd/getpt.c
+++ b/sysdeps/unix/bsd/getpt.c
@@ -88,5 +88,4 @@ __posix_openpt (int oflag)
 weak_alias (__posix_openpt, posix_openpt)
 
 stub_warning (posix_openpt)
-# include <stub-tag.h>
 #endif
diff --git a/sysdeps/unix/sysv/linux/epoll_pwait.c b/sysdeps/unix/sysv/linux/epoll_pwait.c
index 70756e8443..7bea455b49 100644
--- a/sysdeps/unix/sysv/linux/epoll_pwait.c
+++ b/sysdeps/unix/sysv/linux/epoll_pwait.c
@@ -64,7 +64,6 @@ int epoll_pwait (int epfd, struct epoll_event *events,
 }
 stub_warning (epoll_pwait)
 
-# include <stub-tag.h>
 #endif
 
 libc_hidden_def (epoll_pwait)
diff --git a/sysdeps/unix/sysv/linux/futimens.c b/sysdeps/unix/sysv/linux/futimens.c
index f586b80f31..c4469fc93a 100644
--- a/sysdeps/unix/sysv/linux/futimens.c
+++ b/sysdeps/unix/sysv/linux/futimens.c
@@ -45,5 +45,4 @@ futimens (int fd, const struct timespec tsp[2])
 }
 #ifndef __NR_utimensat
 stub_warning (futimens)
-# include <stub-tag.h>
 #endif
diff --git a/sysdeps/unix/sysv/linux/lutimes.c b/sysdeps/unix/sysv/linux/lutimes.c
index c26623262e..7e05a72a2b 100644
--- a/sysdeps/unix/sysv/linux/lutimes.c
+++ b/sysdeps/unix/sysv/linux/lutimes.c
@@ -54,5 +54,4 @@ lutimes (const char *file, const struct timeval tvp[2])
 
 #ifndef __NR_utimensat
 stub_warning (lutimes)
-# include <stub-tag.h>
 #endif
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
index f17a4949fa..f4a49c5c41 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
@@ -48,6 +48,4 @@ sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
   return -1;
 }
 stub_warning (sync_file_range)
-
-# include <stub-tag.h>
 #endif
diff --git a/sysdeps/unix/sysv/linux/readahead.c b/sysdeps/unix/sysv/linux/readahead.c
index e7d0c110e6..439936741d 100644
--- a/sysdeps/unix/sysv/linux/readahead.c
+++ b/sysdeps/unix/sysv/linux/readahead.c
@@ -42,8 +42,6 @@ __readahead (int fd, off64_t offset, size_t count)
   return -1;
 }
 stub_warning (readahead)
-
-# include <stub-tag.h>
 #endif
 
 weak_alias (__readahead, readahead)
diff --git a/sysdeps/unix/sysv/linux/sync_file_range.c b/sysdeps/unix/sysv/linux/sync_file_range.c
index a7785298b4..551e900dad 100644
--- a/sysdeps/unix/sysv/linux/sync_file_range.c
+++ b/sysdeps/unix/sysv/linux/sync_file_range.c
@@ -74,6 +74,4 @@ sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
   return -1;
 }
 stub_warning (sync_file_range)
-
-# include <stub-tag.h>
 #endif
diff --git a/sysdeps/unix/sysv/linux/utimensat.c b/sysdeps/unix/sysv/linux/utimensat.c
index f52e615dd1..fc1d362cea 100644
--- a/sysdeps/unix/sysv/linux/utimensat.c
+++ b/sysdeps/unix/sysv/linux/utimensat.c
@@ -45,5 +45,4 @@ utimensat (int fd, const char *file, const struct timespec tsp[2],
 }
 #ifndef __NR_utimensat
 stub_warning (utimensat)
-# include <stub-tag.h>
 #endif
diff --git a/sysvipc/msgctl.c b/sysvipc/msgctl.c
index 02c06f7e2e..16a4f95140 100644
--- a/sysvipc/msgctl.c
+++ b/sysvipc/msgctl.c
@@ -33,4 +33,3 @@ msgctl (msqid, cmd, buf)
 }
 
 stub_warning (msgctl)
-#include <stub-tag.h>
diff --git a/sysvipc/msgget.c b/sysvipc/msgget.c
index 2d8a938230..859c445962 100644
--- a/sysvipc/msgget.c
+++ b/sysvipc/msgget.c
@@ -32,4 +32,3 @@ msgget (key, msgflg)
 }
 
 stub_warning (msgget)
-#include <stub-tag.h>
diff --git a/sysvipc/msgrcv.c b/sysvipc/msgrcv.c
index a3135fb9d7..d49a6a764d 100644
--- a/sysvipc/msgrcv.c
+++ b/sysvipc/msgrcv.c
@@ -38,4 +38,3 @@ msgrcv (msqid, msgp, msgsz, msgtyp, msgflg)
 }
 
 stub_warning (msgrcv)
-#include <stub-tag.h>
diff --git a/sysvipc/msgsnd.c b/sysvipc/msgsnd.c
index a6f8aed3cd..cf067fa2af 100644
--- a/sysvipc/msgsnd.c
+++ b/sysvipc/msgsnd.c
@@ -37,4 +37,3 @@ msgsnd (msqid, msgp, msgsz, msgflg)
 }
 
 stub_warning (msgsnd)
-#include <stub-tag.h>
diff --git a/sysvipc/semctl.c b/sysvipc/semctl.c
index 8e27a41cca..f5e69f4a8c 100644
--- a/sysvipc/semctl.c
+++ b/sysvipc/semctl.c
@@ -30,4 +30,3 @@ semctl (int semid, int semnum, int cmd, ...)
 }
 
 stub_warning (semctl)
-#include <stub-tag.h>
diff --git a/sysvipc/semget.c b/sysvipc/semget.c
index 8e3f0b57bb..dbac3a388a 100644
--- a/sysvipc/semget.c
+++ b/sysvipc/semget.c
@@ -33,4 +33,3 @@ semget (key, nsems, semflg)
 }
 
 stub_warning (semget)
-#include <stub-tag.h>
diff --git a/sysvipc/semop.c b/sysvipc/semop.c
index ea557cf9b5..298c8c0695 100644
--- a/sysvipc/semop.c
+++ b/sysvipc/semop.c
@@ -32,4 +32,3 @@ semop (semid, sops, nsops)
 }
 
 stub_warning (semop)
-#include <stub-tag.h>
diff --git a/sysvipc/semtimedop.c b/sysvipc/semtimedop.c
index 7fe1ccef7f..e7c631ac94 100644
--- a/sysvipc/semtimedop.c
+++ b/sysvipc/semtimedop.c
@@ -33,4 +33,3 @@ semtimedop (semid, sops, nsops, timeout)
 }
 
 stub_warning (semtimedop)
-#include <stub-tag.h>
diff --git a/sysvipc/shmat.c b/sysvipc/shmat.c
index 178f194aa0..bcd31765d1 100644
--- a/sysvipc/shmat.c
+++ b/sysvipc/shmat.c
@@ -34,4 +34,3 @@ shmat (shmid, shmaddr, shmflg)
 }
 
 stub_warning (shmat)
-#include <stub-tag.h>
diff --git a/sysvipc/shmctl.c b/sysvipc/shmctl.c
index 7c69f53fa8..9ffec7dc87 100644
--- a/sysvipc/shmctl.c
+++ b/sysvipc/shmctl.c
@@ -32,4 +32,3 @@ shmctl (shmid, cmd, buf)
 }
 
 stub_warning (shmctl)
-#include <stub-tag.h>
diff --git a/sysvipc/shmdt.c b/sysvipc/shmdt.c
index e1da7f73f8..8a40046016 100644
--- a/sysvipc/shmdt.c
+++ b/sysvipc/shmdt.c
@@ -31,4 +31,3 @@ shmdt (shmaddr)
 }
 
 stub_warning (shmdt)
-#include <stub-tag.h>
diff --git a/sysvipc/shmget.c b/sysvipc/shmget.c
index 9bf190fdf1..650603b8f0 100644
--- a/sysvipc/shmget.c
+++ b/sysvipc/shmget.c
@@ -33,4 +33,3 @@ shmget (key, size, shmflg)
 }
 
 stub_warning (shmget)
-#include <stub-tag.h>
diff --git a/termios/tcdrain.c b/termios/tcdrain.c
index ced692d9a8..0cc7b0e901 100644
--- a/termios/tcdrain.c
+++ b/termios/tcdrain.c
@@ -35,4 +35,3 @@ weak_alias (__libc_tcdrain, tcdrain)
 
 
 stub_warning (tcdrain)
-#include <stub-tag.h>
diff --git a/termios/tcflow.c b/termios/tcflow.c
index b94e96705d..8b064ea3b2 100644
--- a/termios/tcflow.c
+++ b/termios/tcflow.c
@@ -49,4 +49,3 @@ tcflow (fd, action)
 
 
 stub_warning (tcflow)
-#include <stub-tag.h>
diff --git a/termios/tcflush.c b/termios/tcflush.c
index 1df192adb2..5888411ac3 100644
--- a/termios/tcflush.c
+++ b/termios/tcflush.c
@@ -42,4 +42,3 @@ tcflush (fd, queue_selector)
 
 
 stub_warning(tcflush);
-#include <stub-tag.h>
diff --git a/termios/tcgetattr.c b/termios/tcgetattr.c
index d47d7e70f9..1ec2aa9497 100644
--- a/termios/tcgetattr.c
+++ b/termios/tcgetattr.c
@@ -42,4 +42,3 @@ __tcgetattr (fd, termios_p)
 stub_warning (tcgetattr)
 
 weak_alias (__tcgetattr, tcgetattr)
-#include <stub-tag.h>
diff --git a/termios/tcgetpgrp.c b/termios/tcgetpgrp.c
index 04b989bc4c..b013ec65d0 100644
--- a/termios/tcgetpgrp.c
+++ b/termios/tcgetpgrp.c
@@ -35,4 +35,3 @@ tcgetpgrp (fd)
 }
 libc_hidden_def (tcgetpgrp)
 stub_warning (tcgetpgrp)
-#include <stub-tag.h>
diff --git a/termios/tcsendbrk.c b/termios/tcsendbrk.c
index 4d4e67808f..5e6805df29 100644
--- a/termios/tcsendbrk.c
+++ b/termios/tcsendbrk.c
@@ -36,4 +36,3 @@ tcsendbreak (fd, duration)
 
 
 stub_warning (tcsendbreak)
-#include <stub-tag.h>
diff --git a/termios/tcsetattr.c b/termios/tcsetattr.c
index 5f3a271be0..b6127976cb 100644
--- a/termios/tcsetattr.c
+++ b/termios/tcsetattr.c
@@ -104,4 +104,3 @@ bad_speed (speed_t speed)
 
 
 stub_warning (tcsetattr)
-#include <stub-tag.h>
diff --git a/termios/tcsetpgrp.c b/termios/tcsetpgrp.c
index 1b474742fa..dea5e96aec 100644
--- a/termios/tcsetpgrp.c
+++ b/termios/tcsetpgrp.c
@@ -37,4 +37,3 @@ tcsetpgrp (fd, pgrp_id)
 
 
 stub_warning (tcsetpgrp)
-#include <stub-tag.h>
diff --git a/time/adjtime.c b/time/adjtime.c
index f25c6fab12..1c005c977c 100644
--- a/time/adjtime.c
+++ b/time/adjtime.c
@@ -33,4 +33,3 @@ __adjtime (delta, olddelta)
 stub_warning (adjtime)
 
 weak_alias (__adjtime, adjtime)
-#include <stub-tag.h>
diff --git a/time/clock.c b/time/clock.c
index e701b2e944..2e10fd3e3a 100644
--- a/time/clock.c
+++ b/time/clock.c
@@ -28,4 +28,3 @@ clock ()
 }
 
 stub_warning (clock)
-#include <stub-tag.h>
diff --git a/time/getitimer.c b/time/getitimer.c
index c5caa813be..fc0ebf8bfa 100644
--- a/time/getitimer.c
+++ b/time/getitimer.c
@@ -38,4 +38,3 @@ __getitimer (which, value)
 stub_warning (getitimer)
 
 weak_alias (__getitimer, getitimer)
-#include <stub-tag.h>
diff --git a/time/gettimeofday.c b/time/gettimeofday.c
index 7eb770c2d7..4528a6a289 100644
--- a/time/gettimeofday.c
+++ b/time/gettimeofday.c
@@ -34,4 +34,3 @@ weak_alias (__gettimeofday, gettimeofday)
 libc_hidden_weak (gettimeofday)
 
 stub_warning (gettimeofday)
-#include <stub-tag.h>
diff --git a/time/setitimer.c b/time/setitimer.c
index 8132ff2d69..40880f8210 100644
--- a/time/setitimer.c
+++ b/time/setitimer.c
@@ -40,4 +40,3 @@ __setitimer (which, new, old)
 stub_warning (setitimer)
 
 weak_alias (__setitimer, setitimer)
-#include <stub-tag.h>
diff --git a/time/settimeofday.c b/time/settimeofday.c
index 65abbb7128..c1ceec0b61 100644
--- a/time/settimeofday.c
+++ b/time/settimeofday.c
@@ -31,4 +31,3 @@ __settimeofday (tv, tz)
 stub_warning (settimeofday)
 
 weak_alias (__settimeofday, settimeofday)
-#include <stub-tag.h>
diff --git a/time/stime.c b/time/stime.c
index 22234f5b7f..1ea1c17da5 100644
--- a/time/stime.c
+++ b/time/stime.c
@@ -36,4 +36,3 @@ stime (when)
 }
 
 stub_warning (stime)
-#include <stub-tag.h>
diff --git a/time/time.c b/time/time.c
index da645d05b2..15dbb69212 100644
--- a/time/time.c
+++ b/time/time.c
@@ -32,4 +32,3 @@ time (timer)
 libc_hidden_def (time)
 
 stub_warning (time)
-#include <stub-tag.h>