compel/plugins: simplify #includes

First, for building compel plugins, we already have
"-I compel/include/uapi" in ccflags and asflags, so there is
no need to add "-iquote include/uapi".

Second, let's refer to compel plugin uapi includes in a uniform way,
choosing the same way the external code does, i.e. #include <compel/...>.

Third, in a few cases simplify #include statements by including
compel/plugins/plugin-std.h instead of a number of plugins/std/*.h files.

Reviewed-by: Cyrill Gorcunov <gorcunov@openvz.org>
Reviewed-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Acked-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

compel/plugins/Makefile

@@ -20,9 +20,7 @@ ccflags-y		+= -fpie -fno-stack-protector
 
 # General compel/plugins includes
 ccflags-y		+= -iquote $(obj)/include
-ccflags-y		+= -iquote $(obj)/include/uapi
 asflags-y		+= -iquote $(obj)/include
-asflags-y		+= -iquote $(obj)/include/uapi
 
 # Arch compel/plugins includes
 ccflags-y		+= -iquote $(PLUGIN_ARCH_DIR)/include

compel/plugins/shmem/shmem.c

@@ -1,8 +1,8 @@
 #include <sys/mman.h>
 
-#include "uapi/plugins.h"
-#include "uapi/plugin-shmem.h"
-#include "uapi/std/syscall.h"
+#include <compel/plugins.h>
+#include <compel/plugins/plugin-shmem.h>
+#include <compel/plugins/std/syscall.h>
 #include "shmem.h"
 #include "std-priv.h"
 

compel/plugins/std/fds.c

@@ -1,11 +1,7 @@
 #include <errno.h>
 
-#include "uapi/plugins.h"
-
-#include "uapi/std/syscall.h"
-#include "uapi/std/string.h"
-#include "uapi/std/log.h"
-#include "uapi/std/fds.h"
+#include <compel/plugins.h>
+#include <compel/plugins/plugin-std.h>
 
 #include "std-priv.h"
 

compel/plugins/std/infect.c

@@ -1,11 +1,6 @@
-#include <compel/plugins/std/syscall.h>
-#include <compel/plugins/std/infect.h>
+#include <compel/plugins/plugin-std.h>
 
 #include "common/scm.h"
-#include "uapi/compel/plugins/std/fds.h"
-#include "uapi/compel/plugins/std/string.h"
-#include "uapi/compel/plugins/std/log.h"
-
 #include "common/compiler.h"
 #include "common/lock.h"
 

compel/plugins/std/std.c

@@ -1,7 +1,7 @@
 #include <sys/types.h>
 
-#include "uapi/plugins.h"
-#include "uapi/plugin-std.h"
+#include <compel/plugins.h>
+#include <compel/plugins/plugin-std.h>
 
 #include "asm/prologue.h"
 

compel/plugins/std/string.c

@@ -2,8 +2,8 @@
 #include <stdbool.h>
 #include <stdarg.h>
 
-#include "uapi/std/syscall.h"
-#include "uapi/std/string.h"
+#include <compel/plugins/std/syscall.h>
+#include <compel/plugins/std/string.h>
 
 #include "features.h"
 

compel/test/infect/parasite.c

@@ -1,10 +1,6 @@
 #include <errno.h>
 
-#include <compel/plugins/std/syscall.h>
-#include <compel/plugins/std/string.h>
-#include <compel/plugins/std/log.h>
-
-#include <compel/infect-rpc.h>
+#include <compel/plugins/plugin-std.h>
 
 /*
  * Stubs for std compel plugin.