diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index 8f248b5a4..951ac7530 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -5,7 +5,7 @@
 
 #include "asm/types.h"
 #include "asm/restorer.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "ptrace.h"
 #include "asm/processor-flags.h"
 #include "protobuf.h"
diff --git a/criu/arch/aarch64/include/asm/bitops.h b/criu/arch/aarch64/include/asm/bitops.h
index 5a750447f..b1c06b8d4 100644
--- a/criu/arch/aarch64/include/asm/bitops.h
+++ b/criu/arch/aarch64/include/asm/bitops.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_BITOPS_H__
 #define __CR_ASM_BITOPS_H__
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "asm-generic/bitops.h"
 
 #endif /* __CR_ASM_BITOPS_H__ */
diff --git a/criu/arch/aarch64/include/asm/string.h b/criu/arch/aarch64/include/asm/string.h
index 2c3a34fbb..020a8eccd 100644
--- a/criu/arch/aarch64/include/asm/string.h
+++ b/criu/arch/aarch64/include/asm/string.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_STRING_H__
 #define __CR_ASM_STRING_H__
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "asm-generic/string.h"
 
 #endif /* __CR_ASM_STRING_H__ */
diff --git a/criu/arch/arm/crtools.c b/criu/arch/arm/crtools.c
index 1168f94e9..71438ac04 100644
--- a/criu/arch/arm/crtools.c
+++ b/criu/arch/arm/crtools.c
@@ -3,7 +3,7 @@
 
 #include "asm/types.h"
 #include "asm/restorer.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "ptrace.h"
 #include "asm/processor-flags.h"
 #include "protobuf.h"
diff --git a/criu/arch/arm/include/asm/bitops.h b/criu/arch/arm/include/asm/bitops.h
index 5a750447f..b1c06b8d4 100644
--- a/criu/arch/arm/include/asm/bitops.h
+++ b/criu/arch/arm/include/asm/bitops.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_BITOPS_H__
 #define __CR_ASM_BITOPS_H__
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "asm-generic/bitops.h"
 
 #endif /* __CR_ASM_BITOPS_H__ */
diff --git a/criu/arch/arm/include/asm/string.h b/criu/arch/arm/include/asm/string.h
index 2c3a34fbb..020a8eccd 100644
--- a/criu/arch/arm/include/asm/string.h
+++ b/criu/arch/arm/include/asm/string.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_STRING_H__
 #define __CR_ASM_STRING_H__
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "asm-generic/string.h"
 
 #endif /* __CR_ASM_STRING_H__ */
diff --git a/criu/arch/ppc64/crtools.c b/criu/arch/ppc64/crtools.c
index 9f4caced6..dd631f4f6 100644
--- a/criu/arch/ppc64/crtools.c
+++ b/criu/arch/ppc64/crtools.c
@@ -10,7 +10,7 @@
 #include "asm/restorer.h"
 
 #include "cr_options.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "ptrace.h"
 #include "parasite-syscall.h"
 #include "log.h"
diff --git a/criu/arch/ppc64/include/asm/bitops.h b/criu/arch/ppc64/include/asm/bitops.h
index 910971981..d038aa161 100644
--- a/criu/arch/ppc64/include/asm/bitops.h
+++ b/criu/arch/ppc64/include/asm/bitops.h
@@ -38,7 +38,7 @@
  * Copied from the kernel file arch/powerpc/include/asm/bitops.h
  */
 
-#include "compiler.h"
+#include "common/compiler.h"
 
 #include "asm/bitsperlong.h"
 
diff --git a/criu/arch/ppc64/include/asm/string.h b/criu/arch/ppc64/include/asm/string.h
index 4531b3ba6..93eb42813 100644
--- a/criu/arch/ppc64/include/asm/string.h
+++ b/criu/arch/ppc64/include/asm/string.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_STRING_H__
 #define __CR_ASM_STRING_H__
 
-#include "compiler.h"
+#include "common/compiler.h"
 
 #define HAS_BUILTIN_MEMCPY
 #define HAS_BUILTIN_MEMCMP
