diff --git a/include/atomic.h b/include/atomic.h
index 6a83500d3..84083864e 100644
--- a/include/atomic.h
+++ b/include/atomic.h
@@ -57,4 +57,4 @@ typedef struct {
 		ret__ != 0;					\
 	})
 
-#endif /* ATOMIC_H__ */
+#endif /* __CR_ATOMIC_H__ */
diff --git a/include/bitops.h b/include/bitops.h
index 5d8deb3b0..c65602b5a 100644
--- a/include/bitops.h
+++ b/include/bitops.h
@@ -115,4 +115,4 @@ found_middle:
 # error x86-32 is not implemented yet
 #endif /* CONFIG_X86_64 */
 
-#endif /* CR_BITOPS_H_ */
+#endif /* __CR_BITOPS_H__ */
diff --git a/include/compiler.h b/include/compiler.h
index 99a7d1a3f..30f299a54 100644
--- a/include/compiler.h
+++ b/include/compiler.h
@@ -68,4 +68,4 @@
 
 #define is_log2(v)		(((v) & ((v) - 1)) == 0)
 
-#endif /* CR_COMPILER_H_ */
+#endif /* __CR_COMPILER_H__ */
diff --git a/include/cpu.h b/include/cpu.h
index 38f5e2691..63ebe4a99 100644
--- a/include/cpu.h
+++ b/include/cpu.h
@@ -20,4 +20,4 @@ extern void cpu_set_feature(unsigned int feature);
 extern bool cpu_has_feature(unsigned int feature);
 extern int cpu_init(void);
 
-#endif /* CPU_H__ */
+#endif /* __CR_CPU_H__ */
diff --git a/include/crtools.h b/include/crtools.h
index 115534117..326f0df58 100644
--- a/include/crtools.h
+++ b/include/crtools.h
@@ -239,4 +239,4 @@ static inline int in_vma_area(struct vma_area *vma, unsigned long addr)
 		addr < (unsigned long)vma->vma.end;
 }
 
-#endif /* CRTOOLS_H_ */
+#endif /* __CR_CRTOOLS_H__ */
diff --git a/include/eventfd.h b/include/eventfd.h
index 240c8ad24..a5b46181f 100644
--- a/include/eventfd.h
+++ b/include/eventfd.h
@@ -14,4 +14,4 @@ extern int dump_eventfd(struct fd_parms *p, int lfd, const struct cr_fdset *set)
 extern int collect_eventfd(void);
 extern void show_eventfds(int fd, struct cr_options *o);
 
-#endif /* EVENTFD_H__ */
+#endif /* __CR_EVENTFD_H__ */
diff --git a/include/eventpoll.h b/include/eventpoll.h
index 04e4cbfea..4928258b4 100644
--- a/include/eventpoll.h
+++ b/include/eventpoll.h
@@ -15,4 +15,4 @@ extern int collect_eventpoll(void);
 extern void show_eventpoll(int fd, struct cr_options *o);
 extern void show_eventpoll_tfd(int fd, struct cr_options *o);
 
-#endif /* EVENTPOLL_H__ */
+#endif /* __CR_EVENTPOLL_H__ */
diff --git a/include/fifo.h b/include/fifo.h
index c8ce2c5d4..bfa9612cc 100644
--- a/include/fifo.h
+++ b/include/fifo.h
@@ -7,4 +7,4 @@ struct cr_fdset;
 extern int dump_fifo(struct fd_parms *p, int lfd, const struct cr_fdset *set);
 extern int collect_fifo(void);
 
-#endif /* FIFO_H__ */
+#endif /* __CR_FIFO_H__ */
diff --git a/include/file-ids.h b/include/file-ids.h
index fa2b78efd..86e16b8ea 100644
--- a/include/file-ids.h
+++ b/include/file-ids.h
@@ -15,4 +15,4 @@ extern int fd_id_generate(pid_t pid, FdinfoEntry *fe);
 extern u32 fd_id_generate_special(void);
 extern void fd_id_show_tree(void);
 
