fix includes

spa/include/spa/monitor/device.h

@@ -30,9 +30,8 @@ extern "C" {
 #endif
 
 #include <spa/utils/defs.h>
+#include <spa/utils/hook.h>
 #include <spa/utils/dict.h>
-#include <spa/support/plugin.h>
-#include <spa/pod/builder.h>
 #include <spa/pod/event.h>
 
 /**

spa/include/spa/monitor/utils.h

@@ -29,6 +29,7 @@
 extern "C" {
 #endif
 
+#include <spa/pod/builder.h>
 #include <spa/monitor/device.h>
 
 struct spa_result_device_params_data {

spa/include/spa/node/event.h

@@ -29,9 +29,7 @@
 extern "C" {
 #endif
 
-#include <spa/utils/defs.h>
 #include <spa/pod/event.h>
-#include <spa/node/node.h>
 
 /* object id of SPA_TYPE_EVENT_Node */
 enum spa_node_event {

spa/include/spa/node/node.h

@@ -30,9 +30,12 @@ extern "C" {
 #endif
 
 #include <spa/utils/defs.h>
-#include <spa/utils/result.h>
 #include <spa/utils/type.h>
 #include <spa/utils/hook.h>
+#include <spa/buffer/buffer.h>
+#include <spa/node/event.h>
+#include <spa/node/command.h>
+
 
 /**
  * A spa_node is a component that can consume and produce buffers.
@@ -40,12 +43,6 @@ extern "C" {
 #define SPA_VERSION_NODE	0
 struct spa_node { struct spa_interface iface; };
 
-#include <spa/support/plugin.h>
-
-#include <spa/buffer/buffer.h>
-#include <spa/node/event.h>
-#include <spa/node/command.h>
-
 /**
  * Node information structure
  *

spa/include/spa/param/type-info.h

@@ -32,7 +32,6 @@ extern "C" {
 #include <spa/utils/defs.h>
 #include <spa/param/props.h>
 #include <spa/param/format.h>
-#include <spa/node/io.h>
 #include <spa/buffer/type-info.h>
 
 /* base for parameter object enumerations */

spa/include/spa/support/loop.h

@@ -31,7 +31,6 @@ extern "C" {
 
 #include <spa/utils/defs.h>
 #include <spa/utils/hook.h>
-#include <spa/utils/result.h>
 #include <spa/support/system.h>
 
 #define SPA_VERSION_LOOP		0

spa/include/spa/support/system.h

@@ -33,7 +33,6 @@ extern "C" {
 
 #include <spa/utils/defs.h>
 #include <spa/utils/hook.h>
-#include <spa/utils/result.h>
 
 /**
  * a collection of core system functions

spa/include/spa/utils/defs.h

@@ -236,14 +236,6 @@ struct spa_param_info {
 #define spa_memzero(x,l) (memset((x), 0, (l)))
 #define spa_zero(x) (spa_memzero(&(x), sizeof(x)))
 
-#define spa_strerror(err)		\
-({					\
-	int _err = -err;		\
-	if (SPA_RESULT_IS_ASYNC(err))	\
-		_err = EINPROGRESS;	\
-	strerror(_err);			\
-})
-
 #ifdef SPA_DEBUG_MEMCPY
 #define spa_memcpy(d,s,n)						\
 ({									\

spa/include/spa/utils/result.h

@@ -43,6 +43,14 @@ extern "C" {
 #define SPA_RESULT_ASYNC_SEQ(res)	((res) & SPA_ASYNC_SEQ_MASK)
 #define SPA_RESULT_RETURN_ASYNC(seq)	(SPA_ASYNC_BIT | SPA_RESULT_ASYNC_SEQ(seq))
 
+#define spa_strerror(err)		\
+({					\
+	int _err = -err;		\
+	if (SPA_RESULT_IS_ASYNC(err))	\
+		_err = EINPROGRESS;	\
+	strerror(_err);			\
+})
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif