Use __glibc_reserved instead __unused.

86 files changed, 385 insertions, 294 deletions

diff --git a/ChangeLog b/ChangeLog
index 2971fcc684..2c5b039804 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,51 @@
+2013-11-26  Ondřej Bílka  <neleai@seznam.cz>
+	* resolv/netdb.h: Use __glibc_reserved instead __unused.
+	* rt/aio.h: Likewise.
+	* sysdeps/gnu/bits/utmp.h: Likewise.
+	* sysdeps/gnu/bits/utmpx.h: Likewise.
+	* sysdeps/gnu/netinet/ip_icmp.h: Likewise.
+	* sysdeps/unix/sysv/linux/bits/ipc.h: Likewise.
+	* sysdeps/unix/sysv/linux/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/bits/stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/kernel_stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/ntp_gettimex.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/ipc.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/ipc.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/utmp.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/utmpx.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-32/utmp32.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h: Likewise.
+	* sysdeps/unix/sysv/linux/sh/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/ipc.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sys/procfs.h: Likewise.
+	* sysdeps/unix/sysv/linux/sys/timex.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86/bits/stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/xstatconv.c: Likewise.
+	* sysdeps/x86/fpu/bits/fenv.h: Likewise.
+
 2013-11-25  Carlos O'Donell  <carlos@redhat.com>
 
 	[BZ #16245]
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 779843d17f..9f4063016f 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-26  Ondřej Bílka  <neleai@seznam.cz>
+	* sysdeps/i386/tls.h: Use __glibc_reserved instead __unused.
+	* sysdeps/x86_64/tls.h: Likewise.
+
 2013-11-25  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
 	[BZ #11214]
diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h
index 3d18b1de73..9a56e21d52 100644
--- a/nptl/sysdeps/i386/tls.h
+++ b/nptl/sysdeps/i386/tls.h
@@ -56,7 +56,7 @@ typedef struct
 #ifndef __ASSUME_PRIVATE_FUTEX
   int private_futex;
 #else
-  int __unused1;
+  int __glibc_reserved1;
 #endif
   /* Reservation of some values for the TM ABI.  */
   void *__private_tm[4];
diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h
index 61df1af2b0..d6350fdf4a 100644
--- a/nptl/sysdeps/x86_64/tls.h
+++ b/nptl/sysdeps/x86_64/tls.h
@@ -65,14 +65,14 @@ typedef struct
 # ifndef __ASSUME_PRIVATE_FUTEX
   int private_futex;
 # else
-  int __unused1;
+  int __glibc_reserved1;
 # endif
   int rtld_must_xmm_save;
   /* Reservation of some values for the TM ABI.  */
   void *__private_tm[4];
   /* GCC split stack support.  */
   void *__private_ss;
-  long int __unused2;
+  long int __glibc_reserved2;
   /* Have space for the post-AVX register size.  */
   __128bits rtld_savespace_sse[8][4] __attribute__ ((aligned (32)));
 
diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index 8f97951dec..05c6ba4950 100644
--- a/ports/ChangeLog.alpha
+++ b/ports/ChangeLog.alpha
@@ -1,3 +1,12 @@
+2013-11-26  Ondřej Bílka  <neleai@seznam.cz>
+	* sysdeps/unix/sysv/linux/alpha/bits/ipc.h: Use __glibc_reserved instead __unused.
+	* sysdeps/unix/sysv/linux/alpha/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/kernel_stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/xstatconv.c: Likewise.
+
 2013-11-16  Richard Henderson  <rth@redhat.com>
 
 	* sysdeps/unix/sysv/linux/alpha/rt_sigaction.S: Include a nop
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 2ee4444259..4124e474b1 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,6 @@
+2013-11-26  Ondřej Bílka  <neleai@seznam.cz>
+	* sysdeps/unix/sysv/linux/arm/bits/shm.h: Use __glibc_reserved instead __unused.
+
 2013-11-22  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/arm/armv7/multiarch/memcpy_impl.S
diff --git a/ports/ChangeLog.hppa b/ports/ChangeLog.hppa
index 82df2cec89..6a28bfe221 100644
--- a/ports/ChangeLog.hppa
+++ b/ports/ChangeLog.hppa
@@ -1,3 +1,10 @@
+2013-11-26  Ondřej Bílka  <neleai@seznam.cz>
+	* sysdeps/unix/sysv/linux/hppa/bits/ipc.h: Use __glibc_reserved instead __unused.
+	* sysdeps/unix/sysv/linux/hppa/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/hppa/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/hppa/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/hppa/kernel_stat.h: Likewise.
+
 2013-11-21  Guy Martin  <gmsoft@tuxicoman.be>
 
 	* sysdeps/hppa/dl-lookupcfg.h: Remove obsolete
diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64
index 89133295e1..d2825f1700 100644
--- a/ports/ChangeLog.ia64
+++ b/ports/ChangeLog.ia64
@@ -1,3 +1,10 @@
+2013-11-26  Ondřej Bílka  <neleai@seznam.cz>
+	* sysdeps/unix/sysv/linux/ia64/bits/ipc.h: Use __glibc_reserved instead __unused.
+	* sysdeps/unix/sysv/linux/ia64/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/ia64/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/ia64/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/ia64/bits/stat.h: Likewise.
+
 2013-11-21  Guy Martin  <gmsoft@tuxicoman.be>
 
 	* sysdeps/ia64/dl-lookupcfg.h: Remove obsolete
diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 327216f5f4..f78f3848fa 100644
--- a/ports/ChangeLog.m68k
+++ b/ports/ChangeLog.m68k
@@ -1,3 +1,6 @@
+2013-11-26  Ondřej Bílka  <neleai@seznam.cz>
+	* sysdeps/unix/sysv/linux/m68k/bits/stat.h: Use __glibc_reserved instead __unused.
+
 2013-10-30  Mike Frysinger  <vapier@gentoo.org>
 
 	* sysdeps/unix/sysv/linux/m68k/configure.in: Moved to ...
diff --git a/ports/ChangeLog.microblaze b/ports/ChangeLog.microblaze
index d792effa43..0762dd3be2 100644
--- a/ports/ChangeLog.microblaze
+++ b/ports/ChangeLog.microblaze
@@ -1,3 +1,7 @@
+2013-11-26  Ondřej Bílka  <neleai@seznam.cz>
+	* sysdeps/unix/sysv/linux/microblaze/bits/stat.h: Use __glibc_reserved instead __unused.
+	* sysdeps/unix/sysv/linux/microblaze/kernel_stat.h: Likewise.
+
 2013-10-30  Mike Frysinger  <vapier@gentoo.org>
 
 	* sysdeps/unix/sysv/linux/microblaze/configure.in: Moved to ...
diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips
index 3382d838fe..753e04b908 100644
--- a/ports/ChangeLog.mips
+++ b/ports/ChangeLog.mips
@@ -1,3 +1,9 @@
+2013-11-26  Ondřej Bílka  <neleai@seznam.cz>
+	* sysdeps/unix/sysv/linux/mips/bits/ipc.h: Use __glibc_reserved instead __unused.
+	* sysdeps/unix/sysv/linux/mips/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/mips/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/mips/bits/shm.h: Likewise.
+
 2013-10-30  Mike Frysinger  <vapier@gentoo.org>
 
 	* sysdeps/mips/configure.in: Moved to ...
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/ipc.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/ipc.h
index 66903d3ac2..deb3a2b213 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/bits/ipc.h
+++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/ipc.h
@@ -49,6 +49,6 @@ struct ipc_perm
     unsigned int mode;			/* Read/write permission.  */
     unsigned short int __seq;		/* Sequence number.  */
     unsigned short int __pad1;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h
index 8bb057b4ee..415ef21a99 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h
+++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h
@@ -46,8 +46,8 @@ struct msqid_ds
   msglen_t msg_qbytes;		/* max number of bytes allowed on queue */
   __pid_t msg_lspid;		/* pid of last msgsnd() */
   __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 #ifdef __USE_MISC
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/sem.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/sem.h
index c2d73aa4e8..739cbc415f 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/bits/sem.h
+++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/sem.h
@@ -41,8 +41,8 @@ struct semid_ds
   __time_t sem_otime;			/* last semop() time */
   __time_t sem_ctime;			/* last time changed by semctl() */
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 /* The user should define a union like the following to use it for arguments
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/shm.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/shm.h
index 125e277f35..cd9476f4de 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/bits/shm.h
+++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/shm.h
@@ -56,8 +56,8 @@ struct shmid_ds
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };
 
 #ifdef __USE_MISC
@@ -79,10 +79,10 @@ struct	shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
-    unsigned long int __unused3;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
+    unsigned long int __glibc_reserved3;
+    unsigned long int __glibc_reserved4;
   };
 
 struct shm_info
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h
index 3e106477f3..c34cbca371 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h
+++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h
@@ -92,7 +92,7 @@ struct stat
     __ST_TIME(a);		/* Time of last access.  */
     __ST_TIME(m);		/* Time of last modification.  */
     __ST_TIME(c);		/* Time of last status change.  */
-    long __unused[3];
+    long __glibc_reserved[3];
   };
 
 #ifdef __USE_LARGEFILE64
@@ -113,7 +113,7 @@ struct stat64
     __ST_TIME(a);		/* Time of last access.  */
     __ST_TIME(m);		/* Time of last modification.  */
     __ST_TIME(c);		/* Time of last status change.  */
-    long __unused[3];
+    long __glibc_reserved[3];
   };
 #endif
 
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h b/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
index 94d358efc4..6708411407 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
+++ b/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
@@ -40,7 +40,7 @@ struct kernel_stat64
     unsigned long   st_mtimensec;
     unsigned long   st_ctime;
     unsigned long   st_ctimensec;
