This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

#include <stub-tag.h> (was: [tschwinge/sendmmsg] Add recvmmsg and sendmmsg to the generic glibc API)


Hi!

On Fri,  2 Nov 2012 12:38:00 -0700 (PDT), Roland McGrath <roland@hack.frob.com> wrote:
> > > All files using stub_warning need #include <stub-tag.h>.
> > 
> > Have been missing from sysdeps/unix/sysv/linux/*mmsg.c.  ;-)
> 
> Please send a separate fix for that.  The failure mode is missing __stub_*
> defines in the installed <gnu/stubs.h> file (here only when compiling with
> kernel headers that don't define __NR_sendmmsg et al).

Actually -- nope.  ;-)

I used:

    $ find ./ -type f -print0 | xargs -0 grep -Z -l stub_warning | xargs -0 grep -L -F '#include <stub-tag.h>'

... to locate any such files, including expectedly a few false positives,
then I had a look at include/stub-tag.h:

    /* 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.  */

Then I found:

    commit 3e1e123d02fa495961898f390741bd743a92022d
    Author: Roland McGrath <roland@gnu.org>
    Date:   Fri Feb 11 10:17:19 2005 +0000
    
        [BZ #715]
        
        [...]
        
            * include/stub-tag.h: Update comment.
    
    commit 561bcb8086e326e06f295278dcdb13493636c61a
    Author: Roland McGrath <roland@gnu.org>
    Date:   Fri Feb 11 00:29:55 2005 +0000
    
        [BZ #157]
        
            * include/libc-symbols.h (stub_warning): Emit a marker section called
            .gnu.glibc-stub.NAME.
            * Makerules ($(objpfx)stubs): Depend on object files, not dep files.
            Use objdump to collect those marker section names.
            ($(common-objpfx)shlib.lds): Discard .gnu.glibc-stub.* sections.

So, Âinclude <stub-tag.h>Â in fact is no more.

I used:

    $ find ./ -type f -print0 | xargs -0 grep -Z -l -F '#include <stub-tag.h>' | xargs -0 grep -L -F stub_warning

... to confirm there are no files including <stub-tag.h> but not using
stub_warning.

With the following patch, that cruft is removed while in particular the
installed [...]/include/gnu/stub*.h files are identcal (containing a good
dozen of __stub_* definitions for x86-64 GNU/Linux builds.  OK to commit?

	[BZ #157]

	* include/stub-tag.h: Remove file.  Remove all '#include's of it.
	* 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.

diff --git Makerules Makerules
index ebb9895..56dc60b 100644
--- Makerules
+++ 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 dirent/closedir.c dirent/closedir.c
index 745062b..63ce52c 100644
--- dirent/closedir.c
+++ dirent/closedir.c
@@ -31,4 +31,3 @@ __closedir (DIR *dirp)
 weak_alias (__closedir, closedir)
 
 stub_warning (closedir)
-#include <stub-tag.h>
diff --git dirent/dirfd.c dirent/dirfd.c
index 026421f..2cab938 100644
--- dirent/dirfd.c
+++ dirent/dirfd.c
@@ -29,4 +29,3 @@ dirfd (dirp)
 }
 
 stub_warning (dirfd)
-#include <stub-tag.h>
diff --git dirent/fdopendir.c dirent/fdopendir.c
index fd6e274..0894a08 100644
--- dirent/fdopendir.c
+++ dirent/fdopendir.c
@@ -31,4 +31,3 @@ __fdopendir (int fd)
 weak_alias (__fdopendir, fdopendir)
 
 stub_warning (fdopendir)
-#include <stub-tag.h>
diff --git dirent/getdents.c dirent/getdents.c
index a5277eb..3b52227 100644
--- dirent/getdents.c
+++ 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 dirent/getdents64.c dirent/getdents64.c
index ce013ca..63b0435 100644
--- dirent/getdents64.c
+++ dirent/getdents64.c
@@ -32,4 +32,3 @@ getdirentries64 (fd, buf, nbytes, basep)
 }
 
 stub_warning (getdirentries64)
-#include <stub-tag.h>
diff --git dirent/opendir.c dirent/opendir.c
index ce7084c..beb9d10 100644
--- dirent/opendir.c
+++ dirent/opendir.c
@@ -38,4 +38,3 @@ __opendir (const char *name)
 weak_alias (__opendir, opendir)
 
 stub_warning (opendir)
-#include <stub-tag.h>
diff --git dirent/readdir.c dirent/readdir.c
index da4ecb4..5a7fa42 100644
--- dirent/readdir.c
+++ dirent/readdir.c
@@ -29,4 +29,3 @@ __readdir (DIR *dirp)
 weak_alias (__readdir, readdir)
 
 stub_warning (readdir)
-#include <stub-tag.h>
diff --git dirent/readdir64.c dirent/readdir64.c
index 8fb7bfc..484d983 100644
--- dirent/readdir64.c
+++ dirent/readdir64.c
@@ -28,4 +28,3 @@ __readdir64 (DIR *dirp)
 }
 weak_alias (__readdir64, readdir64)
 stub_warning (readdir64)
-#include <stub-tag.h>
diff --git dirent/readdir64_r.c dirent/readdir64_r.c
index 6b178d5..648d5ef 100644
--- dirent/readdir64_r.c
+++ 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 dirent/readdir_r.c dirent/readdir_r.c
index 115a3ce..3a2fa6e 100644
--- dirent/readdir_r.c
+++ 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 dirent/rewinddir.c dirent/rewinddir.c
index 5519e67..78e4d53 100644
--- dirent/rewinddir.c
+++ dirent/rewinddir.c
@@ -32,4 +32,3 @@ libc_hidden_def (rewinddir)
 
 
 stub_warning (rewinddir)
-#include <stub-tag.h>
diff --git dirent/seekdir.c dirent/seekdir.c
index a6e2685..a274bcd 100644
--- dirent/seekdir.c
+++ dirent/seekdir.c
@@ -37,4 +37,3 @@ seekdir (dirp, pos)
 
 
 stub_warning (seekdir)
-#include <stub-tag.h>
diff --git dirent/telldir.c dirent/telldir.c
index f255a0e..a00e750 100644
--- dirent/telldir.c
+++ dirent/telldir.c
@@ -37,4 +37,3 @@ telldir (dirp)
 
 
 stub_warning (telldir)
-#include <stub-tag.h>
diff --git gmon/profil.c gmon/profil.c
index 53c2263..a48ef71 100644
--- gmon/profil.c
+++ 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 grp/setgroups.c grp/setgroups.c
index 7ef0da2..2de0c8f 100644
--- grp/setgroups.c
+++ grp/setgroups.c
@@ -31,4 +31,3 @@ setgroups (n, groups)
 libc_hidden_def (setgroups)
 
 stub_warning (setgroups)
-#include <stub-tag.h>
diff --git include/stub-tag.h include/stub-tag.h
deleted file mode 100644
index d4d10c8..0000000
--- 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 inet/if_index.c inet/if_index.c
index ba25ec6..3d70676 100644
--- inet/if_index.c
+++ 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 io/access.c io/access.c
index b8f7300..9b82a99 100644
--- io/access.c
+++ io/access.c
@@ -37,4 +37,3 @@ __access (file, type)
 stub_warning (access)
 
 weak_alias (__access, access)
-#include <stub-tag.h>
diff --git io/chdir.c io/chdir.c
index 9f52097..251afd3 100644
--- io/chdir.c
+++ io/chdir.c
@@ -36,4 +36,3 @@ __chdir (path)
 stub_warning (chdir)
 
 weak_alias (__chdir, chdir)
-#include <stub-tag.h>
diff --git io/chmod.c io/chmod.c
index 7d45cc8..8e4be3d 100644
--- io/chmod.c
+++ io/chmod.c
@@ -38,4 +38,3 @@ __chmod (file, mode)
 stub_warning (chmod)
 
 weak_alias (__chmod, chmod)
-#include <stub-tag.h>
diff --git io/chown.c io/chown.c
index e91bd1b..45bd9e2 100644
--- io/chown.c
+++ io/chown.c
@@ -41,4 +41,3 @@ libc_hidden_def (__chown)
 stub_warning (chown)
 
 weak_alias (__chown, chown)
-#include <stub-tag.h>
diff --git io/close.c io/close.c
index 41c37d8..ce9276f 100644
--- io/close.c
+++ io/close.c
@@ -36,4 +36,3 @@ libc_hidden_def (__close)
 stub_warning (close)
 
 weak_alias (__close, close)
-#include <stub-tag.h>
diff --git io/dup.c io/dup.c
index d28e318..c659de3 100644
--- io/dup.c
+++ io/dup.c
@@ -30,4 +30,3 @@ __dup (fd)
 stub_warning (dup)
 
 weak_alias (__dup, dup)
-#include <stub-tag.h>
diff --git io/dup2.c io/dup2.c
index aeeebd5..a043af5 100644
--- io/dup2.c
+++ io/dup2.c
@@ -44,4 +44,3 @@ libc_hidden_def (__dup2)
 stub_warning (dup2)
 
 weak_alias (__dup2, dup2)
-#include <stub-tag.h>
diff --git io/dup3.c io/dup3.c
index 7e97bf7..4df7e9b 100644
--- io/dup3.c
+++ 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 io/euidaccess.c io/euidaccess.c
index 82ddd37..d71d221 100644
--- io/euidaccess.c
+++ 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 io/faccessat.c io/faccessat.c
index 3e30dde..4e8e46c 100644
--- io/faccessat.c
+++ io/faccessat.c
@@ -46,5 +46,3 @@ faccessat (fd, file, type, flag)
   return -1;
 }
 stub_warning (faccessat)
-
-#include <stub-tag.h>
diff --git io/fchdir.c io/fchdir.c
index de4ebef..c7ce4a9 100644
--- io/fchdir.c
+++ io/fchdir.c
@@ -29,4 +29,3 @@ fchdir (fd)
 }
 
 stub_warning (fchdir)
-#include <stub-tag.h>
diff --git io/fchmod.c io/fchmod.c
index 89087b6..b5dc512 100644
--- io/fchmod.c
+++ io/fchmod.c
@@ -38,4 +38,3 @@ __fchmod (fd, mode)
 stub_warning (fchmod)
 
 weak_alias (__fchmod, fchmod)
-#include <stub-tag.h>
diff --git io/fchmodat.c io/fchmodat.c
index d171f36..1bbe63e 100644
--- io/fchmodat.c
+++ io/fchmodat.c
@@ -46,5 +46,3 @@ fchmodat (fd, file, mode, flag)
   return -1;
 }
 stub_warning (fchmodat)
-
-#include <stub-tag.h>
diff --git io/fchown.c io/fchown.c
index 5b15f90..c98b84e 100644
--- io/fchown.c
+++ io/fchown.c
@@ -39,4 +39,3 @@ __fchown (fd, owner, group)
 stub_warning (fchown)
 
 weak_alias (__fchown, fchown)
-#include <stub-tag.h>
diff --git io/fchownat.c io/fchownat.c
index c779f28..8f82ce6 100644
--- io/fchownat.c
+++ io/fchownat.c
@@ -46,5 +46,3 @@ fchownat (fd, file, owner, group, flag)
   return -1;
 }
 stub_warning (fchownat)
-
-#include <stub-tag.h>
diff --git io/fcntl.c io/fcntl.c
index 550eb11..766f605 100644
--- io/fcntl.c
+++ io/fcntl.c
@@ -37,4 +37,3 @@ libc_hidden_def (__fcntl)
 stub_warning (fcntl)
 
 weak_alias (__fcntl, fcntl)
-#include <stub-tag.h>
diff --git io/flock.c io/flock.c
index 6da0b6b..68f1b44 100644
--- io/flock.c
+++ io/flock.c
@@ -32,4 +32,3 @@ __flock (fd, operation)
 weak_alias (__flock, flock)
 
 stub_warning (flock)
-#include <stub-tag.h>
diff --git io/fstatfs.c io/fstatfs.c
index 9579fcc..1bca3d5 100644
--- io/fstatfs.c
+++ 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 io/fstatfs64.c io/fstatfs64.c
index 640be9f..031a81f 100644
--- io/fstatfs64.c
+++ 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 io/fstatvfs.c io/fstatvfs.c
index 4b64949..fd4936c 100644
--- io/fstatvfs.c
+++ 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 io/fstatvfs64.c io/fstatvfs64.c
index 9eb62a3..a8374dd 100644
--- io/fstatvfs64.c
+++ 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 io/futimens.c io/futimens.c
index df3ddf3..b80de08 100644
--- io/futimens.c
+++ 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 io/fxstat.c io/fxstat.c
index 216a14c..50c0657 100644
--- io/fxstat.c
+++ 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 io/fxstat64.c io/fxstat64.c
index dd0c569..56755f8 100644
--- io/fxstat64.c
+++ 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 io/fxstatat.c io/fxstatat.c
index a6e79d0..fff4be2 100644
--- io/fxstatat.c
+++ 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 io/fxstatat64.c io/fxstatat64.c
index 950e267..43fd53e 100644
--- io/fxstatat64.c
+++ 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 io/getcwd.c io/getcwd.c
index 5984a35..3aba719 100644
--- io/getcwd.c
+++ io/getcwd.c
@@ -36,4 +36,3 @@ weak_alias (__getcwd, getcwd)
 
 stub_warning (__getcwd)
 stub_warning (getcwd)
