about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog81
-rw-r--r--bits/fcntl.h2
-rw-r--r--bits/sigaction.h2
-rw-r--r--bits/waitstatus.h2
-rw-r--r--ctype/ctype.h2
-rw-r--r--dirent/dirent.h8
-rw-r--r--grp/grp.h9
-rw-r--r--inet/netinet/in.h10
-rw-r--r--io/sys/stat.h11
-rw-r--r--libio/bits/stdio-ldbl.h4
-rw-r--r--libio/bits/stdio.h8
-rw-r--r--libio/bits/stdio2.h2
-rw-r--r--libio/stdio.h20
-rw-r--r--math/bits/math-finite.h6
-rw-r--r--math/bits/mathcalls.h18
-rw-r--r--math/math.h8
-rw-r--r--misc/sys/uio.h2
-rw-r--r--posix/bits/unistd.h2
-rw-r--r--posix/glob.h2
-rw-r--r--posix/sys/types.h4
-rw-r--r--posix/sys/wait.h10
-rw-r--r--posix/unistd.h40
-rw-r--r--pwd/pwd.h4
-rw-r--r--resolv/netdb.h4
-rw-r--r--signal/signal.h16
-rw-r--r--stdlib/stdlib.h29
-rw-r--r--string/bits/string2.h2
-rw-r--r--string/string.h11
-rw-r--r--sysdeps/m68k/m680x0/fpu/bits/mathinline.h10
-rw-r--r--sysdeps/mach/hurd/bits/fcntl.h2
-rw-r--r--sysdeps/mach/hurd/bits/stat.h4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/sigaction.h2
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/stat.h2
-rw-r--r--sysdeps/unix/sysv/linux/bits/fcntl-linux.h4
-rw-r--r--sysdeps/unix/sysv/linux/bits/in.h4
-rw-r--r--sysdeps/unix/sysv/linux/bits/sigaction.h2
-rw-r--r--sysdeps/unix/sysv/linux/bits/socket.h4
-rw-r--r--sysdeps/unix/sysv/linux/bits/stat.h4
-rw-r--r--sysdeps/unix/sysv/linux/ia64/bits/sigaction.h2
-rw-r--r--sysdeps/unix/sysv/linux/m68k/bits/stat.h4
-rw-r--r--sysdeps/unix/sysv/linux/mips/bits/sigaction.h2
-rw-r--r--sysdeps/unix/sysv/linux/mips/bits/stat.h8
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/bits/stat.h8
-rw-r--r--sysdeps/unix/sysv/linux/s390/bits/sigaction.h2
-rw-r--r--sysdeps/unix/sysv/linux/s390/bits/stat.h8
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/sigaction.h2
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/stat.h4
-rw-r--r--sysdeps/unix/sysv/linux/x86/bits/stat.h4
-rw-r--r--sysdeps/x86/bits/string.h2
-rw-r--r--sysdeps/x86/fpu/bits/mathinline.h12
-rw-r--r--time/sys/time.h2
-rw-r--r--time/time.h16
52 files changed, 255 insertions, 178 deletions
diff --git a/ChangeLog b/ChangeLog
index 913009b8be..41491f6b9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,84 @@
+2014-02-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* bits/fcntl.h [__USE_MISC]: Remove redundant conditionals.
+	* bits/sigaction.h [__USE_MISC]: Likewise.
+	* bits/waitstatus.h: Update #endif comments.
+	* ctype/ctype.h: Likewise.
+	* dirent/dirent.h: Likewise.
+	[__USE_MISC]: Remove redundant conditionals.
+	* grp/grp.h: Update #endif comments.
+	[__USE_GNU]: Remove redundant conditionals.
+	[__USE_MISC]: Likewise.
+	* inet/netinet/in.h [__USE_GNU]: Likewise.
+	* io/sys/stat.h [__USE_MISC]: Likewise.
+	* libio/bits/stdio-ldbl.h [__USE_MISC]: Likewise.
+	* libio/bits/stdio.h: Update #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* libio/bits/stdio2.h [__USE_MISC]: Likewise.
+	* libio/stdio.h: Update #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* math/bits/math-finite.h [__USE_MISC]: Likewise.
+	* math/bits/mathcalls.h [__USE_MISC]: Likewise.
+	* math/math.h: Update #else and #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* misc/sys/uio.h: Update #endif comments.
+	* posix/bits/unistd.h [__USE_MISC]: Remove redundant conditionals.
+	* posix/glob.h [__USE_MISC]: Likewise.
+	* posix/sys/types.h: Update #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* posix/sys/wait.h: Update #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* posix/unistd.h: Update #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* pwd/pwd.h [__USE_GNU]: Likewise.
+	[__USE_MISC]: Likewise.
+	* resolv/netdb.h [__USE_GNU]: Likewise.
+	* signal/signal.h: Update #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* stdlib/stdlib.h: Update #else and #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	[__USE_GNU]: Likewise.
+	* string/bits/string2.h [__USE_MISC]: Likewise.
+	* string/string.h: Update #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* sysdeps/m68k/m680x0/fpu/bits/mathinline.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/mach/hurd/bits/fcntl.h [__USE_MISC]: Likewise.
+	* sysdeps/mach/hurd/bits/stat.h [__USE_MISC]: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/bits/sigaction.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/alpha/bits/stat.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/bits/fcntl-linux.h: Update #endif
+	comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* sysdeps/unix/sysv/linux/bits/in.h [__USE_GNU]: Likewise.
+	* sysdeps/unix/sysv/linux/bits/sigaction.h [__USE_MISC]: Likewise.
+	* sysdeps/unix/sysv/linux/bits/socket.h [__USE_GNU]: Likewise.
+	* sysdeps/unix/sysv/linux/bits/stat.h [__USE_MISC]: Likewise.
+	* sysdeps/unix/sysv/linux/ia64/bits/sigaction.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/m68k/bits/stat.h [__USE_MISC]: Likewise.
+	* sysdeps/unix/sysv/linux/mips/bits/sigaction.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/mips/bits/stat.h [__USE_MISC]: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/stat.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/sigaction.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/stat.h [__USE_MISC]: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/stat.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/x86/bits/stat.h [__USE_MISC]: Likewise.
+	* sysdeps/x86/bits/string.h: Update #endif comments.
+	* sysdeps/x86/fpu/bits/mathinline.h [__USE_MISC]: Remove redundant
+	conditionals.
+	* time/sys/time.h: Update #endif comments.
+	* time/time.h: Likewise.
+	[__USE_MISC]: Remove redundant conditionals.
+
 2014-02-21  Yury Gribov  <y.gribov@samsung.com>
 
 	[BZ #16600]
diff --git a/bits/fcntl.h b/bits/fcntl.h
index c5eb3758bc..088d293fda 100644
--- a/bits/fcntl.h
+++ b/bits/fcntl.h
@@ -88,7 +88,7 @@
 #define	F_SETFD		2	/* Set file descriptor flags.  */
 #define	F_GETFL		3	/* Get file status flags.  */
 #define	F_SETFL		4	/* Set file status flags.  */
-#if defined __USE_MISC || defined __USE_UNIX98 || defined __USE_XOPEN2K8
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 #define	F_GETOWN	5	/* Get owner (receiver of SIGIO).  */
 #define	F_SETOWN	6	/* Set owner (receiver of SIGIO).  */
 #endif
diff --git a/bits/sigaction.h b/bits/sigaction.h
index 951a5c41d3..6a0a8b29b4 100644
--- a/bits/sigaction.h
+++ b/bits/sigaction.h
@@ -55,7 +55,7 @@ struct sigaction
 #if defined __USE_UNIX98 || defined __USE_MISC
 # define SA_ONSTACK	0x0001	/* Take signal on signal stack.  */
 #endif
-#if defined __USE_UNIX98 || defined __USE_MISC || defined __USE_XOPEN2K8
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 # define SA_RESTART	0x0002	/* Restart syscall on signal return.  */
 # define SA_NODEFER	0x0010	/* Don't automatically block the signal when
 				    its handler is being executed.  */
diff --git a/bits/waitstatus.h b/bits/waitstatus.h
index 76f9ee48e9..5087574827 100644
--- a/bits/waitstatus.h
+++ b/bits/waitstatus.h
@@ -102,4 +102,4 @@ union wait
 # define w_stopsig	__wait_stopped.__w_stopsig
 # define w_stopval	__wait_stopped.__w_stopval
 
-#endif	/* Use BSD.  */
+#endif	/* Use misc.  */
diff --git a/ctype/ctype.h b/ctype/ctype.h
index a493b9281b..0a9ffba555 100644
--- a/ctype/ctype.h
+++ b/ctype/ctype.h
@@ -157,7 +157,7 @@ extern int toascii (int __c) __THROW;
    check the argument for being in the range of a `char'.  */
 __exctype (_toupper);
 __exctype (_tolower);
-#endif /* Use SVID or use misc.  */
+#endif /* Use X/Open or use misc.  */
 
 /* This code is needed for the optimized mapping functions.  */
 #define __tobody(c, f, a, args) \
diff --git a/dirent/dirent.h b/dirent/dirent.h
index bf37a7f58c..f6db6c683b 100644
--- a/dirent/dirent.h
+++ b/dirent/dirent.h
@@ -173,7 +173,7 @@ extern struct dirent *__REDIRECT (readdir, (DIR *__dirp), readdir64)
 extern struct dirent64 *readdir64 (DIR *__dirp) __nonnull ((1));
 #endif
 
-#if defined __USE_POSIX || defined __USE_MISC
+#ifdef __USE_POSIX
 /* Reentrant version of `readdir'.  Return in RESULT a pointer to the
    next entry.
 
@@ -217,7 +217,7 @@ extern void seekdir (DIR *__dirp, long int __pos) __THROW __nonnull ((1));
 extern long int telldir (DIR *__dirp) __THROW __nonnull ((1));
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN2K8
+#ifdef __USE_XOPEN2K8
 
 /* Return the file descriptor used by DIRP.  */
 extern int dirfd (DIR *__dirp) __THROW __nonnull ((1));
@@ -340,7 +340,7 @@ extern int alphasort64 (const struct dirent64 **__e1,
 			const struct dirent64 **__e2)
      __THROW __attribute_pure__ __nonnull ((1, 2));
 # endif
-#endif /* Use BSD or misc or XPG7.  */
+#endif /* Use XPG7.  */
 
 
 #ifdef __USE_MISC
@@ -371,7 +371,7 @@ extern __ssize_t getdirentries64 (int __fd, char *__restrict __buf,
 				  __off64_t *__restrict __basep)
      __THROW __nonnull ((2, 4));
 # endif
-#endif /* Use BSD or misc.  */
+#endif /* Use misc.  */
 
 #ifdef __USE_GNU
 /* Function to compare two `struct dirent's by name & version.  */
diff --git a/grp/grp.h b/grp/grp.h
index 5bdc221e4f..10b2a4119a 100644
--- a/grp/grp.h
+++ b/grp/grp.h
@@ -48,7 +48,7 @@ struct group
   };
 
 
