53 files changed, 99 insertions, 102 deletions

diff --git a/compel/Makefile b/compel/Makefile
index d421bc078..ad98e9d6d 100644
--- a/compel/Makefile
+++ b/compel/Makefile
@@ -23,6 +23,11 @@ lib-y			+= src/lib/log.o
 host-lib-y		+= src/lib/log.o
 
 lib-y			+= arch/$(ARCH)/src/lib/cpu.o
+lib-y			+= arch/$(ARCH)/src/lib/infect.o
+lib-y			+= src/lib/infect-rpc.o
+lib-y			+= src/lib/infect-util.o
+lib-y			+= src/lib/infect.o
+lib-y			+= src/lib/ptrace.o
 
 ifeq ($(ARCH),x86)
 lib-y			+= src/lib/handle-elf-32.o
diff --git a/compel/arch/aarch64/src/lib/include/ptrace.h b/compel/arch/aarch64/src/lib/include/uapi/asm/breakpoints.h
index e18454df2..5f090490d 100644
--- a/compel/arch/aarch64/src/lib/include/ptrace.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/breakpoints.h
@@ -1,5 +1,5 @@
-#ifndef __COMPEL_PTRACE_H__
-#define __COMPEL_PTRACE_H__
+#ifndef __COMPEL_BREAKPOINTS_H__
+#define __COMPEL_BREAKPOINTS_H__
 #define ARCH_SI_TRAP TRAP_BRKPT
 
 static inline int ptrace_set_breakpoint(pid_t pid, void *addr)
diff --git a/criu/arch/aarch64/include/asm/infect-types.h b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
index ff9e53e7c..714881c57 100644
--- a/criu/arch/aarch64/include/asm/infect-types.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
@@ -7,8 +7,6 @@
 #include <asm/ptrace.h>
 #include "common/page.h"
 
-#include "page.h"
-
 #define SIGMAX			64
 #define SIGMAX_OLD		31
 
diff --git a/criu/arch/aarch64/infect.c b/compel/arch/aarch64/src/lib/infect.c
index aeb734781..fceea2816 100644
--- a/criu/arch/aarch64/infect.c
+++ b/compel/arch/aarch64/src/lib/infect.c
@@ -2,12 +2,10 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <linux/elf.h>
-#include "asm/parasite-syscall.h"
 #include <compel/plugins/std/syscall-codes.h>
-#include "asm/types.h"
-#include "criu-log.h"
-#include "parasite-syscall.h"
-#include "compel/include/errno.h"
+#include "uapi/compel/asm/infect-types.h"
+#include "log.h"
+#include "errno.h"
 #include "infect.h"
 #include "infect-priv.h"
 
diff --git a/compel/arch/arm/src/lib/include/ptrace.h b/compel/arch/arm/src/lib/include/uapi/asm/breakpoints.h
index e18454df2..5f090490d 100644
--- a/compel/arch/arm/src/lib/include/ptrace.h
+++ b/compel/arch/arm/src/lib/include/uapi/asm/breakpoints.h
@@ -1,5 +1,5 @@
-#ifndef __COMPEL_PTRACE_H__
-#define __COMPEL_PTRACE_H__
+#ifndef __COMPEL_BREAKPOINTS_H__
+#define __COMPEL_BREAKPOINTS_H__
 #define ARCH_SI_TRAP TRAP_BRKPT
 
 static inline int ptrace_set_breakpoint(pid_t pid, void *addr)
diff --git a/criu/arch/arm/include/asm/infect-types.h b/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
index 91b4c1e98..9c2092e5d 100644
--- a/criu/arch/arm/include/asm/infect-types.h
+++ b/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
@@ -5,8 +5,6 @@
 #include <sys/mman.h>
 #include "common/page.h"
 
-#include "page.h"
-
 #define SIGMAX			64
 #define SIGMAX_OLD		31
 