-#include <stub-tag.h>
diff --git io/isatty.c io/isatty.c
index f8e793b..eb53271 100644
--- io/isatty.c
+++ io/isatty.c
@@ -30,4 +30,3 @@ __isatty (fd)
 weak_alias (__isatty, isatty)
 
 stub_warning (isatty)
-#include <stub-tag.h>
diff --git io/lchmod.c io/lchmod.c
index 8d9b79f..5044f4c 100644
--- io/lchmod.c
+++ io/lchmod.c
@@ -29,4 +29,3 @@ lchmod (const char *file, mode_t mode)
 }
 
 stub_warning (lchmod)
-#include <stub-tag.h>
diff --git io/lchown.c io/lchown.c
index 7ecf334..682083c 100644
--- io/lchown.c
+++ io/lchown.c
@@ -39,4 +39,3 @@ __lchown (file, owner, group)
 stub_warning (lchown)
 
 weak_alias (__lchown, lchown)
-#include <stub-tag.h>
diff --git io/link.c io/link.c
index 3b03965..b43f5eb 100644
--- io/link.c
+++ io/link.c
@@ -38,4 +38,3 @@ __link (from, to)
 stub_warning (link)
 
 weak_alias (__link, link)
-#include <stub-tag.h>
diff --git io/linkat.c io/linkat.c
index 2fa8cde..6274d09 100644
--- io/linkat.c
+++ io/linkat.c
@@ -47,5 +47,3 @@ linkat (fromfd, from, tofd, to, flags)
   return -1;
 }
 stub_warning (linkat)
-
-#include <stub-tag.h>
diff --git io/lseek.c io/lseek.c
index 0729cb6..7fd6188 100644
--- io/lseek.c
+++ io/lseek.c
@@ -49,4 +49,3 @@ stub_warning (lseek)
 libc_hidden_def (__lseek)
 
 weak_alias (__lseek, lseek)
-#include <stub-tag.h>
diff --git io/lseek64.c io/lseek64.c
index acea3f3..21b853a 100644
--- io/lseek64.c
+++ 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 io/lxstat64.c io/lxstat64.c
index 38d78a8..84993c2 100644
--- io/lxstat64.c
+++ 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 io/mkdir.c io/mkdir.c
index ac95d36..39c3db1 100644
--- io/mkdir.c
+++ io/mkdir.c
@@ -39,4 +39,3 @@ __mkdir (path, mode)
 stub_warning (mkdir)
 
 weak_alias (__mkdir, mkdir)
-#include <stub-tag.h>
diff --git io/mkdirat.c io/mkdirat.c
index 04533fc..e8d10ae 100644
--- io/mkdirat.c
+++ io/mkdirat.c
@@ -53,5 +53,3 @@ mkdirat (fd, path, mode)
   return -1;
 }
 stub_warning (mkdirat)
-
-#include <stub-tag.h>
diff --git io/mkfifo.c io/mkfifo.c
index 1b55921..8fdd021 100644
--- io/mkfifo.c
+++ io/mkfifo.c
@@ -39,4 +39,3 @@ mkfifo (path, mode)
 
 
 stub_warning (mkfifo)
-#include <stub-tag.h>
diff --git io/mkfifoat.c io/mkfifoat.c
index 30cea31..850d567 100644
--- io/mkfifoat.c
+++ io/mkfifoat.c
@@ -56,4 +56,3 @@ mkfifoat (fd, path, mode)
 
 
 stub_warning (mkfifoat)
-#include <stub-tag.h>
diff --git io/open.c io/open.c
index b691120..a388b33 100644
--- io/open.c
+++ 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 io/open64.c io/open64.c
index b4ce18d..704491d 100644
--- io/open64.c
+++ 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 io/openat.c io/openat.c
index b496539..efcbaa9 100644
--- io/openat.c
+++ 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 io/openat64.c io/openat64.c
index 2071760..7de0e69 100644
--- io/openat64.c
+++ 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 io/pipe.c io/pipe.c
index 07a37ae..1f1c03f 100644
--- io/pipe.c
+++ io/pipe.c
@@ -40,4 +40,3 @@ libc_hidden_def (__pipe)
 stub_warning (pipe)
 
 weak_alias (__pipe, pipe)
-#include <stub-tag.h>
diff --git io/pipe2.c io/pipe2.c
index 8a15e84..2478fc3 100644
--- io/pipe2.c
+++ io/pipe2.c
@@ -39,5 +39,3 @@ __pipe2 (pipedes, flags)
 }
 weak_alias (__pipe2, pipe2)
 stub_warning (pipe2)
-
-#include <stub-tag.h>
diff --git io/poll.c io/poll.c
index 15539ea..2dc7fc6 100644
--- io/poll.c
+++ io/poll.c
@@ -35,4 +35,3 @@ poll (fds, nfds, timeout)
 }
 
 stub_warning (poll)
-#include <stub-tag.h>
diff --git io/posix_fadvise.c io/posix_fadvise.c
index 3733601..70d0700 100644
--- io/posix_fadvise.c
+++ 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 io/posix_fadvise64.c io/posix_fadvise64.c
index 645ed6c..3398c8e 100644
--- io/posix_fadvise64.c
+++ 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 io/posix_fallocate.c io/posix_fallocate.c
index 3f8a3cb..d5138f0 100644
--- io/posix_fallocate.c
+++ 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 io/posix_fallocate64.c io/posix_fallocate64.c
index 07b08ae..486646a 100644
--- io/posix_fallocate64.c
+++ 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 io/read.c io/read.c
index 681f16e..f676d49 100644
--- io/read.c
+++ 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 io/readlink.c io/readlink.c
index de4040b..4a1811b 100644
--- io/readlink.c
+++ io/readlink.c
@@ -33,4 +33,3 @@ __readlink (path, buf, len)
 stub_warning (readlink)
 
 weak_alias (__readlink, readlink)
-#include <stub-tag.h>
diff --git io/readlinkat.c io/readlinkat.c
index d4e6ba2..473f4e9 100644
--- io/readlinkat.c
+++ 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 io/rmdir.c io/rmdir.c
index c244ecc..83c7636 100644
--- io/rmdir.c
+++ io/rmdir.c
@@ -37,4 +37,3 @@ __rmdir (path)
 stub_warning (rmdir)
 
 weak_alias (__rmdir, rmdir)
-#include <stub-tag.h>
diff --git io/sendfile.c io/sendfile.c
index 22222db..4823c80 100644
--- io/sendfile.c
+++ 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 io/sendfile64.c io/sendfile64.c
index 05b13a3..8fddcc8 100644
--- io/sendfile64.c
+++ 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 io/statfs.c io/statfs.c
index 50cf3f3..0bb674a 100644
--- io/statfs.c
+++ io/statfs.c
@@ -31,4 +31,3 @@ libc_hidden_def (__statfs)
 weak_alias (__statfs, statfs)
 
 stub_warning (statfs)
-#include <stub-tag.h>
diff --git io/statfs64.c io/statfs64.c
index 1239495..a895d43 100644
--- io/statfs64.c
+++ 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 io/statvfs.c io/statvfs.c
index b66d027..0ff847f 100644
--- io/statvfs.c
+++ 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 io/statvfs64.c io/statvfs64.c
index 1101acd..7e57bc7 100644
--- io/statvfs64.c
+++ 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 io/symlink.c io/symlink.c
index 6e135d9..298854f 100644
--- io/symlink.c
+++ io/symlink.c
@@ -38,4 +38,3 @@ __symlink (from, to)
 stub_warning (symlink)
 
 weak_alias (__symlink, symlink)
-#include <stub-tag.h>
diff --git io/symlinkat.c io/symlinkat.c
index d5affb9..4937a2e 100644
--- io/symlinkat.c
+++ io/symlinkat.c
@@ -44,5 +44,3 @@ symlinkat (from, fd, to)
   return -1;
 }
 stub_warning (symlinkat)
-
-#include <stub-tag.h>
diff --git io/ttyname.c io/ttyname.c
index 5473b5e..8df1fd4 100644
--- io/ttyname.c
+++ io/ttyname.c
@@ -34,4 +34,3 @@ ttyname (fd)
 
 
 stub_warning (ttyname)
-#include <stub-tag.h>
diff --git io/ttyname_r.c io/ttyname_r.c
index 5acbbd5..6d7dfab 100644
--- io/ttyname_r.c
+++ 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 io/umask.c io/umask.c
index 1e71aae..07d7150 100644
--- io/umask.c
+++ io/umask.c
@@ -30,4 +30,3 @@ __umask (mask)
 stub_warning (umask)
 
 weak_alias (__umask, umask)
-#include <stub-tag.h>
diff --git io/unlink.c io/unlink.c
index 04d69f8..b7a6d7c 100644
--- io/unlink.c
+++ io/unlink.c
@@ -37,4 +37,3 @@ __unlink (name)
 stub_warning (unlink)
 
 weak_alias (__unlink, unlink)
-#include <stub-tag.h>
diff --git io/unlinkat.c io/unlinkat.c
index f059611..afa5053 100644
--- io/unlinkat.c
+++ io/unlinkat.c
@@ -44,5 +44,3 @@ unlinkat (fd, name, flag)
   return -1;
 }
 stub_warning (unlinkat)
-
-#include <stub-tag.h>
diff --git io/utime.c io/utime.c
index 865628f..7b30776 100644
--- io/utime.c
+++ io/utime.c
@@ -39,4 +39,3 @@ utime (file, times)
 libc_hidden_def (utime)
 
 stub_warning (utime)
-#include <stub-tag.h>
diff --git io/utimensat.c io/utimensat.c
index d103d45..b1d3b03 100644
--- io/utimensat.c
+++ 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 io/write.c io/write.c
index a5f907a..8c9523d 100644
--- io/write.c
+++ 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 io/xmknod.c io/xmknod.c
index 78bbf5a..bea68e1 100644
--- io/xmknod.c
+++ io/xmknod.c
@@ -38,4 +38,3 @@ stub_warning (__xmknod)
 
 weak_alias (__xmknod, _xmknod)
 libc_hidden_def (__xmknod)
-#include <stub-tag.h>
diff --git io/xmknodat.c io/xmknodat.c
index a743cce..1be6ffa 100644
--- io/xmknodat.c
+++ 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 io/xstat.c io/xstat.c
index 6871189..806604e 100644
--- io/xstat.c
+++ 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 io/xstat64.c io/xstat64.c
index 9d15344..aad1352 100644
--- io/xstat64.c
+++ 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 login/getpt.c login/getpt.c
index 34218a6..4b9b037 100644
--- login/getpt.c
+++ 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 login/grantpt.c login/grantpt.c
index a076112..fd7ee6c 100644
--- login/grantpt.c
+++ login/grantpt.c
@@ -31,4 +31,3 @@ grantpt (fd)
 }
 
 stub_warning (grantpt)
-#include <stub-tag.h>
diff --git login/unlockpt.c login/unlockpt.c
index 1f3bf14..f00d88f 100644
--- login/unlockpt.c
+++ login/unlockpt.c
@@ -31,4 +31,3 @@ unlockpt (fd)
 }
 
 stub_warning (unlockpt)