-    long            __unused[3];
+    long            __glibc_reserved[3];
   };
 
 /* Definition of `struct stat' used by glibc 2.0.  */
@@ -82,7 +82,7 @@ struct glibc21_stat
     unsigned int st_flags;
     unsigned int st_gen;
     int __pad3;
-    long __unused[4];
+    long __glibc_reserved[4];
   };
 
 #define XSTAT_IS_XSTAT64 1
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/xstatconv.c b/ports/sysdeps/unix/sysv/linux/alpha/xstatconv.c
index 79ec57840e..4e7e78b98f 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/xstatconv.c
+++ b/ports/sysdeps/unix/sysv/linux/alpha/xstatconv.c
@@ -74,10 +74,10 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
 	buf->st_flags = kbuf->st_flags;
 	buf->st_gen = kbuf->st_gen;
 	buf->__pad3 = 0;
-	buf->__unused[0] = 0;
-	buf->__unused[1] = 0;
-	buf->__unused[2] = 0;
-	buf->__unused[3] = 0;
+	buf->__glibc_reserved[0] = 0;
+	buf->__glibc_reserved[1] = 0;
+	buf->__glibc_reserved[2] = 0;
+	buf->__glibc_reserved[3] = 0;
       }
       break;
 
@@ -105,9 +105,9 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
 	buf->st_ctime = kbuf->st_ctime;
 	buf->st_ctimensec = 0;
 
-	buf->__unused[0] = 0;
-	buf->__unused[1] = 0;
-	buf->__unused[2] = 0;
+	buf->__glibc_reserved[0] = 0;
+	buf->__glibc_reserved[1] = 0;
+	buf->__glibc_reserved[2] = 0;
       }
       break;
 
diff --git a/ports/sysdeps/unix/sysv/linux/arm/bits/shm.h b/ports/sysdeps/unix/sysv/linux/arm/bits/shm.h
index 08a0ca48b7..eb581eaba9 100644
--- a/ports/sysdeps/unix/sysv/linux/arm/bits/shm.h
+++ b/ports/sysdeps/unix/sysv/linux/arm/bits/shm.h
@@ -51,16 +51,16 @@ struct shmid_ds
     struct ipc_perm shm_perm;		/* operation permission struct */
     size_t shm_segsz;			/* size of segment in bytes */
     __time_t shm_atime;			/* time of last shmat() */
-    unsigned long int __unused1;
+    unsigned long int __glibc_reserved1;
     __time_t shm_dtime;			/* time of last shmdt() */
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved2;
     __time_t shm_ctime;			/* time of last change by shmctl() */
-    unsigned long int __unused3;
+    unsigned long int __glibc_reserved3;
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
   };
 
 #ifdef __USE_MISC
@@ -82,10 +82,10 @@ struct	shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
-    unsigned long int __unused3;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
+    unsigned long int __glibc_reserved3;
+    unsigned long int __glibc_reserved4;
   };
 
 struct shm_info
diff --git a/ports/sysdeps/unix/sysv/linux/generic/bits/msq.h b/ports/sysdeps/unix/sysv/linux/generic/bits/msq.h
index 49cbf0611d..c2680d035e 100644
--- a/ports/sysdeps/unix/sysv/linux/generic/bits/msq.h
+++ b/ports/sysdeps/unix/sysv/linux/generic/bits/msq.h
@@ -41,23 +41,23 @@ struct msqid_ds
   struct ipc_perm msg_perm;	/* structure describing operation permission */
   __time_t msg_stime;		/* time of last msgsnd command */
 #if __WORDSIZE == 32
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
 #endif
   __time_t msg_rtime;		/* time of last msgrcv command */
 #if __WORDSIZE == 32
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
 #endif
   __time_t msg_ctime;		/* time of last change */
 #if __WORDSIZE == 32
-  unsigned long int __unused3;
+  unsigned long int __glibc_reserved3;
 #endif
   unsigned long int __msg_cbytes; /* current number of bytes on queue */
   msgqnum_t msg_qnum;		/* number of messages currently on queue */
   msglen_t msg_qbytes;		/* max number of bytes allowed on queue */
   __pid_t msg_lspid;		/* pid of last msgsnd() */
   __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  unsigned long int __unused4;
-  unsigned long int __unused5;
+  unsigned long int __glibc_reserved4;
+  unsigned long int __glibc_reserved5;
 };
 
 #ifdef __USE_MISC
diff --git a/ports/sysdeps/unix/sysv/linux/generic/bits/sem.h b/ports/sysdeps/unix/sysv/linux/generic/bits/sem.h
index 8b926ceaba..7b5d36ab51 100644
--- a/ports/sysdeps/unix/sysv/linux/generic/bits/sem.h
+++ b/ports/sysdeps/unix/sysv/linux/generic/bits/sem.h
@@ -42,15 +42,15 @@ struct semid_ds
   struct ipc_perm sem_perm;		/* operation permission struct */
   __time_t sem_otime;			/* last semop() time */
 #if __WORDSIZE == 32
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
 #endif
   __time_t sem_ctime;			/* last time changed by semctl() */
 #if __WORDSIZE == 32
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
 #endif
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused3;
-  unsigned long int __unused4;
+  unsigned long int __glibc_reserved3;
+  unsigned long int __glibc_reserved4;
 };
 
 /* The user should define a union like the following to use it for arguments
diff --git a/ports/sysdeps/unix/sysv/linux/generic/bits/shm.h b/ports/sysdeps/unix/sysv/linux/generic/bits/shm.h
index 070058f7c7..5afd30fdef 100644
--- a/ports/sysdeps/unix/sysv/linux/generic/bits/shm.h
+++ b/ports/sysdeps/unix/sysv/linux/generic/bits/shm.h
@@ -54,21 +54,21 @@ struct shmid_ds
     size_t shm_segsz;			/* size of segment in bytes */
     __time_t shm_atime;			/* time of last shmat() */
 #if __WORDSIZE == 32
-    unsigned long int __unused1;
+    unsigned long int __glibc_reserved1;
 #endif
     __time_t shm_dtime;			/* time of last shmdt() */
 #if __WORDSIZE == 32
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved2;
 #endif
     __time_t shm_ctime;			/* time of last change by shmctl() */
 #if __WORDSIZE == 32
-    unsigned long int __unused3;
+    unsigned long int __glibc_reserved3;
 #endif
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
   };
 
 #ifdef __USE_MISC
@@ -90,10 +90,10 @@ struct	shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
-    unsigned long int __unused3;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
+    unsigned long int __glibc_reserved3;
+    unsigned long int __glibc_reserved4;
   };
 
 struct shm_info
diff --git a/ports/sysdeps/unix/sysv/linux/generic/bits/stat.h b/ports/sysdeps/unix/sysv/linux/generic/bits/stat.h
index feb5f2b1cf..a9a42cca5b 100644
--- a/ports/sysdeps/unix/sysv/linux/generic/bits/stat.h
+++ b/ports/sysdeps/unix/sysv/linux/generic/bits/stat.h
@@ -87,7 +87,7 @@ struct stat
     __time_t st_ctime;			/* Time of last status change.  */
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 #endif
-    int __unused[2];
+    int __glibc_reserved[2];
   };
 
 #undef __field64
@@ -125,7 +125,7 @@ struct stat64
     __time_t st_ctime;			/* Time of last status change.  */
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 #endif
-    int __unused[2];
+    int __glibc_reserved[2];
   };
 #endif
 