diff --git a/criu/arch/x86/cpu.c b/criu/arch/x86/cpu.c
index c60d3c258..1252f7f4c 100644
--- a/criu/arch/x86/cpu.c
+++ b/criu/arch/x86/cpu.c
@@ -11,7 +11,7 @@
 #include "asm/cpu.h"
 #include "asm/fpu.h"
 
-#include "compiler.h"
+#include "common/compiler.h"
 
 #include "cr_options.h"
 #include "image.h"
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index a0242cbe0..de3dfd276 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -10,7 +10,7 @@
 #include "asm/fpu.h"
 
 #include "cr_options.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "restorer.h"
 #include "ptrace.h"
 #include "parasite-syscall.h"
diff --git a/criu/arch/x86/include/asm/fpu.h b/criu/arch/x86/include/asm/fpu.h
index be168324b..1d0e9d7e3 100644
--- a/criu/arch/x86/include/asm/fpu.h
+++ b/criu/arch/x86/include/asm/fpu.h
@@ -4,7 +4,7 @@
 #include <sys/types.h>
 #include <stdbool.h>
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "asm/int.h"
 
 #define FP_MIN_ALIGN_BYTES		64
diff --git a/criu/arch/x86/include/asm/string.h b/criu/arch/x86/include/asm/string.h
index ca4d4ab85..415bf5ce3 100644
--- a/criu/arch/x86/include/asm/string.h
+++ b/criu/arch/x86/include/asm/string.h
@@ -3,7 +3,7 @@
 
 #define HAS_BUILTIN_MEMCPY
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "asm-generic/string.h"
 
 #ifdef CR_NOGLIBC
diff --git a/criu/cgroup-props.c b/criu/cgroup-props.c
index 174b98769..938d7cece 100644
--- a/criu/cgroup-props.c
+++ b/criu/cgroup-props.c
@@ -8,7 +8,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "compiler.h"
+#include "int.h"
+#include "common/compiler.h"
 #include "cgroup-props.h"
 #include "cr_options.h"
 #include "config.h"
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 2ae683722..f2a99d1ed 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -37,7 +37,7 @@
 #include "imgset.h"
 #include "file-ids.h"
 #include "kcmp-ids.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "crtools.h"
 #include "cr_options.h"
 #include "servicefd.h"
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index a5cce1645..0eaf34d23 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -25,7 +25,7 @@
 
 #include "types.h"
 #include "ptrace.h"
-#include "compiler.h"
+#include "common/compiler.h"
 
 #include "cr_options.h"
 #include "servicefd.h"
diff --git a/criu/crtools.c b/criu/crtools.c
index f8ba9f171..a0e0fb95f 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -21,7 +21,7 @@
 
 #include "int.h"
 #include "page.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "crtools.h"
 #include "cr_options.h"
 #include "external.h"
diff --git a/criu/eventfd.c b/criu/eventfd.c
index 6426de006..0aab4287e 100644
--- a/criu/eventfd.c
+++ b/criu/eventfd.c
@@ -12,7 +12,7 @@
 #include <sys/ioctl.h>
 #include <sys/eventfd.h>
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "imgset.h"
 #include "eventfd.h"
 #include "fdinfo.h"
diff --git a/criu/eventpoll.c b/criu/eventpoll.c
index bb2efbd06..88076db8a 100644
--- a/criu/eventpoll.c
+++ b/criu/eventpoll.c
@@ -13,7 +13,7 @@
 #include <sys/epoll.h>
 
 #include "crtools.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "imgset.h"
 #include "rst_info.h"
 #include "eventpoll.h"
diff --git a/criu/file-ids.c b/criu/file-ids.c
index d3ff05ae8..36973cbdd 100644
--- a/criu/file-ids.c
+++ b/criu/file-ids.c
@@ -13,7 +13,7 @@
 #include "file-ids.h"
 #include "rbtree.h"
 #include "kcmp-ids.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "image.h"
 #include "util.h"
 #include "irmap.h"