-#include <stub-tag.h>
diff --git manual/maint.texi manual/maint.texi
index e6fedcf..0f4b959 100644
--- manual/maint.texi
+++ 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 math/e_acoshl.c math/e_acoshl.c
index 490fd10..cd426ed 100644
--- math/e_acoshl.c
+++ 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 math/e_acosl.c math/e_acosl.c
index 55d9ab0..e5b6971 100644
--- math/e_acosl.c
+++ 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 math/e_asinl.c math/e_asinl.c
index 8e6c47e..d6a6d14 100644
--- math/e_asinl.c
+++ 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 math/e_atan2l.c math/e_atan2l.c
index 8ca3762..2602c98 100644
--- math/e_atan2l.c
+++ 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 math/e_atanhl.c math/e_atanhl.c
index 26c52e7..a6cb507 100644
--- math/e_atanhl.c
+++ 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 math/e_coshl.c math/e_coshl.c
index 92bfd7a..8bf7b20 100644
--- math/e_coshl.c
+++ 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 math/e_expl.c math/e_expl.c
index 5ba6eb5..407d818 100644
--- math/e_expl.c
+++ 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 math/e_fmodl.c math/e_fmodl.c
index dbd361e..61587e9 100644
--- math/e_fmodl.c
+++ 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 math/e_gammal_r.c math/e_gammal_r.c
index c0ae704..9dbce67 100644
--- math/e_gammal_r.c
+++ 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 math/e_hypotl.c math/e_hypotl.c
index 73bad62..6f3eb5f 100644
--- math/e_hypotl.c
+++ 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 math/e_j0l.c math/e_j0l.c
index eb01ba6..1451efd 100644
--- math/e_j0l.c
+++ 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 math/e_j1l.c math/e_j1l.c
index 7701f49..6bb3017 100644
--- math/e_j1l.c
+++ 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 math/e_jnl.c math/e_jnl.c
index 059b1db..d9fddd0 100644
--- math/e_jnl.c
+++ 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 math/e_lgammal_r.c math/e_lgammal_r.c
index 92e7700..3babf7f 100644
--- math/e_lgammal_r.c
+++ 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 math/e_log10l.c math/e_log10l.c
index 2c7ff72..c0b7dfd 100644
--- math/e_log10l.c
+++ 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 math/e_log2l.c math/e_log2l.c
index 95929c3..af7d039 100644
--- math/e_log2l.c
+++ 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 math/e_logl.c math/e_logl.c
index 95608ab..7a4ea1b 100644
--- math/e_logl.c
+++ 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 math/e_powl.c math/e_powl.c
index ab79b1a..1013e2a 100644
--- math/e_powl.c
+++ 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 math/e_rem_pio2l.c math/e_rem_pio2l.c
index 7fa515d..03ac2ef 100644
--- math/e_rem_pio2l.c
+++ 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 math/e_sinhl.c math/e_sinhl.c
index fc756c9..4bc4ac9 100644
--- math/e_sinhl.c
+++ 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 math/e_sqrtl.c math/e_sqrtl.c
index af9c2b5..acbe74f 100644
--- math/e_sqrtl.c
+++ 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 math/fclrexcpt.c math/fclrexcpt.c
index dcdcfbb..5873f44 100644
--- math/fclrexcpt.c
+++ math/fclrexcpt.c
@@ -33,4 +33,3 @@ compat_symbol (libm, __old_feclearexcept, feclearexcept, GLIBC_2_1);
 versioned_symbol (libm, __feclearexcept, feclearexcept, GLIBC_2_2);
 
 stub_warning (feclearexcept)
-#include <stub-tag.h>
diff --git math/fedisblxcpt.c math/fedisblxcpt.c
index f05c319..610f62d 100644
--- math/fedisblxcpt.c
+++ math/fedisblxcpt.c
@@ -26,4 +26,3 @@ fedisableexcept (int excepts)
   return -1;
 }
 stub_warning (fedisableexcept)
-#include <stub-tag.h>
diff --git math/feenablxcpt.c math/feenablxcpt.c
index 9db93c5..f05e1aa 100644
--- math/feenablxcpt.c
+++ math/feenablxcpt.c
@@ -26,4 +26,3 @@ feenableexcept (int excepts)
   return -1;
 }
 stub_warning (feenableexcept)
-#include <stub-tag.h>
diff --git math/fegetenv.c math/fegetenv.c
index 3166d72..f8fbdff 100644
--- math/fegetenv.c
+++ 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 math/fegetexcept.c math/fegetexcept.c
index 0ea5184..e55f22d 100644
--- math/fegetexcept.c
+++ math/fegetexcept.c
@@ -26,4 +26,3 @@ fegetexcept (void)
   return -1;
 }
 stub_warning (fegetexcept)
-#include <stub-tag.h>
diff --git math/fegetround.c math/fegetround.c
index 366ef23..9c5c408 100644
--- math/fegetround.c
+++ math/fegetround.c
@@ -25,4 +25,3 @@ fegetround (void)
   return 0;
 }
 stub_warning (fegetround)
-#include <stub-tag.h>
diff --git math/feholdexcpt.c math/feholdexcpt.c
index 9abfc6c..a3909bd 100644
--- math/feholdexcpt.c
+++ math/feholdexcpt.c
@@ -26,4 +26,3 @@ feholdexcept (fenv_t *envp)
 }
 libm_hidden_def (feholdexcept)
 stub_warning (feholdexcept)
-#include <stub-tag.h>
diff --git math/fesetenv.c math/fesetenv.c
index d285c92..c12d19f 100644
--- math/fesetenv.c
+++ 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 math/fesetround.c math/fesetround.c
index b70b531..9742033 100644
--- math/fesetround.c
+++ math/fesetround.c
@@ -26,4 +26,3 @@ fesetround (int round)
 }
 libm_hidden_def (fesetround)
 stub_warning (fesetround)
-#include <stub-tag.h>
diff --git math/feupdateenv.c math/feupdateenv.c
index 49674bc..c31f8ad 100644
--- math/feupdateenv.c
+++ 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 math/fgetexcptflg.c math/fgetexcptflg.c
index f079336..1b8a589 100644
--- math/fgetexcptflg.c
+++ 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 math/fraiseexcpt.c math/fraiseexcpt.c
index 83a488b..9b3fbfd 100644
--- math/fraiseexcpt.c
+++ 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 math/fsetexcptflg.c math/fsetexcptflg.c
index 7d27d7f..a90f54e 100644
--- math/fsetexcptflg.c
+++ 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 math/ftestexcept.c math/ftestexcept.c
index c396002..bea48e3 100644
--- math/ftestexcept.c
+++ math/ftestexcept.c
@@ -26,4 +26,3 @@ fetestexcept (int excepts)
 }
 libm_hidden_def (fetestexcept)
 stub_warning (fetestexcept)
-#include <stub-tag.h>
diff --git math/k_cosl.c math/k_cosl.c
index bf3708b..6dc72b4 100644
--- math/k_cosl.c
+++ 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 math/k_rem_pio2l.c math/k_rem_pio2l.c
index 236eb30..01bf158 100644
--- math/k_rem_pio2l.c
+++ 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 math/k_sinl.c math/k_sinl.c
index e95c71c..0047942 100644
--- math/k_sinl.c
+++ 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 math/k_tanl.c math/k_tanl.c
index 891d3ab..8831f62 100644
--- math/k_tanl.c
+++ 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 math/s_asinhl.c math/s_asinhl.c
index 1d5cf47..8232fcd 100644
--- math/s_asinhl.c
+++ 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 math/s_atanl.c math/s_atanl.c
index d9a7eb6..2957d70 100644
--- math/s_atanl.c
+++ 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 math/s_cbrtl.c math/s_cbrtl.c
index d668e37..803010b 100644
--- math/s_cbrtl.c
+++ 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 math/s_erfl.c math/s_erfl.c
index f329d58..7ae25d6 100644
--- math/s_erfl.c
+++ 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 math/s_expm1l.c math/s_expm1l.c
index b69d6ae..070d068 100644
--- math/s_expm1l.c
+++ 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 math/s_log1pl.c math/s_log1pl.c
index e5db907..9e51ce2 100644
--- math/s_log1pl.c
+++ 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 math/s_tanhl.c math/s_tanhl.c
index bc9a2d7..ece9a4c 100644
--- math/s_tanhl.c
+++ 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 misc/acct.c misc/acct.c
index 0ae8d7f..8e4713b 100644
--- misc/acct.c
+++ misc/acct.c
@@ -30,4 +30,3 @@ acct (name)
 }
 
 stub_warning (acct)
-#include <stub-tag.h>
diff --git misc/brk.c misc/brk.c
index 0976456..bcbac64 100644
--- misc/brk.c
+++ misc/brk.c
@@ -33,4 +33,3 @@ __brk (addr)
 stub_warning (brk)
 
 weak_alias (__brk, brk)
-#include <stub-tag.h>
diff --git misc/chflags.c misc/chflags.c
index ea6e742..d1a44b2 100644
--- misc/chflags.c
+++ misc/chflags.c
@@ -39,4 +39,3 @@ chflags (file, flags)
 }
 
 stub_warning (chflags)
-#include <stub-tag.h>
diff --git misc/chroot.c misc/chroot.c
index db301ad..1c1bbd8 100644
--- misc/chroot.c
+++ misc/chroot.c
@@ -30,4 +30,3 @@ chroot (path)
 
 
 stub_warning (chroot)
-#include <stub-tag.h>
diff --git misc/fchflags.c misc/fchflags.c
index ebb50db..8277134 100644
--- misc/fchflags.c
+++ misc/fchflags.c
@@ -39,4 +39,3 @@ fchflags (fd, flags)
 }
 
 stub_warning (fchflags)
-#include <stub-tag.h>
diff --git misc/fgetxattr.c misc/fgetxattr.c
index 049fd28..86df9a4 100644
--- misc/fgetxattr.c
+++ misc/fgetxattr.c
@@ -27,4 +27,3 @@ fgetxattr (int __fd, const char *__name,
 }
 
 stub_warning (fgetxattr)
-#include <stub-tag.h>
diff --git misc/flistxattr.c misc/flistxattr.c
index dbbe20a..8f5667f 100644
--- misc/flistxattr.c
+++ misc/flistxattr.c
@@ -26,4 +26,3 @@ flistxattr (int __fd, char *__list, size_t __size)
 }
 
 stub_warning (flistxattr)
-#include <stub-tag.h>
diff --git misc/fremovexattr.c misc/fremovexattr.c
index 8f38e0a..f21da5a 100644
--- misc/fremovexattr.c
+++ misc/fremovexattr.c
@@ -26,4 +26,3 @@ fremovexattr (int __fd, const char *__name)
 }
 
 stub_warning (fremovexattr)
-#include <stub-tag.h>
diff --git misc/fsetxattr.c misc/fsetxattr.c
index 706e4bb..2d62a17 100644
--- misc/fsetxattr.c
+++ 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 misc/fsync.c misc/fsync.c
index d94a059..a927f72 100644
--- misc/fsync.c
+++ misc/fsync.c
@@ -29,4 +29,3 @@ fsync (fd)
 
 
 stub_warning (fsync)
-#include <stub-tag.h>
diff --git misc/ftruncate.c misc/ftruncate.c
index f2b2e27..79bf287 100644
--- misc/ftruncate.c
+++ misc/ftruncate.c
@@ -32,4 +32,3 @@ __ftruncate (fd, length)
 weak_alias (__ftruncate, ftruncate)
      
 stub_warning (ftruncate)
-#include <stub-tag.h>
diff --git misc/futimes.c misc/futimes.c
index b644fd1..1204a9c 100644
--- misc/futimes.c
+++ 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 misc/futimesat.c misc/futimesat.c
index 5d895bc..b33939e 100644
--- misc/futimesat.c
+++ misc/futimesat.c
@@ -42,4 +42,3 @@ futimesat (fd, file, tvp)
 }
 
 stub_warning (futimesat)
-#include <stub-tag.h>
diff --git misc/getdomain.c misc/getdomain.c
index c8d1527..7fb8da2 100644
--- misc/getdomain.c
+++ misc/getdomain.c
@@ -56,7 +56,6 @@ getdomainname (name, len)
 }
 
 stub_warning (getdomainname)
-#include <stub-tag.h>
 
 #endif
 
diff --git misc/getdtsz.c misc/getdtsz.c
index 020ec9d..7c6f7e6 100644
--- misc/getdtsz.c
+++ misc/getdtsz.c
@@ -29,4 +29,3 @@ __getdtablesize ()
 stub_warning (getdtablesize)
 
 weak_alias (__getdtablesize, getdtablesize)
-#include <stub-tag.h>
diff --git misc/gethostid.c misc/gethostid.c
index 8854cf4..876c83c 100644
--- misc/gethostid.c
+++ misc/gethostid.c
@@ -28,4 +28,3 @@ gethostid ()
 
 
 stub_warning (gethostid)
-#include <stub-tag.h>
diff --git misc/gethostname.c misc/gethostname.c
index 6e70da9..40d3027 100644
--- misc/gethostname.c
+++ misc/gethostname.c
@@ -32,4 +32,3 @@ __gethostname (name, len)
 stub_warning (gethostname)
 
 weak_alias (__gethostname, gethostname)
-#include <stub-tag.h>
diff --git misc/getloadavg.c misc/getloadavg.c
index 768fe32..6e39939 100644
--- misc/getloadavg.c
+++ misc/getloadavg.c
@@ -33,4 +33,3 @@ getloadavg (double loadavg[], int nelem)
   return -1;
 }
 stub_warning (getloadavg)
-#include <stub-tag.h>
diff --git misc/getpagesize.c misc/getpagesize.c
index 0ec823d..6d3821a 100644
--- misc/getpagesize.c
+++ misc/getpagesize.c
@@ -29,4 +29,3 @@ libc_hidden_def (__getpagesize)
 stub_warning (getpagesize)
 
 weak_alias (__getpagesize, getpagesize)
-#include <stub-tag.h>
diff --git misc/getsysstats.c misc/getsysstats.c
index d03e75b..c5ce2fd 100644
--- misc/getsysstats.c
+++ 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 misc/getxattr.c misc/getxattr.c
index bde3619..1e5b2bb 100644
--- misc/getxattr.c
+++ misc/getxattr.c
@@ -27,4 +27,3 @@ getxattr (const char *__path, const char *__name,
 }
 
 stub_warning (getxattr)