-#if defined __USE_MISC || defined __USE_GNU
+#ifdef __USE_MISC
 # define __need_FILE
 # include <stdio.h>
 #endif
@@ -62,8 +62,7 @@ struct group
 extern void setgrent (void);
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED \
-    || defined __USE_XOPEN2K8
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* Close the group-file stream.
 
    This function is a possible cancellation point and therefore not
@@ -110,7 +109,7 @@ extern struct group *getgrgid (__gid_t __gid);
    marked with __THROW.  */
 extern struct group *getgrnam (const char *__name);
 
-#if defined __USE_POSIX || defined __USE_MISC
+#ifdef __USE_POSIX
 
 # ifdef __USE_MISC
 /* Reasonable value for the buffer sized used in the reentrant
@@ -200,7 +199,7 @@ extern int getgrouplist (const char *__user, __gid_t __group,
    therefore not marked with __THROW.  */
 extern int initgroups (const char *__user, __gid_t __group);
 
-#endif /* Use BSD.  */
+#endif /* Use misc.  */
 
 __END_DECLS
 
diff --git a/inet/netinet/in.h b/inet/netinet/in.h
index d8d8e53631..ca491bef77 100644
--- a/inet/netinet/in.h
+++ b/inet/netinet/in.h
@@ -211,13 +211,13 @@ struct in6_addr
     union
       {
 	uint8_t	__u6_addr8[16];
-#if defined __USE_MISC || defined __USE_GNU
+#ifdef __USE_MISC
 	uint16_t __u6_addr16[8];
 	uint32_t __u6_addr32[4];
 #endif
       } __in6_u;
 #define s6_addr			__in6_u.__u6_addr8
-#if defined __USE_MISC || defined __USE_GNU
+#ifdef __USE_MISC
 # define s6_addr16		__in6_u.__u6_addr16
 # define s6_addr32		__in6_u.__u6_addr32
 #endif
@@ -259,7 +259,7 @@ struct sockaddr_in6
   };
 #endif /* !__USE_KERNEL_IPV6_DEFS */
 
-#if defined __USE_MISC || defined __USE_GNU
+#ifdef __USE_MISC
 /* IPv4 multicast request.  */
 struct ip_mreq
   {
@@ -295,7 +295,7 @@ struct ipv6_mreq
   };
 #endif /* !__USE_KERNEL_IPV6_DEFS */
 
