infect: Reshuffle headers

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

criu/arch/x86/infect.c

@@ -5,17 +5,18 @@
 #include <sys/mman.h>
 #include <sys/user.h>
 
+#include "errno.h"
 #include "asm/processor-flags.h"
+#include "asm/fpu.h"
+#include "asm/cpu.h"
+#include "kerndat.h"
+
 #include "uapi/std/syscall-codes.h"
 #include "compel/include/asm/syscall.h"
 #include "compel/include/asm/ptrace.h"
-#include "err.h"
-#include "asm/fpu.h"
-#include "asm/types.h"
-#include "errno.h"
-#include "asm/cpu.h"
+#include "common/err.h"
+#include "asm/infect-types.h"
 #include "ptrace.h"
-#include "kerndat.h"
 #include "infect.h"
 #include "infect-priv.h"
 

criu/infect-rpc.c

-#include "xmalloc.h"
-#include "types.h"
 #include "log.h"
 #include "common/bug.h"
+#include "common/xmalloc.h"
 #include "lock.h"
+
 #include "infect.h"
 #include "infect-priv.h"
 #include "infect-rpc.h"

criu/infect-util.c

@@ -3,6 +3,7 @@
 #include "common/bug.h"
 #include "lock.h"
 #include "util-pie.h"
+
 #include "infect-rpc.h"
 #include "infect-util.h"
 

criu/infect.c

@@ -8,7 +8,16 @@
 #include <stdio.h>
 #include <linux/seccomp.h>
 
-#include "xmalloc.h"
+#include "pie-relocs.h"
+#include "parasite-blob.h"
+#include "criu-log.h"
+#include "common/bug.h"
+#include "common/xmalloc.h"
+#include "lock.h"
+
+#include <fcntl.h>
+#include "util.h"
+
 #include "uapi/std/syscall-codes.h"
 #include "uapi/std/asm/syscall-types.h"
 #include "compel/include/asm/ptrace.h"
@@ -16,18 +25,10 @@
 #include "asm/sigframe.h"
 #include "infect.h"
 #include "ptrace.h"
-#include "pie-relocs.h"
-#include "parasite-blob.h"
-#include "criu-log.h"
-#include "common/bug.h"
-#include "lock.h"
 #include "infect-rpc.h"
 #include "infect-priv.h"
 #include "infect-util.h"
 
-#include <fcntl.h>
-#include "util.h"
-
 #define UNIX_PATH_MAX (sizeof(struct sockaddr_un) - \
 			(size_t)((struct sockaddr_un *) 0)->sun_path)