diff --git a/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h b/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h
index 04a75e2e87..34827a940f 100644
--- a/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h
+++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h
@@ -57,6 +57,6 @@ struct ipc_perm
 #endif
     unsigned short int __seq;		/* Sequence number.  */
     unsigned int __pad3;
-    __extension__ unsigned long long int __unused1;
-    __extension__ unsigned long long int __unused2;
+    __extension__ unsigned long long int __glibc_reserved1;
+    __extension__ unsigned long long int __glibc_reserved2;
   };
diff --git a/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h b/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h
index ac35f510b5..366165e0fb 100644
--- a/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h
+++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h
@@ -56,8 +56,8 @@ struct msqid_ds
   msglen_t msg_qbytes;		/* max number of bytes allowed on queue */
   __pid_t msg_lspid;		/* pid of last msgsnd() */
   __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 #ifdef __USE_MISC
diff --git a/ports/sysdeps/unix/sysv/linux/hppa/bits/sem.h b/ports/sysdeps/unix/sysv/linux/hppa/bits/sem.h
index 9c180166de..9f471176da 100644
--- a/ports/sysdeps/unix/sysv/linux/hppa/bits/sem.h
+++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/sem.h
@@ -48,8 +48,8 @@ struct semid_ds
 #endif
   __time_t sem_ctime;			/* last time changed by semctl() */
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 /* The user should define a union like the following to use it for arguments
diff --git a/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h b/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h
index 9ebf2ec0d0..6905df0d26 100644
--- a/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h
+++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h
@@ -64,8 +64,8 @@ struct shmid_ds
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };
 
 #ifdef __USE_MISC
@@ -87,10 +87,10 @@ struct	shminfo
     unsigned long shmmni;
     unsigned long shmseg;
     unsigned long shmall;
-    unsigned long __unused1;
-    unsigned long __unused2;
-    unsigned long __unused3;
-    unsigned long __unused4;
+    unsigned long __glibc_reserved1;
+    unsigned long __glibc_reserved2;
+    unsigned long __glibc_reserved3;
+    unsigned long __glibc_reserved4;
   };
 
 struct shm_info
diff --git a/ports/sysdeps/unix/sysv/linux/hppa/kernel_stat.h b/ports/sysdeps/unix/sysv/linux/hppa/kernel_stat.h
index a85c5be464..e3ea72402f 100644
--- a/ports/sysdeps/unix/sysv/linux/hppa/kernel_stat.h
+++ b/ports/sysdeps/unix/sysv/linux/hppa/kernel_stat.h
@@ -13,11 +13,11 @@ struct kernel_stat {
 	struct timespec st_ctim;
 	long		st_blksize;
 	long		st_blocks;
-	unsigned long	__unused1;	/* ACL stuff */
-	unsigned long	__unused2;	/* network */
-	unsigned long	__unused3;	/* network */
-	unsigned long	__unused4;	/* cnodes */
-	unsigned short	__unused5;	/* netsite */
+	unsigned long	__glibc_reserved1;	/* ACL stuff */
+	unsigned long	__glibc_reserved2;	/* network */
+	unsigned long	__glibc_reserved3;	/* network */
+	unsigned long	__glibc_reserved4;	/* cnodes */
+	unsigned short	__glibc_reserved5;	/* netsite */
 	short		st_fstype;
 	unsigned long	st_realdev;
 	unsigned short	st_basemode;
diff --git a/ports/sysdeps/unix/sysv/linux/ia64/bits/ipc.h b/ports/sysdeps/unix/sysv/linux/ia64/bits/ipc.h
index 1063828194..fb78b5bcf0 100644
--- a/ports/sysdeps/unix/sysv/linux/ia64/bits/ipc.h
+++ b/ports/sysdeps/unix/sysv/linux/ia64/bits/ipc.h
@@ -48,6 +48,6 @@ struct ipc_perm
     __mode_t mode;			/* Read/write permission.  */
     unsigned short int __seq;		/* Sequence number.  */
     unsigned short int __pad1;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };
diff --git a/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h b/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h
index 8519390c48..f3f9f75a5a 100644
--- a/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h
+++ b/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h
@@ -42,8 +42,8 @@ struct msqid_ds
   unsigned long int msg_qbytes;	/* max number of bytes allowed on queue */
   __pid_t msg_lspid;		/* pid of last msgsnd() */
   __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 #ifdef __USE_MISC
diff --git a/ports/sysdeps/unix/sysv/linux/ia64/bits/sem.h b/ports/sysdeps/unix/sysv/linux/ia64/bits/sem.h
index 392493bca8..998ba85ef7 100644
--- a/ports/sysdeps/unix/sysv/linux/ia64/bits/sem.h
+++ b/ports/sysdeps/unix/sysv/linux/ia64/bits/sem.h
@@ -42,8 +42,8 @@ struct semid_ds
   __time_t sem_otime;			/* last semop() time */
   __time_t sem_ctime;			/* last time changed by semctl() */
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 /* The user should define a union like the following to use it for arguments
diff --git a/ports/sysdeps/unix/sysv/linux/ia64/bits/shm.h b/ports/sysdeps/unix/sysv/linux/ia64/bits/shm.h
index 05755f87eb..a6c0910f74 100644
--- a/ports/sysdeps/unix/sysv/linux/ia64/bits/shm.h
+++ b/ports/sysdeps/unix/sysv/linux/ia64/bits/shm.h
@@ -52,8 +52,8 @@ struct shmid_ds
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };
 
 #ifdef __USE_MISC
@@ -75,10 +75,10 @@ struct	shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
-    unsigned long int __unused3;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
+    unsigned long int __glibc_reserved3;
+    unsigned long int __glibc_reserved4;
   };
 
 struct shm_info
diff --git a/ports/sysdeps/unix/sysv/linux/ia64/bits/stat.h b/ports/sysdeps/unix/sysv/linux/ia64/bits/stat.h
index b2071cdf55..d984dc4477 100644
--- a/ports/sysdeps/unix/sysv/linux/ia64/bits/stat.h
+++ b/ports/sysdeps/unix/sysv/linux/ia64/bits/stat.h
@@ -64,7 +64,7 @@ struct stat
 #endif
     __blksize_t st_blksize;	/* Optimal block size for I/O.  */
     __blkcnt_t st_blocks;	/* Nr. 512-byte blocks allocated.  */
-    long int __unused[3];
+    long int __glibc_reserved[3];
   };
 
 #ifdef __USE_LARGEFILE64
@@ -103,7 +103,7 @@ struct stat64
 #endif
     __blksize_t st_blksize;	/* Optimal block size for I/O.  */
     __blkcnt64_t st_blocks;	/* Nr. 512-byte blocks allocated.  */
-    long int __unused[3];
+    long int __glibc_reserved[3];
   };
 #endif
 
diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
index fb65b1446c..da6e45647c 100644
--- a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
+++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
@@ -84,8 +84,8 @@ struct stat
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 #endif
 #ifndef __USE_FILE_OFFSET64
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
 #else
     __ino64_t st_ino;			/* File serial number.	*/
 #endif
diff --git a/ports/sysdeps/unix/sysv/linux/microblaze/bits/stat.h b/ports/sysdeps/unix/sysv/linux/microblaze/bits/stat.h
index 0fa0edb5b0..e41d99270f 100644
--- a/ports/sysdeps/unix/sysv/linux/microblaze/bits/stat.h
+++ b/ports/sysdeps/unix/sysv/linux/microblaze/bits/stat.h
@@ -71,8 +71,8 @@ struct stat
         __time_t                st_ctime;     /* Time of last status change.  */
         unsigned long int       st_ctimensec; /* Nsecs of last status change.  */
 #endif
-        unsigned int            __unused4;
-        unsigned int            __unused5;
+        unsigned int            __glibc_reserved4;
+        unsigned int            __glibc_reserved5;
 };
 #else /* __USE_FILE_OFFSET64 */
 /* MS: If __USE_FILE_OFFSET64 is setup then struct stat should match stat64
@@ -115,8 +115,8 @@ struct stat
         __time_t                st_ctime;     /* Time of last status change.  */
         unsigned long int       st_ctimensec; /* Nsecs of last status change.  */
 #endif
-        unsigned int            __unused4;
-        unsigned int            __unused5;
+        unsigned int            __glibc_reserved4;
+        unsigned int            __glibc_reserved5;
 };
 #endif /* __USE_FILE_OFFSET64 */
 
@@ -156,8 +156,8 @@ struct stat64
         __time_t                st_ctime;     /* Time of last status change.  */
         unsigned long int       st_ctimensec; /* Nsecs of last status change.  */
 #endif