-#endif /* FILE_IDS_H__ */
+#endif /* __CR_FILE_IDS_H__ */
diff --git a/include/files-reg.h b/include/files-reg.h
index 45a233d31..17c88c9c3 100644
--- a/include/files-reg.h
+++ b/include/files-reg.h
@@ -36,4 +36,4 @@ extern int dump_one_reg_file(int lfd, u32 id, const struct fd_parms *p);
 extern struct file_remap *lookup_ghost_remap(u32 dev, u32 ino);
 extern void remap_put(struct file_remap *remap);
 
-#endif /* FILES_REG_H__ */
+#endif /* __CR_FILES_REG_H__ */
diff --git a/include/files.h b/include/files.h
index fcd9f3174..caefb34d5 100644
--- a/include/files.h
+++ b/include/files.h
@@ -100,4 +100,4 @@ extern int set_fd_flags(int fd, int flags);
 
 #define LREMAP_PARAM	"link-remap"
 
-#endif /* FILES_H_ */
+#endif /* __CR_FILES_H__ */
diff --git a/include/fpu.h b/include/fpu.h
index e9447a009..86826633c 100644
--- a/include/fpu.h
+++ b/include/fpu.h
@@ -81,4 +81,4 @@ struct xsave_struct {
 	struct ymmh_struct		ymmh;
 } __aligned(FP_MIN_ALIGN_BYTES) __packed;
 