-#if defined __USE_MISC || defined __USE_GNU
+#ifdef __USE_MISC
 /* Multicast group request.  */
 struct group_req
   {
@@ -496,7 +496,7 @@ extern uint16_t htons (uint16_t __hostshort)
 
 #define IN6_IS_ADDR_MULTICAST(a) (((const uint8_t *) (a))[0] == 0xff)
 
-#if defined __USE_MISC || defined __USE_GNU
+#ifdef __USE_MISC
 /* Bind socket to a privileged IP port.  */
 extern int bindresvport (int __sockfd, struct sockaddr_in *__sock_in) __THROW;
 
diff --git a/io/sys/stat.h b/io/sys/stat.h
index 9b02703b65..65dbc3d1cf 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -26,12 +26,11 @@
 
 #include <bits/types.h>		/* For __mode_t and __dev_t.  */
 
-#if defined __USE_XOPEN || defined __USE_XOPEN2K || defined __USE_MISC \
-	 || defined __USE_ATFILE
+#if defined __USE_XOPEN || defined __USE_XOPEN2K || defined __USE_ATFILE
 # if defined __USE_XOPEN || defined __USE_XOPEN2K
 #  define __need_time_t
 # endif
-# if defined __USE_MISC || defined __USE_ATFILE
+# ifdef __USE_ATFILE
 #  define __need_timespec
 # endif
 # include <time.h>		/* For time_t resp. timespec.  */
@@ -141,7 +140,7 @@ __BEGIN_DECLS
 # define S_ISLNK(mode)  0
 #endif
 
-#if (defined __USE_MISC || defined __USE_UNIX98 || defined __USE_XOPEN2K) \
+#if (defined __USE_UNIX98 || defined __USE_XOPEN2K) \
     && defined __S_IFSOCK
 # define S_ISSOCK(mode) __S_ISTYPE((mode), __S_IFSOCK)
 #elif defined __USE_XOPEN2K
@@ -256,7 +255,7 @@ extern int fstatat64 (int __fd, const char *__restrict __file,
 # endif
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
 # ifndef __USE_FILE_OFFSET64
 /* Get file attributes about FILE and put them in BUF.
    If FILE is a symbolic link, do not follow it.  */
@@ -293,7 +292,7 @@ extern int lchmod (const char *__file, __mode_t __mode)
 #endif
 
 /* Set file access permissions of the file FD is open on to MODE.  */
-#if defined __USE_MISC || defined __USE_POSIX
+#ifdef __USE_POSIX
 extern int fchmod (int __fd, __mode_t __mode) __THROW;
 #endif
 
diff --git a/libio/bits/stdio-ldbl.h b/libio/bits/stdio-ldbl.h
index dc8b33c4a9..4cc6c30a30 100644
--- a/libio/bits/stdio-ldbl.h
+++ b/libio/bits/stdio-ldbl.h
@@ -40,7 +40,7 @@ __LDBL_REDIR_DECL (sscanf)
 #endif
 __END_NAMESPACE_STD
 
-#if defined __USE_MISC || defined __USE_ISOC99 || defined __USE_UNIX98
+#if defined __USE_ISOC99 || defined __USE_UNIX98
 __BEGIN_NAMESPACE_C99
 __LDBL_REDIR_DECL (snprintf)
 __LDBL_REDIR_DECL (vsnprintf)
@@ -78,7 +78,7 @@ __LDBL_REDIR_DECL (obstack_vprintf)
 #if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
 __LDBL_REDIR_DECL (__sprintf_chk)
 __LDBL_REDIR_DECL (__vsprintf_chk)
-# if defined __USE_MISC || defined __USE_ISOC99 || defined __USE_UNIX98
+# if defined __USE_ISOC99 || defined __USE_UNIX98
 __LDBL_REDIR_DECL (__snprintf_chk)
 __LDBL_REDIR_DECL (__vsnprintf_chk)
 # endif
diff --git a/libio/bits/stdio.h b/libio/bits/stdio.h
index 4d872e26d1..615ada56dd 100644
--- a/libio/bits/stdio.h
+++ b/libio/bits/stdio.h
@@ -57,7 +57,7 @@ fgetc_unlocked (FILE *__fp)
 # endif /* misc */
 
 
-# if defined __USE_POSIX || defined __USE_MISC
+# ifdef __USE_POSIX
 /* This is defined in POSIX.1:1996.  */
 __STDIO_INLINE int
 getc_unlocked (FILE *__fp)
@@ -71,7 +71,7 @@ getchar_unlocked (void)
 {
   return _IO_getc_unlocked (stdin);
 }
-# endif	/* POSIX || misc */
+# endif	/* POSIX */
 
 
 /* Write a character to stdout.  */
@@ -92,7 +92,7 @@ fputc_unlocked (int __c, FILE *__stream)
 # endif /* misc */
 
 
-# if defined __USE_POSIX || defined __USE_MISC
+# ifdef __USE_POSIX
 /* This is defined in POSIX.1:1996.  */
 __STDIO_INLINE int
 putc_unlocked (int __c, FILE *__stream)
@@ -106,7 +106,7 @@ putchar_unlocked (int __c)
 {
   return _IO_putc_unlocked (__c, stdout);
 }
-# endif	/* POSIX || misc */
+# endif	/* POSIX */
 
 
 # ifdef	__USE_GNU
diff --git a/libio/bits/stdio2.h b/libio/bits/stdio2.h
index 305620688a..7cb6e51b85 100644
--- a/libio/bits/stdio2.h
+++ b/libio/bits/stdio2.h
@@ -47,7 +47,7 @@ __NTH (vsprintf (char *__restrict __s, const char *__restrict __fmt,
 				   __bos (__s), __fmt, __ap);
 }
 
-#if defined __USE_MISC || defined __USE_ISOC99 || defined __USE_UNIX98
+#if defined __USE_ISOC99 || defined __USE_UNIX98
 
 extern int __snprintf_chk (char *__restrict __s, size_t __n, int __flag,
 			   size_t __slen, const char *__restrict __format,
diff --git a/libio/stdio.h b/libio/stdio.h
index 90a253f209..d8c0bdbab7 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -47,8 +47,8 @@ __BEGIN_NAMESPACE_STD
 /* The opaque type of streams.  This is the definition used elsewhere.  */
 typedef struct _IO_FILE FILE;
 __END_NAMESPACE_STD
-#if defined __USE_LARGEFILE64 || defined __USE_MISC || defined __USE_POSIX \
-    || defined __USE_MISC || defined __USE_ISOC99 || defined __USE_XOPEN \
+#if defined __USE_LARGEFILE64 || defined __USE_POSIX \
+    || defined __USE_ISOC99 || defined __USE_XOPEN \
     || defined __USE_POSIX2
 __USING_NAMESPACE_STD(FILE)
 #endif
@@ -380,7 +380,7 @@ extern int vsprintf (char *__restrict __s, const char *__restrict __format,
 		     _G_va_list __arg) __THROWNL;
 __END_NAMESPACE_STD
 
-#if defined __USE_MISC || defined __USE_ISOC99 || defined __USE_UNIX98
+#if defined __USE_ISOC99 || defined __USE_UNIX98
 __BEGIN_NAMESPACE_C99
 /* Maximum chars of output to write in MAXLEN.  */
 extern int snprintf (char *__restrict __s, size_t __maxlen,
@@ -542,14 +542,14 @@ __END_NAMESPACE_STD
    optimization for it.  */
 #define getc(_fp) _IO_getc (_fp)
 
-#if defined __USE_POSIX || defined __USE_MISC
+#ifdef __USE_POSIX
 /* These are defined in POSIX.1:1996.
 
    These functions are possible cancellation points and therefore not
    marked with __THROW.  */
 extern int getc_unlocked (FILE *__stream);
 extern int getchar_unlocked (void);
-#endif /* Use POSIX or MISC.  */
+#endif /* Use POSIX.  */
 
 #ifdef __USE_MISC
 /* Faster version when locking is not necessary.
@@ -594,14 +594,14 @@ __END_NAMESPACE_STD
 extern int fputc_unlocked (int __c, FILE *__stream);
 #endif /* Use MISC.  */
 
-#if defined __USE_POSIX || defined __USE_MISC
+#ifdef __USE_POSIX
 /* These are defined in POSIX.1:1996.
 
    These functions are possible cancellation points and therefore not
    marked with __THROW.  */
 extern int putc_unlocked (int __c, FILE *__stream);
 extern int putchar_unlocked (int __c);
-#endif /* Use POSIX or MISC.  */
+#endif /* Use POSIX.  */
 
 
 #if defined __USE_MISC \
@@ -864,7 +864,7 @@ extern int fileno_unlocked (FILE *__stream) __THROW __wur;
 #endif
 
 
-#if defined  __USE_POSIX2 || defined __USE_MISC
+#ifdef __USE_POSIX2
 /* Create a new stream connected to a pipe running the given command.
 
    This function is a possible cancellation point and therefore not
@@ -905,7 +905,7 @@ extern int obstack_vprintf (struct obstack *__restrict __obstack,
 #endif /* Use GNU.  */
 
 
-#if defined __USE_POSIX || defined __USE_MISC
+#ifdef __USE_POSIX
 /* These are defined in POSIX.1:1996.  */
 
 /* Acquire ownership of STREAM.  */
@@ -917,7 +917,7 @@ extern int ftrylockfile (FILE *__stream) __THROW __wur;
 
 /* Relinquish the ownership granted for STREAM.  */
 extern void funlockfile (FILE *__stream) __THROW;
-#endif /* POSIX || misc */
+#endif /* POSIX */
 
 #if defined __USE_XOPEN && !defined __USE_XOPEN2K && !defined __USE_GNU
 /* The X/Open standard requires some functions and variables to be
diff --git a/math/bits/math-finite.h b/math/bits/math-finite.h
index e9a2b12d45..aa755de2e6 100644
--- a/math/bits/math-finite.h
+++ b/math/bits/math-finite.h
@@ -31,7 +31,7 @@ extern long double __REDIRECT_NTH (acosl, (long double), __acosl_finite);
 # endif
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
+#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
 /* acosh.  */
 extern double __REDIRECT_NTH (acosh, (double), __acosh_finite);
 extern float __REDIRECT_NTH (acoshf, (float), __acoshf_finite);
@@ -68,7 +68,7 @@ extern long double __REDIRECT_NTH (atan2l, (long double, long double),
 # endif
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
+#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
 /* atanh.  */
 extern double __REDIRECT_NTH (atanh, (double), __atanh_finite);
 extern float __REDIRECT_NTH (atanhf, (float), __atanhf_finite);
@@ -251,7 +251,7 @@ extern long double __REDIRECT_NTH (lgammal_r, (long double, int *),
 # endif
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_ISOC99
+#if defined __USE_XOPEN || defined __USE_ISOC99
 /* lgamma.  */
 __extern_always_inline double __NTH (lgamma (double __d))
 {
diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h
index 4cb39e85f9..8a94a7e147 100644
--- a/math/bits/mathcalls.h
+++ b/math/bits/mathcalls.h
@@ -82,7 +82,7 @@ __MATHDECL (void,sincos,,
 	    (_Mdouble_ __x, _Mdouble_ *__sinx, _Mdouble_ *__cosx));
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
+#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
 __BEGIN_NAMESPACE_C99
 /* Hyperbolic arc cosine of X.  */
 __MATHCALL (acosh,, (_Mdouble_ __x));
@@ -122,7 +122,7 @@ __MATHCALL (exp10,, (_Mdouble_ __x));
 __MATHCALL (pow10,, (_Mdouble_ __x));
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
+#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
 __BEGIN_NAMESPACE_C99
 /* Return exp(X) - 1.  */
 __MATHCALL (expm1,, (_Mdouble_ __x));
@@ -156,14 +156,14 @@ __MATHCALL (pow,, (_Mdouble_ __x, _Mdouble_ __y));
 __MATHCALL (sqrt,, (_Mdouble_ __x));
 _Mdouble_END_NAMESPACE
 
-#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_ISOC99
+#if defined __USE_XOPEN || defined __USE_ISOC99
 __BEGIN_NAMESPACE_C99
 /* Return `sqrt(X*X + Y*Y)'.  */
 __MATHCALL (hypot,, (_Mdouble_ __x, _Mdouble_ __y));
 __END_NAMESPACE_C99
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
+#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
 __BEGIN_NAMESPACE_C99
 /* Return the cube root of X.  */
 __MATHCALL (cbrt,, (_Mdouble_ __x));
@@ -211,7 +211,7 @@ __MATHCALL (drem,, (_Mdouble_ __x, _Mdouble_ __y));
 __MATHCALL (significand,, (_Mdouble_ __x));
 #endif /* Use misc.  */
 
-#if defined __USE_MISC || defined __USE_ISOC99
+#ifdef __USE_ISOC99
 __BEGIN_NAMESPACE_C99
 /* Return X with its signed changed to Y's.  */
 __MATHCALLX (copysign,, (_Mdouble_ __x, _Mdouble_ __y), (__const__));
@@ -243,7 +243,7 @@ __MATHCALL (yn,, (int, _Mdouble_));
 #endif
 
 
-#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_ISOC99
+#if defined __USE_XOPEN || defined __USE_ISOC99
 __BEGIN_NAMESPACE_C99
 /* Error and gamma functions.  */
 __MATHCALL (erf,, (_Mdouble_));
@@ -272,7 +272,7 @@ __MATHCALL (lgamma,_r, (_Mdouble_, int *__signgamp));
 #endif
 
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
+#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
 __BEGIN_NAMESPACE_C99
 /* Return the integer nearest X in the direction of the
    prevailing rounding mode.  */
@@ -287,7 +287,7 @@ __MATHCALLX (nexttoward,, (_Mdouble_ __x, long double __y), (__const__));
 /* Return the remainder of integer divison X / Y with infinite precision.  */
 __MATHCALL (remainder,, (_Mdouble_ __x, _Mdouble_ __y));
 
-# if defined __USE_MISC || defined __USE_ISOC99
+# ifdef __USE_ISOC99
 /* Return X times (2 to the Nth power).  */
 __MATHCALL (scalbn,, (_Mdouble_ __x, int __n));
 # endif
@@ -356,7 +356,7 @@ __MATHDECL_1 (int, __signbit,, (_Mdouble_ __value))
 __MATHCALL (fma,, (_Mdouble_ __x, _Mdouble_ __y, _Mdouble_ __z));
 #endif /* Use ISO C99.  */
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
+#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
 __END_NAMESPACE_C99
 #endif
 
diff --git a/math/math.h b/math/math.h
index ee574d7323..72ec2ca241 100644
--- a/math/math.h
+++ b/math/math.h
@@ -72,7 +72,7 @@ __BEGIN_DECLS
 #undef _Mdouble_END_NAMESPACE
 #undef	__MATH_PRECNAME
 
-#if defined __USE_MISC || defined __USE_ISOC99
+#ifdef __USE_ISOC99
 
 
 /* Include the file of declarations again, this time using `float'
@@ -137,7 +137,7 @@ extern long double __REDIRECT_NTH (nexttowardl,
 
 # endif /* !(__NO_LONG_DOUBLE_MATH && _LIBC) || __LDBL_COMPAT */
 
-#endif	/* Use misc or ISO C99.  */
+#endif	/* Use ISO C99.  */
 #undef	__MATHDECL_1
 #undef	__MATHDECL
 #undef	__MATHCALL
@@ -352,14 +352,14 @@ extern int matherr (struct exception *__exc);
 /* SVID mode specifies returning this large value instead of infinity.  */
 # define HUGE		3.40282347e+38F
 
-#else	/* !SVID */
+#else	/* !Misc.  */
 
 # ifdef __USE_XOPEN
 /* X/Open wants another strange constant.  */
 #  define MAXFLOAT	3.40282347e+38F
 # endif
 
-#endif	/* SVID */
+#endif	/* Misc.  */
 
 
 /* Some useful constants.  */
diff --git a/misc/sys/uio.h b/misc/sys/uio.h
index cabeaf5ce4..84cab00148 100644
--- a/misc/sys/uio.h
+++ b/misc/sys/uio.h
@@ -115,7 +115,7 @@ extern ssize_t preadv64 (int __fd, const struct iovec *__iovec, int __count,
 extern ssize_t pwritev64 (int __fd, const struct iovec *__iovec, int __count,
 			  __off64_t __offset) __wur;
 # endif
-#endif	/* Use BSD */
+#endif	/* Use misc.  */
 
 __END_DECLS
 
diff --git a/posix/bits/unistd.h b/posix/bits/unistd.h
index d377d28f8b..41cf728079 100644
--- a/posix/bits/unistd.h
+++ b/posix/bits/unistd.h
@@ -119,7 +119,7 @@ pread64 (int __fd, void *__buf, size_t __nbytes, __off64_t __offset)
 # endif
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
 extern ssize_t __readlink_chk (const char *__restrict __path,
 			       char *__restrict __buf, size_t __len,
 			       size_t __buflen)
diff --git a/posix/glob.h b/posix/glob.h
index c0036433e5..5e46bc34c0 100644
--- a/posix/glob.h
+++ b/posix/glob.h
@@ -45,7 +45,7 @@ typedef __SIZE_TYPE__ size_t;
 #define	GLOB_NOESCAPE	(1 << 6)/* Backslashes don't quote metacharacters.  */
 #define	GLOB_PERIOD	(1 << 7)/* Leading `.' can be matched by metachars.  */
 
-#if !defined __USE_POSIX2 || defined __USE_MISC || defined __USE_GNU
+#if !defined __USE_POSIX2 || defined __USE_MISC
 # define GLOB_MAGCHAR	 (1 << 8)/* Set in gl_flags if any metachars seen.  */
 # define GLOB_ALTDIRFUNC (1 << 9)/* Use gl_opendir et al functions.  */
 # define GLOB_BRACE	 (1 << 10)/* Expand "{a,b}" to "a" "b".  */
diff --git a/posix/sys/types.h b/posix/sys/types.h
index 3681813579..04ebe344be 100644
--- a/posix/sys/types.h
+++ b/posix/sys/types.h
@@ -99,7 +99,7 @@ typedef __pid_t pid_t;
 # define __pid_t_defined
 #endif
 
-#if (defined __USE_MISC || defined __USE_XOPEN || defined __USE_XOPEN2K8) \
+#if (defined __USE_XOPEN || defined __USE_XOPEN2K8) \
     && !defined __id_t_defined
 typedef __id_t id_t;
 # define __id_t_defined
@@ -220,7 +220,7 @@ typedef int register_t __attribute__ ((__mode__ (__word__)));
 
 /* BSD defines these symbols, so we follow.  */
 # include <sys/sysmacros.h>
-#endif /* Use BSD.  */
+#endif /* Use misc.  */
 
 
 #if (defined __USE_UNIX98 || defined __USE_XOPEN2K8) \
diff --git a/posix/sys/wait.h b/posix/sys/wait.h
index e243db3374..bff478ad69 100644
--- a/posix/sys/wait.h
+++ b/posix/sys/wait.h
@@ -65,13 +65,13 @@ typedef union
 #   define __WAIT_STATUS_DEFN	int *
 #  endif
 
-# else /* Don't use BSD.  */
+# else /* Don't use misc.  */
 
 #  define __WAIT_INT(status)	(status)
 #  define __WAIT_STATUS		int *
 #  define __WAIT_STATUS_DEFN	int *
 
-# endif /* Use BSD.  */
+# endif /* Use misc.  */
 
 /* This will define all the `__W*' macros.  */
 # include <bits/waitstatus.h>
@@ -95,7 +95,7 @@ typedef union
 #endif
 
 /* The following values are used by the `waitid' function.  */
-#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_XOPEN2K8
+#if defined __USE_XOPEN || defined __USE_XOPEN2K8
 typedef enum
 {
   P_ALL,		/* Wait for any child.  */
@@ -135,7 +135,7 @@ extern __pid_t wait (__WAIT_STATUS __stat_loc);
    __THROW.  */
 extern __pid_t waitpid (__pid_t __pid, int *__stat_loc, int __options);
 
-#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_XOPEN2K8
+#if defined __USE_XOPEN || defined __USE_XOPEN2K8
 # ifndef __id_t_defined
 #  include <bits/types.h>
 typedef __id_t id_t;
@@ -178,7 +178,7 @@ extern __pid_t wait3 (__WAIT_STATUS __stat_loc, int __options,
 /* PID is like waitpid.  Other args are like wait3.  */
 extern __pid_t wait4 (__pid_t __pid, __WAIT_STATUS __stat_loc, int __options,
 		      struct rusage *__usage) __THROWNL;
-#endif /* Use BSD.  */
+#endif /* Use misc.  */
 
 
 __END_DECLS
diff --git a/posix/unistd.h b/posix/unistd.h
index 52e9178829..ac81d92c1e 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -262,7 +262,7 @@ typedef __pid_t pid_t;
 # endif
 #endif	/* X/Open */
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
 # ifndef __intptr_t_defined
 typedef __intptr_t intptr_t;
 #  define __intptr_t_defined
@@ -473,7 +473,7 @@ extern int pause (void);
 extern int chown (const char *__file, __uid_t __owner, __gid_t __group)
      __THROW __nonnull ((1)) __wur;
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* Change the owner and group of the file that FD is open on.  */
 extern int fchown (int __fd, __uid_t __owner, __gid_t __group) __THROW __wur;
 
@@ -483,7 +483,7 @@ extern int fchown (int __fd, __uid_t __owner, __gid_t __group) __THROW __wur;
 extern int lchown (const char *__file, __uid_t __owner, __gid_t __group)
      __THROW __nonnull ((1)) __wur;
 
-#endif /* Use BSD || X/Open Unix.  */
+#endif /* Use X/Open Unix.  */
 
 #ifdef __USE_ATFILE
 /* Change the owner and group of FILE relative to the directory FD is open
@@ -496,7 +496,7 @@ extern int fchownat (int __fd, const char *__file, __uid_t __owner,
 /* Change the process's working directory to PATH.  */
 extern int chdir (const char *__path) __THROW __nonnull ((1)) __wur;
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* Change the process's working directory to the one FD is open on.  */
 extern int fchdir (int __fd) __THROW __wur;
 #endif
@@ -659,7 +659,7 @@ extern int setpgid (__pid_t __pid, __pid_t __pgid) __THROW;
    This is exactly the same as `setpgid (0, 0)'.  */
 extern int setpgrp (void) __THROW;
 
-#endif	/* Use SVID or BSD.  */
+#endif	/* Use misc or X/Open.  */
 
 /* Create a new session with the calling process as its leader.
    The process group IDs of the session and the calling process
@@ -705,10 +705,10 @@ extern int setuid (__uid_t __uid) __THROW __wur;
 extern int setreuid (__uid_t __ruid, __uid_t __euid) __THROW __wur;
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN2K
+#ifdef __USE_XOPEN2K
 /* Set the effective user ID of the calling process to UID.  */
 extern int seteuid (__uid_t __uid) __THROW __wur;
-#endif /* Use BSD.  */
+#endif /* Use POSIX.1-2001.  */
 
 /* Set the group ID of the calling process to GID.
    If the calling process is the super-user, set the real
@@ -722,10 +722,10 @@ extern int setgid (__gid_t __gid) __THROW __wur;
 extern int setregid (__gid_t __rgid, __gid_t __egid) __THROW __wur;
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN2K
+#ifdef __USE_XOPEN2K
 /* Set the effective group ID of the calling process to GID.  */
 extern int setegid (__gid_t __gid) __THROW __wur;
-#endif /* Use BSD.  */
+#endif /* Use POSIX.1-2001.  */
 
 #ifdef __USE_GNU
 /* Fetch the real user ID, effective user ID, and saved-set user ID,
@@ -762,7 +762,7 @@ extern __pid_t fork (void) __THROWNL;
    replaced by a call to `execve'.  Return -1 for errors, 0 to the new process,
    and the process ID of the new process to the old process.  */
 extern __pid_t vfork (void) __THROW;
-#endif /* Use BSD or XPG < 7. */
+#endif /* Use misc or XPG < 7. */
 
 
 /* Return the pathname of the terminal FD is open on, or NULL on errors.
@@ -798,7 +798,7 @@ extern int linkat (int __fromfd, const char *__from, int __tofd,
      __THROW __nonnull ((2, 4)) __wur;
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
 /* Make a symbolic link to FROM named TO.  */
 extern int symlink (const char *__from, const char *__to)
      __THROW __nonnull ((1, 2)) __wur;
@@ -809,7 +809,7 @@ extern int symlink (const char *__from, const char *__to)
 extern ssize_t readlink (const char *__restrict __path,
 			 char *__restrict __buf, size_t __len)
      __THROW __nonnull ((1, 2)) __wur;
-#endif /* Use BSD.  */
+#endif /* Use POSIX.1-2001.  */
 
 #ifdef __USE_ATFILE
 /* Like symlink but a relative path in TO is interpreted relative to TOFD.  */
@@ -872,7 +872,7 @@ extern int setlogin (const char *__name) __THROW __nonnull ((1));
 #endif
 
 
-#if defined __USE_MISC || defined __USE_UNIX98 || defined __USE_XOPEN2K
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K
 /* Put the name of the current host in no more than LEN bytes of NAME.
    The result is null-terminated if LEN is large enough for the full
    name and the terminator.  */
@@ -935,7 +935,7 @@ extern void setusershell (void) __THROW; /* Rewind and re-read the file.  */
    terminal.  If NOCHDIR is zero, do `chdir ("/")'.  If NOCLOSE is zero,
    redirects stdin, stdout, and stderr to /dev/null.  */
 extern int daemon (int __nochdir, int __noclose) __THROW __wur;
-#endif /* Use BSD || X/Open.  */
+#endif /* Use misc || X/Open.  */
 
 
 #if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
@@ -946,7 +946,7 @@ extern int chroot (const char *__path) __THROW __nonnull ((1)) __wur;
 /* Prompt with PROMPT and read a string from the terminal without echoing.
    Uses /dev/tty if possible; otherwise stderr and stdin.  */
 extern char *getpass (const char *__prompt) __nonnull ((1));
-#endif /* Use BSD || X/Open.  */
+#endif /* Use misc || X/Open.  */
 
 
 /* Make all changes done to FD actually appear on disk.
@@ -983,10 +983,10 @@ extern int getpagesize (void)  __THROW __attribute__ ((__const__));
 extern int getdtablesize (void) __THROW;
 # endif
 
-#endif /* Use BSD || X/Open Unix.  */
+#endif /* Use misc || X/Open Unix.  */
 
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 
 /* Truncate FILE to LENGTH bytes.  */
 # ifndef __USE_FILE_OFFSET64
@@ -1006,9 +1006,9 @@ extern int truncate64 (const char *__file, __off64_t __length)
      __THROW __nonnull ((1)) __wur;
 # endif
 
-#endif /* Use BSD || X/Open Unix || POSIX 2008.  */
+#endif /* Use X/Open Unix || POSIX 2008.  */
 
-#if defined __USE_MISC || defined __USE_POSIX199309 \
+#if defined __USE_POSIX199309 \
     || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
 
 /* Truncate the file FD is open on to LENGTH bytes.  */
@@ -1026,7 +1026,7 @@ extern int __REDIRECT_NTH (ftruncate, (int __fd, __off64_t __length),
 extern int ftruncate64 (int __fd, __off64_t __length) __THROW __wur;
 # endif
 
-#endif /* Use BSD || POSIX.1b || X/Open Unix || XPG6.  */
+#endif /* Use POSIX.1b || X/Open Unix || XPG6.  */
 
 
 #if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \
diff --git a/pwd/pwd.h b/pwd/pwd.h
index 6f3c98d50a..2e37562260 100644
--- a/pwd/pwd.h
+++ b/pwd/pwd.h
@@ -58,7 +58,7 @@ struct passwd
 };
 
 
-#if defined __USE_MISC || defined __USE_GNU
+#ifdef __USE_MISC
 # define __need_FILE
 # include <stdio.h>
 #endif
@@ -115,7 +115,7 @@ extern struct passwd *getpwuid (__uid_t __uid);
    marked with __THROW.  */
 extern struct passwd *getpwnam (const char *__name);
 
-#if defined __USE_POSIX || defined __USE_MISC
+#ifdef __USE_POSIX
 
 # ifdef __USE_MISC
 /* Reasonable value for the buffer sized used in the reentrant
diff --git a/resolv/netdb.h b/resolv/netdb.h
index 171d85d3c0..c3386dba13 100644
--- a/resolv/netdb.h
+++ b/resolv/netdb.h
@@ -70,7 +70,7 @@ extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
 # define NO_DATA	4	/* Valid name, no data record of requested
 				   type.  */
 #endif
-#if defined __USE_MISC || defined __USE_GNU
+#ifdef __USE_MISC
 # define NETDB_INTERNAL	-1	/* See errno.  */
 # define NETDB_SUCCESS	0	/* No problem.  */
 # define NO_ADDRESS	NO_DATA	/* No address, look for MX record.  */
@@ -104,7 +104,7 @@ struct hostent
   int h_addrtype;		/* Host address type.  */
   int h_length;			/* Length of address.  */
   char **h_addr_list;		/* List of addresses from name server.  */
-#if defined __USE_MISC || defined __USE_GNU
+#ifdef __USE_MISC
 # define	h_addr	h_addr_list[0] /* Address, for backward compatibility.*/
 #endif
 };
diff --git a/signal/signal.h b/signal/signal.h
index abe0440c8a..fe9fd784dd 100644
--- a/signal/signal.h
+++ b/signal/signal.h
@@ -132,7 +132,7 @@ extern int kill (__pid_t __pid, int __sig) __THROW;
    If PGRP is zero, send SIG to all processes in
    the current process's process group.  */
 extern int killpg (__pid_t __pgrp, int __sig) __THROW;
-#endif /* Use BSD || X/Open Unix.  */
+#endif /* Use misc || X/Open Unix.  */
 
 __BEGIN_NAMESPACE_STD
 /* Raise signal SIG, i.e., send SIG to yourself.  */
@@ -144,12 +144,12 @@ __END_NAMESPACE_STD
 extern __sighandler_t ssignal (int __sig, __sighandler_t __handler)
      __THROW;
 extern int gsignal (int __sig) __THROW;
-#endif /* Use SVID.  */
+#endif /* Use misc.  */
 
-#if defined __USE_MISC || defined __USE_XOPEN2K
+#ifdef __USE_XOPEN2K
 /* Print a message describing the meaning of the given signal number.  */
 extern void psignal (int __sig, const char *__s);
-#endif /* Use misc or POSIX 2008.  */
+#endif /* Use POSIX 2008.  */
 
 #ifdef __USE_XOPEN2K
 /* Print a message describing the meaning of the given signal information.  */
@@ -193,7 +193,7 @@ extern int sigsetmask (int __mask) __THROW __attribute_deprecated__;
 
 /* Return currently selected signal mask.  */
 extern int siggetmask (void) __THROW __attribute_deprecated__;
-#endif /* Use BSD.  */
+#endif /* Use misc.  */
 
 
 #ifdef __USE_MISC
@@ -334,10 +334,10 @@ extern int sigvec (int __sig, const struct sigvec *__vec,
 /* Restore the state saved in SCP.  */
 extern int sigreturn (struct sigcontext *__scp) __THROW;
 
-#endif /*  use BSD.  */
+#endif /* Use misc.  */
 
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 # define __need_size_t
 # include <stddef.h>
 
@@ -363,7 +363,7 @@ extern int sigstack (struct sigstack *__ss, struct sigstack *__oss)
 extern int sigaltstack (const struct sigaltstack *__restrict __ss,
 			struct sigaltstack *__restrict __oss) __THROW;
 
-#endif /* use BSD or X/Open Unix.  */
+#endif /* Use POSIX.1-2008 or X/Open Unix.  */
 
 #ifdef __USE_XOPEN_EXTENDED
 /* Simplified interface for signal management.  */
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 20b79a71f5..00329a22ae 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -72,13 +72,13 @@ typedef union
 #   define __WAIT_STATUS_DEFN	int *
 #  endif
 
-# else /* Don't use BSD.  */
+# else /* Don't use misc.  */
 
 #  define __WAIT_INT(status)	(status)
 #  define __WAIT_STATUS		int *
 #  define __WAIT_STATUS_DEFN	int *
 
-# endif /* Use BSD.  */
+# endif /* Use misc.  */
 
 /* Define the macros <sys/wait.h> also would define this way.  */
 # define WEXITSTATUS(status)	__WEXITSTATUS (__WAIT_INT (status))
@@ -151,7 +151,7 @@ extern long int atol (const char *__nptr)
      __THROW __attribute_pure__ __nonnull ((1)) __wur;
 __END_NAMESPACE_STD
 
-#if defined __USE_ISOC99 || defined __USE_MISC
+#ifdef __USE_ISOC99
 __BEGIN_NAMESPACE_C99
 /* Convert a string to a long long integer.  */
 __extension__ extern long long int atoll (const char *__nptr)
@@ -200,9 +200,9 @@ __extension__
 extern unsigned long long int strtouq (const char *__restrict __nptr,
 				       char **__restrict __endptr, int __base)
      __THROW __nonnull ((1));
-#endif /* Use BSD.  */
+#endif /* Use misc.  */
 
-#if defined __USE_ISOC99 || defined __USE_MISC
+#ifdef __USE_ISOC99
 __BEGIN_NAMESPACE_C99
 /* Convert a string to a quadword integer.  */
 __extension__
@@ -286,7 +286,7 @@ __NTH (atol (const char *__nptr))
 }
 __END_NAMESPACE_STD
 
-# if defined __USE_MISC || defined __USE_ISOC99
+# ifdef __USE_ISOC99
 __BEGIN_NAMESPACE_C99
 __extension__ __extern_inline long long int
 __NTH (atoll (const char *__nptr))
@@ -308,7 +308,7 @@ extern char *l64a (long int __n) __THROW __wur;
 extern long int a64l (const char *__s)
      __THROW __attribute_pure__ __nonnull ((1)) __wur;
 
-#endif	/* Use SVID || extended X/Open.  */
+#endif	/* Use misc || extended X/Open.  */
 
 #if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
 # include <sys/types.h>	/* we need int32_t... */
@@ -366,7 +366,7 @@ extern int setstate_r (char *__restrict __statebuf,
 		       struct random_data *__restrict __buf)
      __THROW __nonnull ((1, 2));
 # endif	/* Use misc.  */
-#endif	/* Use SVID || extended X/Open || BSD. */
+#endif	/* Use extended X/Open || misc. */
 
 
 __BEGIN_NAMESPACE_STD
@@ -455,7 +455,7 @@ extern int lcong48_r (unsigned short int __param[7],
 		      struct drand48_data *__buffer)
      __THROW __nonnull ((1, 2));
 # endif	/* Use misc.  */
-#endif	/* Use SVID or X/Open.  */
+#endif	/* Use misc or X/Open.  */
 
 #endif /* don't just need malloc and calloc */
 
@@ -488,9 +488,9 @@ __END_NAMESPACE_STD
 extern void cfree (void *__ptr) __THROW;
 #endif /* Use misc.  */
 
-#if defined __USE_GNU || defined __USE_MISC
+#ifdef __USE_MISC
 # include <alloca.h>
-#endif /* Use GNU, BSD, or misc.  */
+#endif /* Use misc.  */
 
 #if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \
     || defined __USE_MISC
@@ -578,7 +578,7 @@ extern char *secure_getenv (const char *__name)
 extern int putenv (char *__string) __THROW __nonnull ((1));
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN2K
+#ifdef __USE_XOPEN2K
 /* Set NAME to VALUE in the environment.
    If REPLACE is nonzero, overwrite an existing value.  */
 extern int setenv (const char *__name, const char *__value, int __replace)
@@ -606,8 +606,7 @@ extern int clearenv (void) __THROW;
 extern char *mktemp (char *__template) __THROW __nonnull ((1));
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED \
-    || defined __USE_XOPEN2K8
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* Generate a unique temporary file name from TEMPLATE.
    The last six characters of TEMPLATE must be "XXXXXX";
    they are replaced with a string that makes the filename unique.
@@ -654,7 +653,7 @@ extern int mkstemps64 (char *__template, int __suffixlen)
 # endif
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN2K8
+#ifdef __USE_XOPEN2K8
 /* Create a unique temporary directory from TEMPLATE.
    The last six characters of TEMPLATE must be "XXXXXX";
    they are replaced with a string that makes the directory name unique.
diff --git a/string/bits/string2.h b/string/bits/string2.h
index ad7316b4b6..1b6a1ef974 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -1167,7 +1167,7 @@ __strtok_r_1c (char *__s, char __sep, char **__nextp)
   *__nextp = __s;
   return __result;
 }
-# if defined __USE_POSIX || defined __USE_MISC
+# ifdef __USE_POSIX
 #  define strtok_r(s, sep, nextp) __strtok_r (s, sep, nextp)
 # endif
 #endif
diff --git a/string/string.h b/string/string.h
index 22ee34b835..c79debcc28 100644
--- a/string/string.h
+++ b/string/string.h
@@ -58,7 +58,7 @@ __END_NAMESPACE_STD
 extern void *memccpy (void *__restrict __dest, const void *__restrict __src,
 		      int __c, size_t __n)
      __THROW __nonnull ((1, 2));
-#endif /* SVID.  */
+#endif /* Misc || X/Open.  */
 
 
 __BEGIN_NAMESPACE_STD
@@ -170,8 +170,7 @@ extern size_t strxfrm_l (char *__dest, const char *__src, size_t __n,
 			 __locale_t __l) __THROW __nonnull ((2, 4));
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED \
-    || defined __USE_XOPEN2K8
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* Duplicate S, returning an identical malloc'd string.  */
 extern char *strdup (const char *__s)
      __THROW __attribute_malloc__ __nonnull ((1));
@@ -355,7 +354,7 @@ extern char *__strtok_r (char *__restrict __s,
 			 const char *__restrict __delim,
 			 char **__restrict __save_ptr)
      __THROW __nonnull ((2, 3));
-#if defined __USE_POSIX || defined __USE_MISC
+#ifdef __USE_POSIX
 extern char *strtok_r (char *__restrict __s, const char *__restrict __delim,
 		       char **__restrict __save_ptr)
      __THROW __nonnull ((2, 3));
@@ -412,7 +411,7 @@ __BEGIN_NAMESPACE_STD
 /* Return a string describing the meaning of the `errno' code in ERRNUM.  */
 extern char *strerror (int __errnum) __THROW;
 __END_NAMESPACE_STD
-#if defined __USE_XOPEN2K || defined __USE_MISC
+#ifdef __USE_XOPEN2K
 /* Reentrant version of `strerror'.
    There are 2 flavors of `strerror_r', GNU which returns the string
    and may or may not use the supplied temporary buffer and POSIX one
@@ -537,7 +536,7 @@ extern int strcasecmp (const char *__s1, const char *__s2)
 /* Compare no more than N chars of S1 and S2, ignoring case.  */
 extern int strncasecmp (const char *__s1, const char *__s2, size_t __n)
      __THROW __attribute_pure__ __nonnull ((1, 2));
-#endif /* Use BSD.  */
+#endif /* Use misc.  */
 
 #ifdef	__USE_GNU
 /* Again versions of a few functions which use the given locale instead
diff --git a/sysdeps/m68k/m680x0/fpu/bits/mathinline.h b/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
index e609eb5c1b..5f72bb928e 100644
--- a/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
+++ b/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
@@ -131,7 +131,7 @@ __NTH (__signbitl (long double __x))
    suffixed with f and l for the float and long double version, resp).  OP
    is the name of the fpu operation (without leading f).  */
 
-#if defined __USE_MISC || defined __USE_ISOC99
+#ifdef __USE_ISOC99
 # define __inline_mathop(func, op)			\
   __inline_mathop1(double, func, op)			\
   __inline_mathop1(float, __CONCAT(func,f), op)	\
@@ -157,7 +157,7 @@ __inline_mathop(__tan, tan)
 __inline_mathop(__tanh, tanh)
 __inline_mathop(__fabs, abs)
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
+#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
 __inline_mathop(__rint, int)
 __inline_mathop(__expm1, etoxm1)
 __inline_mathop(__log1p, lognp1)
@@ -176,7 +176,7 @@ __inline_mathop(__trunc, intrz)
 __inline_mathop(atan, atan)
 __inline_mathop(tanh, tanh)
 
-# if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
+# if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
 __inline_mathop(rint, int)
 __inline_mathop(log1p, lognp1)
 # endif
@@ -229,7 +229,7 @@ __m81_defun (float_type, __CONCAT(__ceil,s), (float_type __x))	  	  \
 }
 
 __inline_functions(double,)
-#if defined __USE_MISC || defined __USE_ISOC99
+#ifdef __USE_ISOC99
 __inline_functions(float,f)
 __inline_functions(long double,l)
 #endif
@@ -392,7 +392,7 @@ __inline_forward(void,sincos, (double __x, double *__sinx, double *__cosx),
 		 (__x, __sinx, __cosx))
 # endif
 
-# if defined __USE_MISC || defined __USE_ISOC99
+# ifdef __USE_ISOC99
 
 __inline_forward_c(float,floorf, (float __x), (__x))
 __inline_forward_c(float,ceilf, (float __x), (__x))
diff --git a/sysdeps/mach/hurd/bits/fcntl.h b/sysdeps/mach/hurd/bits/fcntl.h
index 109cc07201..392c140e9e 100644
--- a/sysdeps/mach/hurd/bits/fcntl.h
+++ b/sysdeps/mach/hurd/bits/fcntl.h
@@ -159,7 +159,7 @@
 #define	F_SETFD		2	/* Set file descriptor flags.  */
 #define	F_GETFL		3	/* Get file status flags.  */
 #define	F_SETFL		4	/* Set file status flags.  */
-#if defined __USE_MISC || defined __USE_UNIX98 || defined __USE_XOPEN2K8
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 # define F_GETOWN	5	/* Get owner (receiver of SIGIO).  */
 # define F_SETOWN	6	/* Set owner (receiver of SIGIO).  */
 #endif
diff --git a/sysdeps/mach/hurd/bits/stat.h b/sysdeps/mach/hurd/bits/stat.h
index 6f7a781119..8ff60df53b 100644
--- a/sysdeps/mach/hurd/bits/stat.h
+++ b/sysdeps/mach/hurd/bits/stat.h
@@ -57,7 +57,7 @@ struct stat
     __off64_t st_size;		/* Size in bytes.  */
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN2K8
+#ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -121,7 +121,7 @@ struct stat64
 
     __off64_t st_size;		/* Size in bytes.  */
 
-#if defined __USE_MISC || defined __USE_XOPEN2K8
+#ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h b/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h
index 9fd37cd198..bc3348798d 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h
@@ -54,7 +54,7 @@ struct sigaction
 #if defined __USE_UNIX98 || defined __USE_MISC
 # define SA_ONSTACK   0x00000001 /* Use signal stack by using `sa_restorer'. */
 #endif
-#if defined __USE_UNIX98 || defined __USE_MISC || defined __USE_XOPEN2K8
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 # define SA_RESTART   0x00000002 /* Restart syscall on signal return.  */
 # define SA_NODEFER   0x00000008 /* Don't automatically block the signal
 				    when its handler is being executed.  */
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/stat.h b/sysdeps/unix/sysv/linux/alpha/bits/stat.h
index ec42d1803d..23ca73876a 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/stat.h
@@ -43,7 +43,7 @@
 
    Use neat tidy anonymous unions and structures when possible.  */
 
-#if defined __USE_MISC || defined __USE_XOPEN2K8
+#ifdef __USE_XOPEN2K8
 # if __GNUC_PREREQ(3,3)
 #  define __ST_TIME(X)				\
 	__extension__ union {			\
diff --git a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
index 0be95955fc..915eb3ede5 100644
--- a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
+++ b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
@@ -158,7 +158,7 @@
 # define __F_GETOWN	9
 #endif
 
-#if defined __USE_MISC || defined __USE_UNIX98 || defined __USE_XOPEN2K8
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 # define F_SETOWN	__F_SETOWN /* Get owner (process receiving SIGIO).  */
 # define F_GETOWN	__F_GETOWN /* Set owner (process receiving SIGIO).  */
 #endif
@@ -262,7 +262,7 @@ struct f_owner_ex
 # define FASYNC		O_ASYNC
 # define FNONBLOCK	O_NONBLOCK
 # define FNDELAY	O_NDELAY
-#endif /* Use BSD.  */
+#endif /* Use misc.  */
 
 #ifndef __POSIX_FADV_DONTNEED
 #  define __POSIX_FADV_DONTNEED	4
diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h
index 6754da0584..f5b02dd462 100644
--- a/sysdeps/unix/sysv/linux/bits/in.h
+++ b/sysdeps/unix/sysv/linux/bits/in.h
@@ -54,7 +54,7 @@
 #define IP_ADD_SOURCE_MEMBERSHIP 39 /* ip_mreq_source: join source group */
 #define IP_DROP_SOURCE_MEMBERSHIP 40 /* ip_mreq_source: leave source group */
 #define IP_MSFILTER 41
-#if defined __USE_MISC || defined __USE_GNU
+#ifdef __USE_MISC
 # define MCAST_JOIN_GROUP 42	/* group_req: join any-source group */
 # define MCAST_BLOCK_SOURCE 43	/* group_source_req: block from given group */
 # define MCAST_UNBLOCK_SOURCE 44 /* group_source_req: unblock from given group*/
@@ -129,7 +129,7 @@
 #define IP_DEFAULT_MULTICAST_LOOP       1
 #define IP_MAX_MEMBERSHIPS              20
 
-#if defined __USE_MISC || defined __USE_GNU
+#ifdef __USE_MISC
 /* Structure used to describe IP options for IP_OPTIONS and IP_RETOPTS.
    The `ip_dst' field is used for the first-hop gateway when using a
    source route (this gets put into the header proper).  */
diff --git a/sysdeps/unix/sysv/linux/bits/sigaction.h b/sysdeps/unix/sysv/linux/bits/sigaction.h
index 7e97ff1506..eb09e81816 100644
--- a/sysdeps/unix/sysv/linux/bits/sigaction.h
+++ b/sysdeps/unix/sysv/linux/bits/sigaction.h
@@ -57,7 +57,7 @@ struct sigaction
 #if defined __USE_UNIX98 || defined __USE_MISC
 # define SA_ONSTACK   0x08000000 /* Use signal stack by using `sa_restorer'. */
 #endif
-#if defined __USE_UNIX98 || defined __USE_MISC || defined __USE_XOPEN2K8
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 # define SA_RESTART   0x10000000 /* Restart syscall on signal return.  */
 # define SA_NODEFER   0x40000000 /* Don't automatically block the signal when
 				    its handler is being executed.  */
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 7ea165b2bf..e05971e90c 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -317,7 +317,7 @@ struct ucred
 #endif
 
 /* Ugly workaround for unclean kernel headers.  */
-#if !defined __USE_MISC && !defined __USE_GNU
+#ifndef __USE_MISC
 # ifndef FIOGETOWN
 #  define __SYS_SOCKET_H_undef_FIOGETOWN
 # endif
@@ -344,7 +344,7 @@ struct ucred
 /* Get socket manipulation related informations from kernel headers.  */
 #include <asm/socket.h>
 
-#if !defined __USE_MISC && !defined __USE_GNU
+#ifndef __USE_MISC
 # ifdef __SYS_SOCKET_H_undef_FIOGETOWN
 #  undef __SYS_SOCKET_H_undef_FIOGETOWN
 #  undef FIOGETOWN
diff --git a/sysdeps/unix/sysv/linux/bits/stat.h b/sysdeps/unix/sysv/linux/bits/stat.h
index 769f99a6d7..205593855f 100644
--- a/sysdeps/unix/sysv/linux/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/bits/stat.h
@@ -62,7 +62,7 @@ struct stat
 #else
     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
 #endif
-#if defined __USE_MISC || defined __USE_XOPEN2K8
+#ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -108,7 +108,7 @@ struct stat64
     __blksize_t st_blksize;		/* Optimal block size for I/O.  */
 
     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
-# if defined __USE_MISC || defined __USE_XOPEN2K8
+# ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/sigaction.h b/sysdeps/unix/sysv/linux/ia64/bits/sigaction.h
index 39478711cc..f9bc1ea37d 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/sigaction.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/sigaction.h
@@ -53,7 +53,7 @@ struct sigaction
 #if defined __USE_UNIX98 || defined __USE_MISC
 # define SA_ONSTACK   0x08000000 /* Use signal stack by using `sa_restorer'. */
 #endif
-#if defined __USE_UNIX98 || defined __USE_MISC || defined __USE_XOPEN2K8
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 # define SA_RESTART   0x10000000 /* Restart syscall on signal return.  */
 # define SA_NODEFER   0x40000000 /* Don't automatically block the signal
 				    when its handler is being executed.  */
diff --git a/sysdeps/unix/sysv/linux/m68k/bits/stat.h b/sysdeps/unix/sysv/linux/m68k/bits/stat.h
index c0bed57ded..ee47329d5a 100644
--- a/sysdeps/unix/sysv/linux/m68k/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/m68k/bits/stat.h
@@ -62,7 +62,7 @@ struct stat
 #else
     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
 #endif
-#if defined __USE_MISC || defined __USE_XOPEN2K8
+#ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -108,7 +108,7 @@ struct stat64
     __blksize_t st_blksize;		/* Optimal block size for I/O.  */
 
     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
-# if defined __USE_MISC || defined __USE_XOPEN2K8
+# ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
diff --git a/sysdeps/unix/sysv/linux/mips/bits/sigaction.h b/sysdeps/unix/sysv/linux/mips/bits/sigaction.h
index c84b592fdb..9315cdace3 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/sigaction.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/sigaction.h
@@ -63,7 +63,7 @@ struct sigaction
 #if defined __USE_UNIX98 || defined __USE_MISC
 # define SA_ONSTACK   0x08000000 /* Use signal stack by using `sa_restorer'. */
 #endif
-#if defined __USE_UNIX98 || defined __USE_MISC || defined __USE_XOPEN2K8
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 # define SA_RESETHAND 0x80000000 /* Reset to SIG_DFL on entry to handler.  */
 # define SA_RESTART   0x10000000 /* Restart syscall on signal return.  */
 # define SA_NODEFER   0x40000000 /* Don't automatically block the signal when
diff --git a/sysdeps/unix/sysv/linux/mips/bits/stat.h b/sysdeps/unix/sysv/linux/mips/bits/stat.h
index 8a1527217e..029d1fb35d 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/stat.h
@@ -62,7 +62,7 @@ struct stat
     long int st_pad2[3];
     __off64_t st_size;		/* Size of file, in bytes.  */
 #endif
-#if defined __USE_MISC || defined __USE_XOPEN2K8
+#ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -106,7 +106,7 @@ struct stat64
     unsigned long int st_rdev;	/* Device number, if device.  */
     long int st_pad2[3];
     __off64_t st_size;		/* Size of file, in bytes.  */
-# if defined __USE_MISC || defined __USE_XOPEN2K8
+# ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -153,7 +153,7 @@ struct stat
     unsigned int st_pad2[3];	/* Reserved for st_rdev expansion  */
     __off64_t st_size;
 #endif
-#if defined __USE_MISC || defined __USE_XOPEN2K8
+#ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -197,7 +197,7 @@ struct stat64
     __dev_t st_rdev;
     unsigned int st_pad2[3];	/* Reserved for st_rdev expansion  */
     __off64_t st_size;
-# if defined __USE_MISC || defined __USE_XOPEN2K8
+# ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/stat.h b/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
index 1325594e2d..79d6ee9681 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
@@ -70,7 +70,7 @@ struct stat
 # else
     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
 # endif
-# if defined __USE_MISC || defined __USE_XOPEN2K8
+# ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -110,7 +110,7 @@ struct stat64
     __off64_t st_size;			/* Size of file, in bytes.  */
     __blksize_t st_blksize;		/* Optimal block size for I/O.  */
     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
-#  if defined __USE_MISC || defined __USE_XOPEN2K8
+#  ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -164,7 +164,7 @@ struct stat
 # else
     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
 # endif
-# if defined __USE_MISC || defined __USE_XOPEN2K8
+# ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -204,7 +204,7 @@ struct stat64
     __off64_t st_size;			/* Size of file, in bytes.  */
     __blksize_t st_blksize;		/* Optimal block size for I/O.  */
     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
-#  if defined __USE_MISC || defined __USE_XOPEN2K8
+#  ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
diff --git a/sysdeps/unix/sysv/linux/s390/bits/sigaction.h b/sysdeps/unix/sysv/linux/s390/bits/sigaction.h
index 8d5ec4d898..f8baf84c43 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/sigaction.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/sigaction.h
@@ -90,7 +90,7 @@ struct sigaction
 #if defined __USE_UNIX98 || defined __USE_MISC
 # define SA_ONSTACK   0x08000000 /* Use signal stack by using `sa_restorer'. */
 #endif
-#if defined __USE_UNIX98 || defined __USE_MISC || defined __USE_XOPEN2K8
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 # define SA_RESTART   0x10000000 /* Restart syscall on signal return.  */
 # define SA_NODEFER   0x40000000 /* Don't automatically block the signal when
 				    its handler is being executed.	 */
diff --git a/sysdeps/unix/sysv/linux/s390/bits/stat.h b/sysdeps/unix/sysv/linux/s390/bits/stat.h
index 61ce38c12f..c154fe9a4d 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/stat.h
@@ -58,7 +58,7 @@ struct stat
     int pad0;
     __dev_t st_rdev;		/* Device number, if device.  */
     __off_t st_size;		/* Size of file, in bytes.  */
-#if defined __USE_MISC || defined __USE_XOPEN2K8
+#ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -111,7 +111,7 @@ struct stat
 # else
     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
 # endif
-# if defined __USE_MISC || defined __USE_XOPEN2K8
+# ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -155,7 +155,7 @@ struct stat64
     int pad0;
     __dev_t st_rdev;		/* Device number, if device.  */
     __off_t st_size;		/* Size of file, in bytes.  */
-#  if defined __USE_MISC || defined __USE_XOPEN2K8
+#  ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -197,7 +197,7 @@ struct stat64
     __blksize_t st_blksize;		/* Optimal block size for I/O.  */
 
     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
-#  if defined __USE_MISC || defined __USE_XOPEN2K8
+#  ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h b/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
index 5d8bf142e1..eaccf97af5 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
@@ -58,7 +58,7 @@ struct sigaction
 #if defined __USE_UNIX98 || defined __USE_MISC
 # define SA_ONSTACK   0x00000001 /* Use signal stack by using `sa_restorer'. */
 #endif
-#if defined __USE_UNIX98 || defined __USE_MISC || defined __USE_XOPEN2K8
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 # define SA_RESTART   0x00000002 /* Restart syscall on signal return.  */
 # define SA_INTERRUPT 0x00000010 /* Historical no-op.  */
 # define SA_NOMASK    0x00000020 /* Don't automatically block the signal when
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/stat.h b/sysdeps/unix/sysv/linux/sparc/bits/stat.h
index 69cb511100..cfa6a2e3db 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/stat.h
@@ -62,7 +62,7 @@ struct stat
 #else
     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
 #endif
-#if defined __USE_MISC || defined __USE_XOPEN2K8
+#ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -105,7 +105,7 @@ struct stat64
     __blksize_t st_blksize;		/* Optimal block size for I/O.  */
 
     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
-# if defined __USE_MISC || defined __USE_XOPEN2K8
+# ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
diff --git a/sysdeps/unix/sysv/linux/x86/bits/stat.h b/sysdeps/unix/sysv/linux/x86/bits/stat.h
index 6fcb869cf9..35b6810fe4 100644
--- a/sysdeps/unix/sysv/linux/x86/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/stat.h
@@ -81,7 +81,7 @@ struct stat
 #else
     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
 #endif
-#if defined __USE_MISC || defined __USE_XOPEN2K8
+#ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -142,7 +142,7 @@ struct stat64
 # endif
     __blksize_t st_blksize;	/* Optimal block size for I/O.  */
     __blkcnt64_t st_blocks;	/* Nr. 512-byte blocks allocated.  */
-# if defined __USE_MISC || defined __USE_XOPEN2K8
+# ifdef __USE_XOPEN2K8
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
diff --git a/sysdeps/x86/bits/string.h b/sysdeps/x86/bits/string.h
index 30c88d6315..423ad3880c 100644
--- a/sysdeps/x86/bits/string.h
+++ b/sysdeps/x86/bits/string.h
@@ -1974,7 +1974,7 @@ __strstr_g (const char *__haystack, const char *__needle)
 #    define ffsl(word) ffs(word)
 #   endif
 #  endif /* i686 */
-# endif	/* BSD || X/Open */
+# endif	/* Misc || X/Open */
 
 # ifndef _FORCE_INLINES
 #  undef __STRING_INLINE
diff --git a/sysdeps/x86/fpu/bits/mathinline.h b/sysdeps/x86/fpu/bits/mathinline.h
index b4b28f30f1..9c32e9503b 100644
--- a/sysdeps/x86/fpu/bits/mathinline.h
+++ b/sysdeps/x86/fpu/bits/mathinline.h
@@ -283,7 +283,7 @@ __END_NAMESPACE_C99
 #  endif
 
 #  if defined __SSE4_1__ && defined __SSE2_MATH__
-#   if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
+#   if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
 __BEGIN_NAMESPACE_C99
 
 /* Round to nearest integer.  */
@@ -399,7 +399,7 @@ __END_NAMESPACE_C99
    We define two sets of macros.  The set with the additional NP
    doesn't add a prototype declaration.  */
 
-#  if defined __USE_MISC || defined __USE_ISOC99
+#  ifdef __USE_ISOC99
 #   define __inline_mathop(func, op) \
   __inline_mathop_ (double, func, op)					      \
   __inline_mathop_ (float, __CONCAT(func,f), op)			      \
@@ -421,7 +421,7 @@ __END_NAMESPACE_C99
   __inline_mathop_declNP_ (float_type, func, op, "0" (__x))
 
 
-#  if defined __USE_MISC || defined __USE_ISOC99
+#  ifdef __USE_ISOC99
 #   define __inline_mathop_decl(func, op, params...) \
   __inline_mathop_decl_ (double, func, op, params)			      \
   __inline_mathop_decl_ (float, __CONCAT(func,f), op, params)		      \
@@ -450,7 +450,7 @@ __END_NAMESPACE_C99
   }
 
 
-#  if defined __USE_MISC || defined __USE_ISOC99
+#  ifdef __USE_ISOC99
 #   define __inline_mathcode(func, arg, code) \
   __inline_mathcode_ (double, func, arg, code)				      \
   __inline_mathcode_ (float, __CONCAT(func,f), arg, code)		      \
@@ -684,7 +684,7 @@ __inline_mathopNP_ (long double, __sqrtl, "fsqrt")
 
 #  if __GNUC_PREREQ (2, 8)
 __inline_mathcodeNP_ (double, fabs, __x, return __builtin_fabs (__x))
-#   if defined __USE_MISC || defined __USE_ISOC99
+#   ifdef __USE_ISOC99
 __inline_mathcodeNP_ (float, fabsf, __x, return __builtin_fabsf (__x))
 __inline_mathcodeNP_ (long double, fabsl, __x, return __builtin_fabsl (__x))
 #   endif
@@ -793,7 +793,7 @@ __NTH (ldexp (double __x, int __y))
 
 
 /* Optimized versions for some non-standardized functions.  */
-#  if defined __USE_ISOC99 || defined __USE_MISC
+#  ifdef __USE_ISOC99
 
 #   ifdef __FAST_MATH__
 __inline_mathcodeNP (expm1, __x, __expm1_code)
diff --git a/time/sys/time.h b/time/sys/time.h
index 60cf2d2289..a3f219e910 100644
--- a/time/sys/time.h
+++ b/time/sys/time.h
@@ -184,7 +184,7 @@ extern int futimesat (int __fd, const char *__file,
       (result)->tv_usec += 1000000;					      \
     }									      \
   } while (0)
-#endif	/* BSD */
+#endif	/* Misc.  */
 
 __END_DECLS
 
diff --git a/time/time.h b/time/time.h
index 608ab9d08f..b76ce06cce 100644
--- a/time/time.h
+++ b/time/time.h
@@ -58,7 +58,7 @@ __BEGIN_NAMESPACE_STD
 /* Returned by `clock'.  */
 typedef __clock_t clock_t;
 __END_NAMESPACE_STD
-#if defined __USE_XOPEN || defined __USE_POSIX || defined __USE_MISC
+#if defined __USE_XOPEN || defined __USE_POSIX
 __USING_NAMESPACE_STD(clock_t)
 #endif
 
@@ -74,7 +74,7 @@ __BEGIN_NAMESPACE_STD
 /* Returned by `time'.  */
 typedef __time_t time_t;
 __END_NAMESPACE_STD
-#if defined __USE_POSIX || defined __USE_MISC
+#ifdef __USE_POSIX
 __USING_NAMESPACE_STD(time_t)
 #endif
 
@@ -108,7 +108,7 @@ typedef __timer_t timer_t;
 
 #if (!defined __timespec_defined					\
      && ((defined _TIME_H						\
-	  && (defined __USE_POSIX199309 || defined __USE_MISC		\
+	  && (defined __USE_POSIX199309					\
 	      || defined __USE_ISOC11))					\
 	 || defined __need_timespec))
 # define __timespec_defined	1
@@ -151,7 +151,7 @@ struct tm
 # endif
 };
 __END_NAMESPACE_STD
-#if defined __USE_XOPEN || defined __USE_POSIX || defined __USE_MISC
+#if defined __USE_XOPEN || defined __USE_POSIX
 __USING_NAMESPACE_STD(tm)
 #endif
 
@@ -243,7 +243,7 @@ extern struct tm *gmtime (const time_t *__timer) __THROW;
 extern struct tm *localtime (const time_t *__timer) __THROW;
 __END_NAMESPACE_STD
 
-# if defined __USE_POSIX || defined __USE_MISC
+# ifdef __USE_POSIX
 /* Return the `struct tm' representation of *TIMER in UTC,
    using *TP to store the result.  */
 extern struct tm *gmtime_r (const time_t *__restrict __timer,
@@ -253,7 +253,7 @@ extern struct tm *gmtime_r (const time_t *__restrict __timer,
    using *TP to store the result.  */
 extern struct tm *localtime_r (const time_t *__restrict __timer,
 			       struct tm *__restrict __tp) __THROW;
-# endif	/* POSIX or misc */
+# endif	/* POSIX */
 
 __BEGIN_NAMESPACE_STD
 /* Return a string of the form "Day Mon dd hh:mm:ss yyyy\n"
@@ -264,7 +264,7 @@ extern char *asctime (const struct tm *__tp) __THROW;
 extern char *ctime (const time_t *__timer) __THROW;
 __END_NAMESPACE_STD
 
-# if defined __USE_POSIX || defined __USE_MISC
+# ifdef __USE_POSIX
 /* Reentrant versions of the above functions.  */
 
 /* Return in BUF a string of the form "Day Mon dd hh:mm:ss yyyy\n"
@@ -275,7 +275,7 @@ extern char *asctime_r (const struct tm *__restrict __tp,
 /* Equivalent to `asctime_r (localtime_r (timer, *TMP*), buf)'.  */
 extern char *ctime_r (const time_t *__restrict __timer,
 		      char *__restrict __buf) __THROW;
-# endif	/* POSIX or misc */
+# endif	/* POSIX */
 
 
 /* Defined in localtime.c.  */