-        unsigned int            __unused4;
-        unsigned int            __unused5;
+        unsigned int            __glibc_reserved4;
+        unsigned int            __glibc_reserved5;
 };
 #endif
 
diff --git a/ports/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h b/ports/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h
index 2823856e4d..12d718ef04 100644
--- a/ports/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h
+++ b/ports/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h
@@ -40,10 +40,10 @@ struct kernel_stat
         struct timespec st_ctim;
 #define _HAVE_STAT_NSEC
 #define _HAVE_STAT64_NSEC
-        unsigned int    __unused4;
+        unsigned int    __glibc_reserved4;
 #define _HAVE_STAT___UNUSED4
 #define _HAVE_STAT64___UNUSED4
-        unsigned int    __unused5;
+        unsigned int    __glibc_reserved5;
 #define _HAVE_STAT___UNUSED5
 #define _HAVE_STAT64___UNUSED5
 };
diff --git a/ports/sysdeps/unix/sysv/linux/mips/bits/ipc.h b/ports/sysdeps/unix/sysv/linux/mips/bits/ipc.h
index 8b2892d52b..82496d6841 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/bits/ipc.h
+++ b/ports/sysdeps/unix/sysv/linux/mips/bits/ipc.h
@@ -49,6 +49,6 @@ struct ipc_perm
     unsigned int mode;			/* Read/write permission.  */
     unsigned short int __seq;		/* Sequence number.  */
     unsigned short int __pad1;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
 };
diff --git a/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h b/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h
index e814bc722f..f97585cfd3 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h
+++ b/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h
@@ -39,33 +39,33 @@ struct msqid_ds
 {
   struct ipc_perm msg_perm;	/* structure describing operation permission */
 #if __WORDSIZE == 32 && defined (__MIPSEB__)
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
 #endif
   __time_t msg_stime;		/* time of last msgsnd command */
 #if __WORDSIZE == 32 && defined (__MIPSEL__)
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
 #endif
 #if __WORDSIZE == 32 && defined (__MIPSEB__)
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
 #endif
   __time_t msg_rtime;		/* time of last msgrcv command */
 #if __WORDSIZE == 32 && defined (__MIPSEL__)
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
 #endif
 #if __WORDSIZE == 32 && defined (__MIPSEB__)
-  unsigned long int __unused3;
+  unsigned long int __glibc_reserved3;
 #endif
   __time_t msg_ctime;		/* time of last change */
 #if __WORDSIZE == 32 && defined (__MIPSEL__)
-  unsigned long int __unused3;
+  unsigned long int __glibc_reserved3;
 #endif
   unsigned long int __msg_cbytes; /* current number of bytes on queue */
   msgqnum_t msg_qnum;		/* number of messages currently on queue */
   msglen_t msg_qbytes;		/* max number of bytes allowed on queue */
   __pid_t msg_lspid;		/* pid of last msgsnd() */
   __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  unsigned long int __unused4;
-  unsigned long int __unused5;
+  unsigned long int __glibc_reserved4;
+  unsigned long int __glibc_reserved5;
 };
 
 #ifdef __USE_MISC
diff --git a/ports/sysdeps/unix/sysv/linux/mips/bits/sem.h b/ports/sysdeps/unix/sysv/linux/mips/bits/sem.h
index c2d73aa4e8..739cbc415f 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/bits/sem.h
+++ b/ports/sysdeps/unix/sysv/linux/mips/bits/sem.h
@@ -41,8 +41,8 @@ struct semid_ds
   __time_t sem_otime;			/* last semop() time */
   __time_t sem_ctime;			/* last time changed by semctl() */
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 /* The user should define a union like the following to use it for arguments
diff --git a/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h b/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h
index 5c118037b1..28d8ab05d1 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h
+++ b/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h
@@ -53,8 +53,8 @@ struct shmid_ds
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };
 
 #ifdef __USE_MISC
@@ -75,10 +75,10 @@ struct shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
-    unsigned long int __unused3;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
+    unsigned long int __glibc_reserved3;
+    unsigned long int __glibc_reserved4;
   };
 
 struct shm_info
diff --git a/resolv/netdb.h b/resolv/netdb.h
index 412343b42b..56729d179b 100644
--- a/resolv/netdb.h
+++ b/resolv/netdb.h
@@ -586,7 +586,7 @@ struct gaicb
   struct addrinfo *ar_result;	/* Pointer to result.  */
   /* The following are internal elements.  */
   int __return;
-  int __unused[5];
+  int __glibc_reserved[5];
 };
 
 /* Lookup mode.  */
diff --git a/rt/aio.h b/rt/aio.h
index 23d602dec7..fd2f15dbd6 100644
--- a/rt/aio.h
+++ b/rt/aio.h
@@ -54,7 +54,7 @@ struct aiocb
 #else
   __off64_t aio_offset;		/* File offset.  */
 #endif
-  char __unused[32];
+  char __glibc_reserved[32];
 };
 
 /* The same for the 64bit offsets.  Please note that the members aio_fildes
@@ -77,7 +77,7 @@ struct aiocb64
   __ssize_t __return_value;
 
   __off64_t aio_offset;		/* File offset.  */
-  char __unused[32];
+  char __glibc_reserved[32];
 };
 #endif
 
diff --git a/sysdeps/gnu/bits/utmp.h b/sysdeps/gnu/bits/utmp.h
index 8a768d97c5..ebb611cf32 100644
--- a/sysdeps/gnu/bits/utmp.h
+++ b/sysdeps/gnu/bits/utmp.h
@@ -81,7 +81,7 @@ struct utmp
 #endif
 
   int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
-  char __unused[20];		/* Reserved for future use.  */
+  char __glibc_reserved[20];		/* Reserved for future use.  */
 };
 
 /* Backwards compatibility hacks.  */
diff --git a/sysdeps/gnu/bits/utmpx.h b/sysdeps/gnu/bits/utmpx.h
index 6cfb31644b..271d8b7d96 100644
--- a/sysdeps/gnu/bits/utmpx.h
+++ b/sysdeps/gnu/bits/utmpx.h
@@ -78,7 +78,7 @@ struct utmpx
   struct timeval ut_tv;		/* Time entry was made.  */
 #endif
   __int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
-  char __unused[20];		/* Reserved for future use.  */
+  char __glibc_reserved[20];		/* Reserved for future use.  */
 };
 
 
diff --git a/sysdeps/gnu/netinet/ip_icmp.h b/sysdeps/gnu/netinet/ip_icmp.h
index 136fb4703e..d23318c9d3 100644
--- a/sysdeps/gnu/netinet/ip_icmp.h
+++ b/sysdeps/gnu/netinet/ip_icmp.h
@@ -38,7 +38,7 @@ struct icmphdr
     u_int32_t	gateway;	/* gateway address */
     struct
     {
-      u_int16_t	__unused;
+      u_int16_t	__glibc_reserved;
       u_int16_t	mtu;
     } frag;			/* path mtu discovery */
   } un;
diff --git a/sysdeps/unix/sysv/linux/bits/ipc.h b/sysdeps/unix/sysv/linux/bits/ipc.h
index a29cb6db28..9460643e73 100644
--- a/sysdeps/unix/sysv/linux/bits/ipc.h
+++ b/sysdeps/unix/sysv/linux/bits/ipc.h
@@ -50,6 +50,6 @@ struct ipc_perm
     unsigned short int __pad1;
     unsigned short int __seq;		/* Sequence number.  */
     unsigned short int __pad2;
-    __syscall_ulong_t __unused1;
-    __syscall_ulong_t __unused2;
+    __syscall_ulong_t __glibc_reserved1;
+    __syscall_ulong_t __glibc_reserved2;
   };
diff --git a/sysdeps/unix/sysv/linux/bits/msq.h b/sysdeps/unix/sysv/linux/bits/msq.h
index 8f6eb8a7d0..59fc2fdcc3 100644
--- a/sysdeps/unix/sysv/linux/bits/msq.h
+++ b/sysdeps/unix/sysv/linux/bits/msq.h
@@ -39,18 +39,18 @@ struct msqid_ds
 {
   struct ipc_perm msg_perm;	/* structure describing operation permission */
   __time_t msg_stime;		/* time of last msgsnd command */
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
   __time_t msg_rtime;		/* time of last msgrcv command */
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
   __time_t msg_ctime;		/* time of last change */
-  unsigned long int __unused3;
+  unsigned long int __glibc_reserved3;
   unsigned long int __msg_cbytes; /* current number of bytes on queue */
   msgqnum_t msg_qnum;		/* number of messages currently on queue */
   msglen_t msg_qbytes;		/* max number of bytes allowed on queue */
   __pid_t msg_lspid;		/* pid of last msgsnd() */
   __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  unsigned long int __unused4;
-  unsigned long int __unused5;
+  unsigned long int __glibc_reserved4;
+  unsigned long int __glibc_reserved5;
 };
 
 #ifdef __USE_MISC