-#endif /* FPU_H__ */
+#endif /* __CR_FPU_H__ */
diff --git a/include/image.h b/include/image.h
index 82373a545..6d6a4a6a8 100644
--- a/include/image.h
+++ b/include/image.h
@@ -133,4 +133,4 @@ struct page_entry {
 #define GET_FILE_OFF(s, m)	(offsetof(s,m) + MAGIC_OFFSET)
 #define GET_FILE_OFF_AFTER(s)	(sizeof(s) + MAGIC_OFFSET)
 
-#endif /* CR_IMAGE_H */
+#endif /* __CR_IMAGE_H__ */
diff --git a/include/inet_diag.h b/include/inet_diag.h
index 5dd3e83fb..95be2c19d 100644
--- a/include/inet_diag.h
+++ b/include/inet_diag.h
@@ -133,4 +133,4 @@ struct tcpvegas_info {
 	__u32	tcpv_minrtt;
 };
 
-#endif /* _INET_DIAG_H_ */
+#endif /* __CR_INET_DIAG_H__ */
diff --git a/include/inotify.h b/include/inotify.h
index 04c87eaae..417f2a3e2 100644
--- a/include/inotify.h
+++ b/include/inotify.h
@@ -15,4 +15,4 @@ extern int collect_inotify(void);
 extern void show_inotify_wd(int fd_inotify_wd, struct cr_options *o);
 extern void show_inotify(int fd_inotify, struct cr_options *o);
 
-#endif /* INOTIFY_H__ */
+#endif /* __CR_INOTIFY_H__ */
diff --git a/include/ipc_ns.h b/include/ipc_ns.h
index 42e208421..52b01d88c 100644
--- a/include/ipc_ns.h
+++ b/include/ipc_ns.h
@@ -11,4 +11,4 @@ extern void show_ipc_sem(int fd, struct cr_options *);
 extern int dump_ipc_ns(int ns_pid, struct cr_fdset *fdset);
 extern int prepare_ipc_ns(int pid);
 
-#endif /* CR_IPC_NS_H_ */
+#endif /* __CR_IPC_NS_H__ */
diff --git a/include/kcmp-ids.h b/include/kcmp-ids.h
index 35bff648d..9117d0c86 100644
--- a/include/kcmp-ids.h
+++ b/include/kcmp-ids.h
@@ -25,4 +25,4 @@ u32 kid_generate_gen(struct kid_tree *tree,
 		struct kid_elem *elem, int *new_id);
 void kid_show_tree(struct kid_tree *tree);
 
-#endif
+#endif /* __CR_KCMP_IDS_H__ */
diff --git a/include/libnetlink.h b/include/libnetlink.h
index 5ce033a26..616a1117b 100644
--- a/include/libnetlink.h
+++ b/include/libnetlink.h
@@ -16,4 +16,4 @@ extern int addattr_l(struct nlmsghdr *n, int maxlen, int type,
 	((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
 
 
-#endif /* LIBNETLINK_H__ */
+#endif /* __CR_LIBNETLINK_H__ */
diff --git a/include/linkage.h b/include/linkage.h
index 63daa37d7..5e0948f07 100644
--- a/include/linkage.h
+++ b/include/linkage.h
@@ -21,4 +21,4 @@
 
 #endif  /* __ASSEMBLY__ */
 
-#endif /* LINKAGE_H_ */
+#endif /* __CR_LINKAGE_H__ */
diff --git a/include/list.h b/include/list.h
index 1d2717f42..54377d394 100644
--- a/include/list.h
+++ b/include/list.h
@@ -283,4 +283,4 @@ static inline void list_splice_tail_init(struct list_head *list,
 #define list_safe_reset_next(pos, n, member)				\
 	n = list_entry(pos->member.next, typeof(*pos), member)
 
-#endif /* CR_LIST_H_ */
+#endif /* __CR_LIST_H__ */
diff --git a/include/lock.h b/include/lock.h
index f925d5c48..8ef4113e2 100644
--- a/include/lock.h
+++ b/include/lock.h
@@ -121,4 +121,4 @@ static void inline mutex_unlock(mutex_t *m)
 	BUG_ON(sys_futex(&m->raw.counter, FUTEX_WAKE, 1, NULL, NULL, 0) < 0);
 }
 
-#endif /* CR_LOCK_H_ */
+#endif /* __CR_LOCK_H__ */
diff --git a/include/log-levels.h b/include/log-levels.h
index 195c102b0..3e6753f49 100644
--- a/include/log-levels.h
+++ b/include/log-levels.h
@@ -9,4 +9,4 @@
 
 #define DEFAULT_LOGLEVEL	LOG_WARN
 
-#endif /* LOG_LEVELS_H__ */
+#endif /* __CR_LOG_LEVELS_H__ */
diff --git a/include/log.h b/include/log.h
index 8fa7dc656..802f3f2d8 100644
--- a/include/log.h
+++ b/include/log.h
@@ -49,4 +49,4 @@ extern void print_on_level(unsigned int loglevel, const char *format, ...)
 #define pr_perror(fmt, ...)	\
 	pr_err(fmt ": %m\n", ##__VA_ARGS__)
 
-#endif /* LOG_H__ */
+#endif /* __CR_LOG_H__ */
diff --git a/include/memcpy_64.h b/include/memcpy_64.h
index 82188d6eb..20f11cdb9 100644
--- a/include/memcpy_64.h
+++ b/include/memcpy_64.h
@@ -19,4 +19,4 @@ static always_inline void *builtin_memcpy(void *to, const void *from, unsigned i
 	return to;
 }
 
-#endif /* __MEMCPY_64_H__ */
+#endif /* __CR_MEMCPY_64_H__ */
diff --git a/include/mount.h b/include/mount.h
index 781da0884..a2ffa02f2 100644
--- a/include/mount.h
+++ b/include/mount.h
@@ -17,4 +17,5 @@ extern void show_mountpoints(int fd, struct cr_options *);
 int prepare_mnt_ns(int pid);
 
 extern int pivot_root(const char *new_root, const char *put_old);
-#endif /* MOUNT_H__ */
+
+#endif /* __CR_MOUNT_H__ */
diff --git a/include/namespaces.h b/include/namespaces.h
index 43efc6e5a..8b3404201 100644
--- a/include/namespaces.h
+++ b/include/namespaces.h
@@ -10,4 +10,5 @@ struct cr_options;
 int try_show_namespaces(int pid, struct cr_options *);
 int switch_ns(int pid, int type, char *ns, int *rst);
 int restore_ns(int rst, int type);
-#endif
+
+#endif /* __CR_NS_H__ */
diff --git a/include/net.h b/include/net.h
index fb55e0777..321493c50 100644
--- a/include/net.h
+++ b/include/net.h
@@ -19,4 +19,5 @@ struct veth_pair {
 
 extern int network_lock(void);
 extern void network_unlock(void);
-#endif
+
+#endif /* __CR_NET_H__ */
diff --git a/include/netfilter.h b/include/netfilter.h
index a64d0bdc4..a857d3a96 100644
--- a/include/netfilter.h
+++ b/include/netfilter.h
@@ -7,4 +7,5 @@ int nf_unlock_connection(struct inet_sk_desc *);
 
 struct inet_sk_info;
 int nf_unlock_connection_info(struct inet_sk_info *);
-#endif
+
+#endif /* __CR_NETFILTER_H__ */
diff --git a/include/packet_diag.h b/include/packet_diag.h
index 6827f6525..e5d9193a8 100644
--- a/include/packet_diag.h
+++ b/include/packet_diag.h
@@ -73,4 +73,4 @@ struct packet_diag_ring {
 	__u32   pdr_features;
 };
 
-#endif
+#endif /* __CR_PACKET_DIAG_H__ */
diff --git a/include/parasite-syscall.h b/include/parasite-syscall.h
index c57472876..6b0d65914 100644
--- a/include/parasite-syscall.h
+++ b/include/parasite-syscall.h
@@ -69,4 +69,4 @@ int syscall_seized(struct parasite_ctl *ctl, int nr, unsigned long *ret,
 		unsigned long arg5,
 		unsigned long arg6);
 
-#endif /* PARASITE_SYSCALL_H_ */
+#endif /* __CR_PARASITE_SYSCALL_H__ */
diff --git a/include/parasite.h b/include/parasite.h
index 67c38e115..f743e0695 100644
--- a/include/parasite.h
+++ b/include/parasite.h
@@ -127,4 +127,5 @@ struct parasite_tty_args {
 #define parasite_sym(pblob, name) ((void *)(pblob) + parasite_blob_offset__##name)
 
 #endif /* !__ASSEMBLY__ */
-#endif /* CR_PARASITE_H_ */
+
+#endif /* __CR_PARASITE_H__ */
diff --git a/include/pipes.h b/include/pipes.h
index 641d207e2..d31d48e7b 100644
--- a/include/pipes.h
+++ b/include/pipes.h
@@ -36,4 +36,4 @@ struct pipe_data_rst {
 extern int collect_pipe_data(int img_type, struct pipe_data_rst **hash);
 extern int restore_pipe_data(int img_type, int pfd, u32 id, struct pipe_data_rst **hash);
 
-#endif
+#endif /* __CR_PIPES_H__ */
diff --git a/include/proc_parse.h b/include/proc_parse.h
index ad8349d3b..df72ef7d2 100644
--- a/include/proc_parse.h
+++ b/include/proc_parse.h
@@ -140,4 +140,4 @@ extern int parse_fdinfo(int fd, int type,
 		int (*cb)(union fdinfo_entries *e, void *arg), void *arg);
 extern int parse_cpuinfo_features(void);
 
-#endif /* PROC_PARSE_H__ */
+#endif /* __CR_PROC_PARSE_H__ */
diff --git a/include/processor-flags.h b/include/processor-flags.h
index ea5a01926..9f1bccdbe 100644
--- a/include/processor-flags.h
+++ b/include/processor-flags.h
@@ -25,4 +25,4 @@
 #define X86_EFLAGS_VIP	0x00100000 /* Virtual Interrupt Pending */
 #define X86_EFLAGS_ID	0x00200000 /* CPUID detection flag */
 
-#endif /* CR_PROCESSOR_FLAGS_H__ */
+#endif /* __CR_PROCESSOR_FLAGS_H__ */
diff --git a/include/protobuf.h b/include/protobuf.h
index 7308ca60a..6851c22df 100644
--- a/include/protobuf.h
+++ b/include/protobuf.h
@@ -104,4 +104,5 @@ int collect_image(int fd_t, int obj_t, unsigned size,
 		int (*collect)(void *obj, ProtobufCMessage *msg));
 int collect_image_sh(int fd_t, int obj_t, unsigned size,
 		int (*collect)(void *obj, ProtobufCMessage *msg));
-#endif /* PROTOBUF_H__ */
+
+#endif /* __CR_PROTOBUF_H__ */
diff --git a/include/pstree.h b/include/pstree.h
index ff0bd1105..d13dacfcb 100644
--- a/include/pstree.h
+++ b/include/pstree.h
@@ -1,5 +1,6 @@
 #ifndef __CR_PSTREE_H__
 #define __CR_PSTREE_H__
+
 #include "list.h"
 #include "crtools.h"
 
@@ -60,4 +61,5 @@ extern int dump_pstree(struct pstree_item *root_item);
 
 struct task_entries;
 extern struct task_entries *task_entries;
-#endif
+
+#endif /* __CR_PSTREE_H__ */
diff --git a/include/ptrace.h b/include/ptrace.h
index 2c27c0967..ea45d20b5 100644
--- a/include/ptrace.h
+++ b/include/ptrace.h
@@ -40,4 +40,4 @@ extern int ptrace_peek_area(pid_t pid, void *dst, void *addr, long bytes);
 extern int ptrace_poke_area(pid_t pid, void *src, void *addr, long bytes);
 extern int ptrace_swap_area(pid_t pid, void *dst, void *src, long bytes);
 
-#endif /* SEIZE_H_ */
+#endif /* __CR_SEIZE_H__ */
diff --git a/include/rbtree.h b/include/rbtree.h
index ff220c042..a512cf3f3 100644
--- a/include/rbtree.h
+++ b/include/rbtree.h
@@ -2,8 +2,8 @@
  * RBtree implementation adopted from the Linux kernel sources.
  */
 
-#ifndef RBTREE_H__
-#define RBTREE_H__
+#ifndef __CR_RBTREE_H__
+#define __CR_RBTREE_H__
 
 #include <stddef.h>
 
@@ -86,4 +86,4 @@ static inline void rb_link_and_balance(struct rb_root *root,
 	rb_insert_color(node, root);
 }
 
-#endif /* RBTREE_H__ */
+#endif /* __CR_RBTREE_H__ */
diff --git a/include/restorer.h b/include/restorer.h
index 1b590d4c2..095f03d09 100644
--- a/include/restorer.h
+++ b/include/restorer.h
@@ -295,4 +295,4 @@ find_shmem(struct shmems *shmems, unsigned long shmid)
 			(vma_entry_is(vma, VMA_ANON_PRIVATE) || \
 			vma_entry_is(vma, VMA_FILE_PRIVATE)))
 
-#endif /* CR_RESTORER_H__ */
+#endif /* __CR_RESTORER_H__ */
diff --git a/include/shmem.h b/include/shmem.h
index 18eafc594..bc7135129 100644
--- a/include/shmem.h
+++ b/include/shmem.h
@@ -13,4 +13,5 @@ extern struct shmems *rst_shmems;
 
 int cr_dump_shmem(void);
 int add_shmem_area(pid_t pid, VmaEntry *vma);
-#endif
+
+#endif /* __CR_SHMEM_H__ */
diff --git a/include/signalfd.h b/include/signalfd.h
index 9721a4dbb..2ac8ff58e 100644
--- a/include/signalfd.h
+++ b/include/signalfd.h
@@ -1,5 +1,6 @@
 #ifndef __CR_SIGNALFD_H__
 #define __CR_SIGNALFD_H__
+
 struct cr_fdset;
 struct fd_parms;
 struct cr_options;
@@ -7,4 +8,5 @@ extern int is_signalfd_link(int lfd);
 extern int dump_signalfd(struct fd_parms *p, int lfd, const struct cr_fdset *set);
 extern void show_signalfd(int fd, struct cr_options *o);
 extern int collect_signalfd(void);
-#endif
+
+#endif /* __CR_SIGNALFD_H__ */
diff --git a/include/sk-inet.h b/include/sk-inet.h
index 84a920337..522f54926 100644
--- a/include/sk-inet.h
+++ b/include/sk-inet.h
@@ -69,4 +69,5 @@ int check_tcp_repair(void);
 
 extern int rst_tcp_socks_size;
 extern int rst_tcp_socks_remap(void *addr);
-#endif
+
+#endif /* __CR_SK_INET_H__ */
diff --git a/include/sk-packet.h b/include/sk-packet.h
index 3499151c8..a998c3398 100644
--- a/include/sk-packet.h
+++ b/include/sk-packet.h
@@ -37,4 +37,4 @@ struct tpacket_req3 {
 };
 #endif
 
-#endif
+#endif /* __CR_SK_PACKET_H__ */
diff --git a/include/sk-queue.h b/include/sk-queue.h
index 2044cd0f0..7d134103f 100644
--- a/include/sk-queue.h
+++ b/include/sk-queue.h
@@ -11,4 +11,4 @@ extern int dump_sk_queue(int sock_fd, int sock_id);
 extern void show_sk_queues(int fd, struct cr_options *o);
 extern int restore_sk_queue(int fd, unsigned int peer_id);
 
-#endif /* SK_QUEUE_H__ */
+#endif /* __CR_SK_QUEUE_H__ */
diff --git a/include/sockets.h b/include/sockets.h
index 444ab94bd..0deadb648 100644
--- a/include/sockets.h
+++ b/include/sockets.h
@@ -78,4 +78,4 @@ static inline int sk_decode_shutdown(int val)
 	return hows[val];
 }
 
-#endif /* CR_SOCKETS_H__ */
+#endif /* __CR_SOCKETS_H__ */
diff --git a/include/syscall-types.h b/include/syscall-types.h
index 261e288af..42850152e 100644
--- a/include/syscall-types.h
+++ b/include/syscall-types.h
@@ -5,8 +5,8 @@
  * Anything else should go to plain type.h
  */
 
-#ifndef SYSCALL_TYPES_H__
-#define SYSCALL_TYPES_H__
+#ifndef __CR_SYSCALL_TYPES_H__
+#define __CR_SYSCALL_TYPES_H__
 
 #include <sys/time.h>
 #include <arpa/inet.h>
@@ -61,4 +61,4 @@ struct robust_list_head;
 
 #define setns	sys_setns
 
-#endif /* SYSCALL_TYPES_H__ */
+#endif /* __CR_SYSCALL_TYPES_H__ */
diff --git a/include/sysctl.h b/include/sysctl.h
index cd062391a..4a7682d71 100644
--- a/include/sysctl.h
+++ b/include/sysctl.h
@@ -31,4 +31,4 @@ enum {
 #define CTL_LEN(t)	((t) >> CTL_SHIFT)
 #define CTL_TYPE(t)	((t) & ((1 << CTL_SHIFT) - 1))
 
-#endif /* CR_SYSCTL_H_ */
+#endif /* __CR_SYSCTL_H__ */
diff --git a/include/tty.h b/include/tty.h
index 0d202b9c5..bf370abec 100644
--- a/include/tty.h
+++ b/include/tty.h
@@ -24,4 +24,4 @@ extern int tty_verify_active_pairs(void);
 extern int tty_prep_fds(void);
 extern void tty_fini_fds(void);
 
-#endif /* CR_TTY_H__ */
+#endif /* __CR_TTY_H__ */
diff --git a/include/types.h b/include/types.h
index f47440e0c..f29975215 100644
--- a/include/types.h
+++ b/include/types.h
@@ -245,4 +245,4 @@ typedef struct {
 # define MADV_DONTDUMP 16
 #endif
 
-#endif /* CR_TYPES_H_ */
+#endif /* __CR_TYPES_H__ */
diff --git a/include/unix_diag.h b/include/unix_diag.h
index 40b892d55..7e7dd3394 100644
--- a/include/unix_diag.h
+++ b/include/unix_diag.h
@@ -64,4 +64,4 @@ struct unix_diag_rqlen {
 	u32	udiag_wqueue;
 };
 
-#endif /* UNIX_DIAG_H__ */
+#endif /* __CR_UNIX_DIAG_H__ */
diff --git a/include/util-net.h b/include/util-net.h
index ce69b0fce..e847f6e12 100644
--- a/include/util-net.h
+++ b/include/util-net.h
@@ -59,4 +59,4 @@ static inline int recv_fd(int sock)
 	return fd;
 }
 
-#endif
+#endif /* __CR_UTIL_NET_H__ */
diff --git a/include/util.h b/include/util.h
index cb2b4ac72..d3c85fc38 100644
--- a/include/util.h
+++ b/include/util.h
@@ -330,4 +330,4 @@ static inline bool dir_dots(struct dirent *de)
 	return !strcmp(de->d_name, ".") || !strcmp(de->d_name, "..");
 }
 
-#endif /* UTIL_H_ */
+#endif /* __CR_UTIL_H__ */
diff --git a/include/uts_ns.h b/include/uts_ns.h
index f7d8dfc4a..3c013d5af 100644
--- a/include/uts_ns.h
+++ b/include/uts_ns.h
@@ -8,4 +8,4 @@ struct cr_options;
 void show_utsns(int fd, struct cr_options *);
 int prepare_utsns(int pid);
 
-#endif /* CR_UTS_NS_H_ */
+#endif /* __CR_UTS_NS_H__ */