diff --git a/criu/filesystems.c b/criu/filesystems.c
index 0975e1096..f2780ecfe 100644
--- a/criu/filesystems.c
+++ b/criu/filesystems.c
@@ -5,7 +5,7 @@
 #include <sys/mount.h>
 
 #include "int.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "xmalloc.h"
 #include "cr_options.h"
 #include "filesystems.h"
diff --git a/criu/fsnotify.c b/criu/fsnotify.c
index a2d1b878c..ec276b100 100644
--- a/criu/fsnotify.c
+++ b/criu/fsnotify.c
@@ -22,7 +22,7 @@
 
 #include <sys/fanotify.h>
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "imgset.h"
 #include "fsnotify.h"
 #include "fdinfo.h"
diff --git a/criu/include/asm-generic/string.h b/criu/include/asm-generic/string.h
index 9e649c027..3f34c3a67 100644
--- a/criu/include/asm-generic/string.h
+++ b/criu/include/asm-generic/string.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_GENERIC_STRING_H__
 #define __CR_ASM_GENERIC_STRING_H__
 
-#include "compiler.h"
+#include "common/compiler.h"
 
 #ifndef HAS_BUILTIN_MEMCPY
 static always_inline void *builtin_memcpy(void *to, const void *from, unsigned int n)
diff --git a/criu/include/bug.h b/criu/include/bug.h
index a479c673b..881f0daf8 100644
--- a/criu/include/bug.h
+++ b/criu/include/bug.h
@@ -4,7 +4,7 @@
 #include <signal.h>
 #include <stdbool.h>
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "log.h"
 
 #ifndef BUG_ON_HANDLER
diff --git a/criu/include/err.h b/criu/include/err.h
index c5b6165a5..bc2c8fd8b 100644
--- a/criu/include/err.h
+++ b/criu/include/err.h
@@ -4,7 +4,7 @@
 #ifndef __CR_ERR_H__
 #define __CR_ERR_H__
 