diff --git a/sysdeps/unix/sysv/linux/bits/sem.h b/sysdeps/unix/sysv/linux/bits/sem.h
index 62f5407415..26ea325a19 100644
--- a/sysdeps/unix/sysv/linux/bits/sem.h
+++ b/sysdeps/unix/sysv/linux/bits/sem.h
@@ -39,12 +39,12 @@ struct semid_ds
 {
   struct ipc_perm sem_perm;		/* operation permission struct */
   __time_t sem_otime;			/* last semop() time */
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
   __time_t sem_ctime;			/* last time changed by semctl() */
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused3;
-  unsigned long int __unused4;
+  unsigned long int __glibc_reserved3;
+  unsigned long int __glibc_reserved4;
 };
 
 /* The user should define a union like the following to use it for arguments
diff --git a/sysdeps/unix/sysv/linux/bits/shm.h b/sysdeps/unix/sysv/linux/bits/shm.h
index e0ad934df3..5390d66cfa 100644
--- a/sysdeps/unix/sysv/linux/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/bits/shm.h
@@ -51,16 +51,16 @@ struct shmid_ds
     struct ipc_perm shm_perm;		/* operation permission struct */
     size_t shm_segsz;			/* size of segment in bytes */
     __time_t shm_atime;			/* time of last shmat() */
-    unsigned long int __unused1;
+    unsigned long int __glibc_reserved1;
     __time_t shm_dtime;			/* time of last shmdt() */
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved2;
     __time_t shm_ctime;			/* time of last change by shmctl() */
-    unsigned long int __unused3;
+    unsigned long int __glibc_reserved3;
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
   };
 
 #ifdef __USE_MISC
@@ -82,10 +82,10 @@ struct	shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
-    unsigned long int __unused3;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
+    unsigned long int __glibc_reserved3;
+    unsigned long int __glibc_reserved4;
   };
 
 struct shm_info
diff --git a/sysdeps/unix/sysv/linux/bits/stat.h b/sysdeps/unix/sysv/linux/bits/stat.h
index d71093ef3f..65e2a5a30a 100644
--- a/sysdeps/unix/sysv/linux/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/bits/stat.h
@@ -84,8 +84,8 @@ struct stat
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 #endif
 #ifndef __USE_FILE_OFFSET64
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
 #else
     __ino64_t st_ino;			/* File serial number.	*/
 #endif
diff --git a/sysdeps/unix/sysv/linux/kernel_stat.h b/sysdeps/unix/sysv/linux/kernel_stat.h
index 9f8434caad..dcdab48dbb 100644
--- a/sysdeps/unix/sysv/linux/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/kernel_stat.h
@@ -18,9 +18,9 @@ struct kernel_stat
     struct timespec st_atim;
     struct timespec st_mtim;
     struct timespec st_ctim;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved4;
 #define _HAVE___UNUSED4
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved5;
 #define _HAVE___UNUSED5
   };
 
diff --git a/sysdeps/unix/sysv/linux/ntp_gettimex.c b/sysdeps/unix/sysv/linux/ntp_gettimex.c
index 24dae736e9..4f3522743a 100644
--- a/sysdeps/unix/sysv/linux/ntp_gettimex.c
+++ b/sysdeps/unix/sysv/linux/ntp_gettimex.c
@@ -37,9 +37,9 @@ ntp_gettimex (struct ntptimeval *ntv)
   ntv->maxerror = tntx.maxerror;
   ntv->esterror = tntx.esterror;
   ntv->tai = tntx.tai;
-  ntv->__unused1 = 0;
-  ntv->__unused2 = 0;
-  ntv->__unused3 = 0;
-  ntv->__unused4 = 0;
+  ntv->__glibc_reserved1 = 0;
+  ntv->__glibc_reserved2 = 0;
+  ntv->__glibc_reserved3 = 0;
+  ntv->__glibc_reserved4 = 0;
   return result;
 }
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h b/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
index f2bb635a54..889bbcdb4a 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
@@ -49,8 +49,8 @@ struct ipc_perm
     __mode_t mode;		/* Read/write permission.  */
     __uint32_t __seq;		/* Sequence number.  */
     __uint32_t __pad1;
-    __uint64_t __unused1;
-    __uint64_t __unused2;
+    __uint64_t __glibc_reserved1;
+    __uint64_t __glibc_reserved2;
   };
 
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/msq.h b/sysdeps/unix/sysv/linux/powerpc/bits/msq.h
index 59147c268c..b22fa72e84 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/msq.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/msq.h
@@ -39,15 +39,15 @@ struct msqid_ds
 {
   struct ipc_perm msg_perm;    /* structure describing operation permission */
 #if __WORDSIZE == 32
-  unsigned int __unused1;
+  unsigned int __glibc_reserved1;
 #endif
   __time_t msg_stime;          /* time of last msgsnd command */
 #if __WORDSIZE == 32
-  unsigned int __unused2;
+  unsigned int __glibc_reserved2;
 #endif
   __time_t msg_rtime;          /* time of last msgrcv command */
 #if __WORDSIZE == 32
-  unsigned int __unused3;
+  unsigned int __glibc_reserved3;
 #endif
   __time_t msg_ctime;          /* time of last change */
   unsigned long __msg_cbytes; /* current number of bytes on queue */
@@ -55,8 +55,8 @@ struct msqid_ds
   msglen_t msg_qbytes;         /* max number of bytes allowed on queue */
   __pid_t msg_lspid;           /* pid of last msgsnd() */
   __pid_t msg_lrpid;           /* pid of last msgrcv() */
-  unsigned long __unused4;
-  unsigned long __unused5;
+  unsigned long __glibc_reserved4;
+  unsigned long __glibc_reserved5;
 };
 
 #ifdef __USE_MISC
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/sem.h b/sysdeps/unix/sysv/linux/powerpc/bits/sem.h
index 3847a3377e..56f47f118f 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/sem.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/sem.h
@@ -39,16 +39,16 @@ struct semid_ds
 {
   struct ipc_perm sem_perm;            /* operation permission struct */
 #if __WORDSIZE == 32
-  unsigned int __unused1;
+  unsigned int __glibc_reserved1;
 #endif
   __time_t sem_otime;                  /* last semop() time */
 #if __WORDSIZE == 32
-  unsigned int __unused2;
+  unsigned int __glibc_reserved2;
 #endif
   __time_t sem_ctime;                  /* last time changed by semctl() */
   unsigned long int sem_nsems;         /* number of semaphores in set */
-  unsigned long __unused3;
-  unsigned long __unused4;
+  unsigned long __glibc_reserved3;
+  unsigned long __glibc_reserved4;
 };
 
 /* The user should define a union like the following to use it for arguments
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/shm.h b/sysdeps/unix/sysv/linux/powerpc/bits/shm.h
index e43d2fd168..a343335bd0 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/shm.h
@@ -50,26 +50,26 @@ struct shmid_ds
   {
     struct ipc_perm shm_perm;          /* operation permission struct */
 #if __WORDSIZE == 32
-    unsigned int __unused1;
+    unsigned int __glibc_reserved1;
 #endif
     __time_t shm_atime;                        /* time of last shmat() */
 #if __WORDSIZE == 32
-    unsigned int __unused2;
+    unsigned int __glibc_reserved2;
 #endif
     __time_t shm_dtime;                        /* time of last shmdt() */
 #if __WORDSIZE == 32
-    unsigned int __unused3;
+    unsigned int __glibc_reserved3;
 #endif
     __time_t shm_ctime;			/* time of last change by shmctl() */
 #if __WORDSIZE == 32
-    unsigned int __unused4;
+    unsigned int __glibc_reserved4;
 #endif
     size_t shm_segsz;                  /* size of segment in bytes */
     __pid_t shm_cpid;                  /* pid of creator */
     __pid_t shm_lpid;                  /* pid of last shmop */
     shmatt_t shm_nattch;               /* number of current attaches */
-    unsigned long __unused5;
-    unsigned long __unused6;
+    unsigned long __glibc_reserved5;
+    unsigned long __glibc_reserved6;
   };
 
 #ifdef __USE_MISC
@@ -91,10 +91,10 @@ struct shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
-    unsigned long int __unused3;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
+    unsigned long int __glibc_reserved3;
+    unsigned long int __glibc_reserved4;
   };
 
 struct shm_info
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/stat.h b/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
index e5faec0106..252aae9eac 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
@@ -91,8 +91,8 @@ struct stat
     __time_t st_ctime;			/* Time of last status change.  */
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 # endif
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
   };
 
 
