diff --git a/criu/aio.c b/criu/aio.c
index 45651f2d3..6ee65d5f4 100644
--- a/criu/aio.c
+++ b/criu/aio.c
@@ -11,7 +11,7 @@
 #include "parasite.h"
 #include "parasite-syscall.h"
 #include "images/mm.pb-c.h"
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #define NR_IOEVENTS_IN_NPAGES(npages) ((PAGE_SIZE * (npages) - sizeof(struct aio_ring)) / sizeof(struct io_event))
 
diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index f98743a23..76bd1fea7 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -19,7 +19,7 @@
 #include "util.h"
 #include "cpu.h"
 #include "restorer.h"
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #define assign_reg(dst, src, e)		dst->e = (__typeof__(dst->e))(src)->e
 
diff --git a/criu/arch/arm/crtools.c b/criu/arch/arm/crtools.c
index c216cdc5c..840d489a6 100644
--- a/criu/arch/arm/crtools.c
+++ b/criu/arch/arm/crtools.c
@@ -18,8 +18,7 @@
 #include "elf.h"
 #include "parasite-syscall.h"
 #include "restorer.h"
-
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #define assign_reg(dst, src, e)		dst->e = (__typeof__(dst->e))((src)->ARM_##e)
 
diff --git a/criu/arch/ppc64/crtools.c b/criu/arch/ppc64/crtools.c
index 5a5966ad4..0d9f49c3f 100644
--- a/criu/arch/ppc64/crtools.c
+++ b/criu/arch/ppc64/crtools.c
@@ -17,7 +17,7 @@
 #include "log.h"
 #include "util.h"
 #include "cpu.h"
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #include "protobuf.h"
 #include "images/core.pb-c.h"
diff --git a/criu/arch/s390/crtools.c b/criu/arch/s390/crtools.c
index 238035b76..000b7779f 100644
--- a/criu/arch/s390/crtools.c
+++ b/criu/arch/s390/crtools.c
@@ -17,7 +17,7 @@
 #include "log.h"
 #include "util.h"
 #include "cpu.h"
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #include "protobuf.h"
 #include "images/core.pb-c.h"
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index e4073c27b..9c8beeedd 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -1,5 +1,5 @@
 #include "compel/asm/fpu.h"
-#include "compel/compel.h"
+#include "compel/infect.h"
 #include "compel/plugins/std/syscall-codes.h"
 #include "cpu.h"
 #include "cr_options.h"
diff --git a/criu/arch/x86/sys-exec-tbl.c b/criu/arch/x86/sys-exec-tbl.c
index 608dc2510..225b8a153 100644
--- a/criu/arch/x86/sys-exec-tbl.c
+++ b/criu/arch/x86/sys-exec-tbl.c
@@ -1,4 +1,3 @@
-#include <compel/compel.h>
 
 static struct syscall_exec_desc sc_exec_table_64[] = {
 #include "sys-exec-tbl-64.c"
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 85105a18e..41146d4ad 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -67,7 +67,6 @@
 #include "timerfd.h"
 #include "action-scripts.h"
 #include "shmem.h"
-#include <compel/compel.h>
 #include "aio.h"
 #include "lsm.h"
 #include "seccomp.h"
diff --git a/criu/include/proc_parse.h b/criu/include/proc_parse.h
index 96a097b3d..fd50ff47e 100644
--- a/criu/include/proc_parse.h
+++ b/criu/include/proc_parse.h
@@ -3,7 +3,7 @@
 
 #include <sys/types.h>
 
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #define PROC_TASK_COMM_LEN	32
 #define PROC_TASK_COMM_LEN_FMT	"(%31s"
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 8ac83820b..2ad72c350 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -33,7 +33,6 @@
 #include "net.h"
 #include "tun.h"
 #include <compel/plugins/std/syscall-codes.h>
-#include <compel/compel.h>
 #include "netfilter.h"
 #include "fsnotify.h"
 #include "linux/userfaultfd.h"
diff --git a/criu/mem.c b/criu/mem.c
index 4e110c9e9..55022d94a 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -29,7 +29,7 @@
 #include "pagemap-cache.h"
 #include "fault-injection.h"
 #include "prctl.h"
-#include <compel/compel.h>
+#include "compel/infect-util.h"
 
 #include "protobuf.h"
 #include "images/pagemap.pb-c.h"
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index e5a8194e5..b649d1b51 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -45,8 +45,6 @@
 #include "infect-rpc.h"
 #include "pie/parasite-blob.h"
 
-#include <compel/compel.h>
-
 unsigned long get_exec_start(struct vm_area_list *vmas)
 {
 	struct vma_area *vma_area;
diff --git a/criu/pie/pie-relocs.h b/criu/pie/pie-relocs.h
index 6797486c2..e36126be6 100644
--- a/criu/pie/pie-relocs.h
+++ b/criu/pie/pie-relocs.h
@@ -1,8 +1,6 @@
 #ifndef __PIE_RELOCS_H__
 #define __PIE_RELOCS_H__
 
-#include <compel/compel.h>
-
 #include "common/config.h"
 #include "common/compiler.h"
 
diff --git a/criu/seize.c b/criu/seize.c
index 0ba2d9b1d..f973806d9 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -23,7 +23,6 @@
 #include "string.h"
 #include "xmalloc.h"
 #include "util.h"
-#include <compel/compel.h>
 
 #define NR_ATTEMPTS 5
 
diff --git a/criu/vdso.c b/criu/vdso.c
index 19ba4765d..433a54728 100644
--- a/criu/vdso.c
+++ b/criu/vdso.c
@@ -20,7 +20,6 @@
 #include "criu-log.h"
 #include "mem.h"
 #include "vma.h"
-#include <compel/compel.h>
 #include <compel/plugins/std/syscall.h>
 
 #ifdef LOG_PREFIX