-#include <stub-tag.h>
diff --git misc/gtty.c misc/gtty.c
index e1a2668..2c6ae3f 100644
--- misc/gtty.c
+++ misc/gtty.c
@@ -36,4 +36,3 @@ gtty (fd, params)
 }
 
 stub_warning (gtty)
-#include <stub-tag.h>
diff --git misc/ioctl.c misc/ioctl.c
index 616ee2d..f47d90e 100644
--- misc/ioctl.c
+++ misc/ioctl.c
@@ -31,4 +31,3 @@ __ioctl (fd, request)
 stub_warning (ioctl)
 
 weak_alias (__ioctl, ioctl)
-#include <stub-tag.h>
diff --git misc/lgetxattr.c misc/lgetxattr.c
index fcdf53c..44e23d9 100644
--- misc/lgetxattr.c
+++ misc/lgetxattr.c
@@ -27,4 +27,3 @@ lgetxattr (const char *__path, const char *__name,
 }
 
 stub_warning (lgetxattr)
-#include <stub-tag.h>
diff --git misc/listxattr.c misc/listxattr.c
index a58f217..5de7d30 100644
--- misc/listxattr.c
+++ 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 misc/llistxattr.c misc/llistxattr.c
index f133579..da3bfee 100644
--- misc/llistxattr.c
+++ 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 misc/lremovexattr.c misc/lremovexattr.c
index 541e22d..a04853f 100644
--- misc/lremovexattr.c
+++ misc/lremovexattr.c
@@ -26,4 +26,3 @@ lremovexattr (const char *__path, const char *__name)
 }
 
 stub_warning (lremovexattr)
-#include <stub-tag.h>
diff --git misc/lsetxattr.c misc/lsetxattr.c
index bc43e17..f433fe4 100644
--- misc/lsetxattr.c
+++ misc/lsetxattr.c
@@ -27,4 +27,3 @@ lsetxattr (const char *__path, const char *__name,
 }
 
 stub_warning (lsetxattr)
-#include <stub-tag.h>
diff --git misc/lutimes.c misc/lutimes.c
index ed7e842..57faae4 100644
--- misc/lutimes.c
+++ 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 misc/madvise.c misc/madvise.c
index 4e9681a..188a20e 100644
--- misc/madvise.c
+++ misc/madvise.c
@@ -33,4 +33,3 @@ libc_hidden_def (__madvise)
 weak_alias (__madvise, madvise)
 
 stub_warning (madvise)
-#include <stub-tag.h>
diff --git misc/mincore.c misc/mincore.c
index e85ebce..8e8045c 100644
--- misc/mincore.c
+++ 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 misc/mlock.c misc/mlock.c
index 588495c..0d81d04 100644
--- misc/mlock.c
+++ misc/mlock.c
@@ -31,4 +31,3 @@ mlock (const void *addr, size_t len)
 }
 
 stub_warning (mlock)
-#include <stub-tag.h>
diff --git misc/mlockall.c misc/mlockall.c
index a740388..e51b953 100644
--- misc/mlockall.c
+++ misc/mlockall.c
@@ -32,4 +32,3 @@ mlockall (int flags)
 }
 
 stub_warning (mlockall)
-#include <stub-tag.h>
diff --git misc/mmap.c misc/mmap.c
index b77856d..dbe6255 100644
--- misc/mmap.c
+++ 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 misc/mprotect.c misc/mprotect.c
index e6cb623..bef7efc 100644
--- misc/mprotect.c
+++ 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 misc/msync.c misc/msync.c
index c163994..aa3d0ce 100644
--- misc/msync.c
+++ 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 misc/munlock.c misc/munlock.c
index 0a02e5b..37fd518 100644
--- misc/munlock.c
+++ misc/munlock.c
@@ -30,4 +30,3 @@ munlock (const void *addr, size_t len)
 }
 
 stub_warning (munlock)
-#include <stub-tag.h>
diff --git misc/munlockall.c misc/munlockall.c
index 8094ab6..bceb944 100644
--- misc/munlockall.c
+++ misc/munlockall.c
@@ -30,4 +30,3 @@ munlockall (void)
 }
 
 stub_warning (munlockall)
-#include <stub-tag.h>
diff --git misc/munmap.c misc/munmap.c
index 8c3c37c..97c6ef9 100644
--- misc/munmap.c
+++ 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 misc/preadv.c misc/preadv.c
index 0e5138c..9ef32a6 100644
--- misc/preadv.c
+++ misc/preadv.c
@@ -37,4 +37,3 @@ preadv (fd, vector, count, offset)
 }
 
 stub_warning (preadv)
-#include <stub-tag.h>
diff --git misc/preadv64.c misc/preadv64.c
index c7c9dd1..dd49490 100644
--- misc/preadv64.c
+++ misc/preadv64.c
@@ -37,4 +37,3 @@ preadv64 (fd, vector, count, offset)
 }
 
 stub_warning (preadv64)
-#include <stub-tag.h>
diff --git misc/ptrace.c misc/ptrace.c
index a70f195..4f600d8 100644
--- misc/ptrace.c
+++ misc/ptrace.c
@@ -99,4 +99,3 @@ ptrace (request)
 
 
 stub_warning (ptrace)
-#include <stub-tag.h>
diff --git misc/pwritev.c misc/pwritev.c
index 2e10ca8..fba8a57 100644
--- misc/pwritev.c
+++ misc/pwritev.c
@@ -37,4 +37,3 @@ pwritev (fd, vector, count, offset)
 }
 
 stub_warning (pwritev)
-#include <stub-tag.h>
diff --git misc/pwritev64.c misc/pwritev64.c
index 650abd6..c599511 100644
--- misc/pwritev64.c
+++ misc/pwritev64.c
@@ -37,4 +37,3 @@ pwritev64 (fd, vector, count, offset)
 }
 
 stub_warning (pwritev64)
-#include <stub-tag.h>
diff --git misc/readv.c misc/readv.c
index 74fb3a9..6b165d7 100644
--- misc/readv.c
+++ 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 misc/reboot.c misc/reboot.c
index c8a4c04..455a6bd 100644
--- misc/reboot.c
+++ misc/reboot.c
@@ -30,4 +30,3 @@ reboot (howto)
 
 
 stub_warning (reboot)
-#include <stub-tag.h>
diff --git misc/remap_file_pages.c misc/remap_file_pages.c
index 2ad057d..08a2d4c 100644
--- misc/remap_file_pages.c
+++ 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 misc/removexattr.c misc/removexattr.c
index 56a9014..aede787 100644
--- misc/removexattr.c
+++ misc/removexattr.c
@@ -26,4 +26,3 @@ removexattr (const char *__path, const char *__name)
 }
 
 stub_warning (removexattr)
-#include <stub-tag.h>
diff --git misc/revoke.c misc/revoke.c
index ed1659e..2e42a42 100644
--- misc/revoke.c
+++ misc/revoke.c
@@ -27,4 +27,3 @@ revoke (file)
   return -1;
 }
 stub_warning (revoke)
-#include <stub-tag.h>
diff --git misc/select.c misc/select.c
index ce08f0c..8f5cb0d 100644
--- misc/select.c
+++ misc/select.c
@@ -39,4 +39,3 @@ libc_hidden_def (__select)
 stub_warning (select)
 
 weak_alias (__select, select)
-#include <stub-tag.h>
diff --git misc/setdomain.c misc/setdomain.c
index b19e20b..7e6665b 100644
--- misc/setdomain.c
+++ misc/setdomain.c
@@ -30,4 +30,3 @@ setdomainname (name, len)
 }
 
 stub_warning (setdomainname)
-#include <stub-tag.h>
diff --git misc/setegid.c misc/setegid.c
index 22a0bc8..219c1b9 100644
--- misc/setegid.c
+++ misc/setegid.c
@@ -28,4 +28,3 @@ setegid (gid)
 }
 libc_hidden_def (setegid)
 stub_warning (setegid)
-#include <stub-tag.h>
diff --git misc/seteuid.c misc/seteuid.c
index b338f71..648b77a 100644
--- misc/seteuid.c
+++ misc/seteuid.c
@@ -28,4 +28,3 @@ seteuid (uid)
 }
 libc_hidden_def (seteuid)
 stub_warning (seteuid)
-#include <stub-tag.h>
diff --git misc/sethostid.c misc/sethostid.c
index fd4483e..73dfb33 100644
--- misc/sethostid.c
+++ misc/sethostid.c
@@ -30,4 +30,3 @@ sethostid (id)
 
 
 stub_warning (sethostid)
-#include <stub-tag.h>
diff --git misc/sethostname.c misc/sethostname.c
index ff31900..9641358 100644
--- misc/sethostname.c
+++ misc/sethostname.c
@@ -31,4 +31,3 @@ sethostname (name, len)
 
 
 stub_warning (sethostname)
-#include <stub-tag.h>
diff --git misc/setregid.c misc/setregid.c
index d73260d..ad7ca4b 100644
--- misc/setregid.c
+++ 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 misc/setreuid.c misc/setreuid.c
index 3a97788..87fcfc6 100644
--- misc/setreuid.c
+++ 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 misc/setxattr.c misc/setxattr.c
index d0f8035..6409751 100644
--- misc/setxattr.c
+++ misc/setxattr.c
@@ -27,4 +27,3 @@ setxattr (const char *__path, const char *__name,
 }
 
 stub_warning (setxattr)
-#include <stub-tag.h>
diff --git misc/sstk.c misc/sstk.c
index 3401936..3a4580b 100644
--- misc/sstk.c
+++ misc/sstk.c
@@ -31,4 +31,3 @@ sstk (increment)
 }
 
 stub_warning (sstk)
-#include <stub-tag.h>
diff --git misc/stty.c misc/stty.c
index 66c475c..5ce9e23 100644
--- misc/stty.c
+++ misc/stty.c
@@ -36,4 +36,3 @@ stty (fd, params)
 }
 
 stub_warning (stty)
-#include <stub-tag.h>
diff --git misc/swapoff.c misc/swapoff.c
index f4e59f8..d887c43 100644
--- misc/swapoff.c
+++ misc/swapoff.c
@@ -27,4 +27,3 @@ swapoff (const char *path)
 }
 
 stub_warning (swapoff)
-#include <stub-tag.h>
diff --git misc/swapon.c misc/swapon.c
index 095f79d..f4bdf13 100644
--- misc/swapon.c
+++ misc/swapon.c
@@ -30,4 +30,3 @@ swapon (path)
 }
 
 stub_warning (swapon)
-#include <stub-tag.h>
diff --git misc/sync.c misc/sync.c
index 45e7187..01a1696 100644
--- misc/sync.c
+++ misc/sync.c
@@ -27,4 +27,3 @@ sync ()
 
 
 stub_warning (sync)
-#include <stub-tag.h>
diff --git misc/syncfs.c misc/syncfs.c
index 4dc5340..b949111 100644
--- misc/syncfs.c
+++ misc/syncfs.c
@@ -29,4 +29,3 @@ syncfs (int fd)
 
 
 stub_warning (syncfs)
-#include <stub-tag.h>
diff --git misc/syscall.c misc/syscall.c
index ad44d2b..f6dae57 100644
--- misc/syscall.c
+++ misc/syscall.c
@@ -31,4 +31,3 @@ syscall (callno)
 }
 
 stub_warning (syscall)
-#include <stub-tag.h>
diff --git misc/truncate.c misc/truncate.c
index 29f72fa..c92acd1 100644
--- misc/truncate.c
+++ misc/truncate.c
@@ -30,4 +30,3 @@ __truncate (path, length)
 weak_alias (__truncate, truncate)
 
 stub_warning (truncate)
-#include <stub-tag.h>
diff --git misc/ualarm.c misc/ualarm.c
index ac7c7a4..ca66d79 100644
--- misc/ualarm.c
+++ misc/ualarm.c
@@ -33,4 +33,3 @@ ualarm (value, interval)
 }
 
 stub_warning (ualarm)
-#include <stub-tag.h>
diff --git misc/usleep.c misc/usleep.c
index f67346e..674a025 100644
--- misc/usleep.c
+++ misc/usleep.c
@@ -28,4 +28,3 @@ usleep (useconds)
 }
 
 stub_warning (usleep)
-#include <stub-tag.h>
diff --git misc/ustat.c misc/ustat.c
index 135afe2..2dd92e7 100644
--- misc/ustat.c
+++ misc/ustat.c
@@ -29,4 +29,3 @@ ustat (dev, ust)
   return -1;
 }
 stub_warning (ustat)
-#include <stub-tag.h>
diff --git misc/utimes.c misc/utimes.c
index 3d0e868..5cdfe6c 100644
--- misc/utimes.c
+++ misc/utimes.c
@@ -39,4 +39,3 @@ __utimes (file, tvp)
 weak_alias (__utimes, utimes)
 
 stub_warning (utimes)