@@ -131,8 +131,8 @@ struct stat64
     __time_t st_ctime;			/* Time of last status change.  */
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 #  endif
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
   };
 # endif /* __USE_LARGEFILE64 */
 
@@ -185,9 +185,9 @@ struct stat
     __time_t st_ctime;			/* Time of last status change.  */
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 # endif
-    unsigned long int __unused4;
-    unsigned long int __unused5;
-    unsigned long int __unused6;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
+    unsigned long int __glibc_reserved6;
   };
 
 # ifdef __USE_LARGEFILE64
@@ -225,9 +225,9 @@ struct stat64
     __time_t st_ctime;			/* Time of last status change.  */
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 #  endif
-    unsigned long int __unused4;
-    unsigned long int __unused5;
-    unsigned long int __unused6;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
+    unsigned long int __glibc_reserved6;
   };
 # endif /* __USE_LARGEFILE64 */
 #endif
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h
index 93cfb764a5..b816da9297 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h
@@ -31,9 +31,9 @@ struct kernel_stat
     struct timespec st_atim;
     struct timespec st_mtim;
     struct timespec st_ctim;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved4;
 #define _HAVE___UNUSED4
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved5;
 #define _HAVE___UNUSED5
   };
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h b/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
index 935a68c70a..11f48b5b85 100644
--- a/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
@@ -97,7 +97,7 @@ typedef struct _libc_vrstate
 } vrregset_t  __attribute__((__aligned__(16)));
 
 typedef struct {
-	unsigned long	__unused[4];
+	unsigned long	__glibc_reserved[4];
 	int		signal;
 	int		__pad0;
 	unsigned long	handler;
diff --git a/sysdeps/unix/sysv/linux/s390/bits/ipc.h b/sysdeps/unix/sysv/linux/s390/bits/ipc.h
index 39519a4a1c..1493af7967 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/ipc.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/ipc.h
@@ -55,6 +55,6 @@ struct ipc_perm
 #endif
     unsigned short int __seq;		/* Sequence number.  */
     unsigned short int __pad2;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };
diff --git a/sysdeps/unix/sysv/linux/s390/bits/msq.h b/sysdeps/unix/sysv/linux/s390/bits/msq.h
index a5eaf89ddf..e2a7e03710 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/msq.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/msq.h
@@ -41,23 +41,23 @@ struct msqid_ds
   struct ipc_perm msg_perm;	/* structure describing operation permission */
   __time_t msg_stime;		/* time of last msgsnd command */
 #if __WORDSIZE != 64
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
 #endif
   __time_t msg_rtime;		/* time of last msgrcv command */
 #if __WORDSIZE != 64
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
 #endif
   __time_t msg_ctime;		/* time of last change */
 #if __WORDSIZE != 64
-  unsigned long int __unused3;
+  unsigned long int __glibc_reserved3;
 #endif
   unsigned long int __msg_cbytes; /* current number of bytes on queue */
   msgqnum_t msg_qnum;		/* number of messages currently on queue */
   msglen_t msg_qbytes;		/* max number of bytes allowed on queue */
   __pid_t msg_lspid;		/* pid of last msgsnd() */
   __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  unsigned long int __unused4;
-  unsigned long int __unused5;
+  unsigned long int __glibc_reserved4;
+  unsigned long int __glibc_reserved5;
 };
 
 #ifdef __USE_MISC
diff --git a/sysdeps/unix/sysv/linux/s390/bits/sem.h b/sysdeps/unix/sysv/linux/s390/bits/sem.h
index fe94448caa..7bfc477e27 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/sem.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/sem.h
@@ -41,15 +41,15 @@ struct semid_ds
   struct ipc_perm sem_perm;		/* operation permission struct */
   __time_t sem_otime;			/* last semop() time */
 #if __WORDSIZE != 64
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
 #endif
   __time_t sem_ctime;			/* last time changed by semctl() */
 #if __WORDSIZE != 64
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
 #endif
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused3;
-  unsigned long int __unused4;
+  unsigned long int __glibc_reserved3;
+  unsigned long int __glibc_reserved4;
 };
 
 /* The user should define a union like the following to use it for arguments
diff --git a/sysdeps/unix/sysv/linux/s390/bits/shm.h b/sysdeps/unix/sysv/linux/s390/bits/shm.h
index c678219e9c..358e617a7d 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/shm.h
@@ -53,21 +53,21 @@ struct shmid_ds
     size_t shm_segsz;			/* size of segment in bytes */
     __time_t shm_atime;			/* time of last shmat() */
 #if __WORDSIZE != 64
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
 #endif
     __time_t shm_dtime;			/* time of last shmdt() */
 #if __WORDSIZE != 64
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
 #endif
     __time_t shm_ctime;			/* time of last change by shmctl() */
 #if __WORDSIZE != 64
-  unsigned long int __unused3;
+  unsigned long int __glibc_reserved3;
 #endif
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
   };
 
 #ifdef __USE_MISC
@@ -89,10 +89,10 @@ struct	shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
-    unsigned long int __unused3;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
+    unsigned long int __glibc_reserved3;
+    unsigned long int __glibc_reserved4;
   };
 
 struct shm_info
diff --git a/sysdeps/unix/sysv/linux/s390/bits/stat.h b/sysdeps/unix/sysv/linux/s390/bits/stat.h
index 5d1e222dbb..51be598ebb 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/stat.h
@@ -81,7 +81,7 @@ struct stat
 #endif
     __blksize_t st_blksize;	/* Optimal block size for I/O.	*/
     __blkcnt_t st_blocks;	/* Nr. 512-byte blocks allocated.  */
-    long int __unused[3];
+    long int __glibc_reserved[3];
   };
 #else
 struct stat
@@ -133,8 +133,8 @@ struct stat
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 # endif
 # ifndef __USE_FILE_OFFSET64
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
 # else
     __ino64_t st_ino;			/* File serial number.	*/
 # endif
@@ -178,7 +178,7 @@ struct stat64
 #  endif
     __blksize_t st_blksize;	/* Optimal block size for I/O.	*/
     __blkcnt64_t st_blocks;	/* Nr. 512-byte blocks allocated.  */
-    long int __unused[3];
+    long int __glibc_reserved[3];
   };
 # else
 struct stat64
diff --git a/sysdeps/unix/sysv/linux/s390/bits/utmp.h b/sysdeps/unix/sysv/linux/s390/bits/utmp.h
index a46470ffcf..96c1c99ffc 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/utmp.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/utmp.h
@@ -81,7 +81,7 @@ struct utmp
 #endif
 
   int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
-  char __unused[20];		/* Reserved for future use.  */
+  char __glibc_reserved[20];		/* Reserved for future use.  */
 };
 
 /* Backwards compatibility hacks.  */
diff --git a/sysdeps/unix/sysv/linux/s390/bits/utmpx.h b/sysdeps/unix/sysv/linux/s390/bits/utmpx.h
index 1fba0b6da6..cb6067b93a 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/utmpx.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/utmpx.h
@@ -78,7 +78,7 @@ struct utmpx
   struct timeval ut_tv;		/* Time entry was made.  */
 #endif
   __int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
-  char __unused[20];		/* Reserved for future use.  */
+  char __glibc_reserved[20];		/* Reserved for future use.  */
 };
 
 
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.h b/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.h
index 350b3e69ee..ae7f04d0b9 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.h
@@ -44,7 +44,7 @@ struct utmp32
   } ut_tv;			/* Time entry was made.  */
 
   int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
-  char __unused[20];		/* Reserved for future use.  */
+  char __glibc_reserved[20];		/* Reserved for future use.  */
 };
 
 
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h
index 82fc774a9a..9e4f33d485 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h
@@ -44,7 +44,7 @@ struct utmpx32
   } ut_tv;			/* Time entry was made.  */
 
   __int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
-  char __unused[20];		/* Reserved for future use.  */
+  char __glibc_reserved[20];		/* Reserved for future use.  */
 };
 
 /* The internal interface needed by the compat wrapper functions.  */
diff --git a/sysdeps/unix/sysv/linux/sh/bits/shm.h b/sysdeps/unix/sysv/linux/sh/bits/shm.h
index d67172b7dc..d35160927c 100644
--- a/sysdeps/unix/sysv/linux/sh/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/sh/bits/shm.h
@@ -49,16 +49,16 @@ struct shmid_ds
     struct ipc_perm shm_perm;		/* operation permission struct */
     size_t shm_segsz;			/* size of segment in bytes */
     __time_t shm_atime;			/* time of last shmat() */
