diff --git a/defs.h b/defs.h
index eabce52c..d94cb687 100644
--- a/defs.h
+++ b/defs.h
@@ -905,4 +905,4 @@ extern unsigned num_quals;
 #define PRI__u64 PRI__64"u"
 #define PRI__x64 PRI__64"x"
 
-#endif /* #ifndef STRACE_DEFS_H */
+#endif /* !STRACE_DEFS_H */
diff --git a/flock.h b/flock.h
index b438ea5b..afa51482 100644
--- a/flock.h
+++ b/flock.h
@@ -46,4 +46,4 @@ typedef struct __kernel_flock64 struct_kernel_flock64;
 # error struct flock64 definition not found in <linux/fcntl.h>
 #endif
 
-#endif /* #ifndef STRACE_FLOCK_H */
+#endif /* !STRACE_FLOCK_H */
diff --git a/gcc_compat.h b/gcc_compat.h
index 0f76fbbf..908df16c 100644
--- a/gcc_compat.h
+++ b/gcc_compat.h
@@ -76,4 +76,4 @@
 # define ATTRIBUTE_ALLOC_SIZE(args)	/* empty */
 #endif
 
-#endif /* #ifndef STRACE_GCC_COMPAT_H */
+#endif /* !STRACE_GCC_COMPAT_H */
diff --git a/ipc_defs.h b/ipc_defs.h
index 0ece1031..e0043ced 100644
--- a/ipc_defs.h
+++ b/ipc_defs.h
@@ -44,4 +44,4 @@
 	if ((arg) & IPC_64) tprints("IPC_64|"); \
 	printxval((flagset), (arg) &~ IPC_64, dflt)
 
-#endif /* #ifndef STRACE_IPC_DEFS_H */
+#endif /* !STRACE_IPC_DEFS_H */
diff --git a/kernel_types.h b/kernel_types.h
index 47fbff46..551a1e6e 100644
--- a/kernel_types.h
+++ b/kernel_types.h
@@ -54,4 +54,4 @@ typedef struct {
 	char		d_name[1];
 } kernel_dirent;
 
-#endif /* #ifndef STRACE_KERNEL_TYPES_H */
+#endif /* !STRACE_KERNEL_TYPES_H */
diff --git a/mpers_type.h b/mpers_type.h
index f9bb2c5d..ac840adb 100644
--- a/mpers_type.h
+++ b/mpers_type.h
@@ -49,4 +49,4 @@
 # endif
 #endif
 
-#endif /* #ifndef STRACE_MPERS_TYPE_H */
+#endif /* !STRACE_MPERS_TYPE_H */
diff --git a/msghdr.h b/msghdr.h
index b56fe61b..41dfd8ca 100644
--- a/msghdr.h
+++ b/msghdr.h
@@ -14,4 +14,4 @@ struct mmsghdr {
 struct tcb;
 extern void print_struct_msghdr(struct tcb *, const struct msghdr *, const int *, unsigned long);
 
-#endif /* #ifndef STRACE_MSGHDR_H */
+#endif /* !STRACE_MSGHDR_H */
diff --git a/printsiginfo.h b/printsiginfo.h
index f2dd62f9..7ad72380 100644
--- a/printsiginfo.h
+++ b/printsiginfo.h
@@ -3,4 +3,4 @@
 
 extern void printsiginfo(const siginfo_t *);
 
-#endif /* #ifndef STRACE_PRINTSIGINFO_H */
+#endif /* !STRACE_PRINTSIGINFO_H */
diff --git a/ptrace.h b/ptrace.h
index aba61b79..0f3b0220 100644
--- a/ptrace.h
+++ b/ptrace.h
@@ -176,4 +176,4 @@ extern long ptrace(int, int, char *, long);
 # define PTRACE_POKEUSER PTRACE_POKEUSR
 #endif
 
-#endif /* #ifndef STRACE_PTRACE_H */
+#endif /* !STRACE_PTRACE_H */
diff --git a/regs.h b/regs.h
index 7bf43055..d89581d7 100644
--- a/regs.h
+++ b/regs.h
@@ -9,4 +9,4 @@
 
 #include "arch_regs.h"
 
-#endif /* #ifndef STRACE_REGS_H */
+#endif /* !STRACE_REGS_H */
diff --git a/seccomp_fprog.h b/seccomp_fprog.h
index f7210725..f4837272 100644
--- a/seccomp_fprog.h
+++ b/seccomp_fprog.h
@@ -6,4 +6,4 @@ struct seccomp_fprog {
 	unsigned long filter;
 };
 
-#endif /* #ifndef STRACE_SECCOMP_FPROG_H */
+#endif /* !STRACE_SECCOMP_FPROG_H */
diff --git a/sigevent.h b/sigevent.h
index 89b85226..04c90792 100644
--- a/sigevent.h
+++ b/sigevent.h
@@ -44,4 +44,4 @@ typedef struct {
 	} sigev_un;
 } struct_sigevent;
 
-#endif /* #ifndef STRACE_SIGEVENT_H */
+#endif /* !STRACE_SIGEVENT_H */
diff --git a/statfs.h b/statfs.h
index 9341687c..c9864248 100644
--- a/statfs.h
+++ b/statfs.h
@@ -42,4 +42,4 @@ struct strace_statfs {
 	unsigned long long f_flags;
 };
 
-#endif /* STRACE_STATFS_H */
+#endif /* !STRACE_STATFS_H */
diff --git a/xlat.h b/xlat.h
index c8073b83..aaa7aab0 100644
--- a/xlat.h
+++ b/xlat.h
@@ -14,4 +14,4 @@ struct xlat {
 # define XLAT_TYPE_PAIR(type, val, str)	{     (type)(val), str  }
 # define XLAT_END			{		0, 0    }
 
-#endif /* #ifndef STRACE_XLAT_H */
+#endif /* !STRACE_XLAT_H */