-#include "compiler.h"
+#include "common/compiler.h"
 
 /*
  * The address of a block returned by malloc or realloc in GNU
diff --git a/criu/include/file-ids.h b/criu/include/file-ids.h
index e6c15c4d9..845cfaa9f 100644
--- a/criu/include/file-ids.h
+++ b/criu/include/file-ids.h
@@ -1,7 +1,7 @@
 #ifndef __CR_FILE_IDS_H__
 #define __CR_FILE_IDS_H__
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "rbtree.h"
 
 #include "images/fdinfo.pb-c.h"
diff --git a/criu/include/files.h b/criu/include/files.h
index 4275b1f89..153e7b300 100644
--- a/criu/include/files.h
+++ b/criu/include/files.h
@@ -4,7 +4,7 @@
 #include <sys/stat.h>
 
 #include "int.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "fcntl.h"
 #include "lock.h"
 #include "common/list.h"
diff --git a/criu/include/image.h b/criu/include/image.h
index 65b7b0a60..fc1cf893c 100644
--- a/criu/include/image.h
+++ b/criu/include/image.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "servicefd.h"
 #include "image-desc.h"
 #include "fcntl.h"
diff --git a/criu/include/namespaces.h b/criu/include/namespaces.h
index 126fd2319..ece23d700 100644
--- a/criu/include/namespaces.h
+++ b/criu/include/namespaces.h
@@ -1,7 +1,7 @@
 #ifndef __CR_NS_H__
 #define __CR_NS_H__
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "files.h"
 #include "common/list.h"
 
diff --git a/criu/include/plugin.h b/criu/include/plugin.h
index 2b02edb24..82a6723d0 100644
--- a/criu/include/plugin.h
+++ b/criu/include/plugin.h
@@ -2,7 +2,7 @@
 #define __CR_PLUGIN_H__
 
 #include "criu-plugin.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "common/list.h"
 
 #define CR_PLUGIN_DEFAULT "/var/lib/criu/"
diff --git a/criu/include/protobuf.h b/criu/include/protobuf.h
index f94b08d8f..a90fcd1b2 100644
--- a/criu/include/protobuf.h
+++ b/criu/include/protobuf.h
@@ -4,7 +4,8 @@
 #include <stdbool.h>
 
 #include "protobuf-desc.h"
-#include "compiler.h"
+#include "common/compiler.h"
+#include "util.h"
 
 struct cr_img;
 
diff --git a/criu/include/rbtree.h b/criu/include/rbtree.h
index 2cde684cc..007950638 100644
--- a/criu/include/rbtree.h
+++ b/criu/include/rbtree.h
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 
-#include "compiler.h"
+#include "common/compiler.h"
 
 #define	RB_RED		0
 #define	RB_BLACK	1
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index c99d5cb30..c58a0e841 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -7,7 +7,7 @@
 
 #include "int.h"
 #include "types.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "asm/fpu.h"
 #include "lock.h"
 #include "util.h"
diff --git a/criu/include/util.h b/criu/include/util.h
index 1f13ff801..234c03f4e 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -13,7 +13,7 @@
 #include <dirent.h>
 
 #include "int.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "xmalloc.h"
 #include "bug.h"
 #include "log.h"
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 98314d081..02684fa76 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -14,7 +14,7 @@
 #include "kerndat.h"
 #include "fs-magic.h"
 #include "mem.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "sysctl.h"
 #include "cr_options.h"
 #include "util.h"
diff --git a/criu/log.c b/criu/log.c
index 0ab15bd40..274361f31 100644
--- a/criu/log.c
+++ b/criu/log.c
@@ -13,7 +13,7 @@
 #include <fcntl.h>
 
 #include "page.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "util.h"
 #include "cr_options.h"
 #include "servicefd.h"
diff --git a/criu/pagemap-cache.c b/criu/pagemap-cache.c
index 20e69f765..aa39dacaa 100644
--- a/criu/pagemap-cache.c
+++ b/criu/pagemap-cache.c
@@ -3,7 +3,7 @@
 
 #include "page.h"
 #include "pagemap-cache.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "xmalloc.h"
 #include "util.h"
 #include "log.h"
diff --git a/criu/pie/pie-relocs.c b/criu/pie/pie-relocs.c
index 7e825b232..c24f395ba 100644
--- a/criu/pie/pie-relocs.c
+++ b/criu/pie/pie-relocs.c
@@ -14,7 +14,7 @@
 
 #include "asm-generic/int.h"
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "piegen/uapi/types.h"
 #include "bug.h"
 
diff --git a/criu/pie/pie-relocs.h b/criu/pie/pie-relocs.h
index 1449ca630..8d9ae2873 100644
--- a/criu/pie/pie-relocs.h
+++ b/criu/pie/pie-relocs.h
@@ -3,7 +3,7 @@
 
 #include "piegen/uapi/types.h"
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "config.h"
 
 #ifdef CONFIG_PIEGEN
diff --git a/criu/pie/piegen/elf.c b/criu/pie/piegen/elf.c
index 58e0beb28..ba6f592cb 100644
--- a/criu/pie/piegen/elf.c
+++ b/criu/pie/piegen/elf.c
@@ -14,7 +14,7 @@
 
 #include "asm-generic/int.h"
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "piegen.h"
 
 static bool __ptr_oob(const void *ptr, const void *start, const size_t size)
diff --git a/criu/pie/piegen/main.c b/criu/pie/piegen/main.c
index c89b1575f..e0bfc59b2 100644
--- a/criu/pie/piegen/main.c
+++ b/criu/pie/piegen/main.c
@@ -13,7 +13,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "config.h"
 #include "piegen.h"
 
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 3b9d8df32..686311265 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -19,7 +19,7 @@
 
 #include "int.h"
 #include "types.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "string.h"
 #include "syscall.h"
 #include "signal.h"
diff --git a/criu/pie/util-fd.c b/criu/pie/util-fd.c
index b6781baaa..323ed37b7 100644
--- a/criu/pie/util-fd.c
+++ b/criu/pie/util-fd.c
@@ -6,7 +6,7 @@
 
 #include "int.h"
 #include "types.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "log.h"
 #include "string.h"
 
diff --git a/criu/pie/util.c b/criu/pie/util.c
index c637c0969..f16982317 100644
--- a/criu/pie/util.c
+++ b/criu/pie/util.c
@@ -7,7 +7,7 @@
 
 #include "int.h"
 #include "types.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "fcntl.h"
 #include "log.h"
 #include "util-pie.h"
diff --git a/criu/plugin.c b/criu/plugin.c
index 54cd4257b..387b11f5e 100644
--- a/criu/plugin.c
+++ b/criu/plugin.c
@@ -7,7 +7,7 @@
 #include <dlfcn.h>
 
 #include "cr_options.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "xmalloc.h"
 #include "plugin.h"
 #include "common/list.h"
diff --git a/criu/protobuf-desc.c b/criu/protobuf-desc.c
index a6807e269..41c208037 100644
--- a/criu/protobuf-desc.c
+++ b/criu/protobuf-desc.c
@@ -8,7 +8,7 @@
 #include <arpa/inet.h>
 #include <ctype.h>
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "log.h"
 
 #include "protobuf-desc.h"
diff --git a/criu/protobuf.c b/criu/protobuf.c
index b5aa7d341..3db829de9 100644
--- a/criu/protobuf.c
+++ b/criu/protobuf.c
@@ -10,7 +10,7 @@
 
 #include "image.h"
 #include "servicefd.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "log.h"
 #include "rst-malloc.h"
 #include "string.h"
diff --git a/criu/ptrace.c b/criu/ptrace.c
index f0fea0ca4..09f7cd9ea 100644
--- a/criu/ptrace.c
+++ b/criu/ptrace.c
@@ -14,7 +14,8 @@
 #include <sys/resource.h>
 #include <sys/wait.h>
 
-#include "compiler.h"
+#include "int.h"
+#include "common/compiler.h"
 #include "util.h"
 #include "ptrace.h"
 #include "pid.h"
diff --git a/criu/seize.c b/criu/seize.c
index 8f878e74d..5a6cef4d5 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -10,7 +10,7 @@
 #include <time.h>
 
 #include "int.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "cr_options.h"
 #include "cr-errno.h"
 #include "pstree.h"
diff --git a/criu/signalfd.c b/criu/signalfd.c
index 07d0bd6da..2f5db5879 100644
--- a/criu/signalfd.c
+++ b/criu/signalfd.c
@@ -2,7 +2,7 @@
 #include <signal.h>
 #include <sys/signalfd.h>
 
-#include "compiler.h"
+#include "common/compiler.h"
 #include "signalfd.h"
 #include "fdinfo.h"
 #include "imgset.h"
diff --git a/criu/tty.c b/criu/tty.c
index dbce49c29..7ec5b1f1c 100644
--- a/criu/tty.c
+++ b/criu/tty.c
@@ -13,7 +13,7 @@
 #include <linux/major.h>
 
 #include "types.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "crtools.h"
 #include "files.h"
 #include "cr_options.h"
diff --git a/criu/util.c b/criu/util.c
index 4179fb94a..2cf035564 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -37,7 +37,7 @@
 
 #include "bitops.h"
 #include "page.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "common/list.h"
 #include "util.h"
 #include "rst-malloc.h"
diff --git a/criu/vdso.c b/criu/vdso.c
index 1977d1da7..a4d4ffdaf 100644
--- a/criu/vdso.c
+++ b/criu/vdso.c
@@ -12,7 +12,7 @@
 #include "types.h"
 #include "parasite-syscall.h"
 #include "parasite.h"
-#include "compiler.h"
+#include "common/compiler.h"
 #include "kerndat.h"
 #include "vdso.h"
 #include "util.h"
diff --git a/criu/include/compiler.h b/include/common/compiler.h
similarity index 100%
rename from criu/include/compiler.h
rename to include/common/compiler.h
diff --git a/include/common/list.h b/include/common/list.h
index 8d3d610b9..4e33475c1 100644
--- a/include/common/list.h
+++ b/include/common/list.h
@@ -6,7 +6,7 @@
  */
 
 #include <stddef.h>
-#include "compiler.h"
+#include "common/compiler.h"
 
 #define POISON_POINTER_DELTA 0
 #define LIST_POISON1  ((void *) 0x00100100 + POISON_POINTER_DELTA)