-#include <stub-tag.h>
diff --git misc/vhangup.c misc/vhangup.c
index 02d8504..0d8ce28 100644
--- misc/vhangup.c
+++ misc/vhangup.c
@@ -29,4 +29,3 @@ vhangup ()
 }
 
 stub_warning (vhangup)
-#include <stub-tag.h>
diff --git misc/writev.c misc/writev.c
index 0bf1cb3..19bc028 100644
--- misc/writev.c
+++ 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 ports/sysdeps/unix/sysv/linux/generic/sysctl.c ports/sysdeps/unix/sysv/linux/generic/sysctl.c
index 0bdb786..0212e1a 100644
--- ports/sysdeps/unix/sysv/linux/generic/sysctl.c
+++ 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 ports/sysdeps/unix/sysv/linux/generic/ustat.c ports/sysdeps/unix/sysv/linux/generic/ustat.c
index 7611e82..d6a2309 100644
--- ports/sysdeps/unix/sysv/linux/generic/ustat.c
+++ 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 ports/sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c ports/sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c
index 2dc110b..1d345ef 100644
--- ports/sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c
+++ 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 posix/_exit.c posix/_exit.c
index a8f1b58..ef2b7d7 100644
--- posix/_exit.c
+++ posix/_exit.c
@@ -32,4 +32,3 @@ libc_hidden_def (_exit)
 weak_alias (_exit, _Exit)
 
 stub_warning (_exit)
-#include <stub-tag.h>
diff --git posix/alarm.c posix/alarm.c
index 0b01948..3fda9b0 100644
--- posix/alarm.c
+++ posix/alarm.c
@@ -35,4 +35,3 @@ alarm (seconds)
 libc_hidden_def (alarm)
 
 stub_warning (alarm)
-#include <stub-tag.h>
diff --git posix/execve.c posix/execve.c
index 63a234f..893cec2 100644
--- posix/execve.c
+++ posix/execve.c
@@ -40,4 +40,3 @@ __execve (path, argv, envp)
 stub_warning (execve)
 
 weak_alias (__execve, execve)
-#include <stub-tag.h>
diff --git posix/fexecve.c posix/fexecve.c
index c7b43c5..6a22a19 100644
--- posix/fexecve.c
+++ posix/fexecve.c
@@ -39,4 +39,3 @@ fexecve (fd, argv, envp)
 }
 
 stub_warning (fexecve)
-#include <stub-tag.h>
diff --git posix/fork.c posix/fork.c
index e499c11..08c69b6 100644
--- posix/fork.c
+++ posix/fork.c
@@ -32,4 +32,3 @@ libc_hidden_def (__fork)
 stub_warning (fork)
 
 weak_alias (__fork, fork)
-#include <stub-tag.h>
diff --git posix/fpathconf.c posix/fpathconf.c
index 07d8684..01a08ca 100644
--- posix/fpathconf.c
+++ posix/fpathconf.c
@@ -58,4 +58,3 @@ __fpathconf (fd, name)
 weak_alias (__fpathconf, fpathconf)
 
 stub_warning (fpathconf)
-#include <stub-tag.h>
diff --git posix/getaddrinfo.c posix/getaddrinfo.c
index b5e8362..bdb79c8 100644
--- posix/getaddrinfo.c
+++ posix/getaddrinfo.c
@@ -36,5 +36,3 @@ freeaddrinfo (struct addrinfo *ai)
 }
 stub_warning (freeaddrinfo)
 libc_hidden_def (freeaddrinfo)
-
-#include <stub-tag.h>
diff --git posix/getegid.c posix/getegid.c
index 482e434..6692bc0 100644
--- posix/getegid.c
+++ posix/getegid.c
@@ -28,4 +28,3 @@ __getegid ()
 stub_warning (getegid)
 
 weak_alias (__getegid, getegid)
-#include <stub-tag.h>
diff --git posix/geteuid.c posix/geteuid.c
index 5fc0ee5..eb59db3 100644
--- posix/geteuid.c
+++ posix/geteuid.c
@@ -29,4 +29,3 @@ __geteuid ()
 stub_warning (geteuid)
 
 weak_alias (__geteuid, geteuid)
-#include <stub-tag.h>
diff --git posix/getgid.c posix/getgid.c
index 6fa3d25..54c7d18 100644
--- posix/getgid.c
+++ posix/getgid.c
@@ -29,4 +29,3 @@ __getgid ()
 stub_warning (getgid)
 
 weak_alias (__getgid, getgid)
-#include <stub-tag.h>
diff --git posix/getgroups.c posix/getgroups.c
index e3910a8..eed9152 100644
--- posix/getgroups.c
+++ posix/getgroups.c
@@ -44,4 +44,3 @@ stub_warning (getgroups);
 #endif
 
 weak_alias (__getgroups, getgroups)
-#include <stub-tag.h>
diff --git posix/getlogin.c posix/getlogin.c
index beab0f0..58bc93f 100644
--- posix/getlogin.c
+++ posix/getlogin.c
@@ -29,4 +29,3 @@ getlogin (void)
 }
 
 stub_warning (getlogin)
-#include <stub-tag.h>
diff --git posix/getlogin_r.c posix/getlogin_r.c
index b3ddd56..7cd7be9 100644
--- posix/getlogin_r.c
+++ 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 posix/getpgid.c posix/getpgid.c
index 198a313..fd1bc5a 100644
--- posix/getpgid.c
+++ posix/getpgid.c
@@ -29,4 +29,3 @@ libc_hidden_def (__getpgid)
 weak_alias (__getpgid, getpgid)
 
 stub_warning (getpgid)
-#include <stub-tag.h>
diff --git posix/getpid.c posix/getpid.c
index 301da5f..3c3bb6a 100644
--- posix/getpid.c
+++ posix/getpid.c
@@ -30,4 +30,3 @@ stub_warning (getpid)
 
 weak_alias (__getpid, getpid)
 libc_hidden_weak (getpid)
-#include <stub-tag.h>
diff --git posix/getppid.c posix/getppid.c
index 2650ed4..92c8b9b 100644
--- posix/getppid.c
+++ posix/getppid.c
@@ -29,4 +29,3 @@ __getppid ()
 stub_warning (getppid)
 
 weak_alias (__getppid, getppid)
-#include <stub-tag.h>
diff --git posix/getresgid.c posix/getresgid.c
index 7f5bdb3..0baec6a 100644
--- posix/getresgid.c
+++ posix/getresgid.c
@@ -31,4 +31,3 @@ libc_hidden_def (__getresgid)
 stub_warning (getresgid)
 
 weak_alias (__getresgid, getresgid)
-#include <stub-tag.h>
diff --git posix/getresuid.c posix/getresuid.c
index bf56fba..7da3173 100644
--- posix/getresuid.c
+++ posix/getresuid.c
@@ -31,4 +31,3 @@ libc_hidden_def (__getresuid)
 stub_warning (getresuid)
 
 weak_alias (__getresuid, getresuid)
-#include <stub-tag.h>
diff --git posix/getsid.c posix/getsid.c
index 6b4caf0..3283d8c 100644
--- posix/getsid.c
+++ posix/getsid.c
@@ -28,4 +28,3 @@ getsid (pid_t pid)
 }
 libc_hidden_def (getsid)
 stub_warning (getsid)
-#include <stub-tag.h>
diff --git posix/getuid.c posix/getuid.c
index d3ff49e..2afbe58 100644
--- posix/getuid.c
+++ posix/getuid.c
@@ -29,4 +29,3 @@ __getuid ()
 stub_warning (getuid)
 
 weak_alias (__getuid, getuid)
-#include <stub-tag.h>
diff --git posix/glob64.c posix/glob64.c
index e329270..2d98cd9 100644
--- posix/glob64.c
+++ posix/glob64.c
@@ -50,4 +50,3 @@ globfree64 (glob64_t *pglob)
 libc_hidden_def (globfree64)
 
 stub_warning (glob64)
-#include <stub-tag.h>
diff --git posix/nanosleep.c posix/nanosleep.c
index 2f44b16..b29e694 100644
--- posix/nanosleep.c
+++ 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 posix/pathconf.c posix/pathconf.c
index e36ba62..6f48b0b 100644
--- posix/pathconf.c
+++ posix/pathconf.c
@@ -37,4 +37,3 @@ __pathconf (path, name)
 weak_alias (__pathconf, pathconf)
 
 stub_warning (pathconf)
-#include <stub-tag.h>
diff --git posix/pause.c posix/pause.c
index af239be..0950510 100644
--- posix/pause.c
+++ posix/pause.c
@@ -30,4 +30,3 @@ pause ()
 }
 
 stub_warning (pause)
-#include <stub-tag.h>
diff --git posix/posix_madvise.c posix/posix_madvise.c
index 271dd47..4b9cc1e 100644
--- posix/posix_madvise.c
+++ 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 posix/pread.c posix/pread.c
index bc81f1a..b62fd94 100644
--- posix/pread.c
+++ 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 posix/pread64.c posix/pread64.c
index 18c4f02..f6b7a35 100644
--- posix/pread64.c
+++ 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 posix/pwrite.c posix/pwrite.c
index 0e8481d..43619ed 100644
--- posix/pwrite.c
+++ 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 posix/pwrite64.c posix/pwrite64.c
index c0dadfe..819cfd6 100644
--- posix/pwrite64.c
+++ 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 posix/sched_getaffinity.c posix/sched_getaffinity.c
index da70878..8641b4e 100644
--- posix/sched_getaffinity.c
+++ 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 posix/sched_getp.c posix/sched_getp.c
index 551d071..d6a7ac6 100644
--- posix/sched_getp.c
+++ 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 posix/sched_gets.c posix/sched_gets.c
index 874b171..dd3f51e 100644
--- posix/sched_gets.c
+++ 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 posix/sched_primax.c posix/sched_primax.c
index 436e353..ef35e11 100644
--- posix/sched_primax.c
+++ 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 posix/sched_primin.c posix/sched_primin.c
index 411e8fb..cffa3f9 100644
--- posix/sched_primin.c
+++ 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 posix/sched_rr_gi.c posix/sched_rr_gi.c
index 8296222..3011050 100644
--- posix/sched_rr_gi.c
+++ 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 posix/sched_setaffinity.c posix/sched_setaffinity.c
index 9d0ac03..3cc9bb7 100644
--- posix/sched_setaffinity.c
+++ 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 posix/sched_setp.c posix/sched_setp.c
index 4c8888c..90de454 100644
--- posix/sched_setp.c
+++ 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 posix/sched_sets.c posix/sched_sets.c
index a52ae45..205471b 100644
--- posix/sched_sets.c
+++ 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 posix/sched_yield.c posix/sched_yield.c
index 2335c85..2257eb3 100644
--- posix/sched_yield.c
+++ 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 posix/setgid.c posix/setgid.c
index 82546f2..3e384ae 100644
--- posix/setgid.c
+++ posix/setgid.c
@@ -33,4 +33,3 @@ __setgid (gid)
 stub_warning (setgid)
 
 weak_alias (__setgid, setgid)
-#include <stub-tag.h>
diff --git posix/setlogin.c posix/setlogin.c
index fd09f51..8a8362b 100644
--- posix/setlogin.c
+++ posix/setlogin.c
@@ -28,4 +28,3 @@ setlogin (name)
 }
 
 stub_warning (setlogin)
-#include <stub-tag.h>
diff --git posix/setpgid.c posix/setpgid.c
index ad073f8..146fb74 100644
--- posix/setpgid.c
+++ posix/setpgid.c
@@ -33,4 +33,3 @@ libc_hidden_def (__setpgid)
 stub_warning (setpgid)
 
 weak_alias (__setpgid, setpgid)
-#include <stub-tag.h>
diff --git posix/setresgid.c posix/setresgid.c
index c4420d9..ba1cce4 100644
--- posix/setresgid.c
+++ posix/setresgid.c
@@ -31,4 +31,3 @@ libc_hidden_def (__setresgid)
 stub_warning (setresgid)
 
 weak_alias (__setresgid, setresgid)
-#include <stub-tag.h>
diff --git posix/setresuid.c posix/setresuid.c
index 1a33cac..edb99a9 100644
--- posix/setresuid.c
+++ posix/setresuid.c
@@ -31,4 +31,3 @@ libc_hidden_def (__setresuid)
 stub_warning (setresuid)
 
 weak_alias (__setresuid, setresuid)
-#include <stub-tag.h>
diff --git posix/setsid.c posix/setsid.c
index 879b0ca..a4f0525 100644
--- posix/setsid.c
+++ posix/setsid.c
@@ -31,4 +31,3 @@ __setsid ()
 stub_warning (setsid)
 
 weak_alias (__setsid, setsid)
