From 94213310a30492c188903c455b9195b8d1593dff Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <george.kiagiadakis@collabora.com>
Date: Mon, 16 Nov 2020 10:35:50 +0200
Subject: [PATCH] private: further cleanup of private.h, sort out header
 includes

---
 lib/wp/core.h        | 7 ++++---
 lib/wp/endpoint.c    | 1 +
 lib/wp/object.h      | 3 +--
 lib/wp/private.h     | 5 -----
 lib/wp/session-bin.h | 1 -
 lib/wp/session.c     | 1 +
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/lib/wp/core.h b/lib/wp/core.h
index 85648d3e..37e2efe2 100644
--- a/lib/wp/core.h
+++ b/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
diff --git a/lib/wp/endpoint.c b/lib/wp/endpoint.c
index 1e18a5ce..bc3e87e2 100644
--- a/lib/wp/endpoint.c
+++ b/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"
diff --git a/lib/wp/object.h b/lib/wp/object.h
index 06a18e5b..6302eac7 100644
--- a/lib/wp/object.h
+++ b/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:
  *
diff --git a/lib/wp/private.h b/lib/wp/private.h
index 0513ab7f..54d83bbd 100644
--- a/lib/wp/private.h
+++ b/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
diff --git a/lib/wp/session-bin.h b/lib/wp/session-bin.h
index 608aaf1c..81ec35e3 100644
--- a/lib/wp/session-bin.h
+++ b/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"
 
diff --git a/lib/wp/session.c b/lib/wp/session.c
index b4f91433..59220ebc 100644
--- a/lib/wp/session.c
+++ b/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"