diff --git a/arch/aarch64/bits/ipc.h b/arch/aarch64/bits/ipc.h
index 9a47bc7a78a47a336c52be6cb23f7972431782e4..6f3328a86a1f7cc10702aecff83ac270d11c8376 100644
--- a/arch/aarch64/bits/ipc.h
+++ b/arch/aarch64/bits/ipc.h
@@ -1,5 +1,4 @@
-struct ipc_perm
-{
+struct ipc_perm {
 	key_t __ipc_perm_key;
 	uid_t uid;
 	gid_t gid;
diff --git a/arch/aarch64/bits/msg.h b/arch/aarch64/bits/msg.h
index 0135a08dc110616926be95421684949dd8d9a984..641e1703512408c1fa8769ed64271bdfdbce65c9 100644
--- a/arch/aarch64/bits/msg.h
+++ b/arch/aarch64/bits/msg.h
@@ -1,5 +1,4 @@
-struct msqid_ds
-{
+struct msqid_ds {
 	struct ipc_perm msg_perm;
 	time_t msg_stime;
 	time_t msg_rtime;
diff --git a/arch/aarch64/bits/shm.h b/arch/aarch64/bits/shm.h
index 4c3c9fb75d33b866eec9ff0fe6adc4b01324e04b..8d19378191bacd8a43080a7f96027befcfd30e4c 100644
--- a/arch/aarch64/bits/shm.h
+++ b/arch/aarch64/bits/shm.h
@@ -1,7 +1,6 @@
 #define SHMLBA 4096
 
-struct shmid_ds
-{
+struct shmid_ds {
 	struct ipc_perm shm_perm;
 	size_t shm_segsz;
 	time_t shm_atime;
diff --git a/arch/aarch64/bits/socket.h b/arch/aarch64/bits/socket.h
index b3fe643ad8309f03f8ff0b1cbc9d3b5aa63ed345..c11677e9d0d2c212bdad66ebc82332162eef1592 100644
--- a/arch/aarch64/bits/socket.h
+++ b/arch/aarch64/bits/socket.h
@@ -1,7 +1,6 @@
 #include <endian.h>
 
-struct msghdr
-{
+struct msghdr {
 	void *msg_name;
 	socklen_t msg_namelen;
 	struct iovec *msg_iov;
@@ -21,8 +20,7 @@ struct msghdr
 	int msg_flags;
 };
 
-struct cmsghdr
-{
+struct cmsghdr {
 #if __BYTE_ORDER == __BIG_ENDIAN
 	int __pad1;
 	socklen_t cmsg_len;
diff --git a/arch/arm/bits/stat.h b/arch/arm/bits/stat.h
index bb9314a5dc47cb070d5efc84dc34a8c7a8e642ef..22b19bbfecf52c0b0158a2f84273c9bb7efd3d64 100644
--- a/arch/arm/bits/stat.h
+++ b/arch/arm/bits/stat.h
@@ -1,8 +1,7 @@
 /* copied from kernel definition, but with padding replaced
  * by the corresponding correctly-sized userspace types. */
 
-struct stat
-{
+struct stat {
 	dev_t st_dev;
 	int __st_dev_padding;
 	long __st_ino_truncated;
diff --git a/arch/generic/bits/ipc.h b/arch/generic/bits/ipc.h
index b748d3b742c0f167058a528584a13fdae9133248..779c42fd7bf5249d1e936f657974e8689ca1b531 100644
--- a/arch/generic/bits/ipc.h
+++ b/arch/generic/bits/ipc.h
@@ -1,5 +1,4 @@
-struct ipc_perm
-{
+struct ipc_perm {
 	key_t __ipc_perm_key;
 	uid_t uid;
 	gid_t gid;
diff --git a/arch/generic/bits/msg.h b/arch/generic/bits/msg.h
index 3db8576b782380ebc0bd675b1253072bf8f630b2..bc8436c4ad26797d69e762b701aa906b9bed1271 100644
--- a/arch/generic/bits/msg.h
+++ b/arch/generic/bits/msg.h
@@ -1,5 +1,4 @@
-struct msqid_ds
-{
+struct msqid_ds {
 	struct ipc_perm msg_perm;
 	time_t msg_stime;
 	int __unused1;
diff --git a/arch/generic/bits/shm.h b/arch/generic/bits/shm.h
index 547581f1a7f5c6986ba477a824c08cd2ff514bc6..45d1d157832388d8ef93ba4f9ae3a8bd5ec91d76 100644
--- a/arch/generic/bits/shm.h
+++ b/arch/generic/bits/shm.h
@@ -1,7 +1,6 @@
 #define SHMLBA 4096
 
-struct shmid_ds
-{
+struct shmid_ds {
 	struct ipc_perm shm_perm;
 	size_t shm_segsz;
 	time_t shm_atime;
diff --git a/arch/generic/bits/socket.h b/arch/generic/bits/socket.h
index 36febbc2226b66b09f92ba3e51142e9738c139cc..1f73b995c68a61e5c1a291cb7dc4f98ea8ae9885 100644
--- a/arch/generic/bits/socket.h
+++ b/arch/generic/bits/socket.h
@@ -1,5 +1,4 @@
-struct msghdr
-{
+struct msghdr {
 	void *msg_name;
 	socklen_t msg_namelen;
 	struct iovec *msg_iov;
@@ -9,8 +8,7 @@ struct msghdr
 	int msg_flags;
 };
 
-struct cmsghdr
-{
+struct cmsghdr {
 	socklen_t cmsg_len;
 	int cmsg_level;
 	int cmsg_type;
diff --git a/arch/generic/bits/termios.h b/arch/generic/bits/termios.h
index 941de7bdcad1c06ed8cec062b8cec21c02b4d3e3..434c02c89aba227093a09d8869ec4bc8eb69ba46 100644
--- a/arch/generic/bits/termios.h
+++ b/arch/generic/bits/termios.h
@@ -1,5 +1,4 @@
-struct termios
-{
+struct termios {
 	tcflag_t c_iflag;
 	tcflag_t c_oflag;
 	tcflag_t c_cflag;
diff --git a/arch/i386/bits/stat.h b/arch/i386/bits/stat.h
index bb9314a5dc47cb070d5efc84dc34a8c7a8e642ef..22b19bbfecf52c0b0158a2f84273c9bb7efd3d64 100644
--- a/arch/i386/bits/stat.h
+++ b/arch/i386/bits/stat.h
@@ -1,8 +1,7 @@
 /* copied from kernel definition, but with padding replaced
  * by the corresponding correctly-sized userspace types. */
 
-struct stat
-{
+struct stat {
 	dev_t st_dev;
 	int __st_dev_padding;
 	long __st_ino_truncated;
diff --git a/arch/i386/bits/user.h b/arch/i386/bits/user.h
index fa623621eeba35e84dedc74c7dc6c768f2e8118a..2c556dd25a93c52fcfdaee5a835a852d97891e92 100644
--- a/arch/i386/bits/user.h
+++ b/arch/i386/bits/user.h
@@ -13,8 +13,7 @@ typedef struct user_fpxregs_struct
 	long st_space[32], xmm_space[32], padding[56];
 } elf_fpxregset_t;
 
-struct user_regs_struct
-{
+struct user_regs_struct {
 	long ebx, ecx, edx, esi, edi, ebp, eax, xds, xes, xfs, xgs;
 	long orig_eax, eip, xcs, eflags, esp, xss;
 };
@@ -22,8 +21,7 @@ struct user_regs_struct
 #define ELF_NGREG 17
 typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG];
 
-struct user
-{
+struct user {
 	struct user_regs_struct		regs;
 	int				u_fpvalid;
 	struct user_fpregs_struct	i387;
diff --git a/arch/microblaze/bits/stat.h b/arch/microblaze/bits/stat.h
index a8c0283ddfe550479a6e96c11bf7b3bb5012fb51..ce6a6bd0ea62d9c0c79df24ef33f34b8dfccef0d 100644
--- a/arch/microblaze/bits/stat.h
+++ b/arch/microblaze/bits/stat.h
@@ -1,8 +1,7 @@
 /* copied from kernel definition, but with padding replaced
  * by the corresponding correctly-sized userspace types. */
 
-struct stat
-{
+struct stat {
 	dev_t st_dev;
 	ino_t st_ino;
 	mode_t st_mode;
diff --git a/arch/mips/bits/msg.h b/arch/mips/bits/msg.h
index bfe2b3a75576e5aae7845b4b3abfcaf888b685fa..f28aece8fa4bd662f0df89931cb6174a5db92047 100644
--- a/arch/mips/bits/msg.h
+++ b/arch/mips/bits/msg.h
@@ -1,5 +1,4 @@
-struct msqid_ds
-{
+struct msqid_ds {
 	struct ipc_perm msg_perm;
 #if _MIPSEL || __MIPSEL || __MIPSEL__
 	time_t msg_stime;
diff --git a/arch/mips/bits/shm.h b/arch/mips/bits/shm.h
index f4b8712618f6f0e7be3b021cbbe325f8d56c414e..6652d6592316b78a3e508f2fd8ae94302efa1c2f 100644
--- a/arch/mips/bits/shm.h
+++ b/arch/mips/bits/shm.h
@@ -1,7 +1,6 @@
 #define SHMLBA 4096
 
-struct shmid_ds
-{
+struct shmid_ds {
 	struct ipc_perm shm_perm;
 	size_t shm_segsz;
 	time_t shm_atime;
diff --git a/arch/mips/bits/signal.h b/arch/mips/bits/signal.h
index 889f77e88e24e1149a969ca193ede85a686a59c5..db6f22d5108ca144a2df4f966894c49e82d0f06b 100644
--- a/arch/mips/bits/signal.h
+++ b/arch/mips/bits/signal.h
@@ -17,8 +17,7 @@ typedef struct {
 		} fp_fregs[32];
 	} fp_r;
 } fpregset_t;
-struct sigcontext
-{
+struct sigcontext {
 	unsigned sc_regmask, sc_status;
 	unsigned long long sc_pc, sc_regs[32], sc_fpregs[32];
 	unsigned sc_ownedfp, sc_fpc_csr, sc_fpc_eir, sc_used_math, sc_dsp;
diff --git a/arch/mips/bits/socket.h b/arch/mips/bits/socket.h
index cc72dcf9bbd802c54021f9536a675fc37a682dfe..191ebdb5a4181b1fab37e39cf4220ddc6c6cc854 100644
--- a/arch/mips/bits/socket.h
+++ b/arch/mips/bits/socket.h
@@ -1,5 +1,4 @@
-struct msghdr
-{
+struct msghdr {
 	void *msg_name;
 	socklen_t msg_namelen;
 	struct iovec *msg_iov;
@@ -9,8 +8,7 @@ struct msghdr
 	int msg_flags;
 };
 
-struct cmsghdr
-{
+struct cmsghdr {
 	socklen_t cmsg_len;
 	int cmsg_level;
 	int cmsg_type;
diff --git a/arch/mips/bits/stat.h b/arch/mips/bits/stat.h
index c8f9b469abd444e4ae3402bcf9843b36aba20e4b..3291a63620a2d491ef788102d267de91e6284d1a 100644
--- a/arch/mips/bits/stat.h
+++ b/arch/mips/bits/stat.h
@@ -1,8 +1,7 @@
 /* copied from kernel definition, but with padding replaced
  * by the corresponding correctly-sized userspace types. */
 
-struct stat
-{
+struct stat {
 	dev_t st_dev;
 	long __st_padding1[2];
 	ino_t st_ino;
diff --git a/arch/mipsn32/bits/msg.h b/arch/mipsn32/bits/msg.h
index bfe2b3a75576e5aae7845b4b3abfcaf888b685fa..f28aece8fa4bd662f0df89931cb6174a5db92047 100644
--- a/arch/mipsn32/bits/msg.h
+++ b/arch/mipsn32/bits/msg.h
@@ -1,5 +1,4 @@
-struct msqid_ds
-{
+struct msqid_ds {
 	struct ipc_perm msg_perm;
 #if _MIPSEL || __MIPSEL || __MIPSEL__
 	time_t msg_stime;
diff --git a/arch/powerpc/bits/ipc.h b/arch/powerpc/bits/ipc.h
index e1bfe2f55400528d5c891af8f4d78b2a6e7a4349..3f2ede07b6d4d4435897b8068be5d34051e5938f 100644
--- a/arch/powerpc/bits/ipc.h
+++ b/arch/powerpc/bits/ipc.h
@@ -1,5 +1,4 @@
-struct ipc_perm
-{
+struct ipc_perm {
 	key_t __ipc_perm_key;
 	uid_t uid;
 	gid_t gid;
diff --git a/arch/powerpc/bits/msg.h b/arch/powerpc/bits/msg.h
index a6b9ad5bad8c2b0af4ef91b6c051e9a241be063f..171c11a34f8f0db180362a1ed32e8969a516ff76 100644
--- a/arch/powerpc/bits/msg.h
+++ b/arch/powerpc/bits/msg.h
@@ -1,5 +1,4 @@
-struct msqid_ds
-{
+struct msqid_ds {
 	struct ipc_perm msg_perm;
 	int __unused1;
 	time_t msg_stime;
diff --git a/arch/powerpc/bits/shm.h b/arch/powerpc/bits/shm.h
index c698ef3455af63bcce505f3fd5201a60e9ab1e97..40e5e8bec848e66d95ebd18d38d920d785c298bc 100644
--- a/arch/powerpc/bits/shm.h
+++ b/arch/powerpc/bits/shm.h
@@ -1,7 +1,6 @@
 #define SHMLBA 4096
 
-struct shmid_ds
-{
+struct shmid_ds {
 	struct ipc_perm shm_perm;
 	int __unused1;
 	time_t shm_atime;
diff --git a/arch/powerpc/bits/signal.h b/arch/powerpc/bits/signal.h
index 17a7354f8d41f776046ff211adb0ebd8ee1142f6..06efb11cf271326301b90156ada7afa4a9912430 100644
--- a/arch/powerpc/bits/signal.h
+++ b/arch/powerpc/bits/signal.h
@@ -23,8 +23,7 @@ typedef struct {
 	unsigned vscr;
 } vrregset_t;
 
-struct sigcontext
-{
+struct sigcontext {
 	unsigned long _unused[4];
 	int signal;
 	unsigned long handler;
diff --git a/arch/powerpc/bits/socket.h b/arch/powerpc/bits/socket.h
index 18087919be9cfb425f396e41ced4a5bc5db55e89..2fee87777376e50322c16a1e9cf695aa57b74c2d 100644
--- a/arch/powerpc/bits/socket.h
+++ b/arch/powerpc/bits/socket.h
@@ -1,5 +1,4 @@
-struct msghdr
-{
+struct msghdr {
 	void *msg_name;
 	socklen_t msg_namelen;
 	struct iovec *msg_iov;
@@ -9,8 +8,7 @@ struct msghdr
 	int msg_flags;
 };
 
-struct cmsghdr
-{
+struct cmsghdr {
 	socklen_t cmsg_len;
 	int cmsg_level;
 	int cmsg_type;
diff --git a/arch/powerpc/bits/stat.h b/arch/powerpc/bits/stat.h
index bd524a1a9453bf13d787f6671627e720d3ce31ba..dcb896fd5fba811fa190c7cc1e6246f76ec4de76 100644
--- a/arch/powerpc/bits/stat.h
+++ b/arch/powerpc/bits/stat.h
@@ -1,8 +1,7 @@
 /* copied from kernel definition, but with padding replaced
  * by the corresponding correctly-sized userspace types. */
 
-struct stat
-{
+struct stat {
 	dev_t st_dev;
 	ino_t st_ino;
 	mode_t st_mode;
diff --git a/arch/powerpc/bits/termios.h b/arch/powerpc/bits/termios.h
index 7f67baf47a80d91ba591bcf936f1bffbb20f0896..0b09630c1598abf8979af6268848d7686bb4c4c8 100644
--- a/arch/powerpc/bits/termios.h
+++ b/arch/powerpc/bits/termios.h
@@ -1,7 +1,6 @@
 #undef NCCS
 #define NCCS 19
-struct termios
-{
+struct termios {
 	tcflag_t c_iflag;
 	tcflag_t c_oflag;
 	tcflag_t c_cflag;
diff --git a/arch/powerpc64/bits/ipc.h b/arch/powerpc64/bits/ipc.h
index e1bfe2f55400528d5c891af8f4d78b2a6e7a4349..3f2ede07b6d4d4435897b8068be5d34051e5938f 100644
--- a/arch/powerpc64/bits/ipc.h
+++ b/arch/powerpc64/bits/ipc.h
@@ -1,5 +1,4 @@
-struct ipc_perm
-{
+struct ipc_perm {
 	key_t __ipc_perm_key;
 	uid_t uid;
 	gid_t gid;
diff --git a/arch/powerpc64/bits/msg.h b/arch/powerpc64/bits/msg.h
index badcf168ef0527bbddf2be9213d59cce7f611e93..2e23ca27f580705efe87a0ab6e9742daaf047577 100644
--- a/arch/powerpc64/bits/msg.h
+++ b/arch/powerpc64/bits/msg.h
@@ -1,5 +1,4 @@
-struct msqid_ds
-{
+struct msqid_ds {
 	struct ipc_perm msg_perm;
 	time_t msg_stime;
 	time_t msg_rtime;
diff --git a/arch/powerpc64/bits/shm.h b/arch/powerpc64/bits/shm.h
index 91268516035a76ad2e02f0eb21b748f183dbb808..8108c3a8116a02035fd8b83dcb24ae1173f1c2bb 100644
--- a/arch/powerpc64/bits/shm.h
+++ b/arch/powerpc64/bits/shm.h
@@ -1,7 +1,6 @@
 #define SHMLBA 4096
 
-struct shmid_ds
-{
+struct shmid_ds {
 	struct ipc_perm shm_perm;
 	time_t shm_atime;
 	time_t shm_dtime;
diff --git a/arch/powerpc64/bits/socket.h b/arch/powerpc64/bits/socket.h
index ec3590c63dde7aa5804339664e28b38735b2901d..2f748ae85f4dee028bd590ac67687d1826019d00 100644
--- a/arch/powerpc64/bits/socket.h
+++ b/arch/powerpc64/bits/socket.h
@@ -1,7 +1,6 @@
 #include <endian.h>
 
-struct msghdr
-{
+struct msghdr {
 	void *msg_name;
 	socklen_t msg_namelen;
 	struct iovec *msg_iov;
@@ -21,8 +20,7 @@ struct msghdr
 	int msg_flags;
 };
 
-struct cmsghdr
-{
+struct cmsghdr {
 #if __BYTE_ORDER == __BIG_ENDIAN
 	int __pad1;
 	socklen_t cmsg_len;
diff --git a/arch/powerpc64/bits/stat.h b/arch/powerpc64/bits/stat.h
index 8172cff7bd9ef754f74233da1955086ff79fafbf..320b49bb6ce4cb0b23873f35111a10f2a1633e1b 100644
--- a/arch/powerpc64/bits/stat.h
+++ b/arch/powerpc64/bits/stat.h
@@ -1,5 +1,4 @@
-struct stat
-{
+struct stat {
 	dev_t st_dev;
 	ino_t st_ino;
 	nlink_t st_nlink;
diff --git a/arch/powerpc64/bits/termios.h b/arch/powerpc64/bits/termios.h
index 7f67baf47a80d91ba591bcf936f1bffbb20f0896..0b09630c1598abf8979af6268848d7686bb4c4c8 100644
--- a/arch/powerpc64/bits/termios.h
+++ b/arch/powerpc64/bits/termios.h
@@ -1,7 +1,6 @@
 #undef NCCS
 #define NCCS 19
-struct termios
-{
+struct termios {
 	tcflag_t c_iflag;
 	tcflag_t c_oflag;
 	tcflag_t c_cflag;
diff --git a/arch/sh/bits/shm.h b/arch/sh/bits/shm.h
index a210fd4af7155deec057f19ad1f41fe32ab8d582..6cdac1311aeddc56e54235c883bb767ae93c657d 100644
--- a/arch/sh/bits/shm.h
+++ b/arch/sh/bits/shm.h
@@ -1,7 +1,6 @@
 #define SHMLBA 16384
 
-struct shmid_ds
-{
+struct shmid_ds {
 	struct ipc_perm shm_perm;
 	size_t shm_segsz;
 	time_t shm_atime;
diff --git a/arch/sh/bits/stat.h b/arch/sh/bits/stat.h
index bb9314a5dc47cb070d5efc84dc34a8c7a8e642ef..22b19bbfecf52c0b0158a2f84273c9bb7efd3d64 100644
--- a/arch/sh/bits/stat.h
+++ b/arch/sh/bits/stat.h
@@ -1,8 +1,7 @@
 /* copied from kernel definition, but with padding replaced
  * by the corresponding correctly-sized userspace types. */
 
-struct stat
-{
+struct stat {
 	dev_t st_dev;
 	int __st_dev_padding;
 	long __st_ino_truncated;
diff --git a/arch/x32/bits/ipc.h b/arch/x32/bits/ipc.h
index 6e604cefba014664a9d591c78b4fc609a244f0e0..55d2e41a4da4d85716812638d16fc1fb8ba5d0b5 100644
--- a/arch/x32/bits/ipc.h
+++ b/arch/x32/bits/ipc.h
@@ -1,5 +1,4 @@
-struct ipc_perm
-{
+struct ipc_perm {
 	key_t __ipc_perm_key;
 	uid_t uid;
 	gid_t gid;
diff --git a/arch/x32/bits/msg.h b/arch/x32/bits/msg.h
index c3b4eae06293c6ff69a15a6ed699fc4956473ef2..63ae9877345fa013a376208bb7e8fcce020f880c 100644
--- a/arch/x32/bits/msg.h
+++ b/arch/x32/bits/msg.h
@@ -1,5 +1,4 @@
-struct msqid_ds
-{
+struct msqid_ds {
 	struct ipc_perm msg_perm;
 	time_t msg_stime;
 	time_t msg_rtime;
diff --git a/arch/x32/bits/shm.h b/arch/x32/bits/shm.h
index 8fa9e73debfb53de76bdd4f9eacbba1ad5906e5c..fa88c1e97620f7cfa7ce254c9cf67abdbfcb316e 100644
--- a/arch/x32/bits/shm.h
+++ b/arch/x32/bits/shm.h
@@ -1,7 +1,6 @@
 #define SHMLBA 4096
 
-struct shmid_ds
-{
+struct shmid_ds {
 	struct ipc_perm shm_perm;
 	size_t shm_segsz;
 	time_t shm_atime;
diff --git a/arch/x32/bits/socket.h b/arch/x32/bits/socket.h
index a90c4cae9d29f401f84c68d818dcd7d34fd28358..a4c89f3d7a97353a979944918a30136753fadac0 100644
--- a/arch/x32/bits/socket.h
+++ b/arch/x32/bits/socket.h
@@ -1,5 +1,4 @@
-struct msghdr
-{
+struct msghdr {
 	void *msg_name;
 	socklen_t msg_namelen;
 	struct iovec *msg_iov;
@@ -9,8 +8,7 @@ struct msghdr
 	int msg_flags;
 };
 
-struct cmsghdr
-{
+struct cmsghdr {
 	socklen_t cmsg_len;
 	int __pad1;
 	int cmsg_level;
diff --git a/arch/x32/bits/user.h b/arch/x32/bits/user.h
index 1bd2d709e1a5584ebfc54bb95547c0c8a4d0fa12..a6edcd1a3492b700259b6b9894d553b1e8f4a5ae 100644
--- a/arch/x32/bits/user.h
+++ b/arch/x32/bits/user.h
@@ -9,8 +9,7 @@ typedef struct user_fpregs_struct
 	uint32_t st_space[32], xmm_space[64], padding[24];
 } elf_fpregset_t;
 
-struct user_regs_struct
-{
+struct user_regs_struct {
 	unsigned long r15, r14, r13, r12, rbp, rbx, r11, r10, r9, r8;
 	unsigned long rax, rcx, rdx, rsi, rdi, orig_rax, rip;
 	unsigned long cs, eflags, rsp, ss, fs_base, gs_base, ds, es, fs, gs;
@@ -18,8 +17,7 @@ struct user_regs_struct
 #define ELF_NGREG 27
 typedef unsigned long long elf_greg_t, elf_gregset_t[ELF_NGREG];
 
-struct user
-{
+struct user {
 	struct user_regs_struct		regs;
 	int				u_fpvalid;
 	struct user_fpregs_struct	i387;
diff --git a/arch/x86_64/bits/ipc.h b/arch/x86_64/bits/ipc.h
index ac5d097981ebb1ad1183b3e2ffbfe6adce18cbe5..3d894e30035c4529987f67765adb11e9faeb689f 100644
--- a/arch/x86_64/bits/ipc.h
+++ b/arch/x86_64/bits/ipc.h
@@ -1,5 +1,4 @@
-struct ipc_perm
-{
+struct ipc_perm {
 	key_t __ipc_perm_key;
 	uid_t uid;
 	gid_t gid;
diff --git a/arch/x86_64/bits/msg.h b/arch/x86_64/bits/msg.h
index badcf168ef0527bbddf2be9213d59cce7f611e93..2e23ca27f580705efe87a0ab6e9742daaf047577 100644
--- a/arch/x86_64/bits/msg.h
+++ b/arch/x86_64/bits/msg.h
@@ -1,5 +1,4 @@
-struct msqid_ds
-{
+struct msqid_ds {
 	struct ipc_perm msg_perm;
 	time_t msg_stime;
 	time_t msg_rtime;
diff --git a/arch/x86_64/bits/shm.h b/arch/x86_64/bits/shm.h
index f4b8712618f6f0e7be3b021cbbe325f8d56c414e..6652d6592316b78a3e508f2fd8ae94302efa1c2f 100644
--- a/arch/x86_64/bits/shm.h
+++ b/arch/x86_64/bits/shm.h
@@ -1,7 +1,6 @@
 #define SHMLBA 4096
 
-struct shmid_ds
-{
+struct shmid_ds {
 	struct ipc_perm shm_perm;
 	size_t shm_segsz;
 	time_t shm_atime;
diff --git a/arch/x86_64/bits/socket.h b/arch/x86_64/bits/socket.h
index a90c4cae9d29f401f84c68d818dcd7d34fd28358..a4c89f3d7a97353a979944918a30136753fadac0 100644
--- a/arch/x86_64/bits/socket.h
+++ b/arch/x86_64/bits/socket.h
@@ -1,5 +1,4 @@
-struct msghdr
-{
+struct msghdr {
 	void *msg_name;
 	socklen_t msg_namelen;
 	struct iovec *msg_iov;
@@ -9,8 +8,7 @@ struct msghdr
 	int msg_flags;
 };
 
-struct cmsghdr
-{
+struct cmsghdr {
 	socklen_t cmsg_len;
 	int __pad1;
 	int cmsg_level;
diff --git a/arch/x86_64/bits/user.h b/arch/x86_64/bits/user.h
index 1bd2d709e1a5584ebfc54bb95547c0c8a4d0fa12..a6edcd1a3492b700259b6b9894d553b1e8f4a5ae 100644
--- a/arch/x86_64/bits/user.h
+++ b/arch/x86_64/bits/user.h
@@ -9,8 +9,7 @@ typedef struct user_fpregs_struct
 	uint32_t st_space[32], xmm_space[64], padding[24];
 } elf_fpregset_t;
 
-struct user_regs_struct
-{
+struct user_regs_struct {
 	unsigned long r15, r14, r13, r12, rbp, rbx, r11, r10, r9, r8;
 	unsigned long rax, rcx, rdx, rsi, rdi, orig_rax, rip;
 	unsigned long cs, eflags, rsp, ss, fs_base, gs_base, ds, es, fs, gs;
@@ -18,8 +17,7 @@ struct user_regs_struct
 #define ELF_NGREG 27
 typedef unsigned long long elf_greg_t, elf_gregset_t[ELF_NGREG];
 
-struct user
-{
+struct user {
 	struct user_regs_struct		regs;
 	int				u_fpvalid;
 	struct user_fpregs_struct	i387;
diff --git a/include/dirent.h b/include/dirent.h
index 5aa8510bfd4330ba10d76c9ac7cc9756981f0bbe..006a360e1c4c5008a21afba9b88d47936cd61c14 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -17,8 +17,7 @@ extern "C" {
 
 typedef struct __dirstream DIR;
 
-struct dirent
-{
+struct dirent {
 	ino_t d_ino;
 	off_t d_off;
 	unsigned short d_reclen;
diff --git a/include/fcntl.h b/include/fcntl.h
index ebd5c30491c1cc6f6bfc146c48c6b8b946fdde51..e683e4dc6873f77638667a2c42cdc3b15610bd1b 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -21,8 +21,7 @@ extern "C" {
 
 #include <bits/fcntl.h>
 
-struct flock
-{
+struct flock {
 	short l_type;
 	short l_whence;
 	off_t l_start;
diff --git a/include/ftw.h b/include/ftw.h
index c8eadbc9dda723eaa5d7c6ef486365a1565ca874..b15c062a8389e3ea62d151ef417f9ad90945660e 100644
--- a/include/ftw.h
+++ b/include/ftw.h
@@ -21,8 +21,7 @@ extern "C" {
 #define FTW_CHDIR 4
 #define FTW_DEPTH 8
 
-struct FTW
-{
+struct FTW {
 	int base;
 	int level;
 };
diff --git a/include/getopt.h b/include/getopt.h
index c1d0df928f749ac0f3094b80f2422abce23b2dfa..35cbd358b52855fb1596da7970c84c18dd0f1cdb 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -9,8 +9,7 @@ int getopt(int, char * const [], const char *);
 extern char *optarg;
 extern int optind, opterr, optopt, optreset;
 
-struct option
-{
+struct option {
 	const char *name;
 	int has_arg;
 	int *flag;
diff --git a/include/grp.h b/include/grp.h
index b331d3264c0f1eb4a9844d8a54e4143e514d9609..358181bf139a2c7f8aacd6d380fae27082d46bec 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -16,8 +16,7 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-struct group
-{
+struct group {
 	char *gr_name;
 	char *gr_passwd;
 	gid_t gr_gid;
diff --git a/include/mntent.h b/include/mntent.h
index d03c414a2b069d7701f285320767fbe67522093a..3492a1d6daa25ad9f061ab67f5b5938603ea7c40 100644
--- a/include/mntent.h
+++ b/include/mntent.h
@@ -20,8 +20,7 @@ extern "C" {
 #define MNTOPT_NOSUID	"nosuid"
 #define MNTOPT_NOAUTO	"noauto"
 
-struct mntent
-{
+struct mntent {
 	char *mnt_fsname;
 	char *mnt_dir;
 	char *mnt_type;
diff --git a/include/net/if.h b/include/net/if.h
index 3f4fc0927388362b5eb2bb230e8a85f9f8a28385..1a4059d60f680e6db9e28c355f1cee2f074de114 100644
--- a/include/net/if.h
+++ b/include/net/if.h
@@ -9,8 +9,7 @@ extern "C" {
 
 #define IF_NAMESIZE 16
 
-struct if_nameindex
-{
+struct if_nameindex {
 	unsigned int if_index;
 	char *if_name;
 };
diff --git a/include/netdb.h b/include/netdb.h
index 47940684e6db1d8419fdd538a6b3bbdb71c28888..967ca211f9dabcf5ae2929d1a999bd9b0a2b15b1 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -13,8 +13,7 @@ extern "C" {
 #include <bits/alltypes.h>
 #endif
 
-struct addrinfo
-{
+struct addrinfo {
 	int ai_flags;
 	int ai_family;
 	int ai_socktype;
@@ -62,16 +61,14 @@ const char *gai_strerror(int);
 
 /* Legacy functions follow (marked OBsolete in SUS) */
 
-struct netent
-{
+struct netent {
 	char *n_name;
 	char **n_aliases;
 	int n_addrtype;
 	uint32_t n_net;
 };
 
-struct hostent
-{
+struct hostent {
 	char *h_name;
 	char **h_aliases;
 	int h_addrtype;
@@ -80,16 +77,14 @@ struct hostent
 };
 #define h_addr h_addr_list[0]
 
-struct servent
-{
+struct servent {
 	char *s_name;
 	char **s_aliases;
 	int s_port;
 	char *s_proto;
 };
 
-struct protoent
-{
+struct protoent {
 	char *p_name;
 	char **p_aliases;
 	int p_proto;
diff --git a/include/netinet/in.h b/include/netinet/in.h
index 04cc81cd113822bd48104dc937715f3daf08da45..f6bb77b1fb09cdf30f0251437e981f305bd292ff 100644
--- a/include/netinet/in.h
+++ b/include/netinet/in.h
@@ -13,16 +13,14 @@ typedef uint16_t in_port_t;
 typedef uint32_t in_addr_t;
 struct in_addr { in_addr_t s_addr; };
 
-struct sockaddr_in
-{
+struct sockaddr_in {
 	sa_family_t sin_family;
 	in_port_t sin_port;
 	struct in_addr sin_addr;
 	uint8_t sin_zero[8];
 };
 
-struct in6_addr
-{
+struct in6_addr {
 	union {
 		uint8_t __s6_addr[16];
 		uint16_t __s6_addr16[8];
@@ -33,8 +31,7 @@ struct in6_addr
 #define s6_addr16 __in6_union.__s6_addr16
 #define s6_addr32 __in6_union.__s6_addr32
 
-struct sockaddr_in6
-{
+struct sockaddr_in6 {
 	sa_family_t     sin6_family;
 	in_port_t       sin6_port;
 	uint32_t        sin6_flowinfo;
@@ -42,8 +39,7 @@ struct sockaddr_in6
 	uint32_t        sin6_scope_id;
 };
 
-struct ipv6_mreq
-{
+struct ipv6_mreq {
 	struct in6_addr ipv6mr_multiaddr;
 	unsigned        ipv6mr_interface;
 };
@@ -228,8 +224,7 @@ uint16_t ntohs(uint16_t);
 #define IP_DEFAULT_MULTICAST_LOOP       1
 #define IP_MAX_MEMBERSHIPS              20
 
-struct ip_opts
-{
+struct ip_opts {
 	struct in_addr ip_dst;
 	char ip_opts[40];
 };
@@ -247,14 +242,12 @@ struct ip_opts
 #define MCAST_EXCLUDE 0
 #define MCAST_INCLUDE 1
 
-struct ip_mreq
-{
+struct ip_mreq {
 	struct in_addr imr_multiaddr;
 	struct in_addr imr_interface;
 };
 
-struct ip_mreqn
-{
+struct ip_mreqn {
 	struct in_addr imr_multiaddr;
 	struct in_addr imr_address;
 	int imr_ifindex;
@@ -299,21 +292,18 @@ struct group_filter {
 	(sizeof(struct group_filter) - sizeof(struct sockaddr_storage) \
 	+ (numsrc) * sizeof(struct sockaddr_storage))
 
-struct in_pktinfo
-{
+struct in_pktinfo {
 	int ipi_ifindex;
 	struct in_addr ipi_spec_dst;
 	struct in_addr ipi_addr;
 };
 
-struct in6_pktinfo
-{
+struct in6_pktinfo {
 	struct in6_addr ipi6_addr;
 	unsigned ipi6_ifindex;
 };
 
-struct ip6_mtuinfo
-{
+struct ip6_mtuinfo {
 	struct sockaddr_in6 ip6m_addr;
 	uint32_t ip6m_mtu;
 };
diff --git a/include/netinet/tcp.h b/include/netinet/tcp.h
index d6f41cab2535361250c913be4906a6af8cfeb90a..9ea64c451ce47177ce7df7607f6b3e97c46249a3 100644
--- a/include/netinet/tcp.h
+++ b/include/netinet/tcp.h
@@ -145,8 +145,7 @@ struct tcphdr {
 #define TCP_CA_Recovery		3
 #define TCP_CA_Loss		4
 
-struct tcp_info
-{
+struct tcp_info {
 	uint8_t tcpi_state;
 	uint8_t tcpi_ca_state;
 	uint8_t tcpi_retransmits;
@@ -192,8 +191,7 @@ struct tcp_info
 
 #define TCP_MD5SIG_MAXKEYLEN    80
 
-struct tcp_md5sig
-{
+struct tcp_md5sig {
 	struct sockaddr_storage tcpm_addr;
 	uint16_t __tcpm_pad1;
 	uint16_t tcpm_keylen;
diff --git a/include/poll.h b/include/poll.h
index 7af737222f64386579a35b43327827ae55de8ec4..daccc760bb26a821ce00424cb1d61f8764cc83c3 100644
--- a/include/poll.h
+++ b/include/poll.h
@@ -28,8 +28,7 @@ extern "C" {
 
 typedef unsigned long nfds_t;
 
-struct pollfd
-{
+struct pollfd {
 	int fd;
 	short events;
 	short revents;
diff --git a/include/pwd.h b/include/pwd.h
index 55d9d42d379e9146d12c8e8a2fcd6f2b15af9288..07a5871d722ef1302e0d29f416d845365a84110f 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -17,8 +17,7 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-struct passwd
-{
+struct passwd {
 	char *pw_name;
 	char *pw_passwd;
 	uid_t pw_uid;
diff --git a/include/sys/acct.h b/include/sys/acct.h
index ee576c4ab39ff28d477623d19d3a205a806b14f8..9b0ba36fbe93a56a49e678386495406f0218674b 100644
--- a/include/sys/acct.h
+++ b/include/sys/acct.h
@@ -14,8 +14,7 @@ extern "C" {
 
 typedef uint16_t comp_t;
 
-struct acct
-{
+struct acct {
 	char ac_flag;
 	uint16_t ac_uid;
 	uint16_t ac_gid;
@@ -36,8 +35,7 @@ struct acct
 };
 
 
-struct acct_v3
-{
+struct acct_v3 {
 	char ac_flag;
 	char ac_version;
 	uint16_t ac_tty;
diff --git a/include/sys/procfs.h b/include/sys/procfs.h
index 2a9287514d6534f8d44a616a05d4a3618675e507..e23bf1ad6b9f6058cfd1fe593ee149ed0e178e08 100644
--- a/include/sys/procfs.h
+++ b/include/sys/procfs.h
@@ -33,8 +33,7 @@ struct elf_prstatus {
 
 #define ELF_PRARGSZ 80
 
-struct elf_prpsinfo
-{
+struct elf_prpsinfo {
 	char pr_state;
 	char pr_sname;
 	char pr_zomb;
diff --git a/include/sys/quota.h b/include/sys/quota.h
index a06f335ae38441644cc22c1dee5e4ad769a6872c..3ed73785df4c6fb9267110cd38a7c191308bf420 100644
--- a/include/sys/quota.h
+++ b/include/sys/quota.h
@@ -57,8 +57,7 @@ extern "C" {
 #define QIF_TIMES	(QIF_BTIME | QIF_ITIME)
 #define QIF_ALL		(QIF_LIMITS | QIF_USAGE | QIF_TIMES)
 
-struct dqblk
-{
+struct dqblk {
 	uint64_t dqb_bhardlimit;
 	uint64_t dqb_bsoftlimit;
 	uint64_t dqb_curspace;
@@ -87,8 +86,7 @@ struct dqblk
 #define IIF_FLAGS	4
 #define IIF_ALL		(IIF_BGRACE | IIF_IGRACE | IIF_FLAGS)
 
-struct dqinfo
-{
+struct dqinfo {
 	uint64_t dqi_bgrace;
 	uint64_t dqi_igrace;
 	uint32_t dqi_flags;
diff --git a/include/sys/resource.h b/include/sys/resource.h
index 6f22a2e780e23ef85ce1a399c0dcb7ba9c42267a..70d793d563f588469f74e670ac6a993aa528a407 100644
--- a/include/sys/resource.h
+++ b/include/sys/resource.h
@@ -19,14 +19,12 @@ extern "C" {
 
 typedef unsigned long long rlim_t;
 
-struct rlimit
-{
+struct rlimit {
 	rlim_t rlim_cur;
 	rlim_t rlim_max;
 };
 
-struct rusage
-{
+struct rusage {
 	struct timeval ru_utime;
 	struct timeval ru_stime;
 	/* linux extentions, but useful */
diff --git a/include/sys/socket.h b/include/sys/socket.h
index 55e53d2aa12e42c5584f004b9fc66b9ea19b5380..59ab1e2ff9518eaca441fa25d0425fdb323944d8 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -20,15 +20,13 @@ extern "C" {
 #include <bits/socket.h>
 
 #ifdef _GNU_SOURCE
-struct ucred
-{
+struct ucred {
 	pid_t pid;
 	uid_t uid;
 	gid_t gid;
 };
 
-struct mmsghdr
-{
+struct mmsghdr {
 	struct msghdr msg_hdr;
 	unsigned int  msg_len;
 };
@@ -39,8 +37,7 @@ int sendmmsg (int, struct mmsghdr *, unsigned int, unsigned int);
 int recvmmsg (int, struct mmsghdr *, unsigned int, unsigned int, struct timespec *);
 #endif
 
-struct linger
-{
+struct linger {
 	int l_onoff;
 	int l_linger;
 };
@@ -297,14 +294,12 @@ struct linger
 #define SCM_RIGHTS      0x01
 #define SCM_CREDENTIALS 0x02
 
-struct sockaddr
-{
+struct sockaddr {
 	sa_family_t sa_family;
 	char sa_data[14];
 };
 
-struct sockaddr_storage
-{
+struct sockaddr_storage {
 	sa_family_t ss_family;
 	char __ss_padding[128-sizeof(long)-sizeof(sa_family_t)];
 	unsigned long __ss_align;
diff --git a/include/sys/time.h b/include/sys/time.h
index bfe1414e86fbc5b95f87680d022c6042cdd175c0..e4b379aea85901146ae5ea4e1a1dccda4972d1e5 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -17,8 +17,7 @@ int gettimeofday (struct timeval *__restrict, void *__restrict);
 #define ITIMER_VIRTUAL 1
 #define ITIMER_PROF    2
 
-struct itimerval
-{
+struct itimerval {
 	struct timeval it_interval;
 	struct timeval it_value;
 };
diff --git a/include/sys/times.h b/include/sys/times.h
index cc55e573fd4b87d1a949423e5c71cc4e2b12b552..80a50522d75d9705972b4a4b5898fee51edc30ae 100644
--- a/include/sys/times.h
+++ b/include/sys/times.h
@@ -8,8 +8,7 @@ extern "C" {
 #define __NEED_clock_t
 #include <bits/alltypes.h>
 
-struct tms
-{
+struct tms {
 	clock_t tms_utime;
 	clock_t tms_stime;
 	clock_t tms_cutime;
diff --git a/include/sys/un.h b/include/sys/un.h
index 7494f1a382ed0164f6e7dc35520e19d30e33c6bf..1a3193ad208de81969695bc4cda1a3015ecff3e6 100644
--- a/include/sys/un.h
+++ b/include/sys/un.h
@@ -14,8 +14,7 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-struct sockaddr_un
-{
+struct sockaddr_un {
 	sa_family_t sun_family;
 	char sun_path[108];
 };
diff --git a/include/sys/utsname.h b/include/sys/utsname.h
index 6b9ea970970dff0571d88111b58c5ecea86d8d12..2c80fb5a2dfbd5c327db4d8e7eb2c2d5776277d0 100644
--- a/include/sys/utsname.h
+++ b/include/sys/utsname.h
@@ -7,8 +7,7 @@ extern "C" {
 
 #include <features.h>
 
-struct utsname
-{
+struct utsname {
 	char sysname[65];
 	char nodename[65];
 	char release[65];
diff --git a/include/time.h b/include/time.h
index 16ec08aeb2b4c6a592d83b0005315d71d9602987..a408679c2b0e0d9b205215cc2ec0eb31490fe65c 100644
--- a/include/time.h
+++ b/include/time.h
@@ -35,8 +35,7 @@ extern "C" {
 #define __tm_zone tm_zone
 #endif
 
-struct tm
-{
+struct tm {
 	int tm_sec;
 	int tm_min;
 	int tm_hour;
@@ -78,8 +77,7 @@ char *ctime_r (const time_t *, char *);
 
 void tzset (void);
 
-struct itimerspec
-{
+struct itimerspec {
 	struct timespec it_interval;
 	struct timespec it_value;
 };
diff --git a/include/utime.h b/include/utime.h
index ec82e0f3f844f82449796dbd9b064b40c49abdb9..dd5ff927c25d1ec82475c569a0d4c09f3c1fce29 100644
--- a/include/utime.h
+++ b/include/utime.h
@@ -9,8 +9,7 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-struct utimbuf
-{
+struct utimbuf {
 	time_t actime;
 	time_t modtime;
 };
diff --git a/include/utmpx.h b/include/utmpx.h
index 44b501d3e43957df445acf29d63c1e120bd72e69..9e5cc955eb1f89c3abc9b8fd2384ea981aa1ae71 100644
--- a/include/utmpx.h
+++ b/include/utmpx.h
@@ -14,8 +14,7 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-struct utmpx
-{
+struct utmpx {
 	short ut_type;
 	pid_t ut_pid;
 	char ut_line[32];