-    unsigned long int __unused1;
+    unsigned long int __glibc_reserved1;
     __time_t shm_dtime;			/* time of last shmdt() */
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved2;
     __time_t shm_ctime;			/* time of last change by shmctl() */
-    unsigned long int __unused3;
+    unsigned long int __glibc_reserved3;
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
   };
 
 #ifdef __USE_MISC
@@ -80,10 +80,10 @@ struct	shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
-    unsigned long int __unused3;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
+    unsigned long int __glibc_reserved3;
+    unsigned long int __glibc_reserved4;
   };
 
 struct shm_info
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
index f384bc7fd4..7efdf68146 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
@@ -82,7 +82,7 @@ struct flock
     __off64_t l_len;	/* Size of the locked area; zero means until EOF.  */
 #endif
     __pid_t l_pid;	/* Process holding the lock.  */
-    short int __unused;
+    short int __glibc_reserved;
   };
 
 #ifdef __USE_LARGEFILE64
@@ -93,7 +93,7 @@ struct flock64
     __off64_t l_start;	/* Offset where the lock begins.  */
     __off64_t l_len;	/* Size of the locked area; zero means until EOF.  */
     __pid_t l_pid;	/* Process holding the lock.  */
-    short int __unused;
+    short int __glibc_reserved;
   };
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/ipc.h b/sysdeps/unix/sysv/linux/sparc/bits/ipc.h
index e59f96abc5..885c1f77a8 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/ipc.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/ipc.h
@@ -56,6 +56,6 @@ struct ipc_perm
     unsigned short int __pad1;
 #endif
     unsigned short int __seq;		/* Sequence number.  */
-    __extension__ unsigned long long int __unused1;
-    __extension__ unsigned long long int __unused2;
+    __extension__ unsigned long long int __glibc_reserved1;
+    __extension__ unsigned long long int __glibc_reserved2;
   };
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/msq.h b/sysdeps/unix/sysv/linux/sparc/bits/msq.h
index 0a0192732c..cdeda0f586 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/msq.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/msq.h
@@ -56,8 +56,8 @@ struct msqid_ds
   msglen_t msg_qbytes;		/* max number of bytes allowed on queue */
   __pid_t msg_lspid;		/* pid of last msgsnd() */
   __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 #ifdef __USE_MISC
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/sem.h b/sysdeps/unix/sysv/linux/sparc/bits/sem.h
index ca02733488..558e5aa2b0 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/sem.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/sem.h
@@ -48,8 +48,8 @@ struct semid_ds
 #endif
   __time_t sem_ctime;			/* last time changed by semctl() */
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 /* The user should define a union like the following to use it for arguments
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/shm.h b/sysdeps/unix/sysv/linux/sparc/bits/shm.h
index 4cbfc721bf..4518cf00ec 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/shm.h
@@ -66,8 +66,8 @@ struct shmid_ds
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };
 
 #ifdef __USE_MISC
@@ -89,10 +89,10 @@ struct	shminfo
     unsigned long shmmni;
     unsigned long shmseg;
     unsigned long shmall;
-    unsigned long __unused1;
-    unsigned long __unused2;
-    unsigned long __unused3;
-    unsigned long __unused4;
+    unsigned long __glibc_reserved1;
+    unsigned long __glibc_reserved2;
+    unsigned long __glibc_reserved3;
+    unsigned long __glibc_reserved4;
   };
 
 struct shm_info
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/stat.h b/sysdeps/unix/sysv/linux/sparc/bits/stat.h
index 9f6812e57b..b87fd584df 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/stat.h
@@ -83,8 +83,8 @@ struct stat
     __time_t st_ctime;			/* Time of last status change.  */
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 #endif
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
   };
 
 #ifdef __USE_LARGEFILE64
@@ -126,8 +126,8 @@ struct stat64
     __time_t st_ctime;			/* Time of last status change.  */
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 # endif
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
   };
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h b/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
index a0da019c5f..5b894b83f9 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
@@ -14,8 +14,8 @@ struct kernel_stat
     struct timespec st_ctim;
     long int st_blksize;
     long int st_blocks;
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
   };
 
 #define _HAVE___UNUSED4
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h b/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
index a4e411d132..2a26a78d9c 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
@@ -14,8 +14,8 @@ struct kernel_stat
     long int st_ctime_sec;
     long int st_blksize;
     long int st_blocks;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };
 
 /* Definition of `struct stat64' used in the kernel.  */
@@ -41,7 +41,7 @@ struct kernel_stat64
     unsigned long int st_mtime_nsec;
     unsigned long int st_ctime_sec;
     unsigned long int st_ctime_nsec;
-    long int __unused[3];
+    long int __glibc_reserved[3];
   };
 
 #define XSTAT_IS_XSTAT64 1
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c b/sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c
index b7e4d96cff..f41d8252ce 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c
@@ -58,8 +58,8 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
 	buf->st_mtim.tv_nsec = 0;
 	buf->st_ctim.tv_sec = kbuf->st_ctime_sec;
 	buf->st_ctim.tv_nsec = 0;
-	buf->__unused4 = 0;
-	buf->__unused5 = 0;
+	buf->__glibc_reserved4 = 0;
+	buf->__glibc_reserved5 = 0;
       }
       break;
 
@@ -108,8 +108,8 @@ __xstat32_conv (int vers, struct stat64 *sbuf, struct stat *buf)
 	buf->st_mtim.tv_nsec = kbuf->st_mtime_nsec;
 	buf->st_ctim.tv_sec = kbuf->st_ctime_sec;
 	buf->st_ctim.tv_nsec = kbuf->st_ctime_nsec;
-	buf->__unused4 = 0;
-	buf->__unused5 = 0;
+	buf->__glibc_reserved4 = 0;
+	buf->__glibc_reserved5 = 0;
       }
       break;
 
diff --git a/sysdeps/unix/sysv/linux/sparc/sys/procfs.h b/sysdeps/unix/sysv/linux/sparc/sys/procfs.h
index 4d8c450017..db7ef22abe 100644
--- a/sysdeps/unix/sysv/linux/sparc/sys/procfs.h
+++ b/sysdeps/unix/sysv/linux/sparc/sys/procfs.h
@@ -55,7 +55,7 @@ typedef struct
 	unsigned long	pr_regs[32];
 	double		pr_dregs[16];
       }			pr_fr;
-    unsigned long	__unused;
+    unsigned long	__glibc_reserved;
     unsigned long	pr_fsr;
     unsigned char	pr_qcnt;
     unsigned char	pr_q_entrysize;
@@ -150,7 +150,7 @@ typedef struct
 	unsigned int	pr_regs[32];
 	double		pr_dregs[16];
       }			pr_fr;
-    unsigned int	__unused;
+    unsigned int	__glibc_reserved;
     unsigned int	pr_fsr;
     unsigned char	pr_qcnt;
     unsigned char	pr_q_entrysize;
diff --git a/sysdeps/unix/sysv/linux/sys/timex.h b/sysdeps/unix/sysv/linux/sys/timex.h
index 610ad630fa..9fea624c92 100644
--- a/sysdeps/unix/sysv/linux/sys/timex.h
+++ b/sysdeps/unix/sysv/linux/sys/timex.h
@@ -34,10 +34,10 @@ struct ntptimeval
   long int esterror;	/* estimated error (us) (ro) */
   long int tai;		/* TAI offset (ro) */
 
-  long int __unused1;
-  long int __unused2;
-  long int __unused3;
-  long int __unused4;
+  long int __glibc_reserved1;
+  long int __glibc_reserved2;
+  long int __glibc_reserved3;
+  long int __glibc_reserved4;
 };
 
 /* Clock states (time_state) */
diff --git a/sysdeps/unix/sysv/linux/x86/bits/msq.h b/sysdeps/unix/sysv/linux/x86/bits/msq.h
index 9355e465d5..f078bbeeeb 100644
--- a/sysdeps/unix/sysv/linux/x86/bits/msq.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/msq.h
@@ -39,23 +39,23 @@ struct msqid_ds
   struct ipc_perm msg_perm;	/* structure describing operation permission */
   __time_t msg_stime;		/* time of last msgsnd command */
 #ifndef __x86_64__
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
 #endif
   __time_t msg_rtime;		/* time of last msgrcv command */
 #ifndef __x86_64__
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
 #endif
   __time_t msg_ctime;		/* time of last change */
 #ifndef __x86_64__