-#include <stub-tag.h>
diff --git posix/setuid.c posix/setuid.c
index a421cb9..5892d23 100644
--- posix/setuid.c
+++ posix/setuid.c
@@ -33,4 +33,3 @@ __setuid (uid)
 stub_warning (setuid)
 
 weak_alias (__setuid, setuid)
-#include <stub-tag.h>
diff --git posix/sleep.c posix/sleep.c
index f5aa751..d7ca5f9 100644
--- posix/sleep.c
+++ posix/sleep.c
@@ -37,4 +37,3 @@ __sleep (seconds)
 weak_alias (__sleep, sleep)
 
 stub_warning (sleep)
-#include <stub-tag.h>
diff --git posix/spawni.c posix/spawni.c
index 4835c71..c8c6127 100644
--- posix/spawni.c
+++ posix/spawni.c
@@ -42,4 +42,3 @@ __spawni (pid_t *pid, const char *file,
 }
 
 stub_warning (__spawni)
-#include <stub-tag.h>
diff --git posix/sysconf.c posix/sysconf.c
index 331aa27..8428f79 100644
--- posix/sysconf.c
+++ posix/sysconf.c
@@ -279,4 +279,3 @@ weak_alias (__sysconf, sysconf)
 libc_hidden_def (__sysconf)
 
 stub_warning (sysconf)
-#include <stub-tag.h>
diff --git posix/times.c posix/times.c
index 5a47517..e6f6003 100644
--- posix/times.c
+++ posix/times.c
@@ -39,4 +39,3 @@ __times (buffer)
 stub_warning (times)
 
 weak_alias (__times, times)
-#include <stub-tag.h>
diff --git posix/wait.c posix/wait.c
index 5d6cbbf..1f78fa2 100644
--- posix/wait.c
+++ 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 posix/wait3.c posix/wait3.c
index 5491ddf..943ad4b 100644
--- posix/wait3.c
+++ 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 posix/wait4.c posix/wait4.c
index c53bba4..b805cb5 100644
--- posix/wait4.c
+++ 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 posix/waitpid.c posix/waitpid.c
index 20e6f68..4253e7b 100644
--- posix/waitpid.c
+++ 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 resolv/gai_sigqueue.c resolv/gai_sigqueue.c
index 22aff54..56f00b9 100644
--- resolv/gai_sigqueue.c
+++ resolv/gai_sigqueue.c
@@ -32,4 +32,3 @@ __gai_sigqueue (sig, val, caller_pid)
 }
 
 stub_warning (__gai_sigqueue)
-#include <stub-tag.h>
diff --git resource/getpriority.c resource/getpriority.c
index ae7521c..6809c5c 100644
--- resource/getpriority.c
+++ resource/getpriority.c
@@ -33,4 +33,3 @@ getpriority (which, who)
 libc_hidden_def (getpriority)
 
 stub_warning (getpriority)
-#include <stub-tag.h>
diff --git resource/getrlimit.c resource/getrlimit.c
index 2ba589c..544c155 100644
--- resource/getrlimit.c
+++ 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 resource/getrusage.c resource/getrusage.c
index 9479758..93cf4c9 100644
--- resource/getrusage.c
+++ resource/getrusage.c
@@ -31,4 +31,3 @@ __getrusage (who, usage)
 stub_warning (getrusage)
 
 weak_alias (__getrusage, getrusage)
-#include <stub-tag.h>
diff --git resource/nice.c resource/nice.c
index 1e938cf..febf7c0 100644
--- resource/nice.c
+++ resource/nice.c
@@ -29,4 +29,3 @@ nice (incr)
 }
 
 stub_warning (nice)
-#include <stub-tag.h>
diff --git resource/setpriority.c resource/setpriority.c
index 8d68fdb..5a5b6cc 100644
--- resource/setpriority.c
+++ resource/setpriority.c
@@ -32,4 +32,3 @@ setpriority (which, who, prio)
 libc_hidden_def (setpriority)
 
 stub_warning (setpriority)
-#include <stub-tag.h>
diff --git resource/setrlimit.c resource/setrlimit.c
index 539cd6f..f92513b 100644
--- resource/setrlimit.c
+++ resource/setrlimit.c
@@ -33,4 +33,3 @@ setrlimit (resource, rlimits)
 
 
 stub_warning (setrlimit)
-#include <stub-tag.h>
diff --git resource/ulimit.c resource/ulimit.c
index 1ca2f2b..802136c 100644
--- resource/ulimit.c
+++ resource/ulimit.c
@@ -35,4 +35,3 @@ __ulimit (int cmd, ...)
 weak_alias (__ulimit, ulimit)
 
 stub_warning (ulimit)
-#include <stub-tag.h>
diff --git rt/aio_cancel.c rt/aio_cancel.c
index e6af7af..b7d36a2 100644
--- rt/aio_cancel.c
+++ 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 rt/aio_fsync.c rt/aio_fsync.c
index 3893e07..0db17b4 100644
--- rt/aio_fsync.c
+++ 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 rt/aio_read.c rt/aio_read.c
index 213a43c..57e4f78 100644
--- rt/aio_read.c
+++ rt/aio_read.c
@@ -32,4 +32,3 @@ aio_read (struct aiocb *aiocbp)
 }
 
 stub_warning (aio_read)
-#include <stub-tag.h>
diff --git rt/aio_sigqueue.c rt/aio_sigqueue.c
index c3d7adb..2843146 100644
--- rt/aio_sigqueue.c
+++ rt/aio_sigqueue.c
@@ -32,4 +32,3 @@ __aio_sigqueue (sig, val, caller_pid)
 }
 
 stub_warning (__aio_sigqueue)
-#include <stub-tag.h>
diff --git rt/aio_suspend.c rt/aio_suspend.c
index ce882fb..8453b8f 100644
--- rt/aio_suspend.c
+++ 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 rt/aio_write.c rt/aio_write.c
index 398e9db..bd428ba 100644
--- rt/aio_write.c
+++ rt/aio_write.c
@@ -32,4 +32,3 @@ aio_write (struct aiocb *aiocbp)
 }
 
 stub_warning (aio_write)
-#include <stub-tag.h>
diff --git rt/clock_getres.c rt/clock_getres.c
index 162c8a5..dfd4d76 100644
--- rt/clock_getres.c
+++ 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 rt/clock_gettime.c rt/clock_gettime.c
index 5139e87..7456bdf 100644
--- rt/clock_gettime.c
+++ 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 rt/clock_nanosleep.c rt/clock_nanosleep.c
index d9a0e92..d4946a5 100644
--- rt/clock_nanosleep.c
+++ 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 rt/clock_settime.c rt/clock_settime.c
index 6f7cdd6..72d81cb 100644
--- rt/clock_settime.c
+++ 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 rt/lio_listio.c rt/lio_listio.c
index 867a20e..a807c47 100644
--- rt/lio_listio.c
+++ rt/lio_listio.c
@@ -38,4 +38,3 @@ lio_listio (int mode,
 }
 
 stub_warning (lio_listio)
-#include <stub-tag.h>
diff --git rt/mq_close.c rt/mq_close.c
index 9c5f9bf..1a3c06f 100644
--- rt/mq_close.c
+++ 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 rt/mq_getattr.c rt/mq_getattr.c
index 3c35fdd..d37328f 100644
--- rt/mq_getattr.c
+++ 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 rt/mq_notify.c rt/mq_notify.c
index 7b89a65..8241b41 100644
--- rt/mq_notify.c
+++ 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 rt/mq_open.c rt/mq_open.c
index d7986fb..af67ef5 100644
--- rt/mq_open.c
+++ 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 rt/mq_receive.c rt/mq_receive.c
index c72802f..e764800 100644
--- rt/mq_receive.c
+++ 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 rt/mq_send.c rt/mq_send.c
index 748ee41..591782f 100644
--- rt/mq_send.c
+++ 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 rt/mq_setattr.c rt/mq_setattr.c
index 58a1e34..658d423 100644
--- rt/mq_setattr.c
+++ 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 rt/mq_timedreceive.c rt/mq_timedreceive.c
index 6c3188a..652d4ec 100644
--- rt/mq_timedreceive.c
+++ 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 rt/mq_timedsend.c rt/mq_timedsend.c
index a3590c3..65ef634 100644
--- rt/mq_timedsend.c
+++ 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 rt/mq_unlink.c rt/mq_unlink.c
index f9f9733..92f484a 100644
--- rt/mq_unlink.c
+++ 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 rt/shm_open.c rt/shm_open.c
index 03a67e8..8b45e1e 100644
--- rt/shm_open.c
+++ 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 rt/shm_unlink.c rt/shm_unlink.c
index 4183577..d0cfa05 100644
--- rt/shm_unlink.c
+++ 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 rt/timer_create.c rt/timer_create.c
index d595d6e..ff28e72 100644
--- rt/timer_create.c
+++ 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 rt/timer_delete.c rt/timer_delete.c
index 80fb3fc..cf2c9b6 100644
--- rt/timer_delete.c
+++ 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 rt/timer_getoverr.c rt/timer_getoverr.c
index 1338de7..bea366d 100644
--- rt/timer_getoverr.c
+++ 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 rt/timer_gettime.c rt/timer_gettime.c
index 0510731..2f1eef0 100644
--- rt/timer_gettime.c
+++ 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 rt/timer_settime.c rt/timer_settime.c
index 0c5090c..549dc15 100644
--- rt/timer_settime.c
+++ 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 setjmp/__longjmp.c setjmp/__longjmp.c
index 6a5780a..43cd13b 100644
--- setjmp/__longjmp.c
+++ setjmp/__longjmp.c
@@ -32,4 +32,3 @@ __longjmp (__jmp_buf env, int val)
 }
 
 stub_warning (longjmp)
-#include <stub-tag.h>
diff --git setjmp/setjmp.c setjmp/setjmp.c
index 11a4fea..c3de551 100644
--- setjmp/setjmp.c
+++ 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 signal/kill.c signal/kill.c
index 3e99181..da6b49f 100644
--- signal/kill.c
+++ signal/kill.c
@@ -33,4 +33,3 @@ __kill (pid, sig)
 stub_warning (kill)
 
 weak_alias (__kill, kill)
-#include <stub-tag.h>
diff --git signal/killpg.c signal/killpg.c
index a2beea9..36bc5ba 100644
--- signal/killpg.c
+++ signal/killpg.c
@@ -32,4 +32,3 @@ killpg (pgrp, sig)
 }
 
 stub_warning (killpg)
-#include <stub-tag.h>
diff --git signal/raise.c signal/raise.c
index aa98a1a..d8d0914 100644
--- signal/raise.c
+++ signal/raise.c
@@ -30,4 +30,3 @@ weak_alias (raise, gsignal)
 
 stub_warning (raise)
 stub_warning (gsignal)
-#include <stub-tag.h>
diff --git signal/sigaction.c signal/sigaction.c
index 2ca3150..743724d 100644
--- signal/sigaction.c
+++ signal/sigaction.c
@@ -40,4 +40,3 @@ libc_hidden_def (__sigaction)
 stub_warning (sigaction)
 
 weak_alias (__sigaction, sigaction)
-#include <stub-tag.h>
diff --git signal/sigaltstack.c signal/sigaltstack.c
index ce51979..a540aed 100644
--- signal/sigaltstack.c
+++ signal/sigaltstack.c
@@ -30,4 +30,3 @@ sigaltstack (ss, oss)
 }
 
 stub_warning (sigaltstack)
-#include <stub-tag.h>
diff --git signal/sigblock.c signal/sigblock.c
index 9b5c442..7294629 100644
--- signal/sigblock.c
+++ signal/sigblock.c
@@ -29,4 +29,3 @@ __sigblock (mask)
 stub_warning (sigblock)
 
 weak_alias (__sigblock, sigblock)
-#include <stub-tag.h>
diff --git signal/sigignore.c signal/sigignore.c
index d0320e8..637dc94 100644
--- signal/sigignore.c
+++ signal/sigignore.c
@@ -29,4 +29,3 @@ sigignore (sig)
 }
 
 stub_warning (sigignore)
-#include <stub-tag.h>
diff --git signal/sigintr.c signal/sigintr.c
index 231ef4d..4495950 100644
--- signal/sigintr.c
+++ signal/sigintr.c
@@ -31,4 +31,3 @@ siginterrupt (sig, interrupt)
 }
 
 stub_warning (siginterrupt)
-#include <stub-tag.h>
diff --git signal/signal.c signal/signal.c
index 4cc4734..bc78d6f 100644
--- signal/signal.c
+++ signal/signal.c
@@ -34,4 +34,3 @@ weak_alias (signal, ssignal)
 
 stub_warning (signal)
 stub_warning (ssignal)
-#include <stub-tag.h>
diff --git signal/sigpause.c signal/sigpause.c
index a7b5cd4..78e61fc 100644
--- signal/sigpause.c
+++ 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 signal/sigpending.c signal/sigpending.c
index 480455a..7b48bfe 100644
--- signal/sigpending.c
+++ signal/sigpending.c
@@ -36,4 +36,3 @@ sigpending (set)
 }
 
 stub_warning (sigpending)
-#include <stub-tag.h>
diff --git signal/sigqueue.c signal/sigqueue.c
index 6cfab4f..48aae58 100644
--- signal/sigqueue.c
+++ 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 signal/sigreturn.c signal/sigreturn.c
index a650786..901404c 100644
--- signal/sigreturn.c
+++ signal/sigreturn.c
@@ -28,4 +28,3 @@ __sigreturn (context)
 stub_warning (sigreturn)
 
 weak_alias (__sigreturn, sigreturn)
-#include <stub-tag.h>
diff --git signal/sigset.c signal/sigset.c
index 7ad11da..a87cbce 100644
--- signal/sigset.c
+++ signal/sigset.c
@@ -30,4 +30,3 @@ sigset (sig, disp)
 }
 
 stub_warning (sigset)
-#include <stub-tag.h>
diff --git signal/sigsetmask.c signal/sigsetmask.c
index f3b90de..495f30e 100644
--- signal/sigsetmask.c
+++ signal/sigsetmask.c
@@ -28,4 +28,3 @@ __sigsetmask (mask)
 stub_warning (sigsetmask)
 
 weak_alias (__sigsetmask, sigsetmask)
-#include <stub-tag.h>
diff --git signal/sigstack.c signal/sigstack.c
index 1164933..9b6f2b1 100644
--- signal/sigstack.c
+++ signal/sigstack.c
@@ -30,4 +30,3 @@ sigstack (ss, oss)
 }
 
 stub_warning (sigstack)
-#include <stub-tag.h>
diff --git signal/sigsuspend.c signal/sigsuspend.c
index 560daaa..35be5c6 100644
--- signal/sigsuspend.c
+++ signal/sigsuspend.c
@@ -33,4 +33,3 @@ weak_alias (__sigsuspend, sigsuspend)
 
 stub_warning (sigsuspend)
 stub_warning (__sigsuspend)
-#include <stub-tag.h>
diff --git signal/sigtimedwait.c signal/sigtimedwait.c
index b5e334c..96bbc6c 100644
--- signal/sigtimedwait.c
+++ signal/sigtimedwait.c
@@ -30,4 +30,3 @@ libc_hidden_def (__sigtimedwait)
 weak_alias (__sigtimedwait, sigtimedwait)
 
 stub_warning (sigtimedwait)
-#include <stub-tag.h>
diff --git signal/sigvec.c signal/sigvec.c
index a8fb46b..e44daf1 100644
--- signal/sigvec.c
+++ signal/sigvec.c
@@ -35,4 +35,3 @@ __sigvec (sig, vec, ovec)
 stub_warning (sigvec)
 
 weak_alias (__sigvec, sigvec)
-#include <stub-tag.h>
diff --git signal/sigwait.c signal/sigwait.c
index 4226f66..2782015 100644
--- signal/sigwait.c
+++ 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 signal/sigwaitinfo.c signal/sigwaitinfo.c
index 19b8c02..a266b36 100644
--- signal/sigwaitinfo.c
+++ signal/sigwaitinfo.c
@@ -29,4 +29,3 @@ libc_hidden_def (__sigwaitinfo)
 weak_alias (__sigwaitinfo, sigwaitinfo)
 
 stub_warning (sigwaitinfo)
-#include <stub-tag.h>
diff --git signal/sysv_signal.c signal/sysv_signal.c
index 574b94e..aaf940b 100644
--- signal/sysv_signal.c
+++ 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 socket/accept.c socket/accept.c
index b9df1ac..c183795 100644
--- socket/accept.c
+++ socket/accept.c
@@ -36,4 +36,3 @@ libc_hidden_def (accept)
 
 
 stub_warning (accept)
-#include <stub-tag.h>
diff --git socket/accept4.c socket/accept4.c
index fad2cc6..d65482c 100644
--- socket/accept4.c
+++ socket/accept4.c
@@ -38,4 +38,3 @@ weak_alias (__libc_accept4, accept4)
 
 
 stub_warning (accept4)
-#include <stub-tag.h>
diff --git socket/bind.c socket/bind.c
index e87351d..a1d6fc6 100644
--- socket/bind.c
+++ socket/bind.c
@@ -32,4 +32,3 @@ __bind (fd, addr, len)
 weak_alias (__bind, bind)
 
 stub_warning (bind)
-#include <stub-tag.h>
diff --git socket/connect.c socket/connect.c
index 79f5cd8..4f421f8 100644
--- socket/connect.c
+++ socket/connect.c
@@ -35,4 +35,3 @@ weak_alias (__connect, connect)
 libc_hidden_def (__connect)
 
 stub_warning (connect)
-#include <stub-tag.h>
diff --git socket/getpeername.c socket/getpeername.c
index 9562814..72e4423 100644
--- socket/getpeername.c
+++ socket/getpeername.c
@@ -32,4 +32,3 @@ getpeername (fd, addr, len)
 
 
 stub_warning (getpeername)
-#include <stub-tag.h>
diff --git socket/getsockname.c socket/getsockname.c
index 03d9765..14df9bc 100644
--- socket/getsockname.c
+++ socket/getsockname.c
@@ -32,4 +32,3 @@ __getsockname (fd, addr, len)
 weak_alias (__getsockname, getsockname)
 
 stub_warning (getsockname)
-#include <stub-tag.h>
diff --git socket/getsockopt.c socket/getsockopt.c
index 661bcf3..f172f20 100644
--- socket/getsockopt.c
+++ socket/getsockopt.c
@@ -34,4 +34,3 @@ getsockopt (fd, level, optname, optval, optlen)
 }
 
 stub_warning (getsockopt)
-#include <stub-tag.h>
diff --git socket/isfdtype.c socket/isfdtype.c
index 188d516..012b0ff 100644
--- socket/isfdtype.c
+++ socket/isfdtype.c
@@ -27,4 +27,3 @@ isfdtype (int fildes, int fdtype)
   return -1;
 }
 stub_warning (isfdtype)
-#include <stub-tag.h>
diff --git socket/listen.c socket/listen.c
index 0c1af82..f657d87 100644
--- socket/listen.c
+++ socket/listen.c
@@ -33,4 +33,3 @@ __listen (fd, n)
 weak_alias (__listen, listen)
 
 stub_warning (listen)
-#include <stub-tag.h>
diff --git socket/recv.c socket/recv.c
index 43fdcfc..6efeb4d 100644
--- socket/recv.c
+++ 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 socket/recvfrom.c socket/recvfrom.c
index 654d2e9..b99774f 100644
--- socket/recvfrom.c
+++ 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 socket/recvmsg.c socket/recvmsg.c
index 7cd6ff3..0afcc0f 100644
--- socket/recvmsg.c
+++ socket/recvmsg.c
@@ -33,4 +33,3 @@ __recvmsg (fd, message, flags)
 weak_alias (__recvmsg, recvmsg)
 
 stub_warning (recvmsg)
-#include <stub-tag.h>
diff --git socket/send.c socket/send.c
index 2b87bae..1f5220d 100644
--- socket/send.c
+++ socket/send.c
@@ -33,4 +33,3 @@ libc_hidden_def (__send)
 weak_alias (__send, send)
 
 stub_warning (send)
-#include <stub-tag.h>
diff --git socket/sendmsg.c socket/sendmsg.c
index 249bb5a..8fce470 100644
--- socket/sendmsg.c
+++ socket/sendmsg.c
@@ -33,4 +33,3 @@ __sendmsg (fd, message, flags)
 weak_alias (__sendmsg, sendmsg)
 
 stub_warning (sendmsg)
-#include <stub-tag.h>
diff --git socket/sendto.c socket/sendto.c
index 040caf8..ae06a54 100644
--- socket/sendto.c
+++ 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 socket/setsockopt.c socket/setsockopt.c
index 21824f6..9e1e7a3 100644
--- socket/setsockopt.c
+++ 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 socket/shutdown.c socket/shutdown.c
index 8ce992c..5c35cc3 100644
--- socket/shutdown.c
+++ socket/shutdown.c
@@ -35,4 +35,3 @@ shutdown (fd, how)
 
 
 stub_warning (shutdown)
-#include <stub-tag.h>
diff --git socket/sockatmark.c socket/sockatmark.c
index dd11b42..7970961 100644
--- socket/sockatmark.c
+++ socket/sockatmark.c
@@ -29,4 +29,3 @@ sockatmark (fd)
 
 
 stub_warning (sockatmark)
-#include <stub-tag.h>
diff --git socket/socket.c socket/socket.c
index 273924a..8cb014e 100644
--- socket/socket.c
+++ socket/socket.c
@@ -34,4 +34,3 @@ __socket (domain, type, protocol)
 
 weak_alias (__socket, socket)
 stub_warning (socket)
-#include <stub-tag.h>
diff --git socket/socketpair.c socket/socketpair.c
index 7933d44..0316748 100644
--- socket/socketpair.c
+++ socket/socketpair.c
@@ -35,4 +35,3 @@ socketpair (domain, type, protocol, fds)
 
 
 stub_warning (socketpair)
-#include <stub-tag.h>
diff --git stdio-common/ctermid.c stdio-common/ctermid.c
index b1bc4c9..e78c3d0 100644
--- stdio-common/ctermid.c
+++ stdio-common/ctermid.c
@@ -32,4 +32,3 @@ ctermid (s)
 
 
 stub_warning (ctermid)
-#include <stub-tag.h>
diff --git stdio-common/cuserid.c stdio-common/cuserid.c
index 758574b..68056dc 100644
--- stdio-common/cuserid.c
+++ stdio-common/cuserid.c
@@ -31,4 +31,3 @@ cuserid (s)
 
 
 stub_warning (cuserid)
-#include <stub-tag.h>
diff --git stdio-common/remove.c stdio-common/remove.c
index 17e3ed6..8563b71 100644
--- stdio-common/remove.c
+++ stdio-common/remove.c
@@ -29,4 +29,3 @@ remove (file)
 libc_hidden_def (remove)
 
 stub_warning (remove)
-#include <stub-tag.h>
diff --git stdio-common/rename.c stdio-common/rename.c
index af84bed..2b3cbcf 100644
--- stdio-common/rename.c
+++ stdio-common/rename.c
@@ -37,4 +37,3 @@ rename (old, new)
 
 
 stub_warning (rename)
-#include <stub-tag.h>
diff --git stdio-common/renameat.c stdio-common/renameat.c
index 821e107..ab2cf42 100644
--- stdio-common/renameat.c
+++ stdio-common/renameat.c
@@ -46,4 +46,3 @@ renameat (oldfd, old, newfd, new)
 
 
 stub_warning (renameat)
-#include <stub-tag.h>
diff --git stdio-common/tempname.c stdio-common/tempname.c
index cdcdaaa..30b9fd4 100644
--- stdio-common/tempname.c
+++ stdio-common/tempname.c
@@ -57,4 +57,3 @@ __gen_tempname (tmpl, suffixlen, flags, kind)
 }
 
 stub_warning (__gen_tempname)
-#include <stub-tag.h>
diff --git stdlib/getcontext.c stdlib/getcontext.c
index aa65e5e..b197438 100644
--- stdlib/getcontext.c
+++ stdlib/getcontext.c
@@ -28,4 +28,3 @@ getcontext (ucp)
 
 
 stub_warning (getcontext)
-#include <stub-tag.h>
diff --git stdlib/makecontext.c stdlib/makecontext.c
index 1f08b18..71fad95 100644
--- stdlib/makecontext.c
+++ 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 stdlib/setcontext.c stdlib/setcontext.c
index 6a7517c..470f238 100644
--- stdlib/setcontext.c
+++ stdlib/setcontext.c
@@ -28,4 +28,3 @@ setcontext (ucp)
 
 
 stub_warning (setcontext)
-#include <stub-tag.h>
diff --git stdlib/swapcontext.c stdlib/swapcontext.c
index 275bc65..ee3acb4 100644
--- stdlib/swapcontext.c
+++ stdlib/swapcontext.c
@@ -29,4 +29,3 @@ swapcontext (oucp, ucp)
 
 
 stub_warning (swapcontext)
-#include <stub-tag.h>
diff --git stdlib/system.c stdlib/system.c
index b2f7d6d..9bc7e82 100644
--- stdlib/system.c
+++ stdlib/system.c
@@ -34,4 +34,3 @@ weak_alias (__libc_system, system)
 
 
 stub_warning (system)
-#include <stub-tag.h>
diff --git streams/fattach.c streams/fattach.c
index 22e36df..9c84127 100644
--- streams/fattach.c
+++ streams/fattach.c
@@ -29,4 +29,3 @@ fattach (fildes, path)
 
 
 stub_warning (fattach)
-#include <stub-tag.h>
diff --git streams/fdetach.c streams/fdetach.c
index 9c872ca..0463736 100644
--- streams/fdetach.c
+++ streams/fdetach.c
@@ -28,4 +28,3 @@ fdetach (path)
 
 
 stub_warning (fdetach)
-#include <stub-tag.h>
diff --git streams/getmsg.c streams/getmsg.c
index 20c32aa..2da0ab6 100644
--- streams/getmsg.c
+++ streams/getmsg.c
@@ -31,4 +31,3 @@ getmsg (fildes, ctlptr, dataptr, flagsp)
 
 
 stub_warning (getmsg)
-#include <stub-tag.h>
diff --git streams/getpmsg.c streams/getpmsg.c
index 7d97f5c..acb25b5 100644
--- streams/getpmsg.c
+++ streams/getpmsg.c
@@ -32,4 +32,3 @@ getpmsg (fildes, ctlptr, dataptr, bandp, flagsp)
 
 
 stub_warning (getpmsg)
-#include <stub-tag.h>
diff --git streams/putmsg.c streams/putmsg.c
index 80f9f0b..2d776bc 100644
--- streams/putmsg.c
+++ streams/putmsg.c
@@ -31,4 +31,3 @@ putmsg (fildes, ctlptr, dataptr, flags)
 
 
 stub_warning (putmsg)
-#include <stub-tag.h>
diff --git streams/putpmsg.c streams/putpmsg.c
index b85e142..c2fa820 100644
--- streams/putpmsg.c
+++ streams/putpmsg.c
@@ -32,4 +32,3 @@ putpmsg (fildes, ctlptr, dataptr, band, flags)
 
 
 stub_warning (putpmsg)
-#include <stub-tag.h>
diff --git sysdeps/unix/Makefile sysdeps/unix/Makefile
index dda3a3e..c5eb87e 100644
--- sysdeps/unix/Makefile
+++ 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 sysdeps/unix/bsd/getpt.c sysdeps/unix/bsd/getpt.c
index 2c566cb..5573bab 100644
--- sysdeps/unix/bsd/getpt.c
+++ 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 sysdeps/unix/sysv/linux/epoll_pwait.c sysdeps/unix/sysv/linux/epoll_pwait.c
index 70756e8..7bea455 100644
--- sysdeps/unix/sysv/linux/epoll_pwait.c
+++ 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 sysdeps/unix/sysv/linux/futimens.c sysdeps/unix/sysv/linux/futimens.c
index f586b80..c4469fc 100644
--- sysdeps/unix/sysv/linux/futimens.c
+++ 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 sysdeps/unix/sysv/linux/lutimes.c sysdeps/unix/sysv/linux/lutimes.c
index c266232..7e05a72 100644
--- sysdeps/unix/sysv/linux/lutimes.c
+++ 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 sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
index f17a494..f4a49c5 100644
--- sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
+++ 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 sysdeps/unix/sysv/linux/readahead.c sysdeps/unix/sysv/linux/readahead.c
index e7d0c11..4399367 100644
--- sysdeps/unix/sysv/linux/readahead.c
+++ 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 sysdeps/unix/sysv/linux/sync_file_range.c sysdeps/unix/sysv/linux/sync_file_range.c
index a778529..551e900 100644
--- sysdeps/unix/sysv/linux/sync_file_range.c
+++ 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 sysdeps/unix/sysv/linux/utimensat.c sysdeps/unix/sysv/linux/utimensat.c
index f52e615..fc1d362 100644
--- sysdeps/unix/sysv/linux/utimensat.c
+++ 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 sysvipc/msgctl.c sysvipc/msgctl.c
index 02c06f7..16a4f95 100644
--- sysvipc/msgctl.c
+++ sysvipc/msgctl.c
@@ -33,4 +33,3 @@ msgctl (msqid, cmd, buf)
 }
 
 stub_warning (msgctl)
-#include <stub-tag.h>
diff --git sysvipc/msgget.c sysvipc/msgget.c
index 2d8a938..859c445 100644
--- sysvipc/msgget.c
+++ sysvipc/msgget.c
@@ -32,4 +32,3 @@ msgget (key, msgflg)
 }
 
 stub_warning (msgget)
-#include <stub-tag.h>
diff --git sysvipc/msgrcv.c sysvipc/msgrcv.c
index a3135fb..d49a6a7 100644
--- sysvipc/msgrcv.c
+++ sysvipc/msgrcv.c
@@ -38,4 +38,3 @@ msgrcv (msqid, msgp, msgsz, msgtyp, msgflg)
 }
 
 stub_warning (msgrcv)
-#include <stub-tag.h>
diff --git sysvipc/msgsnd.c sysvipc/msgsnd.c
index a6f8aed..cf067fa 100644
--- sysvipc/msgsnd.c
+++ sysvipc/msgsnd.c
@@ -37,4 +37,3 @@ msgsnd (msqid, msgp, msgsz, msgflg)
 }
 
 stub_warning (msgsnd)
-#include <stub-tag.h>
diff --git sysvipc/semctl.c sysvipc/semctl.c
index 8e27a41..f5e69f4 100644
--- sysvipc/semctl.c
+++ sysvipc/semctl.c
@@ -30,4 +30,3 @@ semctl (int semid, int semnum, int cmd, ...)
 }
 
 stub_warning (semctl)
-#include <stub-tag.h>
diff --git sysvipc/semget.c sysvipc/semget.c
index 8e3f0b5..dbac3a3 100644
--- sysvipc/semget.c
+++ sysvipc/semget.c
@@ -33,4 +33,3 @@ semget (key, nsems, semflg)
 }
 
 stub_warning (semget)
-#include <stub-tag.h>
diff --git sysvipc/semop.c sysvipc/semop.c
index ea557cf..298c8c0 100644
--- sysvipc/semop.c
+++ sysvipc/semop.c
@@ -32,4 +32,3 @@ semop (semid, sops, nsops)
 }
 
 stub_warning (semop)
-#include <stub-tag.h>
diff --git sysvipc/semtimedop.c sysvipc/semtimedop.c
index 7fe1cce..e7c631a 100644
--- sysvipc/semtimedop.c
+++ sysvipc/semtimedop.c
@@ -33,4 +33,3 @@ semtimedop (semid, sops, nsops, timeout)
 }
 
 stub_warning (semtimedop)
-#include <stub-tag.h>
diff --git sysvipc/shmat.c sysvipc/shmat.c
index 178f194..bcd3176 100644
--- sysvipc/shmat.c
+++ sysvipc/shmat.c
@@ -34,4 +34,3 @@ shmat (shmid, shmaddr, shmflg)
 }
 
 stub_warning (shmat)
-#include <stub-tag.h>
diff --git sysvipc/shmctl.c sysvipc/shmctl.c
index 7c69f53..9ffec7d 100644
--- sysvipc/shmctl.c
+++ sysvipc/shmctl.c
@@ -32,4 +32,3 @@ shmctl (shmid, cmd, buf)
 }
 
 stub_warning (shmctl)
-#include <stub-tag.h>
diff --git sysvipc/shmdt.c sysvipc/shmdt.c
index e1da7f7..8a40046 100644
--- sysvipc/shmdt.c
+++ sysvipc/shmdt.c
@@ -31,4 +31,3 @@ shmdt (shmaddr)
 }
 
 stub_warning (shmdt)
-#include <stub-tag.h>
diff --git sysvipc/shmget.c sysvipc/shmget.c
index 9bf190f..650603b 100644
--- sysvipc/shmget.c
+++ sysvipc/shmget.c
@@ -33,4 +33,3 @@ shmget (key, size, shmflg)
 }
 
 stub_warning (shmget)
-#include <stub-tag.h>
diff --git termios/tcdrain.c termios/tcdrain.c
index ced692d..0cc7b0e 100644
--- termios/tcdrain.c
+++ termios/tcdrain.c
@@ -35,4 +35,3 @@ weak_alias (__libc_tcdrain, tcdrain)
 
 
 stub_warning (tcdrain)
-#include <stub-tag.h>
diff --git termios/tcflow.c termios/tcflow.c
index b94e967..8b064ea 100644
--- termios/tcflow.c
+++ termios/tcflow.c
@@ -49,4 +49,3 @@ tcflow (fd, action)
 
 
 stub_warning (tcflow)
-#include <stub-tag.h>
diff --git termios/tcflush.c termios/tcflush.c
index 1df192a..5888411 100644
--- termios/tcflush.c
+++ termios/tcflush.c
@@ -42,4 +42,3 @@ tcflush (fd, queue_selector)
 
 
 stub_warning(tcflush);
-#include <stub-tag.h>
diff --git termios/tcgetattr.c termios/tcgetattr.c
index d47d7e7..1ec2aa9 100644
--- termios/tcgetattr.c
+++ termios/tcgetattr.c
@@ -42,4 +42,3 @@ __tcgetattr (fd, termios_p)
 stub_warning (tcgetattr)
 
 weak_alias (__tcgetattr, tcgetattr)
-#include <stub-tag.h>
diff --git termios/tcgetpgrp.c termios/tcgetpgrp.c
index 04b989b..b013ec6 100644
--- termios/tcgetpgrp.c
+++ termios/tcgetpgrp.c
@@ -35,4 +35,3 @@ tcgetpgrp (fd)
 }
 libc_hidden_def (tcgetpgrp)
 stub_warning (tcgetpgrp)
-#include <stub-tag.h>
diff --git termios/tcsendbrk.c termios/tcsendbrk.c
index 4d4e678..5e6805d 100644
--- termios/tcsendbrk.c
+++ termios/tcsendbrk.c
@@ -36,4 +36,3 @@ tcsendbreak (fd, duration)
 
 
 stub_warning (tcsendbreak)
-#include <stub-tag.h>
diff --git termios/tcsetattr.c termios/tcsetattr.c
index 5f3a271..b612797 100644
--- termios/tcsetattr.c
+++ termios/tcsetattr.c
@@ -104,4 +104,3 @@ bad_speed (speed_t speed)
 
 
 stub_warning (tcsetattr)
-#include <stub-tag.h>
diff --git termios/tcsetpgrp.c termios/tcsetpgrp.c
index 1b47474..dea5e96 100644
--- termios/tcsetpgrp.c
+++ termios/tcsetpgrp.c
@@ -37,4 +37,3 @@ tcsetpgrp (fd, pgrp_id)
 
 
 stub_warning (tcsetpgrp)
-#include <stub-tag.h>
diff --git time/adjtime.c time/adjtime.c
index f25c6fa..1c005c9 100644
--- time/adjtime.c
+++ time/adjtime.c
@@ -33,4 +33,3 @@ __adjtime (delta, olddelta)
 stub_warning (adjtime)
 
 weak_alias (__adjtime, adjtime)
-#include <stub-tag.h>
diff --git time/clock.c time/clock.c
index e701b2e..2e10fd3 100644
--- time/clock.c
+++ time/clock.c
@@ -28,4 +28,3 @@ clock ()
 }
 
 stub_warning (clock)
-#include <stub-tag.h>
diff --git time/getitimer.c time/getitimer.c
index c5caa81..fc0ebf8 100644
--- time/getitimer.c
+++ time/getitimer.c
@@ -38,4 +38,3 @@ __getitimer (which, value)
 stub_warning (getitimer)
 
 weak_alias (__getitimer, getitimer)
-#include <stub-tag.h>
diff --git time/gettimeofday.c time/gettimeofday.c
index 7eb770c..4528a6a 100644
--- time/gettimeofday.c
+++ time/gettimeofday.c
@@ -34,4 +34,3 @@ weak_alias (__gettimeofday, gettimeofday)
 libc_hidden_weak (gettimeofday)
 
 stub_warning (gettimeofday)
-#include <stub-tag.h>
diff --git time/setitimer.c time/setitimer.c
index 8132ff2..40880f8 100644
--- time/setitimer.c
+++ time/setitimer.c
@@ -40,4 +40,3 @@ __setitimer (which, new, old)
 stub_warning (setitimer)
 
 weak_alias (__setitimer, setitimer)
-#include <stub-tag.h>
diff --git time/settimeofday.c time/settimeofday.c
index 65abbb7..c1ceec0 100644
--- time/settimeofday.c
+++ time/settimeofday.c
@@ -31,4 +31,3 @@ __settimeofday (tv, tz)
 stub_warning (settimeofday)
 
 weak_alias (__settimeofday, settimeofday)
-#include <stub-tag.h>
diff --git time/stime.c time/stime.c
index 22234f5..1ea1c17 100644
--- time/stime.c
+++ time/stime.c
@@ -36,4 +36,3 @@ stime (when)
 }
 
 stub_warning (stime)
-#include <stub-tag.h>
diff --git time/time.c time/time.c
index da645d0..15dbb69 100644
--- time/time.c
+++ time/time.c
@@ -32,4 +32,3 @@ time (timer)
 libc_hidden_def (time)
 
 stub_warning (time)
-#include <stub-tag.h>


GrÃÃe,
 Thomas

Attachment: pgp00000.pgp
Description: PGP signature


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]