private: further cleanup of private.h, sort out header includes

lib/wp/core.h

@@ -9,14 +9,15 @@
 #ifndef __WIREPLUMBER_CORE_H__
 #define __WIREPLUMBER_CORE_H__
 
-#include <glib-object.h>
-#include "object-manager.h"
-#include "proxy.h"
+#include <gio/gio.h>
+#include "defs.h"
+#include "properties.h"
 
 G_BEGIN_DECLS
 
 struct pw_context;
 struct pw_core;
+typedef struct _WpObjectManager WpObjectManager;
 
 #define WP_TYPE_CORE (wp_core_get_type ())
 WP_API

lib/wp/endpoint.c

@@ -16,6 +16,7 @@
 #include "endpoint.h"
 #include "node.h"
 #include "session.h"
+#include "object-manager.h"
 #include "error.h"
 #include "wpenums.h"
 #include "si-factory.h"

lib/wp/object.h

@@ -9,12 +9,11 @@
 #ifndef __WIREPLUMBER_OBJECT_H__
 #define __WIREPLUMBER_OBJECT_H__
 
+#include "core.h"
 #include "transition.h"
 
 G_BEGIN_DECLS
 
-typedef struct _WpCore WpCore;
-
 /**
  * WpObjectFeatures:
  *

lib/wp/private.h

@@ -9,14 +9,9 @@
 #ifndef __WIREPLUMBER_PRIVATE_H__
 #define __WIREPLUMBER_PRIVATE_H__
 
-#include "core.h"
-#include "object-manager.h"
 #include "props.h"
-#include "proxy.h"
-#include "session-item.h"
 #include "spa-type.h"
 
-#include <stdint.h>
 #include <pipewire/pipewire.h>
 
 G_BEGIN_DECLS

lib/wp/session-bin.h

@@ -9,7 +9,6 @@
 #ifndef __WIREPLUMBER_SESSION_BIN_H__
 #define __WIREPLUMBER_SESSION_BIN_H__
 
-#include "core.h"
 #include "session-item.h"
 #include "iterator.h"
 

lib/wp/session.c

@@ -14,6 +14,7 @@
 #define G_LOG_DOMAIN "wp-session"
 
 #include "session.h"
+#include "object-manager.h"
 #include "error.h"
 #include "wpenums.h"
 #include "private/impl-endpoint.h"