-  unsigned long int __unused3;
+  unsigned long int __glibc_reserved3;
 #endif
   __syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */
   msgqnum_t msg_qnum;		/* number of messages currently on queue */
   msglen_t msg_qbytes;		/* max number of bytes allowed on queue */
   __pid_t msg_lspid;		/* pid of last msgsnd() */
   __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  __syscall_ulong_t __unused4;
-  __syscall_ulong_t __unused5;
+  __syscall_ulong_t __glibc_reserved4;
+  __syscall_ulong_t __glibc_reserved5;
 };
 
 #ifdef __USE_MISC
diff --git a/sysdeps/unix/sysv/linux/x86/bits/sem.h b/sysdeps/unix/sysv/linux/x86/bits/sem.h
index b2eaaa9a36..2ec6bb5b8c 100644
--- a/sysdeps/unix/sysv/linux/x86/bits/sem.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/sem.h
@@ -39,12 +39,12 @@ struct semid_ds
 {
   struct ipc_perm sem_perm;		/* operation permission struct */
   __time_t sem_otime;			/* last semop() time */
-  __syscall_ulong_t __unused1;
+  __syscall_ulong_t __glibc_reserved1;
   __time_t sem_ctime;			/* last time changed by semctl() */
-  __syscall_ulong_t __unused2;
+  __syscall_ulong_t __glibc_reserved2;
   __syscall_ulong_t sem_nsems;		/* number of semaphores in set */
-  __syscall_ulong_t __unused3;
-  __syscall_ulong_t __unused4;
+  __syscall_ulong_t __glibc_reserved3;
+  __syscall_ulong_t __glibc_reserved4;
 };
 
 /* The user should define a union like the following to use it for arguments
diff --git a/sysdeps/unix/sysv/linux/x86/bits/shm.h b/sysdeps/unix/sysv/linux/x86/bits/shm.h
index 4fdd06243e..13b11bf230 100644
--- a/sysdeps/unix/sysv/linux/x86/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/shm.h
@@ -52,21 +52,21 @@ struct shmid_ds
     size_t shm_segsz;			/* size of segment in bytes */
     __time_t shm_atime;			/* time of last shmat() */
 #ifndef __x86_64__
-    unsigned long int __unused1;
+    unsigned long int __glibc_reserved1;
 #endif
     __time_t shm_dtime;			/* time of last shmdt() */
 #ifndef __x86_64__
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved2;
 #endif
     __time_t shm_ctime;			/* time of last change by shmctl() */
 #ifndef __x86_64__
-    unsigned long int __unused3;
+    unsigned long int __glibc_reserved3;
 #endif
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    __syscall_ulong_t __unused4;
-    __syscall_ulong_t __unused5;
+    __syscall_ulong_t __glibc_reserved4;
+    __syscall_ulong_t __glibc_reserved5;
   };
 
 #ifdef __USE_MISC
@@ -88,10 +88,10 @@ struct	shminfo
     __syscall_ulong_t shmmni;
     __syscall_ulong_t shmseg;
     __syscall_ulong_t shmall;
-    __syscall_ulong_t __unused1;
-    __syscall_ulong_t __unused2;
-    __syscall_ulong_t __unused3;
-    __syscall_ulong_t __unused4;
+    __syscall_ulong_t __glibc_reserved1;
+    __syscall_ulong_t __glibc_reserved2;
+    __syscall_ulong_t __glibc_reserved3;
+    __syscall_ulong_t __glibc_reserved4;
   };
 
 struct shm_info
diff --git a/sysdeps/unix/sysv/linux/x86/bits/stat.h b/sysdeps/unix/sysv/linux/x86/bits/stat.h
index 9e2f78f8b5..efda6731a0 100644
--- a/sysdeps/unix/sysv/linux/x86/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/stat.h
@@ -103,11 +103,11 @@ struct stat
     __syscall_ulong_t st_ctimensec;	/* Nsecs of last status change.  */
 #endif
 #ifdef __x86_64__
-    __syscall_slong_t __unused[3];
+    __syscall_slong_t __glibc_reserved[3];
 #else
 # ifndef __USE_FILE_OFFSET64
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
 # else
     __ino64_t st_ino;			/* File serial number.	*/
 # endif
@@ -161,7 +161,7 @@ struct stat64
     __syscall_ulong_t st_ctimensec;	/* Nsecs of last status change.  */
 # endif
 # ifdef __x86_64__
-    __syscall_slong_t __unused[3];
+    __syscall_slong_t __glibc_reserved[3];
 # else
     __ino64_t st_ino;			/* File serial number.		*/
 # endif
diff --git a/sysdeps/unix/sysv/linux/xstatconv.c b/sysdeps/unix/sysv/linux/xstatconv.c
index 858b911487..60e4e10797 100644
--- a/sysdeps/unix/sysv/linux/xstatconv.c
+++ b/sysdeps/unix/sysv/linux/xstatconv.c
@@ -78,19 +78,19 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
 	buf->st_ctime = kbuf->st_ctime;
 #endif
 #ifdef _HAVE_STAT___UNUSED1
-	buf->__unused1 = 0;
+	buf->__glibc_reserved1 = 0;
 #endif
 #ifdef _HAVE_STAT___UNUSED2
-	buf->__unused2 = 0;
+	buf->__glibc_reserved2 = 0;
 #endif
 #ifdef _HAVE_STAT___UNUSED3
-	buf->__unused3 = 0;
+	buf->__glibc_reserved3 = 0;
 #endif
 #ifdef _HAVE_STAT___UNUSED4
-	buf->__unused4 = 0;
+	buf->__glibc_reserved4 = 0;
 #endif
 #ifdef _HAVE_STAT___UNUSED5
-	buf->__unused5 = 0;
+	buf->__glibc_reserved5 = 0;
 #endif
       }
       break;
@@ -149,19 +149,19 @@ __xstat64_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
 	buf->st_ctime = kbuf->st_ctime;
 #endif
 #ifdef _HAVE_STAT64___UNUSED1
-	buf->__unused1 = 0;
+	buf->__glibc_reserved1 = 0;
 #endif
 #ifdef _HAVE_STAT64___UNUSED2
-	buf->__unused2 = 0;
+	buf->__glibc_reserved2 = 0;
 #endif
 #ifdef _HAVE_STAT64___UNUSED3
-	buf->__unused3 = 0;
+	buf->__glibc_reserved3 = 0;
 #endif
 #ifdef _HAVE_STAT64___UNUSED4
-	buf->__unused4 = 0;
+	buf->__glibc_reserved4 = 0;
 #endif
 #ifdef _HAVE_STAT64___UNUSED5
-	buf->__unused5 = 0;
+	buf->__glibc_reserved5 = 0;
 #endif
       }
       break;
@@ -254,19 +254,19 @@ __xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf)
 #endif
 
 #ifdef _HAVE_STAT___UNUSED1
-	buf->__unused1 = 0;
+	buf->__glibc_reserved1 = 0;
 #endif
 #ifdef _HAVE_STAT___UNUSED2
-	buf->__unused2 = 0;
+	buf->__glibc_reserved2 = 0;
 #endif
 #ifdef _HAVE_STAT___UNUSED3
-	buf->__unused3 = 0;
+	buf->__glibc_reserved3 = 0;
 #endif
 #ifdef _HAVE_STAT___UNUSED4
-	buf->__unused4 = 0;
+	buf->__glibc_reserved4 = 0;
 #endif
 #ifdef _HAVE_STAT___UNUSED5
-	buf->__unused5 = 0;
+	buf->__glibc_reserved5 = 0;
 #endif
       }
       break;
diff --git a/sysdeps/x86/fpu/bits/fenv.h b/sysdeps/x86/fpu/bits/fenv.h
index b9040cce90..07cac2887c 100644
--- a/sysdeps/x86/fpu/bits/fenv.h
+++ b/sysdeps/x86/fpu/bits/fenv.h
@@ -75,18 +75,18 @@ typedef unsigned short int fexcept_t;
 typedef struct
   {
     unsigned short int __control_word;
-    unsigned short int __unused1;
+    unsigned short int __glibc_reserved1;
     unsigned short int __status_word;
-    unsigned short int __unused2;
+    unsigned short int __glibc_reserved2;
     unsigned short int __tags;
-    unsigned short int __unused3;
+    unsigned short int __glibc_reserved3;
     unsigned int __eip;
     unsigned short int __cs_selector;
     unsigned int __opcode:11;
-    unsigned int __unused4:5;
+    unsigned int __glibc_reserved4:5;
     unsigned int __data_offset;
     unsigned short int __data_selector;
-    unsigned short int __unused5;
+    unsigned short int __glibc_reserved5;
 #ifdef __x86_64__
     unsigned int __mxcsr;
 #endif