[CRIU] [PATCH 47/78] infect: Reshuffle headers

[Cyrill Gorcunov]

From: Pavel Emelyanov <xemul at virtuozzo.com>

Signed-off-by: Pavel Emelyanov <xemul at virtuozzo.com>
---
 criu/arch/x86/infect.c | 13 +++++++------
 criu/infect-rpc.c      |  4 ++--
 criu/infect-util.c     |  1 +
 criu/infect.c          | 19 ++++++++++---------
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/criu/arch/x86/infect.c b/criu/arch/x86/infect.c
index b261dd2895a7..da387feb168f 100644
--- a/criu/arch/x86/infect.c
+++ b/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"
 
diff --git a/criu/infect-rpc.c b/criu/infect-rpc.c
index 858a4c0b6ceb..c8b97a297f6d 100644
--- a/criu/infect-rpc.c
+++ b/criu/infect-rpc.c
@@ -1,8 +1,8 @@
-#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"
diff --git a/criu/infect-util.c b/criu/infect-util.c
index 8db32afdf147..4c0537fdc512 100644
--- a/criu/infect-util.c
+++ b/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"
 
diff --git a/criu/infect.c b/criu/infect.c
index d171ed31b859..515c31e8be2a 100644
--- a/criu/infect.c
+++ b/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)
 
-- 
2.7.4