diff --git a/compel/arch/arm/src/lib/include/uapi/asm/sigframe.h b/compel/arch/arm/src/lib/include/uapi/asm/sigframe.h
index 65ae8a8b9..3e7bc0104 100644
--- a/compel/arch/arm/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/arm/src/lib/include/uapi/asm/sigframe.h
@@ -1,6 +1,8 @@
 #ifndef UAPI_COMPEL_ASM_SIGFRAME_H__
 #define UAPI_COMPEL_ASM_SIGFRAME_H__
 
+#include <compel/asm/infect-types.h>
+
 /* Copied from the Linux kernel header arch/arm/include/asm/sigcontext.h */
 
 struct rt_sigcontext {
diff --git a/criu/arch/arm/infect.c b/compel/arch/arm/src/lib/infect.c
index b22e98d9c..b440ff736 100644
--- a/criu/arch/arm/infect.c
+++ b/compel/arch/arm/src/lib/infect.c
@@ -1,12 +1,10 @@
 #include <sys/ptrace.h>
 #include <sys/types.h>
-#include "asm/parasite-syscall.h"
 #include <compel/plugins/std/syscall-codes.h>
 #include <compel/asm/processor-flags.h>
-#include "asm/types.h"
-#include "criu-log.h"
-#include "parasite-syscall.h"
-#include "compel/include/errno.h"
+#include "uapi/compel/asm/infect-types.h"
+#include "log.h"
+#include "errno.h"
 #include "infect.h"
 #include "infect-priv.h"
 
diff --git a/compel/arch/ppc64/src/lib/include/ptrace.h b/compel/arch/ppc64/src/lib/include/uapi/asm/breakpoints.h
index 0274c2675..1ab89af76 100644
--- a/compel/arch/ppc64/src/lib/include/ptrace.h
+++ b/compel/arch/ppc64/src/lib/include/uapi/asm/breakpoints.h
@@ -1,5 +1,5 @@
-#ifndef __COMPEL_PTRACE_H__
-#define __COMPEL_PTRACE_H__
+#ifndef __COMPEL_BREAKPOINTS_H__
+#define __COMPEL_BREAKPOINTS_H__
 #define ARCH_SI_TRAP TRAP_BRKPT
 
 static inline int ptrace_set_breakpoint(pid_t pid, void *addr)
diff --git a/criu/arch/ppc64/include/asm/infect-types.h b/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
index f243def73..f243def73 100644
--- a/criu/arch/ppc64/include/asm/infect-types.h
+++ b/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
diff --git a/criu/arch/ppc64/infect.c b/compel/arch/ppc64/src/lib/infect.c
index d9a356a5e..959098b8c 100644
--- a/criu/arch/ppc64/infect.c
+++ b/compel/arch/ppc64/src/lib/infect.c
@@ -1,13 +1,13 @@
 #include <sys/ptrace.h>
 #include <sys/types.h>
 #include <sys/uio.h>
+#include <stdint.h>
 #include <errno.h>
 #include <compel/plugins/std/syscall-codes.h>
-#include "asm/types.h"
-#include "ptrace.h"
-#include "parasite-syscall.h"
-#include "compel/include/errno.h"
-#include "criu-log.h"
+#include "uapi/compel/asm/infect-types.h"
+#include "errno.h"
+#include "log.h"
+#include "common/bug.h"
 #include "infect.h"
 #include "infect-priv.h"
 
@@ -22,7 +22,7 @@
 /*
  * Injected syscall instruction
  */
-const u32 code_syscall[] = {
+const uint32_t code_syscall[] = {
 	0x44000002,		/* sc 		*/
 	0x0fe00000		/* twi 31,0,0	*/
 };
diff --git a/compel/arch/x86/src/lib/include/ptrace.h b/compel/arch/x86/src/lib/include/uapi/asm/breakpoints.h
index 844ea0efd..980f25d06 100644
--- a/compel/arch/x86/src/lib/include/ptrace.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/breakpoints.h
@@ -1,5 +1,5 @@
-#ifndef __COMPEL_PTRACE_H__
-#define __COMPEL_PTRACE_H__
+#ifndef __COMPEL_BREAKPOINTS_H__
+#define __COMPEL_BREAKPOINTS_H__
 #define ARCH_SI_TRAP SI_KERNEL
 extern int ptrace_set_breakpoint(pid_t pid, void *addr);
 extern int ptrace_flush_breakpoints(pid_t pid);
diff --git a/criu/arch/x86/include/asm/infect-types.h b/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
index bbc6bcf22..bbc6bcf22 100644
--- a/criu/arch/x86/include/asm/infect-types.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
diff --git a/criu/arch/x86/infect.c b/compel/arch/x86/src/lib/infect.c
index d4208ab54..53cae1dc5 100644
--- a/criu/arch/x86/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -11,15 +11,16 @@
 
 #include <compel/asm/processor-flags.h>
 #include <compel/cpu.h>
-#include "compel/include/errno.h"
+#include "errno.h"
 #include <compel/plugins/std/syscall-codes.h>
 #include <compel/plugins/std/syscall.h>
-#include "compel/include/asm/ptrace.h"
+#include "asm/ptrace.h"
 #include "common/err.h"
 #include "asm/infect-types.h"
-#include "ptrace.h"
+#include "uapi/compel/ptrace.h"
 #include "infect.h"
 #include "infect-priv.h"
+#include "log.h"
 
 /*
  * Injected syscall instruction
diff --git a/criu/include/infect-priv.h b/compel/include/infect-priv.h
index db5259c2c..db5259c2c 100644
--- a/criu/include/infect-priv.h
+++ b/compel/include/infect-priv.h
diff --git a/criu/include/rpc-pie-priv.h b/compel/include/rpc-pie-priv.h
index 3d9091159..3d9091159 100644
--- a/criu/include/rpc-pie-priv.h
+++ b/compel/include/rpc-pie-priv.h
diff --git a/compel/include/uapi/compel.h b/compel/include/uapi/compel.h
index 278a85455..3554c1599 100644
--- a/compel/include/uapi/compel.h
+++ b/compel/include/uapi/compel.h
@@ -4,6 +4,8 @@
 #include <errno.h>
 #include <stdarg.h>
 
+#include <compel/asm/infect-types.h>
+
 #define COMPEL_TYPE_INT		(1u << 0)
 #define COMPEL_TYPE_LONG	(1u << 1)
 #define COMPEL_TYPE_GOTPCREL	(1u << 2)
@@ -22,4 +24,8 @@ typedef void (*compel_log_fn)(unsigned int lvl, const char *fmt, va_list parms);
 extern void compel_log_init(compel_log_fn log_fn, unsigned int level);
 extern unsigned int compel_log_get_loglevel(void);
 
+#include <compel/infect-util.h>
+#include <compel/infect-rpc.h>
+#include <compel/infect.h>
+
 #endif /* UAPI_COMPEL_H__ */
diff --git a/criu/include/infect-rpc.h b/compel/include/uapi/infect-rpc.h
index 0176c1142..0176c1142 100644
--- a/criu/include/infect-rpc.h
+++ b/compel/include/uapi/infect-rpc.h
diff --git a/criu/include/infect-util.h b/compel/include/uapi/infect-util.h
index bd2010c3b..bd2010c3b 100644
--- a/criu/include/infect-util.h
+++ b/compel/include/uapi/infect-util.h
diff --git a/criu/include/infect.h b/compel/include/uapi/infect.h
index 760bdb80d..38051f437 100644
--- a/criu/include/infect.h
+++ b/compel/include/uapi/infect.h
@@ -1,10 +1,15 @@
 #ifndef __COMPEL_INFECT_H__
 #define __COMPEL_INFECT_H__
 
-#include "asm/infect-types.h"
+#include <stdbool.h>
+
+#include <compel/asm/sigframe.h>
+#include <compel/asm/infect-types.h>
 #include <compel/ksigset.h>
 #include <compel/compel.h>
 
+#include "common/compiler.h"
+
 #define PARASITE_START_AREA_MIN	(4096)
 
 extern int compel_stop_task(int pid);
diff --git a/criu/include/ptrace.h b/compel/include/uapi/ptrace.h
index e3f3374d5..2ab9e1c76 100644
--- a/criu/include/ptrace.h
+++ b/compel/include/uapi/ptrace.h
@@ -1,10 +1,11 @@
-#ifndef __CR_PTRACE_H__
-#define __CR_PTRACE_H__
+#ifndef UAPI_COMPEL_PTRACE_H__
+#define UAPI_COMPEL_PTRACE_H__
 
 #include <linux/types.h>
 #include <sys/ptrace.h>
 
-#include "types.h"
+#include <compel/asm/infect-types.h>
+#include <compel/asm/breakpoints.h>
 
 /* some constants for ptrace */
 #ifndef PTRACE_SEIZE
@@ -72,4 +73,4 @@ extern int ptrace_swap_area(pid_t pid, void *dst, void *src, long bytes);
 extern int ptrace_get_regs(pid_t pid, user_regs_struct_t *regs);
 extern int ptrace_set_regs(pid_t pid, user_regs_struct_t *regs);
 
-#endif /* __CR_PTRACE_H__ */
+#endif /* UAPI_COMPEL_PTRACE_H__ */
diff --git a/criu/infect-rpc.c b/compel/src/lib/infect-rpc.c
index 265a4ad2f..265a4ad2f 100644
--- a/criu/infect-rpc.c
+++ b/compel/src/lib/infect-rpc.c
diff --git a/criu/infect-util.c b/compel/src/lib/infect-util.c
index 275e2ec81..99dbee062 100644
--- a/criu/infect-util.c
+++ b/compel/src/lib/infect-util.c
@@ -1,8 +1,8 @@
-#include "int.h"
 #include "log.h"
 #include "common/bug.h"
 #include "common/lock.h"
-#include "util-pie.h"
+
+#include "uapi/compel/plugins/plugin-fds.h"
 
 #include "infect-rpc.h"
 #include "infect-util.h"
diff --git a/criu/infect.c b/compel/src/lib/infect.c
index 4c6c4927f..6a3724636 100644
--- a/criu/infect.c
+++ b/compel/src/lib/infect.c
@@ -9,19 +9,20 @@
 #include <fcntl.h>
 #include <linux/seccomp.h>
 
-#include "criu-log.h"
+#include "log.h"
 #include "common/bug.h"
 #include "common/xmalloc.h"
 #include "common/lock.h"
+#include "common/page.h"
 
 #include <compel/plugins/std/syscall-codes.h>
 #include <compel/plugins/std/asm/syscall-types.h>
-#include "compel/include/asm/ptrace.h"
-#include "compel/include/asm/syscall.h"
+#include "asm/ptrace.h"
+#include "uapi/compel/plugins/std/syscall.h"
 #include "asm/infect-types.h"
 #include "asm/sigframe.h"
 #include "infect.h"
-#include "ptrace.h"
+#include "uapi/compel/ptrace.h"
 #include "infect-rpc.h"
 #include "infect-priv.h"
 #include "infect-util.h"
@@ -495,7 +496,7 @@ int compel_execute_syscall(struct parasite_ctl *ctl,
 {
 	pid_t pid = ctl->rpid;
 	int err;
-	u8 code_orig[BUILTIN_SYSCALL_SIZE];
+	uint8_t code_orig[BUILTIN_SYSCALL_SIZE];
 
 	/*
 	 * Inject syscall instruction and remember original code,
@@ -549,7 +550,7 @@ static int parasite_init_daemon(struct parasite_ctl *ctl)
 	args = compel_parasite_args(ctl, struct parasite_init_args);
 
 	args->sigframe = (uintptr_t)ctl->rsigframe;
-	args->log_level = log_get_loglevel();
+	args->log_level = compel_log_get_loglevel();
 
 	futex_set(&args->daemon_connected, 0);
 
@@ -653,7 +654,7 @@ static int parasite_mmap_exchange(struct parasite_ctl *ctl, unsigned long size)
 static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size)
 {
 	void *where = (void *)ctl->ictx.syscall_ip + BUILTIN_SYSCALL_SIZE;
-	u8 orig_code[MEMFD_FNAME_SZ] = MEMFD_FNAME;
+	uint8_t orig_code[MEMFD_FNAME_SZ] = MEMFD_FNAME;
 	pid_t pid = ctl->rpid;
 	unsigned long sret = -ENOSYS;
 	int ret, fd, lfd;
diff --git a/criu/ptrace.c b/compel/src/lib/ptrace.c
index 8b9e166ec..c2991b5d8 100644
--- a/criu/ptrace.c
+++ b/compel/src/lib/ptrace.c
@@ -15,14 +15,12 @@
 #include <sys/resource.h>
 #include <sys/wait.h>
 
-#include "int.h"
 #include "common/compiler.h"
-#include "util.h"
-#include "ptrace.h"
-#include "pid.h"
-#include "proc_parse.h"
-#include "seccomp.h"
-#include "cr_options.h"
+
+#include "uapi/compel/asm/infect-types.h"
+#include "uapi/compel/ptrace.h"
+
+#include "log.h"
 
 int suspend_seccomp(pid_t pid)
 {
diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index c9dbceb08..668cc2869 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -2,9 +2,6 @@ ccflags-y		+= -iquote criu/$(ARCH)
 ccflags-y		+= -I compel/include/uapi
 ccflags-y		+= -I compel/plugins/include/uapi
 
-obj-y			+= infect.o
-obj-y			+= infect-rpc.o
-obj-y			+= infect-util.o
 obj-y			+= action-scripts.o
 obj-y			+= external.o
 obj-y			+= aio.o
@@ -58,7 +55,6 @@ obj-y			+= proc_parse.o
 obj-y			+= protobuf-desc.o
 obj-y			+= protobuf.o
 obj-y			+= pstree.o
-obj-y			+= ptrace.o
 obj-y			+= rbtree.o
 obj-y			+= rst-malloc.o
 obj-y			+= seccomp.o
diff --git a/criu/aio.c b/criu/aio.c
index 011a1afcf..27c251df5 100644
--- a/criu/aio.c
+++ b/criu/aio.c
@@ -11,8 +11,7 @@
 #include "parasite.h"
 #include "parasite-syscall.h"
 #include "images/mm.pb-c.h"
-#include "infect.h"
-#include "infect-rpc.h"
+#include <compel/compel.h>
 
 #define NR_IOEVENTS_IN_NPAGES(npages) ((PAGE_SIZE * npages - sizeof(struct aio_ring)) / sizeof(struct io_event))
 
diff --git a/criu/arch/aarch64/Makefile b/criu/arch/aarch64/Makefile
index e269de4c8..858e1a583 100644
--- a/criu/arch/aarch64/Makefile
+++ b/criu/arch/aarch64/Makefile
@@ -11,4 +11,3 @@ obj-y			+= cpu.o
 obj-y			+= crtools.o
 obj-y			+= sigframe.o
 obj-y			+= bitops.o
-obj-y			+= infect.o
diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index d3cbc7e6f..f98743a23 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -6,10 +6,10 @@
 #include "types.h"
 #include <compel/asm/processor-flags.h>
 
-#include "asm/infect-types.h"
+#include <compel/asm/infect-types.h>
 #include "asm/restorer.h"
 #include "common/compiler.h"
-#include "ptrace.h"
+#include <compel/ptrace.h>
 #include "asm/dump.h"
 #include "protobuf.h"
 #include "images/core.pb-c.h"
@@ -19,7 +19,7 @@
 #include "util.h"
 #include "cpu.h"
 #include "restorer.h"
-#include "infect.h"
+#include <compel/compel.h>
 
 #define assign_reg(dst, src, e)		dst->e = (__typeof__(dst->e))(src)->e
 
diff --git a/criu/arch/aarch64/sigframe.c b/criu/arch/aarch64/sigframe.c
index e8d99529a..be57c1670 100644
--- a/criu/arch/aarch64/sigframe.c
+++ b/criu/arch/aarch64/sigframe.c
@@ -1,5 +1,5 @@
 #include "asm/types.h"
-#include "asm/infect-types.h"
+#include <compel/asm/infect-types.h>
 #include "asm/sigframe.h"
 
 int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
diff --git a/criu/arch/arm/Makefile b/criu/arch/arm/Makefile
index da513ebca..ec32a9d6b 100644
--- a/criu/arch/arm/Makefile
+++ b/criu/arch/arm/Makefile
@@ -12,4 +12,3 @@ obj-y			+= cpu.o
 obj-y			+= crtools.o
 obj-y			+= sigframe.o
 obj-y			+= bitops.o
-obj-y			+= infect.o
diff --git a/criu/arch/arm/crtools.c b/criu/arch/arm/crtools.c
index aa3860e93..c216cdc5c 100644
--- a/criu/arch/arm/crtools.c
+++ b/criu/arch/arm/crtools.c
@@ -4,11 +4,11 @@
 #include "types.h"
 #include <compel/asm/processor-flags.h>
 
-#include "asm/infect-types.h"
+#include <compel/asm/infect-types.h>
 #include "asm/restorer.h"
 #include "common/compiler.h"
 #include "asm/dump.h"
-#include "ptrace.h"
+#include <compel/ptrace.h>
 #include "protobuf.h"
 #include "images/core.pb-c.h"
 #include "images/creds.pb-c.h"
@@ -18,8 +18,8 @@
 #include "elf.h"
 #include "parasite-syscall.h"
 #include "restorer.h"
-#include "kerndat.h"
-#include "infect.h"
+
+#include <compel/compel.h>
 
 #define assign_reg(dst, src, e)		dst->e = (__typeof__(dst->e))((src)->ARM_##e)
 
diff --git a/criu/arch/arm/sigframe.c b/criu/arch/arm/sigframe.c
index e8d99529a..be57c1670 100644
--- a/criu/arch/arm/sigframe.c
+++ b/criu/arch/arm/sigframe.c
@@ -1,5 +1,5 @@
 #include "asm/types.h"
-#include "asm/infect-types.h"
+#include <compel/asm/infect-types.h>
 #include "asm/sigframe.h"
 
 int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
diff --git a/criu/arch/ppc64/Makefile b/criu/arch/ppc64/Makefile
index cd7c41250..12b8ad2e3 100644
--- a/criu/arch/ppc64/Makefile
+++ b/criu/arch/ppc64/Makefile
@@ -8,4 +8,3 @@ ccflags-y		+= -I compel/plugins/include/uapi
 obj-y			+= cpu.o
 obj-y			+= crtools.o
 obj-y			+= sigframe.o
-obj-y			+= infect.o
diff --git a/criu/arch/ppc64/crtools.c b/criu/arch/ppc64/crtools.c
index 3d662542e..074490956 100644
--- a/criu/arch/ppc64/crtools.c
+++ b/criu/arch/ppc64/crtools.c
@@ -12,12 +12,12 @@
 
 #include "cr_options.h"
 #include "common/compiler.h"
-#include "ptrace.h"
+#include <compel/ptrace.h>
 #include "parasite-syscall.h"
 #include "log.h"
 #include "util.h"
 #include "cpu.h"
-#include "infect.h"
+#include <compel/compel.h>
 
 #include "protobuf.h"
 #include "images/core.pb-c.h"
diff --git a/criu/arch/ppc64/include/asm/restorer.h b/criu/arch/ppc64/include/asm/restorer.h
index 399bdfb52..c779a1869 100644
--- a/criu/arch/ppc64/include/asm/restorer.h
+++ b/criu/arch/ppc64/include/asm/restorer.h
@@ -5,7 +5,7 @@
 #include <asm/elf.h>
 #include <asm/types.h>
 #include "asm/types.h"
-#include "asm/infect-types.h"
+#include <compel/asm/infect-types.h>
 
 #include <compel/asm/sigframe.h>
 
diff --git a/criu/arch/x86/Makefile b/criu/arch/x86/Makefile
index fcbb67129..6744f9a27 100644
--- a/criu/arch/x86/Makefile
+++ b/criu/arch/x86/Makefile
@@ -12,7 +12,6 @@ asflags-y		+= -iquote $(obj)/include
 obj-y			+= cpu.o
 obj-y			+= crtools.o
 obj-y			+= sigframe.o
-obj-y			+= infect.o
 ifeq ($(CONFIG_COMPAT),y)
         obj-y		+= sigaction_compat.o
         obj-y		+= call32.o
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index 886a2c7a3..c59face98 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -14,14 +14,14 @@
 #include "cr_options.h"
 #include "common/compiler.h"
 #include "restorer.h"
-#include "ptrace.h"
+#include <compel/ptrace.h>
 #include "parasite-syscall.h"
 #include "log.h"
 #include "util.h"
 #include "cpu.h"
 #include <compel/plugins/std/syscall-codes.h>
 #include "kerndat.h"
-#include "infect.h"
+#include <compel/compel.h>
 
 #include "protobuf.h"
 #include "images/core.pb-c.h"
diff --git a/criu/arch/x86/sys-exec-tbl.c b/criu/arch/x86/sys-exec-tbl.c
index 1051af06f..608dc2510 100644
--- a/criu/arch/x86/sys-exec-tbl.c
+++ b/criu/arch/x86/sys-exec-tbl.c
@@ -1,4 +1,4 @@
-#include "infect.h"
+#include <compel/compel.h>
 
 static struct syscall_exec_desc sc_exec_table_64[] = {
 #include "sys-exec-tbl-64.c"
diff --git a/criu/cr-check.c b/criu/cr-check.c
index 82e5a9d9e..fc0c2e99d 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -38,7 +38,7 @@
 #include "proc_parse.h"
 #include "mount.h"
 #include "tty.h"
-#include "ptrace.h"
+#include <compel/ptrace.h>
 #include "ptrace-compat.h"
 #include "kerndat.h"
 #include "timerfd.h"
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index e6575ea51..ded343ed8 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -42,7 +42,6 @@
 #include "cr_options.h"
 #include "servicefd.h"
 #include "string.h"
-#include "ptrace.h"
 #include "ptrace-compat.h"
 #include "util.h"
 #include "namespaces.h"
diff --git a/criu/cr-exec.c b/criu/cr-exec.c
index 29a02bd77..b39c77238 100644
--- a/criu/cr-exec.c
+++ b/criu/cr-exec.c
@@ -12,8 +12,7 @@
 #include "log.h"
 #include "util.h"
 #include "kerndat.h"
-#include "infect.h"
-#include "infect-priv.h"
+#include <compel/compel.h>
 
 struct syscall_exec_desc {
 	char *name;
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 7c0baa9b8..2448360c9 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -23,10 +23,8 @@
 
 #include <sys/sendfile.h>
 
-#include "compel/include/asm/ptrace.h"
-
 #include "types.h"
-#include "ptrace.h"
+#include <compel/ptrace.h>
 #include "common/compiler.h"
 
 #include "cr_options.h"
@@ -71,7 +69,7 @@
 #include "file-lock.h"
 #include "action-scripts.h"
 #include "shmem.h"
-#include "infect.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 04359e247..d67ac5e56 100644
--- a/criu/include/proc_parse.h
+++ b/criu/include/proc_parse.h
@@ -3,7 +3,7 @@
 
 #include <sys/types.h>
 
-#include "infect.h"
+#include <compel/compel.h>
 #include "images/seccomp.pb-c.h"
 
 #define PROC_TASK_COMM_LEN	32
diff --git a/criu/include/ptrace-compat.h b/criu/include/ptrace-compat.h
index f6cc8b932..295fb01c6 100644
--- a/criu/include/ptrace-compat.h
+++ b/criu/include/ptrace-compat.h
@@ -1,8 +1,10 @@
-#ifndef __CR_PTRACE_ARCH_H__
-#define __CR_PTRACE_ARCH_H__
+#ifndef __CR_PTRACE_H__
+#define __CR_PTRACE_H__
 
 #include <linux/types.h>
 #include <sys/ptrace.h>
+
+#include "types.h"
 #include "config.h"
 
 #ifndef CONFIG_HAS_PTRACE_PEEKSIGINFO
@@ -13,4 +15,4 @@ struct ptrace_peeksiginfo_args {
 };
 #endif
 
-#endif /* __CR_PTRACE_ARCH_H__ */
+#endif /* __CR_PTRACE_H__ */
diff --git a/criu/include/types.h b/criu/include/types.h
index 36f24085a..7600f3592 100644
--- a/criu/include/types.h
+++ b/criu/include/types.h
@@ -1,5 +1,5 @@
 #ifndef __CR_INC_TYPES_H__
 #define __CR_INC_TYPES_H__
-#include "asm/infect-types.h"
+#include <compel/asm/infect-types.h>
 #include "asm/types.h"
 #endif
diff --git a/criu/mem.c b/criu/mem.c
index 757e13668..26c370ac9 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -25,9 +25,7 @@
 #include "files-reg.h"
 #include "pagemap-cache.h"
 #include "fault-injection.h"
-#include "infect.h"
-#include "infect-rpc.h"
-#include "infect-util.h"
+#include <compel/compel.h>
 
 #include "protobuf.h"
 #include "images/pagemap.pb-c.h"
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index 43d6efbe0..dc7a831e4 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -15,7 +15,7 @@
 #include "images/pagemap.pb-c.h"
 
 #include "imgset.h"
-#include "ptrace.h"
+#include <compel/ptrace.h>
 #include "parasite-syscall.h"
 #include "parasite.h"
 #include "crtools.h"
@@ -46,6 +46,8 @@
 #include "infect-rpc.h"
 #include "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/infect.c b/criu/pie/infect.c
index 2a4cf40f8..1863a1ee9 100644
--- a/criu/pie/infect.c
+++ b/criu/pie/infect.c
@@ -8,7 +8,7 @@
 #include "sigframe.h"
 #include "infect-rpc.h"
 #include "infect-pie.h"
-#include "rpc-pie-priv.h"
+#include "compel/include/rpc-pie-priv.h"
 
 static int tsock = -1;
 
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index b4a476227..e84d63405 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -19,8 +19,6 @@
 #include "criu-log.h"
 #include "tty.h"
 #include "aio.h"
-#include "infect-rpc.h"
-#include "infect-pie.h"
 
 #include "asm/parasite.h"
 #include "restorer.h"
diff --git a/criu/seccomp.c b/criu/seccomp.c
index 15bd69fe9..c5e7a7d93 100644
--- a/criu/seccomp.c
+++ b/criu/seccomp.c
@@ -7,7 +7,7 @@
 #include "imgset.h"
 #include "kcmp.h"
 #include "pstree.h"
-#include "ptrace.h"
+#include <compel/ptrace.h>
 #include "proc_parse.h"
 #include "restorer.h"
 #include "seccomp.h"
diff --git a/criu/seize.c b/criu/seize.c
index 51daadf43..263f5a928 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -15,13 +15,13 @@
 #include "cr-errno.h"
 #include "pstree.h"
 #include "criu-log.h"
-#include "ptrace.h"
+#include <compel/ptrace.h>
 #include "proc_parse.h"
 #include "seize.h"
 #include "stats.h"
 #include "xmalloc.h"
 #include "util.h"
-#include "infect.h"
+#include <compel/compel.h>
 
 #define NR_ATTEMPTS 5
 
diff --git a/criu/vdso.c b/criu/vdso.c
index 7a50587f6..dbbf84e09 100644
--- a/criu/vdso.c
+++ b/criu/vdso.c
@@ -19,8 +19,7 @@
 #include "log.h"
 #include "mem.h"
 #include "vma.h"
-#include "infect.h"
-#include "infect-rpc.h"
+#include <compel/compel.h>
 
 #ifdef LOG_PREFIX
 # undef LOG_PREFIX