[CRIU] [PATCH 1/5] crtools: don't include crtools.h in other headers

[Andrey Vagin]

Signed-off-by: Andrey Vagin <avagin at openvz.org>
---
 file-lock.c           | 3 +++
 include/eventfd.h     | 1 -
 include/eventpoll.h   | 1 -
 include/file-lock.h   | 3 ++-
 include/fsnotify.h    | 1 -
 include/ipc_ns.h      | 2 --
 include/namespaces.h  | 1 -
 include/posix-timer.h | 2 ++
 include/restorer.h    | 1 -
 include/tty.h         | 1 -
 include/uts_ns.h      | 2 --
 11 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/file-lock.c b/file-lock.c
index b55cc64..5ea11cc 100644
--- a/file-lock.c
+++ b/file-lock.c
@@ -6,7 +6,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include "crtools.h"
 #include "fdset.h"
+#include "image.h"
+#include "servicefd.h"
 #include "file-lock.h"
 #include "parasite.h"
 #include "parasite-syscall.h"
diff --git a/include/eventfd.h b/include/eventfd.h
index 5666e50..b36e24c 100644
--- a/include/eventfd.h
+++ b/include/eventfd.h
@@ -7,7 +7,6 @@
 #include "compiler.h"
 #include "asm/types.h"
 #include "files.h"
-#include "crtools.h"
 
 extern int is_eventfd_link(int lfd);
 extern const struct fdtype_ops eventfd_dump_ops;
diff --git a/include/eventpoll.h b/include/eventpoll.h
index e67a2e5..6224e2a 100644
--- a/include/eventpoll.h
+++ b/include/eventpoll.h
@@ -7,7 +7,6 @@
 #include "compiler.h"
 #include "asm/types.h"
 #include "files.h"
-#include "crtools.h"
 
 extern int is_eventpoll_link(int lfd);
 extern const struct fdtype_ops eventpoll_dump_ops;
diff --git a/include/file-lock.h b/include/file-lock.h
index 084cc2c..56de975 100644
--- a/include/file-lock.h
+++ b/include/file-lock.h
@@ -1,7 +1,8 @@
 #ifndef __FILE_LOCK_H__
 #define __FILE_LOCK_H__
 
-#include "crtools.h"
+#include "list.h"
+
 #include "protobuf.h"
 #include "protobuf/file-lock.pb-c.h"
 
diff --git a/include/fsnotify.h b/include/fsnotify.h
index eb33370..d4e41f9 100644
--- a/include/fsnotify.h
+++ b/include/fsnotify.h
@@ -7,7 +7,6 @@
 #include "compiler.h"
 #include "asm/types.h"
 #include "files.h"
-#include "crtools.h"
 
 struct fsnotify_params {
 	u32	id;
diff --git a/include/ipc_ns.h b/include/ipc_ns.h
index 2f3adf3..a50281f 100644
--- a/include/ipc_ns.h
+++ b/include/ipc_ns.h
@@ -1,8 +1,6 @@
 #ifndef __CR_IPC_NS_H__
 #define __CR_IPC_NS_H__
 
-#include "crtools.h"
-
 extern int dump_ipc_ns(int ns_pid, int ns_id);
 extern int prepare_ipc_ns(int pid);
 
diff --git a/include/namespaces.h b/include/namespaces.h
index 5694e00..14061d3 100644
--- a/include/namespaces.h
+++ b/include/namespaces.h
@@ -1,7 +1,6 @@
 #ifndef __CR_NS_H__
 #define __CR_NS_H__
 
-#include "crtools.h"
 #include "files.h"
 
 struct ns_desc {
diff --git a/include/posix-timer.h b/include/posix-timer.h
index 70b007f..344566e 100644
--- a/include/posix-timer.h
+++ b/include/posix-timer.h
@@ -1,6 +1,8 @@
 #ifndef __CR_PROC_POSIX_TIMER_H__
 #define __CR_PROC_POSIX_TIMER_H__
 
+#include "list.h"
+
 struct str_posix_timer {
 	long it_id;
 	int clock_id;
diff --git a/include/restorer.h b/include/restorer.h
index 3df7c7b..3b83d81 100644
--- a/include/restorer.h
+++ b/include/restorer.h
@@ -11,7 +11,6 @@
 #include "image.h"
 #include "lock.h"
 #include "util.h"
-#include "crtools.h"
 #include "asm/restorer.h"
 
 #include "posix-timer.h"
diff --git a/include/tty.h b/include/tty.h
index 43a737c..d2c31e2 100644
--- a/include/tty.h
+++ b/include/tty.h
@@ -2,7 +2,6 @@
 #define __CR_TTY_H__
 
 #include "files.h"
-#include "crtools.h"
 
 /* Kernel's limit */
 #define TERMIOS_NCC	19
diff --git a/include/uts_ns.h b/include/uts_ns.h
index 7919923..a570507 100644
--- a/include/uts_ns.h
+++ b/include/uts_ns.h
@@ -1,8 +1,6 @@
 #ifndef __CR_UTS_NS_H__
 #define __CR_UTS_NS_H__
 
-#include "crtools.h"
-
 int dump_uts_ns(int ns_pid, int ns_id);
 int prepare_utsns(int pid);
 
-- 
1.8.3.1