[BZ #157] Remove include/stub-tag.h for good.

74 files changed, 0 insertions, 90 deletions

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>